Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: improve error message when matching too soon [fixes DXJ-771] #908

Draft
wants to merge 84 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
f049327
feat: improve error message when matching to soon [fixes DXJ-771]
shamsartem Apr 15, 2024
043e713
fix
shamsartem Apr 15, 2024
881362c
fix: don't interactively ask for the env in `fluence default peers` c…
shamsartem Apr 17, 2024
e10fcc8
feat: allow adding spell to any deployment, improve validation [fixes…
shamsartem Apr 17, 2024
907b407
feat: improve offer-update logs [fixes DXJ-760] (#910)
shamsartem Apr 17, 2024
fc1c8b2
feat: retry indexer client on local network (#911)
shamsartem Apr 19, 2024
68a97e2
feat: make it possible to move noxes from one offer to another, impro…
shamsartem Apr 24, 2024
4a2f856
feat: allow selecting a deployment when creating a new service [fixes…
shamsartem Apr 25, 2024
8cc6dc2
feat: update copyright (#919)
shamsartem May 1, 2024
be7352c
chore: configured backporting support (#912)
enjenjenje May 7, 2024
1a5b336
feat: update all dependencies (#917)
shamsartem May 8, 2024
cebc439
feat: chunk CUs when withdrawing collateral, add retry for Tendermint…
shamsartem May 14, 2024
18372b7
fix: filter provider's CUs when exiting from deals. Add CU batching […
shamsartem May 15, 2024
dc796b8
chore: set s3 endpoint to region specific (#932)
enjenjenje May 15, 2024
0269c89
chore: set s3 endpoint to region specific #2
enjenjenje May 15, 2024
95d5bb3
chore: set s3 endpoint to region specific #3
enjenjenje May 15, 2024
a0a9400
chore: set s3 endpoint to region specific #4
enjenjenje May 15, 2024
9e3f204
chore: set s3 endpoint to region specific #5
enjenjenje May 15, 2024
340900a
chore: set s3 endpoint to region specific #6
enjenjenje May 15, 2024
e62b165
chore: set s3 endpoint to region specific #7
enjenjenje May 15, 2024
4217e93
chore: set s3 endpoint to region specific #8
enjenjenje May 15, 2024
133adeb
chore: set s3 endpoint to region specific #9
enjenjenje May 15, 2024
0e0ed5d
chore: set s3 endpoint to region specific #10
enjenjenje May 15, 2024
45e2df1
chore: set s3 endpoint to region specific #11
enjenjenje May 20, 2024
4654f94
chore: revert back oclif update (#944)
enjenjenje May 20, 2024
f86fbb8
feat: test improvements (#923)
shamsartem May 20, 2024
67ca200
chore(main): release fluence-cli 0.16.3 (#893)
fluencebot May 21, 2024
e83f796
feat: set up monorepo (#943)
shamsartem May 27, 2024
c1b12fc
fix: manifest path (#947)
shamsartem May 28, 2024
6e2e0db
chore: Fix e2e snapshots pulling (#948)
nahsi May 28, 2024
d15d5f7
chore: fixed typo in win promote job (#949)
enjenjenje May 30, 2024
d9e322d
chore: Update aqua-api to 0.14.9 (#952)
DieMyst Jun 7, 2024
06c9d1e
feat: update marine 0.20.1, mrepl 0.31.0 (#954)
shamsartem Jun 10, 2024
b6a84ac
feat: add json flag for provider cc-info (#955)
shamsartem Jun 10, 2024
ef7f63e
feat: local connector, linter, formatter, CI cache fix [fixes DXJ-409…
shamsartem Jun 10, 2024
0a00efe
feat: update nox 0.25.0 (#951)
kmd-fl Jun 10, 2024
1a4adc5
feat: improve redeploy message (#945)
shamsartem Jun 10, 2024
c2bf643
Update package.json
shamsartem Jun 11, 2024
f858d76
fix!: update rust toolchain and fix toolchain override (#959)
shamsartem Jun 11, 2024
7ab3a1f
fix: remove cli from monorepo (#964)
shamsartem Jun 11, 2024
7c87f38
fix: cli-connector not found (#965)
shamsartem Jun 11, 2024
9871831
Update README.md
shamsartem Jun 14, 2024
f16c2a2
fix: add cc-ids flag to provider cc-rewards-withdraw (#970)
shamsartem Jun 20, 2024
fafc236
chore(main): release fluence-cli 0.17.0 (#946)
fluencebot Jun 26, 2024
6e2292e
chore(license): switch to AGPLv3 (#971)
shamsartem Jun 26, 2024
b56b881
feat: bump deal-ts-clients 0.14.0 (#969)
justprosh Jul 1, 2024
362e068
chore: Dump anvil state only with label and on failure (#974)
nahsi Jul 4, 2024
6c5f329
feat: use rust-toolchain.toml (#975)
shamsartem Jul 8, 2024
86b39e6
feat: add human-readable messages to the CLI connector (#976)
shamsartem Jul 9, 2024
8f3f4f6
fix: documentation links in configs (#977)
shamsartem Jul 9, 2024
c63eedf
feat: add health check to graph-node (#981)
shamsartem Jul 12, 2024
4eac711
feat: allow deploying to all CU of peer ids [BRND-13] (#982)
shamsartem Jul 12, 2024
74b3003
chore(deps): deal-ts-clients 0.14.3 (#983)
folex Jul 17, 2024
982b7a9
fix(deps): ts-clients 0.15.0, diamond on stage (#986)
folex Jul 24, 2024
33fdd61
fix(deps): deal-ts-clients 0.15.1, diamond on Dar (#987)
folex Jul 26, 2024
fb7e6db
chore(deps): update nox docker tag to v0.25.1 (#984)
renovate[bot] Jul 26, 2024
0fe3986
chore(main): release fluence-cli 0.17.1 (#972)
fluencebot Jul 26, 2024
9416f32
fix(deps): fluence-network-environment 1.2.2 (#989)
folex Jul 30, 2024
f48e5b5
feat(deps, provider): deal-ts-clients 0.15.2, integrate new collatera…
folex Aug 2, 2024
585d3c6
feat(kras)!: switch kras chain to raas (#993)
folex Aug 7, 2024
1a1a4d3
fix(cli-connector): switch chain networks reliably, fix connector not…
shamsartem Aug 8, 2024
a63df1e
feat: add provider test (#980)
shamsartem Aug 8, 2024
62b70c4
feat: offer-info updates [fixes DXJ-770] (#906)
shamsartem Aug 9, 2024
5aacb77
feat: nox diamond update, update aqua-lib 0.11.0 (#995)
shamsartem Aug 12, 2024
ecd080d
fix(deps): deal-ts-clients 0.15.4, new stage & testnet contracts (#996)
folex Aug 12, 2024
d17ec22
fix: don't ensure rust when showing versions (#999)
shamsartem Aug 13, 2024
e02766c
chore(main): release fluence-cli 0.18.0 (#990)
fluencebot Aug 13, 2024
f6b4430
fix: add retry to getting offers info from indexer when offer is crea…
shamsartem Aug 14, 2024
6d68e06
chore: Use centralized renovate configs (#1003)
nahsi Aug 15, 2024
5997610
feat(marketplace)!: many CUs in a worker (#1001)
shamsartem Aug 22, 2024
7854cd5
chore(main): release fluence-cli 0.19.0 (#1000)
fluencebot Aug 22, 2024
51e7358
fix(chain): update chain uris to .fluence.dev domains (#1007)
folex Aug 29, 2024
ed351f5
feat(vm): add vmConfig to computePeer.nox (#1009)
folex Aug 29, 2024
df4697d
chore(main): release fluence-cli 0.19.1 (#1013)
fluencebot Aug 29, 2024
0f1f5fa
feat: use pinned IPFS container version, other improvements (#1006)
shamsartem Aug 29, 2024
70ba028
chore(ci): add choice options to promote (#1015)
folex Aug 29, 2024
b5413ee
fix(vm_config): add hostSshPort and vmSshPort to Nox's vmConfig (#1016)
folex Sep 2, 2024
c7c0f61
fix(provider): rename rewardDelegationRate to stakerReward (#1017)
folex Sep 3, 2024
0656244
chore(main): release fluence-cli 0.19.2 (#1014)
fluencebot Sep 3, 2024
0c65c19
feat: don't require connecting wallet on provider info if provider ad…
shamsartem Sep 4, 2024
48cc5ad
feat: add offer-remove command (#1018)
shamsartem Sep 4, 2024
dda06c8
feat!: update default ports (#1021)
shamsartem Sep 4, 2024
f9e3ca1
Update README.md
shamsartem Sep 5, 2024
4befac9
feat: up deal-ts-clients, show additional cc-info for providers (#1023)
shamsartem Sep 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
self-hosted-runner:
labels:
- builder
- linux-amd64-m-xlarge
- linux-arm64-m-xlarge
- linux-amd64-m-2xlarge
- linux-arm64-m-2xlarge
- linux-amd64-c-2xlarge
- linux-arm64-c-2xlarge
2 changes: 1 addition & 1 deletion .github/actions/replace-version/action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Replace version
description: |
Replace version in src/versions.json
Replace version in cli/src/versions.json

inputs:
versions:
Expand Down
9 changes: 6 additions & 3 deletions .github/actions/replace-version/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2816,6 +2816,7 @@ try {

const versionsFilePath = (0,path__WEBPACK_IMPORTED_MODULE_2__.join)(
process.env.GITHUB_WORKSPACE,
"cli",
"src",
"versions.json",
);
Expand All @@ -2829,7 +2830,8 @@ try {
// Merge inputVersions into versions
for (const category in inputVersions) {
if (
!versions.hasOwnProperty(category) || inputVersions[category] === null
!versions.hasOwnProperty(category) ||
inputVersions[category] === null
) {
continue;
}
Expand All @@ -2839,7 +2841,8 @@ try {
typeof inputCategoryValue === "string" ||
typeof inputCategoryValue === "number"
) {
if (inputCategoryValue !== "null") { // ignore "null" strings
if (inputCategoryValue !== "null") {
// ignore "null" strings
versions[category] = inputCategoryValue;
}
} else if (typeof inputCategoryValue === "object") {
Expand All @@ -2862,7 +2865,7 @@ try {
}
}

const newVersionsJSONString = JSON.stringify(versions, null, 2);
const newVersionsJSONString = `${JSON.stringify(versions, null, 2)}\n`;

// Save updated versions.json
(0,fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync)(versionsFilePath, newVersionsJSONString);
Expand Down
3 changes: 2 additions & 1 deletion .github/actions/replace-version/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ try {

const versionsFilePath = join(
process.env.GITHUB_WORKSPACE,
"cli",
"src",
"versions.json",
);
Expand Down Expand Up @@ -63,7 +64,7 @@ try {
}
}

const newVersionsJSONString = JSON.stringify(versions, null, 2);
const newVersionsJSONString = `${JSON.stringify(versions, null, 2)}\n`;

// Save updated versions.json
writeFileSync(versionsFilePath, newVersionsJSONString);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/replace-version/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/actions/replace-version/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "ncc build index.js"
},
"author": "Fluence Labs",
"license": "Apache-2.0",
"license": "AGPL-3.0",
"dependencies": {
"@actions/core": "^1.10.0"
},
Expand Down
10 changes: 10 additions & 0 deletions .github/release-please/config-backport.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"bootstrap-sha": "ea46c1efd19f8ac3330a0dd845df272b3c53c9a6",
"release-type": "node",
"versioning": "always-bump-patch",
"packages": {
"cli": {
"component": "fluence-cli"
}
}
}
2 changes: 1 addition & 1 deletion .github/release-please/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"bump-minor-pre-major": true,
"bump-patch-for-minor-pre-major": true,
"packages": {
".": {
"cli": {
"component": "fluence-cli"
}
}
Expand Down
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.16.2"
"cli": "0.19.2"
}
43 changes: 13 additions & 30 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base"],
"enabledManagers": ["npm", "regex", "github-actions"],
"schedule": "every weekend",
"semanticCommitType": "chore",
"semanticCommitScope": "deps",
"respectLatest": false,
"extends": [
"github>fluencelabs/renovate",
"github>fluencelabs/renovate:npm"
],
"enabledManagers": ["npm", "regex"],
"regexManagers": [
{
"fileMatch": ["^src/versions\\.json$"],
"fileMatch": ["^cli/src/versions\\.json$"],
"matchStrings": [
"\"nox\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n"
],
"datasourceTemplate": "docker",
"depNameTemplate": "nox"
},
{
"fileMatch": ["^src/versions\\.json$"],
"fileMatch": ["^cli/src/versions\\.json$"],
"matchStrings": [
"\"chain\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n"
"\"chain-rpc\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n",
"\"chain-deploy-script\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n",
"\"subgraph-deploy-script\": \"(?<lookupName>[^:]+):(?<currentValue>.*)\",\n"
],
"datasourceTemplate": "docker",
"depNameTemplate": "chain"
},
{
"fileMatch": ["^src/versions\\.json$"],
"fileMatch": ["^cli/src/versions\\.json$"],
"matchStrings": [
"\"(?<depName>@fluencelabs/[^\"]+)\": \"(?<currentValue>[^\"\n]+)\""
],
"matchStringsStrategy": "any",
"datasourceTemplate": "npm"
},
{
"fileMatch": ["^src/versions\\.json$"],
"fileMatch": ["^cli/src/versions\\.json$"],
"matchStrings": [
"\"(?<depName>[marine|mrepl|marine\\-rs\\-sdk|marine\\-rs\\-sdk\\-test]+)\": \"(?<currentValue>[^\"\n]+)\""
],
Expand All @@ -41,23 +41,6 @@
}
],
"packageRules": [
{
"paths": ["src/versions.json"],
"schedule": ["at any time"],
"prPriority": 5
},
{
"matchPackagePrefixes": ["@fluencelabs/"],
"schedule": ["at any time"],
"prPriority": 5
},
{
"matchManagers": ["regex"],
"matchDepNames": ["nox"],
"groupName": "nox",
"schedule": ["at any time"],
"prPriority": 5
},
{
"matchPackagePatterns": [
"@fluencelabs/installation-spell",
Expand All @@ -66,7 +49,7 @@
"groupName": "spell"
},
{
"matchPackagePatterns": ["chain", "@fluencelabs/deal-aurora"],
"matchPackagePatterns": ["chain", "@fluencelabs/deal-ts-clients"],
"groupName": "deal"
}
]
Expand Down
26 changes: 23 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ concurrency:
env:
CI: true
FORCE_COLOR: true
FLUENCE_USER_DIR: "${{ github.workspace }}/tmp/.fluence"

jobs:
docs:
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
name: Generate docs
runs-on: ubuntu-latest
steps:
Expand All @@ -26,22 +30,38 @@ jobs:
- name: Setup node with self-hosted npm registry
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "18.20.3"
registry-url: "https://npm.fluence.dev"
cache: "yarn"

- run: yarn install

- run: yarn install
working-directory: cli

- name: Setup golang
uses: actions/setup-go@v5

- name: Install json-schema-docs
run: go install github.com/marcusolsson/json-schema-docs@latest

- name: Cache turbo build setup
uses: actions/cache@v4
with:
path: .turbo
key: ${{ runner.os }}-turbo-${{ github.sha }}
restore-keys: |
${{ runner.os }}-turbo-

- name: Run on each commit
env:
FLUENCE_USER_DIR: "${{ github.workspace }}/tmp/.fluence"
run: yarn on-each-commit

- name: Run on each commit CLI
run: yarn on-each-commit
working-directory: cli

- name: Format
run: yarn format

- name: Auto-commit
uses: stefanzweifel/git-auto-commit-action@v5
52 changes: 38 additions & 14 deletions .github/workflows/pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ on:
env:
CI: true
FORCE_COLOR: true
AWS_REGION: "eu-west-1"
AWS_S3_FORCE_PATH_STYLE: true

jobs:
pack:
Expand All @@ -61,6 +63,10 @@ jobs:
contents: write
id-token: write

env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}

steps:
- name: Checkout fluence-cli
uses: actions/checkout@v4
Expand Down Expand Up @@ -91,10 +97,14 @@ jobs:
- name: Setup node with self-hosted npm registry
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "18.20.3"
registry-url: "https://npm.fluence.dev"
cache: "yarn"

- run: yarn install

- run: yarn install
working-directory: cli

- name: Set js-client version
if: inputs.js-client-snapshots != 'null'
Expand All @@ -103,6 +113,7 @@ jobs:
package: "@fluencelabs/js-client"
version: ${{ fromJson(inputs.js-client-snapshots)['js-client'] }}
package-manager: yarn
working-directory: cli

- name: Set aqua-api version
if: inputs.aqua-snapshots != 'null'
Expand All @@ -111,6 +122,7 @@ jobs:
package: "@fluencelabs/aqua-api"
version: "${{ fromJson(inputs.aqua-snapshots)['aqua-api'] }}"
package-manager: yarn
working-directory: cli

- name: Update versions.json
uses: ./.github/actions/replace-version
Expand All @@ -133,33 +145,43 @@ jobs:
id: version
uses: fluencelabs/github-actions/generate-snapshot-id@main

- name: Set version
if: inputs.upload-to-s3 != true
uses: fluencelabs/github-actions/npm-publish-snapshot@main
- name: Cache turbo build setup
uses: actions/cache@v4
with:
id: ${{ steps.version.outputs.id }}
package-manager: yarn npm
flags: --tag snapshot
publish: false
path: .turbo
key: ${{ runner.os }}-turbo-${{ github.sha }}
restore-keys: |
${{ runner.os }}-turbo-

- name: Build
run: yarn build

- name: Build CLI
run: yarn build
working-directory: cli

- name: Pack fluence-cli
run: yarn pack-${{ inputs.platform }}
working-directory: cli

- name: Upload fluence-cli
if: inputs.upload-to-s3 == true
working-directory: cli
run: yarn upload-${{ inputs.platform }}

- name: Promote fluence-cli
if: inputs.channel != 'null' && inputs.platform != 'win32-x64'
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r .github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --indexes
working-directory: cli
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --indexes

- name: Promote fluence-cli windows
if: inputs.channel != 'null' && inputs.platform == 'win32-x64'
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r .github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --win --indexes
working-directory: cli
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel ${{ inputs.channel }} --no-xz --win --indexes

- name: Rename archive
if: inputs.platform != 'win32-x64'
run: mv dist/fluence-*${{ inputs.platform }}*.tar.gz fluence-cli-${{ inputs.platform }}.tar.gz
run: mv cli/dist/fluence-*${{ inputs.platform }}*.tar.gz fluence-cli-${{ inputs.platform }}.tar.gz

- name: Upload archive to CI
if: inputs.platform != 'win32-x64'
Expand All @@ -177,7 +199,7 @@ jobs:

- name: Rename windows installer
if: inputs.platform == 'win32-x64'
run: mv dist/win32/fluence-*.exe fluence-cli-${{ inputs.platform }}.exe
run: mv cli/dist/win32/fluence-*.exe fluence-cli-${{ inputs.platform }}.exe

- name: Upload windows installer to CI
if: inputs.platform == 'win32-x64'
Expand All @@ -195,8 +217,10 @@ jobs:

- name: Promote fluence-cli to unstable
if: inputs.tag != 'null' && inputs.platform != 'win32-x64'
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r .github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel unstable --no-xz --indexes
working-directory: cli
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel unstable --no-xz --indexes

- name: Promote fluence-cli windows to unstable
if: inputs.tag != 'null' && inputs.platform == 'win32-x64'
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r .github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel unstable --win --no-xz --indexes
working-directory: cli
run: yarn oclif promote -t ${{ inputs.platform }} --version "$(jq .[] -r ../.github/release-please/manifest.json)" --sha "$(git rev-parse --short HEAD)" --channel unstable --win --no-xz --indexes
Loading