diff --git a/packages/cli/package/src/commands/local/up.ts b/packages/cli/package/src/commands/local/up.ts index 86c858476..e49e1fc1a 100644 --- a/packages/cli/package/src/commands/local/up.ts +++ b/packages/cli/package/src/commands/local/up.ts @@ -24,7 +24,7 @@ import { BaseCommand } from "../../baseCommand.js"; import { LOCAL_NET_DEFAULT_WALLET_KEY } from "../../common.js"; import { createCommitments } from "../../lib/chain/commitment.js"; import { depositCollateral } from "../../lib/chain/depositCollateral.js"; -import { distributeToNox } from "../../lib/chain/distributeToNox.js"; +import { distributeToPeer } from "../../lib/chain/distributeToNox.js"; import { createOffers } from "../../lib/chain/offer/offer.js"; import { registerProvider } from "../../lib/chain/providerInfo.js"; import { setChainFlags } from "../../lib/chainFlags.js"; @@ -35,7 +35,7 @@ import { OFFER_FLAG_NAME, ALL_FLAG_VALUE, DOCKER_COMPOSE_FULL_FILE_NAME, - SERVERS_FLAG, + PEERS_FLAG, PRIV_KEY_FLAG, PROVIDER_CONFIG_FULL_FILE_NAME, type FluenceEnv, @@ -52,7 +52,7 @@ export default class Up extends BaseCommand { static override description = `Run ${DOCKER_COMPOSE_FULL_FILE_NAME} using docker compose and set up provider using all the offers from the 'offers' section in ${PROVIDER_CONFIG_FULL_FILE_NAME} config using default wallet key ${LOCAL_NET_DEFAULT_WALLET_KEY}`; static override examples = ["<%= config.bin %> <%= command.id %>"]; static override flags = { - ...SERVERS_FLAG, + ...PEERS_FLAG, timeout: Flags.integer({ description: "Timeout in seconds for attempting to register local network on local peers", @@ -146,7 +146,7 @@ export default class Up extends BaseCommand { } const allOffers = { [OFFER_FLAG_NAME]: ALL_FLAG_VALUE }; - await distributeToNox({ ...flags, ...allOffers, amount: "10" }); + await distributeToPeer({ ...flags, ...allOffers, amount: "10" }); await registerProvider(); await createOffers({ force: true, ...allOffers }); await createCommitments({ ...flags, ...allOffers }); diff --git a/packages/cli/package/src/commands/provider/gen.ts b/packages/cli/package/src/commands/provider/gen.ts index 93ff1bb95..5719e25bf 100644 --- a/packages/cli/package/src/commands/provider/gen.ts +++ b/packages/cli/package/src/commands/provider/gen.ts @@ -22,7 +22,7 @@ import { color } from "@oclif/color"; import { Flags } from "@oclif/core"; import { BaseCommand } from "../../baseCommand.js"; -import { withdrawFromNox } from "../../lib/chain/distributeToNox.js"; +import { withdrawFromPeer } from "../../lib/chain/distributeToNox.js"; import { commandObj } from "../../lib/commandObj.js"; import { ensureComputerPeerConfigs } from "../../lib/configs/project/provider/provider.js"; import { @@ -62,7 +62,7 @@ export default class Gen extends BaseCommand { default: false, }), [NO_WITHDRAW_FLAG_NAME]: Flags.boolean({ - description: `Is used only when --${RESET_PEER_SECRETS_FLAG_NAME} flag is present. Will not withdraw tokens from noxes (if you don't need it or it fails for some reason)`, + description: `Is used only when --${RESET_PEER_SECRETS_FLAG_NAME} flag is present. Will not withdraw tokens from peers (if you don't need it or it fails for some reason)`, default: false, }), }; @@ -79,7 +79,7 @@ export default class Gen extends BaseCommand { if ( flags[RESET_PEER_SECRETS_FLAG_NAME] && (await confirm({ - message: `Are you sure you want to backup nox secrets ${color.yellow(providerSecretsConfigPath)} and ${color.yellow(fluenceSecretsDir)} (if they exist) to ${color.yellow(backupDirPath)} and generate new ones`, + message: `Are you sure you want to backup peer secrets ${color.yellow(providerSecretsConfigPath)} and ${color.yellow(fluenceSecretsDir)} (if they exist) to ${color.yellow(backupDirPath)} and generate new ones`, default: flags[RESET_PEER_SECRETS_FLAG_NAME], })) ) { @@ -87,18 +87,18 @@ export default class Gen extends BaseCommand { !flags[NO_WITHDRAW_FLAG_NAME] && (await confirm({ message: - "Do you want to withdraw remaining tokens from your noxes before continuing", + "Do you want to withdraw remaining tokens from your peers before continuing", default: !flags[NO_WITHDRAW_FLAG_NAME], })) ) { try { - await withdrawFromNox({ + await withdrawFromPeer({ [PEER_NAMES_FLAG_NAME]: ALL_FLAG_VALUE, amount: MAX_TOKEN_AMOUNT_KEYWORD, }); } catch (e) { return commandObj.error( - `Failed to withdraw tokens from noxes. Try using ${color.yellow(`${CLI_NAME} provider tokens-withdraw`)} command with specific nox names and amounts or don't withdraw anything if you don't need to by using --${NO_WITHDRAW_FLAG_NAME} flag. Error: ${stringifyUnknown(e)}`, + `Failed to withdraw tokens from peers. Try using ${color.yellow(`${CLI_NAME} provider tokens-withdraw`)} command with specific peer names and amounts or don't withdraw anything if you don't need to by using --${NO_WITHDRAW_FLAG_NAME} flag. Error: ${stringifyUnknown(e)}`, ); } } diff --git a/packages/cli/package/src/commands/provider/info.ts b/packages/cli/package/src/commands/provider/info.ts index cce15b8ea..624b504f1 100644 --- a/packages/cli/package/src/commands/provider/info.ts +++ b/packages/cli/package/src/commands/provider/info.ts @@ -37,7 +37,7 @@ import { ensureFluenceEnv } from "../../lib/resolveFluenceEnv.js"; export default class Info extends BaseCommand { static override hiddenAliases = ["provider:i"]; - static override description = `Print nox signing wallets and peer ids${aliasesText.apply(this)}`; + static override description = `Print peer signing wallets and peer ids${aliasesText.apply(this)}`; static override flags = { ...CHAIN_FLAGS, ...PEER_AND_OFFER_NAMES_FLAGS, diff --git a/packages/cli/package/src/commands/provider/init.ts b/packages/cli/package/src/commands/provider/init.ts index 9637da535..1a1e88116 100644 --- a/packages/cli/package/src/commands/provider/init.ts +++ b/packages/cli/package/src/commands/provider/init.ts @@ -18,7 +18,6 @@ import { writeFile } from "node:fs/promises"; import { color } from "@oclif/color"; -import { Flags } from "@oclif/core"; import { BaseCommand } from "../../baseCommand.js"; import { commandObj } from "../../lib/commandObj.js"; @@ -28,7 +27,7 @@ import { } from "../../lib/configs/project/provider/provider.js"; import { CHAIN_FLAGS, - SERVERS_FLAG, + PEERS_FLAG, PROVIDER_CONFIG_FULL_FILE_NAME, RECOMMENDED_GITIGNORE_CONTENT, } from "../../lib/const.js"; @@ -38,12 +37,8 @@ import { getGitignorePath } from "../../lib/paths.js"; export default class Init extends BaseCommand { static override description = `Init provider config. Creates a ${PROVIDER_CONFIG_FULL_FILE_NAME} file`; static override flags = { - ...SERVERS_FLAG, + ...PEERS_FLAG, ...CHAIN_FLAGS, - "no-vm": Flags.boolean({ - description: `Generate ${PROVIDER_CONFIG_FULL_FILE_NAME} without vm configuration`, - default: false, - }), }; async run(): Promise { diff --git a/packages/cli/package/src/commands/provider/tokens-distribute.ts b/packages/cli/package/src/commands/provider/tokens-distribute.ts index aaafdb129..136045c6b 100644 --- a/packages/cli/package/src/commands/provider/tokens-distribute.ts +++ b/packages/cli/package/src/commands/provider/tokens-distribute.ts @@ -18,7 +18,7 @@ import { Flags } from "@oclif/core"; import { BaseCommand } from "../../baseCommand.js"; -import { distributeToNox } from "../../lib/chain/distributeToNox.js"; +import { distributeToPeer } from "../../lib/chain/distributeToNox.js"; import { CHAIN_FLAGS, FLT_SYMBOL, @@ -31,17 +31,17 @@ export default class TokensDistribute extends BaseCommand< typeof TokensDistribute > { static override hiddenAliases = ["provider:td"]; - static override description = `Distribute ${FLT_SYMBOL} tokens to noxes${aliasesText.apply(this)}`; + static override description = `Distribute ${FLT_SYMBOL} tokens to peers${aliasesText.apply(this)}`; static override flags = { ...CHAIN_FLAGS, ...PEER_AND_OFFER_NAMES_FLAGS, amount: Flags.string({ - description: `Amount of ${FLT_SYMBOL} tokens to distribute to noxes`, + description: `Amount of ${FLT_SYMBOL} tokens to distribute to peers`, }), }; async run(): Promise { const { flags } = await initCli(this, await this.parse(TokensDistribute)); - await distributeToNox(flags); + await distributeToPeer(flags); } } diff --git a/packages/cli/package/src/commands/provider/tokens-withdraw.ts b/packages/cli/package/src/commands/provider/tokens-withdraw.ts index d4af0afea..27ba9d32d 100644 --- a/packages/cli/package/src/commands/provider/tokens-withdraw.ts +++ b/packages/cli/package/src/commands/provider/tokens-withdraw.ts @@ -18,7 +18,7 @@ import { Flags } from "@oclif/core"; import { BaseCommand } from "../../baseCommand.js"; -import { withdrawFromNox } from "../../lib/chain/distributeToNox.js"; +import { withdrawFromPeer } from "../../lib/chain/distributeToNox.js"; import { CHAIN_FLAGS, FLT_SYMBOL, @@ -32,17 +32,17 @@ const AMOUNT_FLAG_NAME = "amount"; export default class TokensWithdraw extends BaseCommand { static override hiddenAliases = ["provider:tw"]; - static override description = `Withdraw ${FLT_SYMBOL} tokens from noxes${aliasesText.apply(this)}`; + static override description = `Withdraw ${FLT_SYMBOL} tokens from peers${aliasesText.apply(this)}`; static override flags = { ...CHAIN_FLAGS, ...PEER_AND_OFFER_NAMES_FLAGS, [AMOUNT_FLAG_NAME]: Flags.string({ - description: `Amount of ${FLT_SYMBOL} tokens to withdraw from noxes. Use --${AMOUNT_FLAG_NAME} ${MAX_TOKEN_AMOUNT_KEYWORD} to withdraw maximum possible amount`, + description: `Amount of ${FLT_SYMBOL} tokens to withdraw from peers. Use --${AMOUNT_FLAG_NAME} ${MAX_TOKEN_AMOUNT_KEYWORD} to withdraw maximum possible amount`, }), }; async run(): Promise { const { flags } = await initCli(this, await this.parse(TokensWithdraw)); - await withdrawFromNox(flags); + await withdrawFromPeer(flags); } } diff --git a/packages/cli/package/src/lib/chain/commitment.ts b/packages/cli/package/src/lib/chain/commitment.ts index 8e2a23df4..c16d8d3ce 100644 --- a/packages/cli/package/src/lib/chain/commitment.ts +++ b/packages/cli/package/src/lib/chain/commitment.ts @@ -137,7 +137,7 @@ async function getComputePeersWithCCIds( commandObj.warn( `Some of the commitments were not found for:\n${computePeersWithoutCC .map(({ name, peerId }) => { - return `Nox: ${name}, PeerId: ${peerId}`; + return `Peer: ${name}, PeerId: ${peerId}`; }) .join( "\n", @@ -337,9 +337,9 @@ export async function createCommitments(flags: PeerAndOfferNameFlags) { try { createCommitmentsTxReceipts = await signBatch( - `Create commitments for the following noxes:\n\n${computePeers + `Create commitments for the following peers:\n\n${computePeers .map(({ name, peerId }) => { - return `Nox: ${name}\nPeerId: ${peerId}`; + return `Peer: ${name}\nPeerId: ${peerId}`; }) .join("\n\n")}`, [firstCommitmentTx, ...restCommitmentTxs], @@ -493,7 +493,7 @@ export async function collateralWithdraw( for (const commitment of commitments.flatMap(({ ccInfos }) => { return ccInfos; })) { - const { ccId, name: noxName } = commitment; + const { ccId, name: peerName } = commitment; const [unitIds, isExitedStatuses] = await contracts.diamond.getUnitExitStatuses(ccId); @@ -619,7 +619,7 @@ export async function collateralWithdraw( ); await signBatch( - `${firstNotExitedUnit === undefined ? "F" : "Remove compute units from capacity commitments and f"}inish commitment ${noxName === undefined ? ccId : `for ${noxName} (${ccId})`} ${ccId}`, + `${firstNotExitedUnit === undefined ? "Finish" : "Remove compute units from capacity commitments and finish"} commitment ${peerName === undefined ? ccId : `for ${peerName} (${ccId})`} ${ccId}`, firstNotExitedUnit === undefined ? [populateTx(contracts.diamond.finishCommitment, ccId)] : [ @@ -662,8 +662,8 @@ export function stringifyBasicCommitmentInfo({ peerId, ccId, }: CapacityCommitment) { - const noxName = name === undefined ? "" : `Nox: ${name}\n`; - return `${color.yellow(`${noxName}PeerId: ${peerId}`)}\nCommitmentId: ${ccId}`; + const peerName = name === undefined ? "" : `Peer: ${name}\n`; + return `${color.yellow(`${peerName}PeerId: ${peerId}`)}\nCommitmentId: ${ccId}`; } type CapacityCommitment = { @@ -984,10 +984,10 @@ export function stringifyDetailedCommitmentsInfo( return detailedCommitmentsInfoGroupedByStatus .map(({ statusInfo, CCs }) => { return `${getStatusHeading(statusInfo)}${CCs.map((cc) => { - const noxNameString = - "noxName" in cc ? color.yellow(`Nox: ${cc.noxName}\n`) : ""; + const peerNameString = + "peerName" in cc ? color.yellow(`Peer: ${cc.peerName}\n`) : ""; - return `${noxNameString}${getDetailedCommitmentInfoString(cc)}`; + return `${peerNameString}${getDetailedCommitmentInfoString(cc)}`; }).join("\n\n")}`; }) .join("\n\n"); @@ -1009,7 +1009,7 @@ async function getDetailedCommitmentInfo({ status, peerId, ccId, - name: noxName, + name: peerName, currentEpoch, epochDuration, initTimestamp, @@ -1074,7 +1074,7 @@ async function getDetailedCommitmentInfo({ : undefined; return { - ...(noxName === undefined ? {} : { noxName }), + ...(peerName === undefined ? {} : { peerName }), peerId, commitmentId: ccId, status, diff --git a/packages/cli/package/src/lib/chain/distributeToNox.ts b/packages/cli/package/src/lib/chain/distributeToNox.ts index 4dfd25071..63494fc9c 100644 --- a/packages/cli/package/src/lib/chain/distributeToNox.ts +++ b/packages/cli/package/src/lib/chain/distributeToNox.ts @@ -35,7 +35,7 @@ import { resolveComputePeersByNames } from "../resolveComputePeersByNames.js"; import { fltFormatWithSymbol, fltParse } from "./currencies.js"; -export async function distributeToNox( +export async function distributeToPeer( flags: { amount?: string | undefined } & PeerAndOfferNameFlags, ) { const computePeers = await resolveComputePeersByNames(flags); @@ -43,7 +43,7 @@ export async function distributeToNox( const amount = flags.amount ?? (await input({ - message: `Enter the amount of ${FLT_SYMBOL} tokens to distribute to noxes`, + message: `Enter the amount of ${FLT_SYMBOL} tokens to distribute to peers`, })); const parsedAmount = await fltParse(amount); @@ -66,7 +66,7 @@ export async function distributeToNox( } } -export async function withdrawFromNox( +export async function withdrawFromPeer( flags: { amount?: string | undefined; } & PeerAndOfferNameFlags, @@ -76,7 +76,7 @@ export async function withdrawFromNox( const amount = flags.amount ?? (await input({ - message: `Enter the amount of ${FLT_SYMBOL} tokens to distribute to noxes. Use ${color.yellow( + message: `Enter the amount of ${FLT_SYMBOL} tokens to distribute to peers. Use ${color.yellow( MAX_TOKEN_AMOUNT_KEYWORD, )} to withdraw maximum possible amount`, async validate(val: string) { @@ -100,13 +100,16 @@ export async function withdrawFromNox( }, })); - for (const { walletKey: noxWalletKey, name: noxName } of computePeers) { - const { amountBigInt, txReceipt, noxAddress } = + for (const { walletKey: peerWalletKey, name: peerName } of computePeers) { + const { amountBigInt, txReceipt, peerAddress } = amount === MAX_TOKEN_AMOUNT_KEYWORD - ? await withdrawMaxAmount({ noxWalletKey, noxName }) + ? await withdrawMaxAmount({ + peerWalletKey, + peerName, + }) : await withdrawSpecificAmount({ - noxWalletKey, - noxName, + peerWalletKey, + peerName, amountBigInt: await fltParse(amount), }); @@ -117,33 +120,33 @@ export async function withdrawFromNox( `Successfully withdrawn ${color.yellow( await fltFormatWithSymbol(amountBigInt), )} from ${color.yellow( - noxName, - )} (${noxAddress}) to ${color.yellow(providerAddress)} with tx hash: ${color.yellow(txReceipt.hash)}\n`, + peerName, + )} (${peerAddress}) to ${color.yellow(providerAddress)} with tx hash: ${color.yellow(txReceipt.hash)}\n`, ); } } } type WithdrawMaxAmountArgs = { - noxWalletKey: string; - noxName: string; + peerWalletKey: string; + peerName: string; }; async function withdrawMaxAmount({ - noxWalletKey, - noxName, + peerWalletKey, + peerName, }: WithdrawMaxAmountArgs) { - const noxWallet = await getWallet(noxWalletKey); - const noxAddress = await getSignerAddress(); + const peerWallet = await getWallet(peerWalletKey); + const peerAddress = await getSignerAddress(); - const gasLimit = await noxWallet.estimateGas({ - to: noxAddress, + const gasLimit = await peerWallet.estimateGas({ + to: peerAddress, value: 0n, }); - const noxProvider = noxWallet.provider; - assert(noxProvider !== null, "Unreachable. We ensure provider is not null"); - const gasPrice = await noxProvider.getFeeData(); + const peerProvider = peerWallet.provider; + assert(peerProvider !== null, "Unreachable. We ensure provider is not null"); + const gasPrice = await peerProvider.getFeeData(); if ( gasPrice.maxFeePerGas === null || @@ -157,18 +160,18 @@ async function withdrawMaxAmount({ const feeAmount = (gasPrice.maxFeePerGas + gasPrice.maxPriorityFeePerGas) * gasLimit; - const totalBalance = await noxProvider.getBalance(noxAddress); + const totalBalance = await peerProvider.getBalance(peerAddress); const amountBigInt = totalBalance - feeAmount; if (amountBigInt <= 0n) { commandObj.logToStderr( - `No ${FLT_SYMBOL} tokens to withdraw from ${noxName} (${noxAddress})`, + `No ${FLT_SYMBOL} tokens to withdraw from ${peerName} (${peerAddress})`, ); return { txReceipt: undefined, amountBigInt: undefined, - noxAddress: undefined, + peerAddress: undefined, }; } @@ -176,7 +179,7 @@ async function withdrawMaxAmount({ const result = { txReceipt: await sendRawTransaction( - `Withdraw max amount of ${await fltFormatWithSymbol(amountBigInt)} from ${noxName} (${noxAddress}) to ${providerAddress}`, + `Withdraw max amount of ${await fltFormatWithSymbol(amountBigInt)} from ${peerName} (${peerAddress}) to ${providerAddress}`, { to: providerAddress, value: amountBigInt, @@ -184,29 +187,29 @@ async function withdrawMaxAmount({ maxFeePerGas: gasPrice.maxFeePerGas, maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas, }, - noxWallet, + peerWallet, ), amountBigInt, - noxAddress, + peerAddress, }; return result; } async function withdrawSpecificAmount({ - noxWalletKey, - noxName, + peerWalletKey, + peerName, amountBigInt, }: WithdrawMaxAmountArgs & { amountBigInt: bigint }) { const providerAddress = await getSignerAddress(); - const { address: noxAddress } = await getWallet(noxWalletKey); + const { address: peerAddress } = await getWallet(peerWalletKey); return { txReceipt: await sendRawTransaction( - `Withdraw ${await fltFormatWithSymbol(amountBigInt)} from ${noxName} (${noxAddress}) to ${providerAddress}`, + `Withdraw ${await fltFormatWithSymbol(amountBigInt)} from ${peerName} (${peerAddress}) to ${providerAddress}`, { to: providerAddress, value: amountBigInt }, ), amountBigInt, - noxAddress, + peerAddress, }; } diff --git a/packages/cli/package/src/lib/configs/project/provider/provider.ts b/packages/cli/package/src/lib/configs/project/provider/provider.ts index e8e993616..83051d96e 100644 --- a/packages/cli/package/src/lib/configs/project/provider/provider.ts +++ b/packages/cli/package/src/lib/configs/project/provider/provider.ts @@ -41,9 +41,9 @@ import { defaultNumberProperties, DEFAULT_CC_DURATION, DEFAULT_CC_STAKER_REWARD, - DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX, + DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_PEER, CLI_NAME, - DEFAULT_NUMBER_OF_LOCAL_NET_NOXES, + DEFAULT_NUMBER_OF_LOCAL_NET_PEERS, WS_CHAIN_URLS, } from "../../../const.js"; import { resolveDeployment } from "../../../dealClient.js"; @@ -103,7 +103,7 @@ function getDefault(args: ProviderConfigArgs) { const isLocal = chainEnv === "local"; const numberOfNoxes = - args.noxes ?? + args.peers ?? (isInteractive && !isLocal ? Number( await input({ @@ -115,7 +115,7 @@ function getDefault(args: ProviderConfigArgs) { }, }), ) - : DEFAULT_NUMBER_OF_LOCAL_NET_NOXES); + : DEFAULT_NUMBER_OF_LOCAL_NET_PEERS); const computePeerEntries: [string, ComputePeer][] = []; @@ -123,7 +123,7 @@ function getDefault(args: ProviderConfigArgs) { computePeerEntries.push([ `peer-${numToStr(i)}`, { - computeUnits: DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX, + computeUnits: DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_PEER, }, ] as const); } diff --git a/packages/cli/package/src/lib/configs/project/provider/provider0.ts b/packages/cli/package/src/lib/configs/project/provider/provider0.ts index 6e814ce9b..2d0474efa 100644 --- a/packages/cli/package/src/lib/configs/project/provider/provider0.ts +++ b/packages/cli/package/src/lib/configs/project/provider/provider0.ts @@ -27,7 +27,7 @@ import { DEFAULT_CC_DURATION, DEFAULT_CC_STAKER_REWARD, DURATION_EXAMPLE, - DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX, + DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_PEER, PT_SYMBOL, } from "../../../const.js"; import { numToStr } from "../../../helpers/typesafeStringify.js"; @@ -394,7 +394,7 @@ const computePeerSchema = { computeUnits: { type: "integer", description: `How many compute units should nox have. Default: ${numToStr( - DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX, + DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_PEER, )} (each compute unit requires ${COMPUTE_UNIT_MEMORY_STR} of RAM)`, }, nox: noxConfigYAMLSchema, diff --git a/packages/cli/package/src/lib/configs/project/provider/provider1.ts b/packages/cli/package/src/lib/configs/project/provider/provider1.ts index b6dd5c92f..cbdca254c 100644 --- a/packages/cli/package/src/lib/configs/project/provider/provider1.ts +++ b/packages/cli/package/src/lib/configs/project/provider/provider1.ts @@ -26,7 +26,7 @@ import { HTTP_PORT_START, TCP_PORT_START, WEB_SOCKET_PORT_START, - DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX, + DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_PEER, } from "../../../const.js"; import { boolToStr, numToStr } from "../../../helpers/typesafeStringify.js"; import type { ConfigOptions } from "../../initConfigNewTypes.js"; @@ -737,7 +737,7 @@ const computePeerSchema = { computeUnits: { type: "integer", description: `How many compute units should nox have. Default: ${numToStr( - DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX, + DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_PEER, )} (each compute unit requires ${COMPUTE_UNIT_MEMORY_STR} of RAM)`, }, resources: resourcesSchema, diff --git a/packages/cli/package/src/lib/configs/project/provider/provider3.ts b/packages/cli/package/src/lib/configs/project/provider/provider3.ts index bec0bca64..35fdf9330 100644 --- a/packages/cli/package/src/lib/configs/project/provider/provider3.ts +++ b/packages/cli/package/src/lib/configs/project/provider/provider3.ts @@ -355,7 +355,7 @@ function validateNoDuplicateNoxNamesInOffers(config: Config): ValidationResult { if (duplicateNoxNames.length > 0) { return duplicateNoxNames .map(([noxName, offerNames]) => { - return `Nox ${color.yellow( + return `Peer ${color.yellow( noxName, )} is present in multiple offers: ${color.yellow( offerNames.join(", "), diff --git a/packages/cli/package/src/lib/const.ts b/packages/cli/package/src/lib/const.ts index 456b0c9c1..4775f811a 100644 --- a/packages/cli/package/src/lib/const.ts +++ b/packages/cli/package/src/lib/const.ts @@ -53,7 +53,7 @@ export const DEFAULT_CURL_EFFECTOR_CID = export const DEFAULT_VM_EFFECTOR_CID = "bafkreidfw2so3evkkkky7bodnamzg32zweunfkthna362r7e6a63cnqxiy"; -export const DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_NOX = 32; +export const DEFAULT_NUMBER_OF_COMPUTE_UNITS_ON_PEER = 32; export type FluenceEnv = (typeof CHAIN_ENV)[number]; export const isFluenceEnv = getIsUnion(CHAIN_ENV); @@ -77,7 +77,7 @@ export const TCP_PORT_START = 977; export const WEB_SOCKET_PORT_START = 999; export const HTTP_PORT_START = 918; export const DEFAULT_AQUAVM_POOL_SIZE = 2; -export const DEFAULT_NUMBER_OF_LOCAL_NET_NOXES = 3; +export const DEFAULT_NUMBER_OF_LOCAL_NET_PEERS = 3; export const WS_CHAIN_URLS: Record = { mainnet: "wss://ws.mainnet.fluence.dev", @@ -146,18 +146,20 @@ export const ALL_FLAG_VALUE = "all"; export const PEER_NAMES_FLAG_NAME = "peer-names"; -const NOX_NAMES_FLAG_CONFIG = { +const PEER_NAMES_FLAG_CONFIG = { description: `Comma-separated names of peers from ${PROVIDER_CONFIG_FULL_FILE_NAME}. To use all of your peers: --${PEER_NAMES_FLAG_NAME} ${ALL_FLAG_VALUE}`, helpValue: "", }; const PEER_NAMES_FLAG = { - [PEER_NAMES_FLAG_NAME]: Flags.string(NOX_NAMES_FLAG_CONFIG), + [PEER_NAMES_FLAG_NAME]: Flags.string(PEER_NAMES_FLAG_CONFIG), }; -export const SERVERS_FLAG = { - servers: Flags.integer({ - description: `Number of servers to generate when a new ${PROVIDER_CONFIG_FULL_FILE_NAME} is created`, +export const PEERS_FLAG_NAME = "peers"; + +export const PEERS_FLAG = { + [PEERS_FLAG_NAME]: Flags.integer({ + description: `Number of peers to generate when a new ${PROVIDER_CONFIG_FULL_FILE_NAME} is created`, }), }; @@ -238,7 +240,7 @@ export const CC_IDS_FLAG_NAME = "cc-ids"; export const CC_FLAGS = { [PEER_NAMES_FLAG_NAME]: Flags.string({ - ...NOX_NAMES_FLAG_CONFIG, + ...PEER_NAMES_FLAG_CONFIG, exclusive: [CC_IDS_FLAG_NAME], }), [CC_IDS_FLAG_NAME]: Flags.string({ diff --git a/packages/cli/package/src/lib/generateUserProviderConfig.ts b/packages/cli/package/src/lib/generateUserProviderConfig.ts index 2baefd5e2..7e2c75691 100644 --- a/packages/cli/package/src/lib/generateUserProviderConfig.ts +++ b/packages/cli/package/src/lib/generateUserProviderConfig.ts @@ -15,7 +15,8 @@ * along with this program. If not, see . */ +import { PEERS_FLAG_NAME } from "./const.js"; + export type ProviderConfigArgs = { - noxes?: number | undefined; - "no-vm"?: boolean | undefined; + [PEERS_FLAG_NAME]?: number | undefined; }; diff --git a/packages/cli/package/src/lib/resolveComputePeersByNames.ts b/packages/cli/package/src/lib/resolveComputePeersByNames.ts index 39020cc6f..7db8a50cb 100644 --- a/packages/cli/package/src/lib/resolveComputePeersByNames.ts +++ b/packages/cli/package/src/lib/resolveComputePeersByNames.ts @@ -85,7 +85,7 @@ export async function resolveComputePeersByNames( EnsureComputerPeerConfig, never >({ - message: `Select one or more nox names from ${providerConfig.$getPath()}`, + message: `Select one or more peer names from ${providerConfig.$getPath()}`, options: computePeers.map((computePeer) => { return { name: computePeer.name, @@ -100,13 +100,13 @@ export async function resolveComputePeersByNames( return true; }, oneChoiceMessage(choice) { - return `One nox found at ${providerConfig.$getPath()}: ${color.yellow( + return `One peer found at ${providerConfig.$getPath()}: ${color.yellow( choice, )}. Do you want to select it`; }, onNoChoices() { commandObj.error( - `You must have at least one nox specified in ${providerConfig.$getPath()}`, + `You must have at least one peer specified in ${providerConfig.$getPath()}`, ); }, flagName: PEER_NAMES_FLAG_NAME, @@ -121,10 +121,10 @@ export async function resolveComputePeersByNames( return [firstComputePeer, ...restComputePeers]; } - const noxNames = commaSepStrToArr(flags[PEER_NAMES_FLAG_NAME]); + const peerNames = commaSepStrToArr(flags[PEER_NAMES_FLAG_NAME]); - const [unknownNoxNames, validNoxNames] = splitErrorsAndResults( - noxNames, + const [unknownPeerNames, validPeerNames] = splitErrorsAndResults( + peerNames, (name) => { if ( computePeers.find((cp) => { @@ -138,10 +138,10 @@ export async function resolveComputePeersByNames( }, ); - if (unknownNoxNames.length > 0) { + if (unknownPeerNames.length > 0) { commandObj.error( - `nox names: ${color.yellow( - unknownNoxNames.join(", "), + `peer names: ${color.yellow( + unknownPeerNames.join(", "), )} not found in ${color.yellow( "computePeers", )} property of ${providerConfig.$getPath()}`, @@ -150,13 +150,13 @@ export async function resolveComputePeersByNames( const [firstComputePeer, ...restComputePeers] = computePeers.filter( ({ name }) => { - return validNoxNames.includes(name); + return validPeerNames.includes(name); }, ); if (firstComputePeer === undefined) { commandObj.error( - `No compute peers found for nox names: ${validNoxNames.join(", ")}`, + `No compute peers found by names: ${validPeerNames.join(", ")} in ${providerConfig.$getPath()}`, ); }