From 503612c6b156428e8e5855094d6f41b3775358c6 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Fri, 22 Aug 2025 17:55:02 +0900 Subject: [PATCH 01/14] fix build --- packages/cli/package/package.json | 2 +- .../package/src/lib/configs/project/chainContainers.ts | 4 ++-- packages/cli/package/src/versions.json | 6 +++--- packages/cli/package/yarn.lock | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/cli/package/package.json b/packages/cli/package/package.json index 24a90eafa..5d7c30ff8 100644 --- a/packages/cli/package/package.json +++ b/packages/cli/package/package.json @@ -56,7 +56,7 @@ "whatwg-url": "^14.0.0" }, "dependencies": { - "@fluencelabs/deal-ts-clients": "0.23.2-update-deal-interface-c153307-7773-1.0", + "@fluencelabs/deal-ts-clients": "0.24.2-feat-offer-unified-access-23e0cef-8165-1.0", "@kubernetes/client-node": "github:fluencelabs/kubernetes-client-javascript#e72ee00a52fec4eb4a8327632895d888ee504f4d", "@libp2p/crypto": "4.0.1", "@libp2p/peer-id-factory": "4.0.5", diff --git a/packages/cli/package/src/lib/configs/project/chainContainers.ts b/packages/cli/package/src/lib/configs/project/chainContainers.ts index 7129b24cd..f9b6b147f 100644 --- a/packages/cli/package/src/lib/configs/project/chainContainers.ts +++ b/packages/cli/package/src/lib/configs/project/chainContainers.ts @@ -54,12 +54,12 @@ export const chainContainers = { }, services: { [IPFS_CONTAINER_NAME]: { - image: "ipfs/kubo:v0.27.0", + image: "ipfs/kubo:v0.36.0", ports: [`${IPFS_PORT}:${IPFS_PORT}`, "4001:4001"], environment: { IPFS_PROFILE: "server", }, - volumes: [`${IPFS_CONTAINER_NAME}:/data/ipfs`], + volumes: [`./data/ipfs:/data/ipfs`], healthcheck: { test: "ipfs id || exit 1", interval: "8s", diff --git a/packages/cli/package/src/versions.json b/packages/cli/package/src/versions.json index 2f0478932..194accf66 100644 --- a/packages/cli/package/src/versions.json +++ b/packages/cli/package/src/versions.json @@ -1,6 +1,6 @@ { "protocolVersion": 2, - "chain-rpc": "docker.fluence.dev/chain-rpc:update-deal-interface-c153307-7773-1", - "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:update-deal-interface-c153307-7773-1", - "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:update-deal-interface-c153307-7773-1" + "chain-rpc": "docker.fluence.dev/chain-rpc:feat-offer-unified-access-23e0cef-8165-1", + "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:feat-offer-unified-access-23e0cef-8165-1", + "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:feat-offer-unified-access-23e0cef-8165-1" } diff --git a/packages/cli/package/yarn.lock b/packages/cli/package/yarn.lock index 2dd6b5995..4f23d6485 100644 --- a/packages/cli/package/yarn.lock +++ b/packages/cli/package/yarn.lock @@ -1964,7 +1964,7 @@ __metadata: dependencies: "@actions/core": "npm:1.11.1" "@aws-sdk/lib-storage": "npm:^3.501.0" - "@fluencelabs/deal-ts-clients": "npm:0.23.2-update-deal-interface-c153307-7773-1.0" + "@fluencelabs/deal-ts-clients": "npm:0.24.2-feat-offer-unified-access-23e0cef-8165-1.0" "@graphql-codegen/cli": "npm:^5.0.3" "@graphql-codegen/typescript": "npm:^4.1.1" "@graphql-codegen/typescript-graphql-request": "npm:^6.2.0" @@ -2038,9 +2038,9 @@ __metadata: languageName: unknown linkType: soft -"@fluencelabs/deal-ts-clients@npm:0.23.2-update-deal-interface-c153307-7773-1.0": - version: 0.23.2-update-deal-interface-c153307-7773-1.0 - resolution: "@fluencelabs/deal-ts-clients@npm:0.23.2-update-deal-interface-c153307-7773-1.0" +"@fluencelabs/deal-ts-clients@npm:0.24.2-feat-offer-unified-access-23e0cef-8165-1.0": + version: 0.24.2-feat-offer-unified-access-23e0cef-8165-1.0 + resolution: "@fluencelabs/deal-ts-clients@npm:0.24.2-feat-offer-unified-access-23e0cef-8165-1.0" dependencies: "@graphql-typed-document-node/core": "npm:^3.2.0" debug: "npm:^4.3.4" @@ -2052,7 +2052,7 @@ __metadata: graphql-tag: "npm:^2.12.6" ipfs-http-client: "npm:^60.0.1" multiformats: "npm:^13.0.1" - checksum: 10c0/b35fabbd4db97676a50b221805e048912553c84b65c9bd0b09274d5ced72a56f209ef20ddfd0a087fce36e8a82047a2ccfdbb906a94fe996f1d75c011f5f57cf + checksum: 10c0/9ee396f289cdf94f073db8f418d1c2d84d362f38593f84069f7fedef9f8698429267de81dfb9b6071c21bbe44fa3f5f437592c3d0c89de3ca02a2605880890e9 languageName: node linkType: hard From 2d5b49a97de93d1cd0265c30233a86ea802222bb Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Wed, 27 Aug 2025 15:08:39 +0900 Subject: [PATCH 02/14] add new node checksums --- .../tmp/cache/22.18.0/SHASUMS256.txt.asc | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 packages/cli/package/tmp/cache/22.18.0/SHASUMS256.txt.asc diff --git a/packages/cli/package/tmp/cache/22.18.0/SHASUMS256.txt.asc b/packages/cli/package/tmp/cache/22.18.0/SHASUMS256.txt.asc new file mode 100644 index 000000000..b3a5b0d9b --- /dev/null +++ b/packages/cli/package/tmp/cache/22.18.0/SHASUMS256.txt.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +7bb75af308fc9f63e568968e0ef0e1600bb105abe2d2af99217ac72e9a24ffd0 node-v22.18.0-aix-ppc64.tar.gz +1dd46ad5edd1085da2b1a5b7e3e2a03d0266476786a7849a1207045fecc73d39 node-v22.18.0-arm64.msi +2c12913cba67af77ded8a399df3fd91c2e7f8628c7079da40bb9ff33bf00dfc0 node-v22.18.0-darwin-arm64.tar.gz +6616f388e127c858989fc7fa92879cdb20d2a5d446adbfdca6ee4feb385bfa8a node-v22.18.0-darwin-arm64.tar.xz +9c8aa1e5ff5780b38cc1134e2263d84e2f4308eb84c02515e3af33936ca02cdc node-v22.18.0-darwin-x64.tar.gz +76e4a1997da953dbf8e21f6ed1c4dd7eceb39deb96defe3b3e9d8f786ee287a8 node-v22.18.0-darwin-x64.tar.xz +c99fd7e0a7d2b7563ef5276e09a1f23559381c601ef80ccdce91259d6f6d0971 node-v22.18.0-headers.tar.gz +68a214508678fc6119bf1ad391fbf89fb624ab000d85693ef7c8a764b6622351 node-v22.18.0-headers.tar.xz +d415eeea90a2fdb60c66dd386b258acbfc4d1fa4720a8df5dea7369fbdbcddee node-v22.18.0-linux-arm64.tar.gz +04fca1b9afecf375f26b41d65d52aa1703a621abea5a8948c7d1e351e85edade node-v22.18.0-linux-arm64.tar.xz +57830914581dc3640e8d95378b76c6910860f42531959e4e88eb445e0cd982b0 node-v22.18.0-linux-armv7l.tar.gz +4d5efa082c1afbd9732dd13ab878f1b065c48c4caa08c7e6d833a759e3e6cd65 node-v22.18.0-linux-armv7l.tar.xz +38f965cbaa5e730dbd3b1afe895cfdb86da96371474827d05d847d338a0c9c97 node-v22.18.0-linux-ppc64le.tar.gz +f585a7d770619ba4eb7d4fd7df9fab5a1b1bd3aafb42046330a64952796d2869 node-v22.18.0-linux-ppc64le.tar.xz +f3578b0e7cdf247045f6eeb766febd74942954352161102cb6040a4d4c3b4c3c node-v22.18.0-linux-s390x.tar.gz +ffa98dc69fb63dfc49b3825e2c8f0e0489f6c00184dd4a85c6e1cb1d98e613ec node-v22.18.0-linux-s390x.tar.xz +a2e703725d8683be86bb5da967bf8272f4518bdaf10f21389e2b2c9eaeae8c8a node-v22.18.0-linux-x64.tar.gz +c1bfeecf1d7404fa74728f9db72e697decbd8119ccc6f5a294d795756dfcfca7 node-v22.18.0-linux-x64.tar.xz +2b8fdd687b7d497121c0d3f519987a73fcbe3e0b667f7dd0e4913d4bf2ee5adb node-v22.18.0-win-arm64.7z +023afb3d25c4c7d10cb6eb8a64865c347b56d4b07e6690606d021130a9192263 node-v22.18.0-win-arm64.zip +2a19a4258cede4f2bd9be7f65768658ae6436fe8b8b223846e5bacefdf4d64c2 node-v22.18.0-win-x64.7z +c95d8a7e1c99e669cc08c9f1176e068c1f50847c37908fcb8c35b62482366511 node-v22.18.0-win-x64.zip +37212dfb1b5dc1c4d3589979523fd607f05cb1d8780c0a7d37a85e2f899d9259 node-v22.18.0-win-x86.7z +f2e546345f729d8e82c82a088e616e76df14330c53d3cfecbbab51f783f08cf4 node-v22.18.0-win-x86.zip +dffd8e34d8eb1a1a2e6f5e6f129c4b1b8a34aa54e02799007adc99d73efac75c node-v22.18.0-x64.msi +81bc73f802094ee8306ebab9c73f9e1fccfa11c7f4d62f536bd3f3df3f7de947 node-v22.18.0-x86.msi +6dcf25409694feab54e7c634f30cc722f0a31941c81d9d9715e880cb64ef5c35 node-v22.18.0.pkg +26247ff9a75ac13f6dac7e07dca6172314554dcf20761675c5435f1e84e6c4b2 node-v22.18.0.tar.gz +120e0f74419097a9fafae1fd80b9de7791a587e6f1c48c22b193239ccd0f7084 node-v22.18.0.tar.xz +9cdd74e4d0fde4d8b43f2370577a194ebf3fc844cd6d177e98bc7c3f432e972a win-arm64/node.exe +c174ae3348a4a59c9d61629a7a73a38679fd27c55b2a7d85a2ea3e65de2beb13 win-arm64/node.lib +ad2d63ea61956f141f7b3902e7a1107d2efa2e4a7e13ddf94d87c517f42d672d win-arm64/node_pdb.7z +8602ec90e83461cd8435bb9a86696c0d7ec1a1f4029e60a8eafb2891c1fe405b win-arm64/node_pdb.zip +c22d1c59a1f767a1ed0178445a027f2257d318c55430fc819d48f269586822b7 win-x64/node.exe +4af0951712fb05a686a03e0592880e195ba53e5eb70e224d7ea7b8b76f2a3e86 win-x64/node.lib +6694a097f75781fa0d1ed4dd7b3f03076f15c074c16313fc0bab8dfd16998f7f win-x64/node_pdb.7z +31f91c9faa70f5adceb1cb8ded0185cfd2a086843a7d98f6628b0f3261b81200 win-x64/node_pdb.zip +25c4ea966d48ef8c8619e6f672eee14dd6cead56896981bc34b7dddb029fa65f win-x86/node.exe +e1830d28633bfa80180edfffe5f091dc945701ba8cf2b743ca542d34759f505a win-x86/node.lib +c06375292f3250da493051a5b86d3bf82037e1634bf32b71454fdbf3d21ed3f3 win-x86/node_pdb.7z +cc9c904ee85d912ccd4d89a9d3a5ef0a24c42bdee716cc17ff6e10285d71834b win-x86/node_pdb.zip + +-----BEGIN PGP SIGNATURE----- + +iHUEARYIAB0WIQRb6KP2yKXAHRBsCtggsaOQsWjTVgUCaIvkawAKCRAgsaOQsWjT +Von3AQDqcqTlqgKBTSaixzZXClUPuynGLQaifLLw71F+UYVgtAEA3qWofHxzS9lj +hBucx3ouhiHQ2b5F89QYgYD9e8vZTg8= +=6jia +-----END PGP SIGNATURE----- \ No newline at end of file From 4fdd028dca61d2380203ce86388e8db417c8ca6f Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Wed, 27 Aug 2025 15:53:59 +0900 Subject: [PATCH 03/14] add command --- .../commands/provider/offer-access-address.ts | 94 +++++++++++++++++++ .../cli/package/src/lib/chain/offer/offer.ts | 41 ++++++++ .../src/lib/chain/offer/updateOffers.ts | 48 +--------- packages/cli/package/src/lib/const.ts | 7 ++ 4 files changed, 144 insertions(+), 46 deletions(-) create mode 100644 packages/cli/package/src/commands/provider/offer-access-address.ts diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts new file mode 100644 index 000000000..8806ccc27 --- /dev/null +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -0,0 +1,94 @@ +/** + * Fluence CLI + * Copyright (C) 2024 Fluence DAO + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +import { BaseCommand } from "../../baseCommand.js"; +import { + resolveOffersFromProviderConfig, filterOffersFoundOnChain +} from "../../lib/chain/offer/offer.js"; +import { commandObj } from "../../lib/commandObj.js"; +import { + CHAIN_FLAGS, + CLUSTER_ADDRESS_FLAG, + OFFER_FLAG, + ADDRESS_FLAG_NAME +} from "../../lib/const.js"; +import { aliasesText } from "../../lib/helpers/aliasesText.js"; +import { initCli } from "../../lib/lifeCycle.js"; +import { confirm, input } from "../../lib/prompt.js"; +import { getContracts, sign } from "../../lib/dealClient.js"; +import { assertProviderIsRegistered } from "../../lib/chain/providerInfo.js"; + +export default class OfferAccessAddress extends BaseCommand { + static override hiddenAliases = ["provider:sck"]; + static override description = `Set access address for offer for use in cluster software.${aliasesText.apply(this)}`; + static override flags = { + ...OFFER_FLAG, + ...CHAIN_FLAGS, + ...CLUSTER_ADDRESS_FLAG, + }; + + async run(): Promise { + const { flags } = await initCli(this, await this.parse(OfferAccessAddress)); + const offers = await resolveOffersFromProviderConfig(flags); + const offersFoundOnChain = await filterOffersFoundOnChain(offers); + + if (offersFoundOnChain.length !== 1) { + commandObj.logToStderr("Exactly one offer should be selected"); + return; + } + + const offer = offersFoundOnChain[0]; + + if (offer === undefined) { + commandObj.logToStderr("Offer required"); + return; + } + + const address = flags[ADDRESS_FLAG_NAME] ?? await input({ + message: "Enter cluster address", + validate(input: string) { + return ( + input.length === 42 || + "Please enter an address (40 hex digits + 0x)" + ); + }, + }); + + commandObj.logToStderr( + `Setting cluster address ${address} for offer ${offer.offerName} (${offer.offerId})` + ) + + if ( + !(await confirm({ + message: "Would you like to continue", + default: true, + })) + ) { + commandObj.logToStderr("Setting cluster address cancelled"); + return; + } + + const { contracts } = await getContracts(); + + await sign({ + validateAddress: assertProviderIsRegistered, + title: `Setting cluster address ${address} for offer ${offer.offerName} (${offer.offerId})`, + method: contracts.diamond.setClusterKey, + args: [offer.offerId, address,], + }); + } +} diff --git a/packages/cli/package/src/lib/chain/offer/offer.ts b/packages/cli/package/src/lib/chain/offer/offer.ts index 335ce0978..228ba583e 100644 --- a/packages/cli/package/src/lib/chain/offer/offer.ts +++ b/packages/cli/package/src/lib/chain/offer/offer.ts @@ -1434,3 +1434,44 @@ function serializeOfferInfo(offerIndexerInfo: OfferIndexerInfo) { ), }; } + +export type OnChainOffer = Awaited< + ReturnType +>[number]; + +export async function filterOffersFoundOnChain(offers: EnsureOfferConfig[]) { + const [offersWithoutIds, offersWithIds] = splitErrorsAndResults( + offers, + (offer) => { + return offer.offerId === undefined + ? { error: offer } + : { result: { ...offer, offerId: offer.offerId } }; + }, + ); + + if (offersWithoutIds.length > 0) { + commandObj.warn( + `Some of the offers don't have ids stored in ${PROVIDER_ARTIFACTS_CONFIG_FULL_FILE_NAME} so this offers might not have been created on chain:\n${offersWithoutIds + .map(({ offerName }) => { + return offerName; + }) + .join("\n")}`, + ); + } + + const [offerInfoErrors, offersInfo] = await getOffersInfo(offersWithIds); + + if (offerInfoErrors.length > 0) { + commandObj.warn( + `Some of the offers are not found on subgraph indexer:\n${offerInfoErrors + .map(({ offerName, offerId }) => { + return `${offerName} (${offerId})`; + }) + .join( + "\n", + )}\n\nPlease make sure the offers exist. If the offers don't exist you can create them using '${CLI_NAME} provider offer-create' command`, + ); + } + + return offersInfo; +} diff --git a/packages/cli/package/src/lib/chain/offer/updateOffers.ts b/packages/cli/package/src/lib/chain/offer/updateOffers.ts index 151dbfa91..bd7861ad6 100644 --- a/packages/cli/package/src/lib/chain/offer/updateOffers.ts +++ b/packages/cli/package/src/lib/chain/offer/updateOffers.ts @@ -24,13 +24,10 @@ import { commandObj } from "../../commandObj.js"; import type { ResourceType } from "../../configs/project/provider/provider4.js"; import { initNewProviderArtifactsConfig } from "../../configs/project/providerArtifacts/providerArtifacts.js"; import { - CLI_NAME, - PROVIDER_ARTIFACTS_CONFIG_FULL_FILE_NAME, VCPU_PER_CU, } from "../../const.js"; import { getContracts, signBatch, populateTx } from "../../dealClient.js"; import { numToStr } from "../../helpers/typesafeStringify.js"; -import { splitErrorsAndResults } from "../../helpers/utils.js"; import { deployManifests } from "../../manifestsDeploy.js"; import { confirm } from "../../prompt.js"; import { ensureFluenceEnv } from "../../resolveFluenceEnv.js"; @@ -45,10 +42,10 @@ import { assertProviderIsRegistered } from "../providerInfo.js"; import { type OffersArgs, resolveOffersFromProviderConfig, - type EnsureOfferConfig, - getOffersInfo, type OnChainResource, addRemainingCPs, + filterOffersFoundOnChain, + type OnChainOffer } from "./offer.js"; type PeersOnChain = { @@ -219,47 +216,6 @@ export async function removeOffers(flags: OffersArgs) { await providerArtifactsConfig.$commit(); } -type OnChainOffer = Awaited< - ReturnType ->[number]; - -async function filterOffersFoundOnChain(offers: EnsureOfferConfig[]) { - const [offersWithoutIds, offersWithIds] = splitErrorsAndResults( - offers, - (offer) => { - return offer.offerId === undefined - ? { error: offer } - : { result: { ...offer, offerId: offer.offerId } }; - }, - ); - - if (offersWithoutIds.length > 0) { - commandObj.warn( - `Some of the offers don't have ids stored in ${PROVIDER_ARTIFACTS_CONFIG_FULL_FILE_NAME} so this offers might not have been created on chain:\n${offersWithoutIds - .map(({ offerName }) => { - return offerName; - }) - .join("\n")}`, - ); - } - - const [offerInfoErrors, offersInfo] = await getOffersInfo(offersWithIds); - - if (offerInfoErrors.length > 0) { - commandObj.warn( - `Some of the offers are not found on subgraph indexer:\n${offerInfoErrors - .map(({ offerName, offerId }) => { - return `${offerName} (${offerId})`; - }) - .join( - "\n", - )}\n\nPlease make sure the offers exist. If the offers don't exist you can create them using '${CLI_NAME} provider offer-create' command`, - ); - } - - return offersInfo; -} - function populateUpdateOffersTxs(offersFoundOnChain: OnChainOffer[]) { return Promise.all( offersFoundOnChain.map(async (offer) => { diff --git a/packages/cli/package/src/lib/const.ts b/packages/cli/package/src/lib/const.ts index ca260f271..1290c85c1 100644 --- a/packages/cli/package/src/lib/const.ts +++ b/packages/cli/package/src/lib/const.ts @@ -183,6 +183,13 @@ export const ADDRESS_FLAG = { }), }; +export const CLUSTER_ADDRESS_FLAG = { + [ADDRESS_FLAG_NAME]: Flags.string({ + description: "Address derived from Cluster private key", + helpValue: "
", + }), +}; + export const CHAIN_FLAGS = { ...ENV_FLAG, ...PRIV_KEY_FLAG, From 0e3c0590813e1986f44287df0fbf56b80cd67dc4 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Wed, 27 Aug 2025 16:23:53 +0900 Subject: [PATCH 04/14] run on-each-commit --- packages/cli/package/docs/commands/README.md | 85 ++++++++++++------- .../commands/provider/offer-access-address.ts | 4 +- 2 files changed, 58 insertions(+), 31 deletions(-) diff --git a/packages/cli/package/docs/commands/README.md b/packages/cli/package/docs/commands/README.md index 98a57f8ff..0c0c5744d 100644 --- a/packages/cli/package/docs/commands/README.md +++ b/packages/cli/package/docs/commands/README.md @@ -23,6 +23,7 @@ * [`fluence provider gen`](#fluence-provider-gen) * [`fluence provider info`](#fluence-provider-info) * [`fluence provider init`](#fluence-provider-init) +* [`fluence provider offer-access-address`](#fluence-provider-offer-access-address) * [`fluence provider offer-create`](#fluence-provider-offer-create) * [`fluence provider offer-info`](#fluence-provider-offer-info) * [`fluence provider offer-remove`](#fluence-provider-offer-remove) @@ -84,7 +85,7 @@ DESCRIPTION Show contract addresses for the fluence environment and accounts for the local environment ``` -_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/chain/info.ts)_ +_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/chain/info.ts)_ ## `fluence default env [ENV]` @@ -107,7 +108,7 @@ EXAMPLES $ fluence default env ``` -_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/default/env.ts)_ +_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/default/env.ts)_ ## `fluence help [COMMAND]` @@ -150,7 +151,7 @@ EXAMPLES $ fluence local down ``` -_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/down.ts)_ +_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/down.ts)_ ## `fluence local init` @@ -175,7 +176,7 @@ EXAMPLES $ fluence local init ``` -_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/init.ts)_ +_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/init.ts)_ ## `fluence local logs` @@ -196,7 +197,7 @@ EXAMPLES $ fluence local logs ``` -_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/logs.ts)_ +_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/logs.ts)_ ## `fluence local ps` @@ -217,7 +218,7 @@ EXAMPLES $ fluence local ps ``` -_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/ps.ts)_ +_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/ps.ts)_ ## `fluence local up` @@ -254,7 +255,7 @@ EXAMPLES $ fluence local up ``` -_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/up.ts)_ +_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/up.ts)_ ## `fluence provider cc-activate` @@ -282,7 +283,7 @@ DESCRIPTION Add FLT collateral to capacity commitment to activate it. Alias: fluence provider ca ``` -_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-activate.ts)_ +_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-activate.ts)_ ## `fluence provider cc-create` @@ -309,7 +310,7 @@ DESCRIPTION Create Capacity commitment. Alias: fluence provider cc ``` -_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-create.ts)_ +_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-create.ts)_ ## `fluence provider cc-finish` @@ -338,7 +339,7 @@ DESCRIPTION commitments and finish capacity commitments. Aliases: fluence provider ccf, fluence provider cc-collateral-withdraw ``` -_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-finish.ts)_ +_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-finish.ts)_ ## `fluence provider cc-info` @@ -367,7 +368,7 @@ DESCRIPTION Get info about capacity commitments. Alias: fluence provider ci ``` -_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-info.ts)_ +_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-info.ts)_ ## `fluence provider cc-remove` @@ -396,7 +397,7 @@ DESCRIPTION provider cr ``` -_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-remove.ts)_ +_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-remove.ts)_ ## `fluence provider cc-rewards-withdraw` @@ -424,7 +425,7 @@ DESCRIPTION Withdraw FLT rewards from capacity commitments. Alias: fluence provider crw ``` -_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ +_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ ## `fluence provider deal-exit` @@ -448,7 +449,7 @@ DESCRIPTION Exit from deal. Alias: fluence provider de ``` -_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-exit.ts)_ +_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-exit.ts)_ ## `fluence provider deal-list` @@ -470,7 +471,7 @@ DESCRIPTION List all deals. Alias: fluence provider dl ``` -_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-list.ts)_ +_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-list.ts)_ ## `fluence provider deal-rewards-info [DEAL-ADDRESS] [ON-CHAIN-WORKER-ID]` @@ -497,7 +498,7 @@ DESCRIPTION Deal rewards info. Alias: fluence provider dri ``` -_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-info.ts)_ +_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-info.ts)_ ## `fluence provider deal-rewards-withdraw` @@ -521,7 +522,7 @@ DESCRIPTION Withdraw USDC rewards from deals. Alias: fluence provider drw ``` -_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ +_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ ## `fluence provider deploy` @@ -551,7 +552,7 @@ EXAMPLES $ fluence provider deploy ``` -_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deploy.ts)_ +_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deploy.ts)_ ## `fluence provider gen` @@ -582,7 +583,7 @@ EXAMPLES $ fluence provider gen ``` -_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/gen.ts)_ +_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/gen.ts)_ ## `fluence provider info` @@ -611,7 +612,7 @@ DESCRIPTION Print peer signing wallets and peer ids. Alias: fluence provider i ``` -_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/info.ts)_ +_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/info.ts)_ ## `fluence provider init` @@ -635,7 +636,33 @@ DESCRIPTION Init provider config. Creates a provider.yaml file ``` -_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/init.ts)_ +_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/init.ts)_ + +## `fluence provider offer-access-address` + +Set access address for offer for use in cluster software.. Alias: fluence provider sck + +``` +USAGE + $ fluence provider offer-access-address [--no-input] [--offers ] [--env ] + [--priv-key ] [--address
] + +FLAGS + --address=
Address derived from Cluster private key + --env= Fluence Environment to use when running the command + --no-input Don't interactively ask for any input from the user + --offers= Comma-separated list of offer names. To use all of your offers: --offers + all + --priv-key= !WARNING! for debug purposes only. Passing private keys through flags is + unsecure. On local env + 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 is used + by default when CLI is used in non-interactive mode + +DESCRIPTION + Set access address for offer for use in cluster software.. Alias: fluence provider sck +``` + +_See code: [src/commands/provider/offer-access-address.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-access-address.ts)_ ## `fluence provider offer-create` @@ -660,7 +687,7 @@ DESCRIPTION Create offers. You have to be registered as a provider to do that. Alias: fluence provider oc ``` -_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-create.ts)_ +_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-create.ts)_ ## `fluence provider offer-info` @@ -687,7 +714,7 @@ DESCRIPTION Get info about offers. Alias: fluence provider oi ``` -_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-info.ts)_ +_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-info.ts)_ ## `fluence provider offer-remove` @@ -714,7 +741,7 @@ DESCRIPTION Remove offers. Alias: fluence provider or ``` -_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-remove.ts)_ +_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-remove.ts)_ ## `fluence provider offer-update` @@ -739,7 +766,7 @@ DESCRIPTION Update offers. Alias: fluence provider ou ``` -_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-update.ts)_ +_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-update.ts)_ ## `fluence provider register` @@ -761,7 +788,7 @@ DESCRIPTION Register as a provider. Alias: fluence provider r ``` -_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/register.ts)_ +_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/register.ts)_ ## `fluence provider tokens-distribute` @@ -789,7 +816,7 @@ DESCRIPTION Distribute FLT tokens to peers. Alias: fluence provider td ``` -_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-distribute.ts)_ +_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-distribute.ts)_ ## `fluence provider tokens-withdraw` @@ -818,7 +845,7 @@ DESCRIPTION Withdraw FLT tokens from peers. Alias: fluence provider tw ``` -_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-withdraw.ts)_ +_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-withdraw.ts)_ ## `fluence provider update` @@ -840,7 +867,7 @@ DESCRIPTION Update provider info. Alias: fluence provider u ``` -_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/update.ts)_ +_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/update.ts)_ ## `fluence update [CHANNEL]` diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts index 8806ccc27..a79c0c2a9 100644 --- a/packages/cli/package/src/commands/provider/offer-access-address.ts +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -19,6 +19,7 @@ import { BaseCommand } from "../../baseCommand.js"; import { resolveOffersFromProviderConfig, filterOffersFoundOnChain } from "../../lib/chain/offer/offer.js"; +import { assertProviderIsRegistered } from "../../lib/chain/providerInfo.js"; import { commandObj } from "../../lib/commandObj.js"; import { CHAIN_FLAGS, @@ -26,11 +27,10 @@ import { OFFER_FLAG, ADDRESS_FLAG_NAME } from "../../lib/const.js"; +import { getContracts, sign } from "../../lib/dealClient.js"; import { aliasesText } from "../../lib/helpers/aliasesText.js"; import { initCli } from "../../lib/lifeCycle.js"; import { confirm, input } from "../../lib/prompt.js"; -import { getContracts, sign } from "../../lib/dealClient.js"; -import { assertProviderIsRegistered } from "../../lib/chain/providerInfo.js"; export default class OfferAccessAddress extends BaseCommand { static override hiddenAliases = ["provider:sck"]; From b9a515e77f77353fcc24a22f5808dc689e579fec Mon Sep 17 00:00:00 2001 From: ValeryAntopol <36988194+ValeryAntopol@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:26:13 +0000 Subject: [PATCH 05/14] Apply automatic changes --- packages/cli/package/docs/commands/README.md | 60 +++++++++---------- .../commands/provider/offer-access-address.ts | 35 ++++++----- .../src/lib/chain/offer/updateOffers.ts | 6 +- 3 files changed, 52 insertions(+), 49 deletions(-) diff --git a/packages/cli/package/docs/commands/README.md b/packages/cli/package/docs/commands/README.md index 0c0c5744d..94c14acc3 100644 --- a/packages/cli/package/docs/commands/README.md +++ b/packages/cli/package/docs/commands/README.md @@ -85,7 +85,7 @@ DESCRIPTION Show contract addresses for the fluence environment and accounts for the local environment ``` -_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/chain/info.ts)_ +_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/chain/info.ts)_ ## `fluence default env [ENV]` @@ -108,7 +108,7 @@ EXAMPLES $ fluence default env ``` -_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/default/env.ts)_ +_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/default/env.ts)_ ## `fluence help [COMMAND]` @@ -151,7 +151,7 @@ EXAMPLES $ fluence local down ``` -_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/down.ts)_ +_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/down.ts)_ ## `fluence local init` @@ -176,7 +176,7 @@ EXAMPLES $ fluence local init ``` -_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/init.ts)_ +_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/init.ts)_ ## `fluence local logs` @@ -197,7 +197,7 @@ EXAMPLES $ fluence local logs ``` -_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/logs.ts)_ +_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/logs.ts)_ ## `fluence local ps` @@ -218,7 +218,7 @@ EXAMPLES $ fluence local ps ``` -_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/ps.ts)_ +_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/ps.ts)_ ## `fluence local up` @@ -255,7 +255,7 @@ EXAMPLES $ fluence local up ``` -_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/up.ts)_ +_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/up.ts)_ ## `fluence provider cc-activate` @@ -283,7 +283,7 @@ DESCRIPTION Add FLT collateral to capacity commitment to activate it. Alias: fluence provider ca ``` -_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-activate.ts)_ +_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-activate.ts)_ ## `fluence provider cc-create` @@ -310,7 +310,7 @@ DESCRIPTION Create Capacity commitment. Alias: fluence provider cc ``` -_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-create.ts)_ +_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-create.ts)_ ## `fluence provider cc-finish` @@ -339,7 +339,7 @@ DESCRIPTION commitments and finish capacity commitments. Aliases: fluence provider ccf, fluence provider cc-collateral-withdraw ``` -_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-finish.ts)_ +_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-finish.ts)_ ## `fluence provider cc-info` @@ -368,7 +368,7 @@ DESCRIPTION Get info about capacity commitments. Alias: fluence provider ci ``` -_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-info.ts)_ +_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-info.ts)_ ## `fluence provider cc-remove` @@ -397,7 +397,7 @@ DESCRIPTION provider cr ``` -_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-remove.ts)_ +_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-remove.ts)_ ## `fluence provider cc-rewards-withdraw` @@ -425,7 +425,7 @@ DESCRIPTION Withdraw FLT rewards from capacity commitments. Alias: fluence provider crw ``` -_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ +_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ ## `fluence provider deal-exit` @@ -449,7 +449,7 @@ DESCRIPTION Exit from deal. Alias: fluence provider de ``` -_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-exit.ts)_ +_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-exit.ts)_ ## `fluence provider deal-list` @@ -471,7 +471,7 @@ DESCRIPTION List all deals. Alias: fluence provider dl ``` -_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-list.ts)_ +_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-list.ts)_ ## `fluence provider deal-rewards-info [DEAL-ADDRESS] [ON-CHAIN-WORKER-ID]` @@ -498,7 +498,7 @@ DESCRIPTION Deal rewards info. Alias: fluence provider dri ``` -_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-info.ts)_ +_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-info.ts)_ ## `fluence provider deal-rewards-withdraw` @@ -522,7 +522,7 @@ DESCRIPTION Withdraw USDC rewards from deals. Alias: fluence provider drw ``` -_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ +_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ ## `fluence provider deploy` @@ -552,7 +552,7 @@ EXAMPLES $ fluence provider deploy ``` -_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deploy.ts)_ +_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deploy.ts)_ ## `fluence provider gen` @@ -583,7 +583,7 @@ EXAMPLES $ fluence provider gen ``` -_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/gen.ts)_ +_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/gen.ts)_ ## `fluence provider info` @@ -612,7 +612,7 @@ DESCRIPTION Print peer signing wallets and peer ids. Alias: fluence provider i ``` -_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/info.ts)_ +_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/info.ts)_ ## `fluence provider init` @@ -636,7 +636,7 @@ DESCRIPTION Init provider config. Creates a provider.yaml file ``` -_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/init.ts)_ +_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/init.ts)_ ## `fluence provider offer-access-address` @@ -662,7 +662,7 @@ DESCRIPTION Set access address for offer for use in cluster software.. Alias: fluence provider sck ``` -_See code: [src/commands/provider/offer-access-address.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-access-address.ts)_ +_See code: [src/commands/provider/offer-access-address.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-access-address.ts)_ ## `fluence provider offer-create` @@ -687,7 +687,7 @@ DESCRIPTION Create offers. You have to be registered as a provider to do that. Alias: fluence provider oc ``` -_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-create.ts)_ +_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-create.ts)_ ## `fluence provider offer-info` @@ -714,7 +714,7 @@ DESCRIPTION Get info about offers. Alias: fluence provider oi ``` -_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-info.ts)_ +_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-info.ts)_ ## `fluence provider offer-remove` @@ -741,7 +741,7 @@ DESCRIPTION Remove offers. Alias: fluence provider or ``` -_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-remove.ts)_ +_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-remove.ts)_ ## `fluence provider offer-update` @@ -766,7 +766,7 @@ DESCRIPTION Update offers. Alias: fluence provider ou ``` -_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-update.ts)_ +_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-update.ts)_ ## `fluence provider register` @@ -788,7 +788,7 @@ DESCRIPTION Register as a provider. Alias: fluence provider r ``` -_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/register.ts)_ +_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/register.ts)_ ## `fluence provider tokens-distribute` @@ -816,7 +816,7 @@ DESCRIPTION Distribute FLT tokens to peers. Alias: fluence provider td ``` -_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-distribute.ts)_ +_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-distribute.ts)_ ## `fluence provider tokens-withdraw` @@ -845,7 +845,7 @@ DESCRIPTION Withdraw FLT tokens from peers. Alias: fluence provider tw ``` -_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-withdraw.ts)_ +_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-withdraw.ts)_ ## `fluence provider update` @@ -867,7 +867,7 @@ DESCRIPTION Update provider info. Alias: fluence provider u ``` -_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/update.ts)_ +_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/update.ts)_ ## `fluence update [CHANNEL]` diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts index a79c0c2a9..fd5dbdb42 100644 --- a/packages/cli/package/src/commands/provider/offer-access-address.ts +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -17,7 +17,8 @@ import { BaseCommand } from "../../baseCommand.js"; import { - resolveOffersFromProviderConfig, filterOffersFoundOnChain + resolveOffersFromProviderConfig, + filterOffersFoundOnChain, } from "../../lib/chain/offer/offer.js"; import { assertProviderIsRegistered } from "../../lib/chain/providerInfo.js"; import { commandObj } from "../../lib/commandObj.js"; @@ -25,14 +26,16 @@ import { CHAIN_FLAGS, CLUSTER_ADDRESS_FLAG, OFFER_FLAG, - ADDRESS_FLAG_NAME + ADDRESS_FLAG_NAME, } from "../../lib/const.js"; import { getContracts, sign } from "../../lib/dealClient.js"; import { aliasesText } from "../../lib/helpers/aliasesText.js"; import { initCli } from "../../lib/lifeCycle.js"; import { confirm, input } from "../../lib/prompt.js"; -export default class OfferAccessAddress extends BaseCommand { +export default class OfferAccessAddress extends BaseCommand< + typeof OfferAccessAddress +> { static override hiddenAliases = ["provider:sck"]; static override description = `Set access address for offer for use in cluster software.${aliasesText.apply(this)}`; static override flags = { @@ -58,19 +61,21 @@ export default class OfferAccessAddress extends BaseCommand Date: Wed, 27 Aug 2025 18:22:21 +0900 Subject: [PATCH 06/14] make single-offer version --- .../commands/provider/offer-access-address.ts | 34 +++++------- .../cli/package/src/lib/chain/offer/offer.ts | 52 ++++++++++++++++++- packages/cli/package/src/lib/const.ts | 25 +++++++++ 3 files changed, 89 insertions(+), 22 deletions(-) diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts index fd5dbdb42..129874121 100644 --- a/packages/cli/package/src/commands/provider/offer-access-address.ts +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -17,16 +17,15 @@ import { BaseCommand } from "../../baseCommand.js"; import { - resolveOffersFromProviderConfig, - filterOffersFoundOnChain, + filterOffersFoundOnChain, resolveSingleOfferFromProviderConfig } from "../../lib/chain/offer/offer.js"; import { assertProviderIsRegistered } from "../../lib/chain/providerInfo.js"; import { commandObj } from "../../lib/commandObj.js"; import { CHAIN_FLAGS, CLUSTER_ADDRESS_FLAG, - OFFER_FLAG, - ADDRESS_FLAG_NAME, + SINGLE_OFFER_FLAG, + ADDRESS_FLAG_NAME, SINGLE_OFFER_FLAG_NAME } from "../../lib/const.js"; import { getContracts, sign } from "../../lib/dealClient.js"; import { aliasesText } from "../../lib/helpers/aliasesText.js"; @@ -39,26 +38,19 @@ export default class OfferAccessAddress extends BaseCommand< static override hiddenAliases = ["provider:sck"]; static override description = `Set access address for offer for use in cluster software.${aliasesText.apply(this)}`; static override flags = { - ...OFFER_FLAG, + ...SINGLE_OFFER_FLAG, ...CHAIN_FLAGS, ...CLUSTER_ADDRESS_FLAG, }; async run(): Promise { const { flags } = await initCli(this, await this.parse(OfferAccessAddress)); - const offers = await resolveOffersFromProviderConfig(flags); - const offersFoundOnChain = await filterOffersFoundOnChain(offers); + const configOffer = await resolveSingleOfferFromProviderConfig(flags[SINGLE_OFFER_FLAG_NAME]); + const offersFoundOnChain = await filterOffersFoundOnChain([configOffer]); + const chainOffer = offersFoundOnChain[0]; - if (offersFoundOnChain.length !== 1) { - commandObj.logToStderr("Exactly one offer should be selected"); - return; - } - - const offer = offersFoundOnChain[0]; - - if (offer === undefined) { - commandObj.logToStderr("Offer required"); - return; + if (chainOffer === undefined) { + commandObj.error(`Offer ${configOffer.offerName} is not found on chain`); } const address = @@ -74,8 +66,8 @@ export default class OfferAccessAddress extends BaseCommand< })); commandObj.logToStderr( - `Setting cluster address ${address} for offer ${offer.offerName} (${offer.offerId})`, - ); + `Setting cluster address ${address} for offer ${chainOffer.offerName} (${chainOffer.offerId})` + ) if ( !(await confirm({ @@ -91,9 +83,9 @@ export default class OfferAccessAddress extends BaseCommand< await sign({ validateAddress: assertProviderIsRegistered, - title: `Setting cluster address ${address} for offer ${offer.offerName} (${offer.offerId})`, + title: `Setting cluster address ${address} for offer ${chainOffer.offerName} (${chainOffer.offerId})`, method: contracts.diamond.setClusterKey, - args: [offer.offerId, address], + args: [chainOffer.offerId, address], }); } } diff --git a/packages/cli/package/src/lib/chain/offer/offer.ts b/packages/cli/package/src/lib/chain/offer/offer.ts index 228ba583e..5aa641f65 100644 --- a/packages/cli/package/src/lib/chain/offer/offer.ts +++ b/packages/cli/package/src/lib/chain/offer/offer.ts @@ -64,7 +64,7 @@ import { splitErrorsAndResults, } from "../../helpers/utils.js"; import { assertIsHex } from "../../helpers/validations.js"; -import { checkboxes, confirm } from "../../prompt.js"; +import { checkboxes, confirm, list } from "../../prompt.js"; import { ensureFluenceEnv } from "../../resolveFluenceEnv.js"; import { getProtocolVersions } from "../chainValidators.js"; import { @@ -955,6 +955,56 @@ export async function resolveOffersFromProviderConfig( return offers; } +export async function resolveSingleOfferFromProviderConfig( + offerName: string | undefined, +): Promise { + const allOffers = await ensureOfferConfigs(); + const providerConfig = await ensureReadonlyProviderConfig(); + + if (offerName === undefined) { + return list({ + message: `Select one offer name from ${providerConfig.$getPath()}`, + options: allOffers.map((offer) => { + return { + name: offer.offerName, + value: offer, + }; + }), + validate: (choices: string[]) => { + if (choices.length === 0) { + return "Please select at least one offer name"; + } + + return true; + }, + oneChoiceMessage(choice) { + return `One offer found at ${providerConfig.$getPath()}: ${color.yellow( + choice, + )}. Do you want to select it`; + }, + onNoChoices() { + commandObj.error( + `You must have at least one offer specified in ${providerConfig.$getPath()}`, + ); + }, + flagName: OFFER_FLAG_NAME, + }); + } + + const offer = allOffers.find((o) => { + return o.offerName === offerName; + }); + + if (offer === undefined) { + commandObj.error( + `Offer: ${color.yellow(offerName)} is not found in the 'offers' section of ${providerConfig.$getPath()}`, + ); + } + + return offer; +} + + export type EnsureOfferConfig = Awaited< ReturnType >[number]; diff --git a/packages/cli/package/src/lib/const.ts b/packages/cli/package/src/lib/const.ts index 1290c85c1..391156af2 100644 --- a/packages/cli/package/src/lib/const.ts +++ b/packages/cli/package/src/lib/const.ts @@ -134,11 +134,24 @@ export const PEERS_FLAG = { export const OFFER_FLAG_NAME = "offers"; export const OFFER_IDS_FLAG_NAME = "offer-ids"; +export const SINGLE_OFFER_FLAG_NAME = "offer"; +export const SINGLE_OFFER_ID_FLAG_NAME = "offer-id"; + + const OFFER_FLAG_OBJECT = { description: `Comma-separated list of offer names. To use all of your offers: --${OFFER_FLAG_NAME} ${ALL_FLAG_VALUE}`, helpValue: "", }; +const SINGLE_OFFER_FLAG_OBJECT = { + description: `Offer name`, + helpValue: "", +}; + +export const SINGLE_OFFER_FLAG = { + [SINGLE_OFFER_FLAG_NAME]: Flags.string(SINGLE_OFFER_FLAG_OBJECT), +}; + export const OFFER_FLAG = { [OFFER_FLAG_NAME]: Flags.string(OFFER_FLAG_OBJECT), }; @@ -155,6 +168,18 @@ export const OFFER_FLAGS = { }), }; +export const SINGLE_OFFER_FLAGS = { + [SINGLE_OFFER_FLAG_NAME]: Flags.string({ + ...SINGLE_OFFER_FLAG_OBJECT, + exclusive: [SINGLE_OFFER_ID_FLAG_NAME], + }), + [SINGLE_OFFER_ID_FLAG_NAME]: Flags.string({ + description: `Offer id. Can't be used together with --${SINGLE_OFFER_FLAG_NAME} flag`, + helpValue: "", + exclusive: [SINGLE_OFFER_FLAG_NAME], + }), +}; + export const PEER_AND_OFFER_NAMES_FLAGS = { ...PEER_NAMES_FLAG, ...OFFER_FLAG, From 107a49f03bd8bdfa2776a391c7288d2cd61ea51c Mon Sep 17 00:00:00 2001 From: ValeryAntopol <36988194+ValeryAntopol@users.noreply.github.com> Date: Wed, 27 Aug 2025 09:27:08 +0000 Subject: [PATCH 07/14] Apply automatic changes --- packages/cli/package/docs/commands/README.md | 7 +++---- .../src/commands/provider/offer-access-address.ts | 14 +++++++++----- packages/cli/package/src/lib/chain/offer/offer.ts | 1 - packages/cli/package/src/lib/const.ts | 1 - 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/cli/package/docs/commands/README.md b/packages/cli/package/docs/commands/README.md index 94c14acc3..c1550a88e 100644 --- a/packages/cli/package/docs/commands/README.md +++ b/packages/cli/package/docs/commands/README.md @@ -644,15 +644,14 @@ Set access address for offer for use in cluster software.. Alias: fluence provid ``` USAGE - $ fluence provider offer-access-address [--no-input] [--offers ] [--env ] - [--priv-key ] [--address
] + $ fluence provider offer-access-address [--no-input] [--offer ] [--env ] [--priv-key + ] [--address
] FLAGS --address=
Address derived from Cluster private key --env= Fluence Environment to use when running the command --no-input Don't interactively ask for any input from the user - --offers= Comma-separated list of offer names. To use all of your offers: --offers - all + --offer= Offer name --priv-key= !WARNING! for debug purposes only. Passing private keys through flags is unsecure. On local env 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 is used diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts index 129874121..c595cdd9d 100644 --- a/packages/cli/package/src/commands/provider/offer-access-address.ts +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -17,7 +17,8 @@ import { BaseCommand } from "../../baseCommand.js"; import { - filterOffersFoundOnChain, resolveSingleOfferFromProviderConfig + filterOffersFoundOnChain, + resolveSingleOfferFromProviderConfig, } from "../../lib/chain/offer/offer.js"; import { assertProviderIsRegistered } from "../../lib/chain/providerInfo.js"; import { commandObj } from "../../lib/commandObj.js"; @@ -25,7 +26,8 @@ import { CHAIN_FLAGS, CLUSTER_ADDRESS_FLAG, SINGLE_OFFER_FLAG, - ADDRESS_FLAG_NAME, SINGLE_OFFER_FLAG_NAME + ADDRESS_FLAG_NAME, + SINGLE_OFFER_FLAG_NAME, } from "../../lib/const.js"; import { getContracts, sign } from "../../lib/dealClient.js"; import { aliasesText } from "../../lib/helpers/aliasesText.js"; @@ -45,7 +47,9 @@ export default class OfferAccessAddress extends BaseCommand< async run(): Promise { const { flags } = await initCli(this, await this.parse(OfferAccessAddress)); - const configOffer = await resolveSingleOfferFromProviderConfig(flags[SINGLE_OFFER_FLAG_NAME]); + const configOffer = await resolveSingleOfferFromProviderConfig( + flags[SINGLE_OFFER_FLAG_NAME], + ); const offersFoundOnChain = await filterOffersFoundOnChain([configOffer]); const chainOffer = offersFoundOnChain[0]; @@ -66,8 +70,8 @@ export default class OfferAccessAddress extends BaseCommand< })); commandObj.logToStderr( - `Setting cluster address ${address} for offer ${chainOffer.offerName} (${chainOffer.offerId})` - ) + `Setting cluster address ${address} for offer ${chainOffer.offerName} (${chainOffer.offerId})`, + ); if ( !(await confirm({ diff --git a/packages/cli/package/src/lib/chain/offer/offer.ts b/packages/cli/package/src/lib/chain/offer/offer.ts index 5aa641f65..5d8b4bb82 100644 --- a/packages/cli/package/src/lib/chain/offer/offer.ts +++ b/packages/cli/package/src/lib/chain/offer/offer.ts @@ -1004,7 +1004,6 @@ export async function resolveSingleOfferFromProviderConfig( return offer; } - export type EnsureOfferConfig = Awaited< ReturnType >[number]; diff --git a/packages/cli/package/src/lib/const.ts b/packages/cli/package/src/lib/const.ts index 391156af2..a26ee0b8c 100644 --- a/packages/cli/package/src/lib/const.ts +++ b/packages/cli/package/src/lib/const.ts @@ -137,7 +137,6 @@ export const OFFER_IDS_FLAG_NAME = "offer-ids"; export const SINGLE_OFFER_FLAG_NAME = "offer"; export const SINGLE_OFFER_ID_FLAG_NAME = "offer-id"; - const OFFER_FLAG_OBJECT = { description: `Comma-separated list of offer names. To use all of your offers: --${OFFER_FLAG_NAME} ${ALL_FLAG_VALUE}`, helpValue: "", From a12033f98d413d85dded3c6fbc0dabc63a0096d5 Mon Sep 17 00:00:00 2001 From: fluencebot <116741523+fluencebot@users.noreply.github.com> Date: Wed, 27 Aug 2025 09:31:39 +0000 Subject: [PATCH 08/14] Apply automatic changes --- .../cli/package/src/commands/provider/offer-access-address.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts index c595cdd9d..958369ca9 100644 --- a/packages/cli/package/src/commands/provider/offer-access-address.ts +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -47,9 +47,11 @@ export default class OfferAccessAddress extends BaseCommand< async run(): Promise { const { flags } = await initCli(this, await this.parse(OfferAccessAddress)); + const configOffer = await resolveSingleOfferFromProviderConfig( flags[SINGLE_OFFER_FLAG_NAME], ); + const offersFoundOnChain = await filterOffersFoundOnChain([configOffer]); const chainOffer = offersFoundOnChain[0]; From 2a1932d476efc501f84f387ea88def6b6e159618 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Thu, 28 Aug 2025 14:52:33 +0900 Subject: [PATCH 09/14] support offer-id --- .../commands/provider/offer-access-address.ts | 13 +- .../cli/package/src/lib/chain/offer/offer.ts | 190 +++++++++++++++++- packages/cli/package/src/lib/const.ts | 2 +- 3 files changed, 188 insertions(+), 17 deletions(-) diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts index 958369ca9..e2b67a636 100644 --- a/packages/cli/package/src/commands/provider/offer-access-address.ts +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -25,9 +25,8 @@ import { commandObj } from "../../lib/commandObj.js"; import { CHAIN_FLAGS, CLUSTER_ADDRESS_FLAG, - SINGLE_OFFER_FLAG, - ADDRESS_FLAG_NAME, - SINGLE_OFFER_FLAG_NAME, + SINGLE_OFFER_FLAGS, + ADDRESS_FLAG_NAME } from "../../lib/const.js"; import { getContracts, sign } from "../../lib/dealClient.js"; import { aliasesText } from "../../lib/helpers/aliasesText.js"; @@ -40,18 +39,14 @@ export default class OfferAccessAddress extends BaseCommand< static override hiddenAliases = ["provider:sck"]; static override description = `Set access address for offer for use in cluster software.${aliasesText.apply(this)}`; static override flags = { - ...SINGLE_OFFER_FLAG, + ...SINGLE_OFFER_FLAGS, ...CHAIN_FLAGS, ...CLUSTER_ADDRESS_FLAG, }; async run(): Promise { const { flags } = await initCli(this, await this.parse(OfferAccessAddress)); - - const configOffer = await resolveSingleOfferFromProviderConfig( - flags[SINGLE_OFFER_FLAG_NAME], - ); - + const configOffer = await resolveSingleOfferFromProviderConfig(flags); const offersFoundOnChain = await filterOffersFoundOnChain([configOffer]); const chainOffer = offersFoundOnChain[0]; diff --git a/packages/cli/package/src/lib/chain/offer/offer.ts b/packages/cli/package/src/lib/chain/offer/offer.ts index 5d8b4bb82..bec0b02ce 100644 --- a/packages/cli/package/src/lib/chain/offer/offer.ts +++ b/packages/cli/package/src/lib/chain/offer/offer.ts @@ -46,8 +46,8 @@ import { OFFER_FLAG_NAME, OFFER_IDS_FLAG_NAME, PROVIDER_ARTIFACTS_CONFIG_FULL_FILE_NAME, - PROVIDER_CONFIG_FULL_FILE_NAME, - VCPU_PER_CU, + PROVIDER_CONFIG_FULL_FILE_NAME, SINGLE_OFFER_FLAG_NAME, SINGLE_OFFER_ID_FLAG_NAME, + VCPU_PER_CU } from "../../const.js"; import { getContracts, @@ -85,6 +85,11 @@ export type OffersArgs = { force?: boolean | undefined; }; +export type SingleOffersArgs = { + [SINGLE_OFFER_FLAG_NAME]?: string | undefined; + [SINGLE_OFFER_ID_FLAG_NAME]?: string | undefined; +}; + export async function createOffers(flags: OffersArgs) { const allOffers = await resolveOffersFromProviderConfig(flags); const providerConfig = await ensureReadonlyProviderConfig(); @@ -956,13 +961,33 @@ export async function resolveOffersFromProviderConfig( } export async function resolveSingleOfferFromProviderConfig( - offerName: string | undefined, + flags: SingleOffersArgs ): Promise { + if ( + flags[SINGLE_OFFER_FLAG_NAME] !== undefined && + flags[SINGLE_OFFER_ID_FLAG_NAME] !== undefined + ) { + commandObj.error( + `You can't use both ${color.yellow( + `--${SINGLE_OFFER_FLAG_NAME}`, + )} and ${color.yellow( + `--${SINGLE_OFFER_ID_FLAG_NAME}`, + )} flags at the same time. Please pick one of them`, + ); + } + + if (flags[SINGLE_OFFER_ID_FLAG_NAME] !== undefined) { + return resolveOfferById(flags[SINGLE_OFFER_ID_FLAG_NAME]); + } + + if (flags[SINGLE_OFFER_FLAG_NAME] !== undefined) { + return resolveOfferByName(flags[SINGLE_OFFER_FLAG_NAME]); + } + const allOffers = await ensureOfferConfigs(); const providerConfig = await ensureReadonlyProviderConfig(); - if (offerName === undefined) { - return list({ + return list({ message: `Select one offer name from ${providerConfig.$getPath()}`, options: allOffers.map((offer) => { return { @@ -988,8 +1013,13 @@ export async function resolveSingleOfferFromProviderConfig( ); }, flagName: OFFER_FLAG_NAME, - }); - } + }); +} + +async function resolveOfferByName(offerName: string): Promise { + const allOffers = await ensureOfferConfigs(); + const providerConfig = await ensureReadonlyProviderConfig(); + const offer = allOffers.find((o) => { return o.offerName === offerName; @@ -1004,6 +1034,152 @@ export async function resolveSingleOfferFromProviderConfig( return offer; } +async function resolveOfferById(offerId: string): Promise { + const allOffers = await ensureOfferConfigs(); + + const offerIdsFromFlags = [offerId]; + const offerIdsFromFlagsSet = new Set(offerIdsFromFlags); + + const offersDefinedLocally = allOffers.filter(({ offerId }) => { + return offerId !== undefined && offerIdsFromFlagsSet.has(offerId); + }); + + const offersDefinedLocallySet = new Set( + offersDefinedLocally.map(({ offerId }) => { + return offerId; + }), + ); + + const offerIdsNotDefinedLocally = offerIdsFromFlags.filter((offerId) => { + return !offersDefinedLocallySet.has(offerId); + }); + + const [offerInfosErrors, offerInfos] = await getOffersInfo( + offerIdsNotDefinedLocally.map((offerId) => { + return { offerId }; + }), + ); + + if (offerInfosErrors.length > 0) { + commandObj.warn( + `Wasn't able to get info about the following offers from indexer:\n\n${offerInfosErrors + .map(({ offerId }) => { + return offerId; + }) + .join("\n")}`, + ); + } + + const protocolVersionsFromChain = await getProtocolVersions(); + + const offersNotDefinedLocally = await Promise.all( + offerInfos.map(async ({ offerId, offerIndexerInfo }) => { + const resourcePricesWithIds = ( + offerIndexerInfo.offerResources ?? [] + ).reduce( + (acc, { resourcePrice, resourceDescription: { type, id } }) => { + const resourceType = onChainResourceTypeToResourceType(type); + + acc[resourceType].push({ + ty: type, + resourceType, + resourceId: id, + resourceName: id, + price: resourcePrice, + }); + + return acc; + }, + { + cpu: [], + ram: [], + storage: [], + ip: [], + bandwidth: [], + }, + ); + + const computePeersFromProviderConfig = await Promise.all( + offerIndexerInfo.peers.map( + async ({ computeUnits, resourcesByType, id }, i) => { + const peerIdBase58 = await peerIdHexStringToBase58String(id); + + const resourcesByTypeWithName = { + cpu: { + ...resourcesByType.cpu, + name: resourcesByType.cpu.resourceId, + }, + ram: { + ...resourcesByType.ram, + name: resourcesByType.ram.resourceId, + }, + storage: resourcesByType.storage.map((res) => { + return { ...res, name: res.resourceId }; + }), + ip: { + ...resourcesByType.ip, + name: resourcesByType.ip.resourceId, + }, + bandwidth: { + ...resourcesByType.bandwidth, + name: resourcesByType.bandwidth.resourceId, + }, + }; + + return { + name: `Peer #${numToStr(i)}`, + peerIdBase58, + peerId: await peerIdBase58ToUint8Array(peerIdBase58), + unitIds: computeUnits.map(({ id }) => { + return new Uint8Array(Buffer.from(id.slice(2), "hex")); + }), + owner: offerIndexerInfo.providerId, + resourcesByType: resourcesByTypeWithName, + }; + }, + ), + ); + + const { dataCenter } = offerIndexerInfo; + + assert( + dataCenter !== null && dataCenter !== undefined, + "Data center is always saved for offer on-chain when offer is created. Try waiting for indexer to index the data center", + ); + + assertIsHex(dataCenter.id, "Data center ID must be a hex string"); + + return { + offerName: `Offer ${offerId}`, + computePeersFromProviderConfig, + offerId, + dataCenter: { name: dataCenter.id, ...dataCenter }, + minProtocolVersion: Number( + protocolVersionsFromChain.minProtocolVersion, + ), + maxProtocolVersion: Number( + protocolVersionsFromChain.maxProtocolVersion, + ), + resourcePricesWithIds, + } satisfies (typeof offersDefinedLocally)[number]; + }), + ); + + const offer = + offersDefinedLocally.find((o) => { + return o.offerId === offerId; + }) ?? + offersNotDefinedLocally.find((o) => { + return o.offerId === offerId; + }); + + if (offer === undefined) { + commandObj.error(`Offer: ${color.yellow(offerId)} is not found`) + } + + return offer; +} + export type EnsureOfferConfig = Awaited< ReturnType >[number]; diff --git a/packages/cli/package/src/lib/const.ts b/packages/cli/package/src/lib/const.ts index a26ee0b8c..ca3e88d42 100644 --- a/packages/cli/package/src/lib/const.ts +++ b/packages/cli/package/src/lib/const.ts @@ -143,7 +143,7 @@ const OFFER_FLAG_OBJECT = { }; const SINGLE_OFFER_FLAG_OBJECT = { - description: `Offer name`, + description: `Offer name. Can't be used together with --offer flag`, helpValue: "", }; From b1dd23e8893cfc74d3d94b51c65d1c4c9afb2e7d Mon Sep 17 00:00:00 2001 From: ValeryAntopol <36988194+ValeryAntopol@users.noreply.github.com> Date: Thu, 28 Aug 2025 05:54:24 +0000 Subject: [PATCH 10/14] Apply automatic changes --- packages/cli/package/docs/commands/README.md | 7 ++- .../commands/provider/offer-access-address.ts | 2 +- .../cli/package/src/lib/chain/offer/offer.ts | 63 ++++++++++--------- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/packages/cli/package/docs/commands/README.md b/packages/cli/package/docs/commands/README.md index c1550a88e..723cbb150 100644 --- a/packages/cli/package/docs/commands/README.md +++ b/packages/cli/package/docs/commands/README.md @@ -644,14 +644,15 @@ Set access address for offer for use in cluster software.. Alias: fluence provid ``` USAGE - $ fluence provider offer-access-address [--no-input] [--offer ] [--env ] [--priv-key - ] [--address
] + $ fluence provider offer-access-address [--no-input] [--offer | --offer-id ] [--env ] [--priv-key ] [--address
] FLAGS --address=
Address derived from Cluster private key --env= Fluence Environment to use when running the command --no-input Don't interactively ask for any input from the user - --offer= Offer name + --offer= Offer name. Can't be used together with --offer flag + --offer-id= Offer id. Can't be used together with --offer flag --priv-key= !WARNING! for debug purposes only. Passing private keys through flags is unsecure. On local env 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 is used diff --git a/packages/cli/package/src/commands/provider/offer-access-address.ts b/packages/cli/package/src/commands/provider/offer-access-address.ts index e2b67a636..950bbbbd7 100644 --- a/packages/cli/package/src/commands/provider/offer-access-address.ts +++ b/packages/cli/package/src/commands/provider/offer-access-address.ts @@ -26,7 +26,7 @@ import { CHAIN_FLAGS, CLUSTER_ADDRESS_FLAG, SINGLE_OFFER_FLAGS, - ADDRESS_FLAG_NAME + ADDRESS_FLAG_NAME, } from "../../lib/const.js"; import { getContracts, sign } from "../../lib/dealClient.js"; import { aliasesText } from "../../lib/helpers/aliasesText.js"; diff --git a/packages/cli/package/src/lib/chain/offer/offer.ts b/packages/cli/package/src/lib/chain/offer/offer.ts index bec0b02ce..8ebf0ffb4 100644 --- a/packages/cli/package/src/lib/chain/offer/offer.ts +++ b/packages/cli/package/src/lib/chain/offer/offer.ts @@ -46,8 +46,10 @@ import { OFFER_FLAG_NAME, OFFER_IDS_FLAG_NAME, PROVIDER_ARTIFACTS_CONFIG_FULL_FILE_NAME, - PROVIDER_CONFIG_FULL_FILE_NAME, SINGLE_OFFER_FLAG_NAME, SINGLE_OFFER_ID_FLAG_NAME, - VCPU_PER_CU + PROVIDER_CONFIG_FULL_FILE_NAME, + SINGLE_OFFER_FLAG_NAME, + SINGLE_OFFER_ID_FLAG_NAME, + VCPU_PER_CU, } from "../../const.js"; import { getContracts, @@ -961,7 +963,7 @@ export async function resolveOffersFromProviderConfig( } export async function resolveSingleOfferFromProviderConfig( - flags: SingleOffersArgs + flags: SingleOffersArgs, ): Promise { if ( flags[SINGLE_OFFER_FLAG_NAME] !== undefined && @@ -988,39 +990,40 @@ export async function resolveSingleOfferFromProviderConfig( const providerConfig = await ensureReadonlyProviderConfig(); return list({ - message: `Select one offer name from ${providerConfig.$getPath()}`, - options: allOffers.map((offer) => { - return { - name: offer.offerName, - value: offer, - }; - }), - validate: (choices: string[]) => { - if (choices.length === 0) { - return "Please select at least one offer name"; - } + message: `Select one offer name from ${providerConfig.$getPath()}`, + options: allOffers.map((offer) => { + return { + name: offer.offerName, + value: offer, + }; + }), + validate: (choices: string[]) => { + if (choices.length === 0) { + return "Please select at least one offer name"; + } - return true; - }, - oneChoiceMessage(choice) { - return `One offer found at ${providerConfig.$getPath()}: ${color.yellow( - choice, - )}. Do you want to select it`; - }, - onNoChoices() { - commandObj.error( - `You must have at least one offer specified in ${providerConfig.$getPath()}`, - ); - }, - flagName: OFFER_FLAG_NAME, + return true; + }, + oneChoiceMessage(choice) { + return `One offer found at ${providerConfig.$getPath()}: ${color.yellow( + choice, + )}. Do you want to select it`; + }, + onNoChoices() { + commandObj.error( + `You must have at least one offer specified in ${providerConfig.$getPath()}`, + ); + }, + flagName: OFFER_FLAG_NAME, }); } -async function resolveOfferByName(offerName: string): Promise { +async function resolveOfferByName( + offerName: string, +): Promise { const allOffers = await ensureOfferConfigs(); const providerConfig = await ensureReadonlyProviderConfig(); - const offer = allOffers.find((o) => { return o.offerName === offerName; }); @@ -1174,7 +1177,7 @@ async function resolveOfferById(offerId: string): Promise { }); if (offer === undefined) { - commandObj.error(`Offer: ${color.yellow(offerId)} is not found`) + commandObj.error(`Offer: ${color.yellow(offerId)} is not found`); } return offer; From d52a940e4874fbeb00ce01550a34cc1908a5f025 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Fri, 29 Aug 2025 18:02:41 +0900 Subject: [PATCH 11/14] update versions --- packages/cli/package/package.json | 2 +- packages/cli/package/src/versions.json | 6 +++--- packages/cli/package/yarn.lock | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/cli/package/package.json b/packages/cli/package/package.json index 5d7c30ff8..0ac17f248 100644 --- a/packages/cli/package/package.json +++ b/packages/cli/package/package.json @@ -56,7 +56,7 @@ "whatwg-url": "^14.0.0" }, "dependencies": { - "@fluencelabs/deal-ts-clients": "0.24.2-feat-offer-unified-access-23e0cef-8165-1.0", + "@fluencelabs/deal-ts-clients": "0.24.2", "@kubernetes/client-node": "github:fluencelabs/kubernetes-client-javascript#e72ee00a52fec4eb4a8327632895d888ee504f4d", "@libp2p/crypto": "4.0.1", "@libp2p/peer-id-factory": "4.0.5", diff --git a/packages/cli/package/src/versions.json b/packages/cli/package/src/versions.json index 194accf66..bcc03f008 100644 --- a/packages/cli/package/src/versions.json +++ b/packages/cli/package/src/versions.json @@ -1,6 +1,6 @@ { "protocolVersion": 2, - "chain-rpc": "docker.fluence.dev/chain-rpc:feat-offer-unified-access-23e0cef-8165-1", - "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:feat-offer-unified-access-23e0cef-8165-1", - "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:feat-offer-unified-access-23e0cef-8165-1" + "chain-rpc": "fluencelabs/chain-rpc:0.24.2", + "chain-deploy-script": "fluencelabs/chain-deploy-script:0.24.2", + "subgraph-deploy-script": "fluencelabs/subgraph-deploy-script:0.24.2" } diff --git a/packages/cli/package/yarn.lock b/packages/cli/package/yarn.lock index 4f23d6485..a237ee7b3 100644 --- a/packages/cli/package/yarn.lock +++ b/packages/cli/package/yarn.lock @@ -1964,7 +1964,7 @@ __metadata: dependencies: "@actions/core": "npm:1.11.1" "@aws-sdk/lib-storage": "npm:^3.501.0" - "@fluencelabs/deal-ts-clients": "npm:0.24.2-feat-offer-unified-access-23e0cef-8165-1.0" + "@fluencelabs/deal-ts-clients": "npm:0.24.2" "@graphql-codegen/cli": "npm:^5.0.3" "@graphql-codegen/typescript": "npm:^4.1.1" "@graphql-codegen/typescript-graphql-request": "npm:^6.2.0" @@ -2038,9 +2038,9 @@ __metadata: languageName: unknown linkType: soft -"@fluencelabs/deal-ts-clients@npm:0.24.2-feat-offer-unified-access-23e0cef-8165-1.0": - version: 0.24.2-feat-offer-unified-access-23e0cef-8165-1.0 - resolution: "@fluencelabs/deal-ts-clients@npm:0.24.2-feat-offer-unified-access-23e0cef-8165-1.0" +"@fluencelabs/deal-ts-clients@npm:0.24.2": + version: 0.24.2 + resolution: "@fluencelabs/deal-ts-clients@npm:0.24.2" dependencies: "@graphql-typed-document-node/core": "npm:^3.2.0" debug: "npm:^4.3.4" @@ -2052,7 +2052,7 @@ __metadata: graphql-tag: "npm:^2.12.6" ipfs-http-client: "npm:^60.0.1" multiformats: "npm:^13.0.1" - checksum: 10c0/9ee396f289cdf94f073db8f418d1c2d84d362f38593f84069f7fedef9f8698429267de81dfb9b6071c21bbe44fa3f5f437592c3d0c89de3ca02a2605880890e9 + checksum: 10c0/a8e21d13adb25c6a36e9c26b6292275784bc358a9ef025acd6406240ef46547730255851d5e83a5e2fc2ffbc0235955840dcf79090a735fa4a13a076ed73bbaa languageName: node linkType: hard From 4727f613b0d3a35cbf5798f6ac4d25a2127daabd Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Mon, 1 Sep 2025 15:04:52 +0900 Subject: [PATCH 12/14] uodate docs --- packages/cli/package/docs/commands/README.md | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/cli/package/docs/commands/README.md b/packages/cli/package/docs/commands/README.md index 723cbb150..bf85d8ff7 100644 --- a/packages/cli/package/docs/commands/README.md +++ b/packages/cli/package/docs/commands/README.md @@ -85,7 +85,7 @@ DESCRIPTION Show contract addresses for the fluence environment and accounts for the local environment ``` -_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/chain/info.ts)_ +_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/chain/info.ts)_ ## `fluence default env [ENV]` @@ -108,7 +108,7 @@ EXAMPLES $ fluence default env ``` -_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/default/env.ts)_ +_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/default/env.ts)_ ## `fluence help [COMMAND]` @@ -151,7 +151,7 @@ EXAMPLES $ fluence local down ``` -_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/down.ts)_ +_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/down.ts)_ ## `fluence local init` @@ -176,7 +176,7 @@ EXAMPLES $ fluence local init ``` -_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/init.ts)_ +_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/init.ts)_ ## `fluence local logs` @@ -197,7 +197,7 @@ EXAMPLES $ fluence local logs ``` -_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/logs.ts)_ +_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/logs.ts)_ ## `fluence local ps` @@ -218,7 +218,7 @@ EXAMPLES $ fluence local ps ``` -_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/ps.ts)_ +_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/ps.ts)_ ## `fluence local up` @@ -255,7 +255,7 @@ EXAMPLES $ fluence local up ``` -_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/up.ts)_ +_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/up.ts)_ ## `fluence provider cc-activate` @@ -283,7 +283,7 @@ DESCRIPTION Add FLT collateral to capacity commitment to activate it. Alias: fluence provider ca ``` -_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-activate.ts)_ +_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-activate.ts)_ ## `fluence provider cc-create` @@ -310,7 +310,7 @@ DESCRIPTION Create Capacity commitment. Alias: fluence provider cc ``` -_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-create.ts)_ +_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-create.ts)_ ## `fluence provider cc-finish` @@ -339,7 +339,7 @@ DESCRIPTION commitments and finish capacity commitments. Aliases: fluence provider ccf, fluence provider cc-collateral-withdraw ``` -_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-finish.ts)_ +_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-finish.ts)_ ## `fluence provider cc-info` @@ -368,7 +368,7 @@ DESCRIPTION Get info about capacity commitments. Alias: fluence provider ci ``` -_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-info.ts)_ +_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-info.ts)_ ## `fluence provider cc-remove` @@ -397,7 +397,7 @@ DESCRIPTION provider cr ``` -_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-remove.ts)_ +_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-remove.ts)_ ## `fluence provider cc-rewards-withdraw` @@ -425,7 +425,7 @@ DESCRIPTION Withdraw FLT rewards from capacity commitments. Alias: fluence provider crw ``` -_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ +_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ ## `fluence provider deal-exit` @@ -449,7 +449,7 @@ DESCRIPTION Exit from deal. Alias: fluence provider de ``` -_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-exit.ts)_ +_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-exit.ts)_ ## `fluence provider deal-list` @@ -471,7 +471,7 @@ DESCRIPTION List all deals. Alias: fluence provider dl ``` -_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-list.ts)_ +_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-list.ts)_ ## `fluence provider deal-rewards-info [DEAL-ADDRESS] [ON-CHAIN-WORKER-ID]` @@ -498,7 +498,7 @@ DESCRIPTION Deal rewards info. Alias: fluence provider dri ``` -_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-info.ts)_ +_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-info.ts)_ ## `fluence provider deal-rewards-withdraw` @@ -522,7 +522,7 @@ DESCRIPTION Withdraw USDC rewards from deals. Alias: fluence provider drw ``` -_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ +_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ ## `fluence provider deploy` @@ -552,7 +552,7 @@ EXAMPLES $ fluence provider deploy ``` -_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deploy.ts)_ +_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deploy.ts)_ ## `fluence provider gen` @@ -583,7 +583,7 @@ EXAMPLES $ fluence provider gen ``` -_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/gen.ts)_ +_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/gen.ts)_ ## `fluence provider info` @@ -612,7 +612,7 @@ DESCRIPTION Print peer signing wallets and peer ids. Alias: fluence provider i ``` -_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/info.ts)_ +_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/info.ts)_ ## `fluence provider init` @@ -636,7 +636,7 @@ DESCRIPTION Init provider config. Creates a provider.yaml file ``` -_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/init.ts)_ +_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/init.ts)_ ## `fluence provider offer-access-address` @@ -662,7 +662,7 @@ DESCRIPTION Set access address for offer for use in cluster software.. Alias: fluence provider sck ``` -_See code: [src/commands/provider/offer-access-address.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-access-address.ts)_ +_See code: [src/commands/provider/offer-access-address.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-access-address.ts)_ ## `fluence provider offer-create` @@ -687,7 +687,7 @@ DESCRIPTION Create offers. You have to be registered as a provider to do that. Alias: fluence provider oc ``` -_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-create.ts)_ +_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-create.ts)_ ## `fluence provider offer-info` @@ -714,7 +714,7 @@ DESCRIPTION Get info about offers. Alias: fluence provider oi ``` -_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-info.ts)_ +_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-info.ts)_ ## `fluence provider offer-remove` @@ -741,7 +741,7 @@ DESCRIPTION Remove offers. Alias: fluence provider or ``` -_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-remove.ts)_ +_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-remove.ts)_ ## `fluence provider offer-update` @@ -766,7 +766,7 @@ DESCRIPTION Update offers. Alias: fluence provider ou ``` -_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-update.ts)_ +_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-update.ts)_ ## `fluence provider register` @@ -788,7 +788,7 @@ DESCRIPTION Register as a provider. Alias: fluence provider r ``` -_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/register.ts)_ +_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/register.ts)_ ## `fluence provider tokens-distribute` @@ -816,7 +816,7 @@ DESCRIPTION Distribute FLT tokens to peers. Alias: fluence provider td ``` -_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-distribute.ts)_ +_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-distribute.ts)_ ## `fluence provider tokens-withdraw` @@ -845,7 +845,7 @@ DESCRIPTION Withdraw FLT tokens from peers. Alias: fluence provider tw ``` -_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-withdraw.ts)_ +_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-withdraw.ts)_ ## `fluence provider update` @@ -867,7 +867,7 @@ DESCRIPTION Update provider info. Alias: fluence provider u ``` -_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/update.ts)_ +_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/update.ts)_ ## `fluence update [CHANNEL]` From 8d998fcb4da09d5807ca43f6dfd8cfff7fb0246d Mon Sep 17 00:00:00 2001 From: ValeryAntopol <36988194+ValeryAntopol@users.noreply.github.com> Date: Mon, 1 Sep 2025 06:06:56 +0000 Subject: [PATCH 13/14] Apply automatic changes --- packages/cli/package/docs/commands/README.md | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/packages/cli/package/docs/commands/README.md b/packages/cli/package/docs/commands/README.md index bf85d8ff7..723cbb150 100644 --- a/packages/cli/package/docs/commands/README.md +++ b/packages/cli/package/docs/commands/README.md @@ -85,7 +85,7 @@ DESCRIPTION Show contract addresses for the fluence environment and accounts for the local environment ``` -_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/chain/info.ts)_ +_See code: [src/commands/chain/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/chain/info.ts)_ ## `fluence default env [ENV]` @@ -108,7 +108,7 @@ EXAMPLES $ fluence default env ``` -_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/default/env.ts)_ +_See code: [src/commands/default/env.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/default/env.ts)_ ## `fluence help [COMMAND]` @@ -151,7 +151,7 @@ EXAMPLES $ fluence local down ``` -_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/down.ts)_ +_See code: [src/commands/local/down.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/down.ts)_ ## `fluence local init` @@ -176,7 +176,7 @@ EXAMPLES $ fluence local init ``` -_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/init.ts)_ +_See code: [src/commands/local/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/init.ts)_ ## `fluence local logs` @@ -197,7 +197,7 @@ EXAMPLES $ fluence local logs ``` -_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/logs.ts)_ +_See code: [src/commands/local/logs.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/logs.ts)_ ## `fluence local ps` @@ -218,7 +218,7 @@ EXAMPLES $ fluence local ps ``` -_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/ps.ts)_ +_See code: [src/commands/local/ps.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/ps.ts)_ ## `fluence local up` @@ -255,7 +255,7 @@ EXAMPLES $ fluence local up ``` -_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/local/up.ts)_ +_See code: [src/commands/local/up.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/local/up.ts)_ ## `fluence provider cc-activate` @@ -283,7 +283,7 @@ DESCRIPTION Add FLT collateral to capacity commitment to activate it. Alias: fluence provider ca ``` -_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-activate.ts)_ +_See code: [src/commands/provider/cc-activate.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-activate.ts)_ ## `fluence provider cc-create` @@ -310,7 +310,7 @@ DESCRIPTION Create Capacity commitment. Alias: fluence provider cc ``` -_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-create.ts)_ +_See code: [src/commands/provider/cc-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-create.ts)_ ## `fluence provider cc-finish` @@ -339,7 +339,7 @@ DESCRIPTION commitments and finish capacity commitments. Aliases: fluence provider ccf, fluence provider cc-collateral-withdraw ``` -_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-finish.ts)_ +_See code: [src/commands/provider/cc-finish.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-finish.ts)_ ## `fluence provider cc-info` @@ -368,7 +368,7 @@ DESCRIPTION Get info about capacity commitments. Alias: fluence provider ci ``` -_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-info.ts)_ +_See code: [src/commands/provider/cc-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-info.ts)_ ## `fluence provider cc-remove` @@ -397,7 +397,7 @@ DESCRIPTION provider cr ``` -_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-remove.ts)_ +_See code: [src/commands/provider/cc-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-remove.ts)_ ## `fluence provider cc-rewards-withdraw` @@ -425,7 +425,7 @@ DESCRIPTION Withdraw FLT rewards from capacity commitments. Alias: fluence provider crw ``` -_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ +_See code: [src/commands/provider/cc-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/cc-rewards-withdraw.ts)_ ## `fluence provider deal-exit` @@ -449,7 +449,7 @@ DESCRIPTION Exit from deal. Alias: fluence provider de ``` -_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-exit.ts)_ +_See code: [src/commands/provider/deal-exit.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-exit.ts)_ ## `fluence provider deal-list` @@ -471,7 +471,7 @@ DESCRIPTION List all deals. Alias: fluence provider dl ``` -_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-list.ts)_ +_See code: [src/commands/provider/deal-list.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-list.ts)_ ## `fluence provider deal-rewards-info [DEAL-ADDRESS] [ON-CHAIN-WORKER-ID]` @@ -498,7 +498,7 @@ DESCRIPTION Deal rewards info. Alias: fluence provider dri ``` -_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-info.ts)_ +_See code: [src/commands/provider/deal-rewards-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-info.ts)_ ## `fluence provider deal-rewards-withdraw` @@ -522,7 +522,7 @@ DESCRIPTION Withdraw USDC rewards from deals. Alias: fluence provider drw ``` -_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ +_See code: [src/commands/provider/deal-rewards-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deal-rewards-withdraw.ts)_ ## `fluence provider deploy` @@ -552,7 +552,7 @@ EXAMPLES $ fluence provider deploy ``` -_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/deploy.ts)_ +_See code: [src/commands/provider/deploy.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/deploy.ts)_ ## `fluence provider gen` @@ -583,7 +583,7 @@ EXAMPLES $ fluence provider gen ``` -_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/gen.ts)_ +_See code: [src/commands/provider/gen.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/gen.ts)_ ## `fluence provider info` @@ -612,7 +612,7 @@ DESCRIPTION Print peer signing wallets and peer ids. Alias: fluence provider i ``` -_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/info.ts)_ +_See code: [src/commands/provider/info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/info.ts)_ ## `fluence provider init` @@ -636,7 +636,7 @@ DESCRIPTION Init provider config. Creates a provider.yaml file ``` -_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/init.ts)_ +_See code: [src/commands/provider/init.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/init.ts)_ ## `fluence provider offer-access-address` @@ -662,7 +662,7 @@ DESCRIPTION Set access address for offer for use in cluster software.. Alias: fluence provider sck ``` -_See code: [src/commands/provider/offer-access-address.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-access-address.ts)_ +_See code: [src/commands/provider/offer-access-address.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-access-address.ts)_ ## `fluence provider offer-create` @@ -687,7 +687,7 @@ DESCRIPTION Create offers. You have to be registered as a provider to do that. Alias: fluence provider oc ``` -_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-create.ts)_ +_See code: [src/commands/provider/offer-create.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-create.ts)_ ## `fluence provider offer-info` @@ -714,7 +714,7 @@ DESCRIPTION Get info about offers. Alias: fluence provider oi ``` -_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-info.ts)_ +_See code: [src/commands/provider/offer-info.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-info.ts)_ ## `fluence provider offer-remove` @@ -741,7 +741,7 @@ DESCRIPTION Remove offers. Alias: fluence provider or ``` -_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-remove.ts)_ +_See code: [src/commands/provider/offer-remove.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-remove.ts)_ ## `fluence provider offer-update` @@ -766,7 +766,7 @@ DESCRIPTION Update offers. Alias: fluence provider ou ``` -_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/offer-update.ts)_ +_See code: [src/commands/provider/offer-update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/offer-update.ts)_ ## `fluence provider register` @@ -788,7 +788,7 @@ DESCRIPTION Register as a provider. Alias: fluence provider r ``` -_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/register.ts)_ +_See code: [src/commands/provider/register.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/register.ts)_ ## `fluence provider tokens-distribute` @@ -816,7 +816,7 @@ DESCRIPTION Distribute FLT tokens to peers. Alias: fluence provider td ``` -_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-distribute.ts)_ +_See code: [src/commands/provider/tokens-distribute.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-distribute.ts)_ ## `fluence provider tokens-withdraw` @@ -845,7 +845,7 @@ DESCRIPTION Withdraw FLT tokens from peers. Alias: fluence provider tw ``` -_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/tokens-withdraw.ts)_ +_See code: [src/commands/provider/tokens-withdraw.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/tokens-withdraw.ts)_ ## `fluence provider update` @@ -867,7 +867,7 @@ DESCRIPTION Update provider info. Alias: fluence provider u ``` -_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/v0.25.1/src/commands/provider/update.ts)_ +_See code: [src/commands/provider/update.ts](https://github.com/fluencelabs/cli/blob/fluence-cli-v0.25.1/src/commands/provider/update.ts)_ ## `fluence update [CHANNEL]` From 053d77ac267a23ab36235441855caf195d582351 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Mon, 1 Sep 2025 21:40:46 +0900 Subject: [PATCH 14/14] remove containers change --- packages/cli/package/src/lib/configs/project/chainContainers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/package/src/lib/configs/project/chainContainers.ts b/packages/cli/package/src/lib/configs/project/chainContainers.ts index f9b6b147f..3f8e3f5ca 100644 --- a/packages/cli/package/src/lib/configs/project/chainContainers.ts +++ b/packages/cli/package/src/lib/configs/project/chainContainers.ts @@ -59,7 +59,7 @@ export const chainContainers = { environment: { IPFS_PROFILE: "server", }, - volumes: [`./data/ipfs:/data/ipfs`], + volumes: [`${IPFS_CONTAINER_NAME}:/data/ipfs`], healthcheck: { test: "ipfs id || exit 1", interval: "8s",