support provider management address

Author: ValeryAntopol

packages/cli/package/package.json

@@ -56,7 +56,7 @@
     "whatwg-url": "^14.0.0"
   },
   "dependencies": {
-    "@fluencelabs/deal-ts-clients": "0.24.2",
+    "@fluencelabs/deal-ts-clients": "0.24.3-feat-beam-support-f0edb5b-8391-1.0",
     "@kubernetes/client-node": "github:fluencelabs/kubernetes-client-javascript#e72ee00a52fec4eb4a8327632895d888ee504f4d",
     "@libp2p/crypto": "4.0.1",
     "@libp2p/peer-id-factory": "4.0.5",

packages/cli/package/src/commands/provider/offer-access-address.ts

@@ -20,7 +20,10 @@ import {
   filterOffersFoundOnChain,
   resolveSingleOfferFromProviderConfig,
 } from "../../lib/chain/offer/offer.js";
-import { assertProviderIsRegistered } from "../../lib/chain/providerInfo.js";
+import {
+  getOfferOwner,
+  makeProviderAddressValidator
+} from "../../lib/chain/providerInfo.js";
 import { commandObj } from "../../lib/commandObj.js";
 import {
   CHAIN_FLAGS,
@@ -82,8 +85,10 @@ export default class OfferAccessAddress extends BaseCommand<
 
     const { contracts } = await getContracts();
 
+    const providerAddress = await getOfferOwner(chainOffer.offerId);
+
     await sign({
-      validateAddress: assertProviderIsRegistered,
+      validateAddress: makeProviderAddressValidator(providerAddress),
       title: `Setting cluster address ${address} for offer ${chainOffer.offerName} (${chainOffer.offerId})`,
       method: contracts.diamond.setClusterKey,
       args: [chainOffer.offerId, address],

packages/cli/package/src/commands/provider/offer-create.ts

@@ -17,7 +17,7 @@
 
 import { BaseCommand } from "../../baseCommand.js";
 import { createOffers } from "../../lib/chain/offer/offer.js";
-import { OFFER_FLAG, CHAIN_FLAGS } from "../../lib/const.js";
+import { OFFER_FLAG, CHAIN_FLAGS, PROVIDER_ADDRESS_FLAG } from "../../lib/const.js";
 import { aliasesText } from "../../lib/helpers/aliasesText.js";
 import { initCli } from "../../lib/lifeCycle.js";
 
@@ -27,10 +27,11 @@ export default class CreateOffer extends BaseCommand<typeof CreateOffer> {
   static override flags = {
     ...CHAIN_FLAGS,
     ...OFFER_FLAG,
+    ...PROVIDER_ADDRESS_FLAG
   };
 
   async run(): Promise<void> {
     const { flags } = await initCli(this, await this.parse(CreateOffer));
-    await createOffers(flags);
+    await createOffers(flags, flags.provider);
   }
 }

packages/cli/package/src/lib/chain/offer/offer.ts

@@ -45,11 +45,12 @@ import {
   CLI_NAME,
   OFFER_FLAG_NAME,
   OFFER_IDS_FLAG_NAME,
+  PROVIDER_ADDRESS_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,
+  VCPU_PER_CU
 } from "../../const.js";
 import {
   getContracts,
@@ -76,7 +77,7 @@ import {
   resourceSupplyFromConfigToChain,
 } from "../conversions.js";
 import { ptFormatWithSymbol } from "../currencies.js";
-import { assertProviderIsRegistered } from "../providerInfo.js";
+import { makeProviderAddressValidator } from "../providerInfo.js";
 
 const MARKET_OFFER_REGISTERED_EVENT_NAME = "MarketOfferRegistered";
 const OFFER_ID_PROPERTY = "offerId";
@@ -87,12 +88,16 @@ export type OffersArgs = {
   force?: boolean | undefined;
 };
 
+export type CreateOffersArgs = OffersArgs & {
+  [PROVIDER_ADDRESS_FLAG_NAME]?: string | undefined;
+};
+
 export type SingleOffersArgs = {
   [SINGLE_OFFER_FLAG_NAME]?: string | undefined;
   [SINGLE_OFFER_ID_FLAG_NAME]?: string | undefined;
 };
 
-export async function createOffers(flags: OffersArgs) {
+export async function createOffers(flags: CreateOffersArgs, maybeProviderAddress?: string) {
   const allOffers = await resolveOffersFromProviderConfig(flags);
   const providerConfig = await ensureReadonlyProviderConfig();
   const providerConfigPath = providerConfig.$getPath();
@@ -164,6 +169,8 @@ export async function createOffers(flags: OffersArgs) {
     let addedCPs;
     let offerRegisterTxReceipt;
 
+    const signerAddress = await getSignerAddress();
+    const providerAddress = maybeProviderAddress ?? signerAddress;
     try {
       ({
         sliceIndex: registeredCUsCount,
@@ -174,17 +181,18 @@ export async function createOffers(flags: OffersArgs) {
         sliceIndex: allCUs.length,
         getArgs(computePeersToRegister) {
           return [
+            providerAddress,
             contracts.deployment.usdc,
             resourcePricesArray,
             setCPUSupplyForCP(computePeersToRegister),
-            dataCenter.id,
+            dataCenter.id
           ];
         },
         getTitle() {
           return `Register offer: ${offerName}`;
         },
-        method: contracts.diamond.registerMarketOfferV2,
-        validateAddress: assertProviderIsRegistered,
+        method: contracts.diamond.registerMarketOfferV2Delegated,
+        validateAddress: makeProviderAddressValidator(providerAddress),
       }));
     } catch (e) {
       pushOfferRegisterResult({
@@ -221,7 +229,6 @@ export async function createOffers(flags: OffersArgs) {
       continue;
     }
 
-    const providerAddress = await getSignerAddress();
     const offerPerEnv = providerArtifactsConfig.offers[fluenceEnv] ?? {};
     offerPerEnv[offerName] = { id: offerId, providerAddress };
     providerArtifactsConfig.offers[fluenceEnv] = offerPerEnv;

packages/cli/package/src/lib/chain/offer/updateOffers.ts

@@ -35,7 +35,7 @@ import {
   resourceSupplyFromChainToConfig,
 } from "../conversions.js";
 import { ptFormatWithSymbol } from "../currencies.js";
-import { assertProviderIsRegistered } from "../providerInfo.js";
+import { getOfferOwner, makeProviderAddressValidator } from "../providerInfo.js";
 
 import {
   type OffersArgs,
@@ -116,6 +116,12 @@ export async function updateOffers(flags: OffersArgs) {
     return;
   }
 
+  let providerAddress = undefined;
+
+  if (offersFoundOnChain[0] !== undefined) {
+    providerAddress = await getOfferOwner(offersFoundOnChain[0].offerId);
+  }
+
   if (firstUpdateOffersTx !== undefined) {
     await signBatch({
       title: `Updating offers:\n\n${populatedOffersTxs
@@ -124,7 +130,7 @@ export async function updateOffers(flags: OffersArgs) {
         })
         .join("\n")}`,
       populatedTxs: [firstUpdateOffersTx, ...restUpdateOffersTxs],
-      validateAddress: assertProviderIsRegistered,
+      validateAddress: makeProviderAddressValidator(providerAddress),
     });
   }
 
@@ -190,14 +196,20 @@ export async function removeOffers(flags: OffersArgs) {
     return;
   }
 
+  let providerAddress = undefined;
+
+  if (offersFoundOnChain[0] !== undefined) {
+    providerAddress = await getOfferOwner(offersFoundOnChain[0].offerId);
+  }
+
   await signBatch({
     title: `Removing offers:\n\n${populatedTxs
       .map(({ offerName, offerId }) => {
         return `${offerName} (${offerId})`;
       })
       .join("\n")}`,
     populatedTxs: [firstRemoveOffersTx, ...restRemoveOffersTxs],
-    validateAddress: assertProviderIsRegistered,
+    validateAddress: makeProviderAddressValidator(providerAddress),
   });
 
   const providerArtifactsConfig = await initNewProviderArtifactsConfig();

packages/cli/package/src/lib/chain/providerInfo.ts

@@ -110,19 +110,36 @@ Provider address: ${signerAddress}
 async function getProviderInfoByAddress(address: string) {
   const { contracts } = await getContracts();
   const { name } = await contracts.diamond.getProviderInfo(address);
-  return { name: name === "" ? null : name, address };
+  const managementAddress = await contracts.diamond.getProviderManagementAddress(address);
+  return { name: name === "" ? null : name, address, managementAddress};
 }
 
 export async function getProviderInfo(address?: string) {
   return getProviderInfoByAddress(address ?? (await getSignerAddress()));
 }
 
-export async function assertProviderIsRegistered(address: string) {
-  const providerInfo = await getProviderInfoByAddress(address);
+export function makeProviderAddressValidator(providerAddress?: string) {
+  return async (address: string) => {
+    providerAddress = providerAddress ?? address;
 
-  if (providerInfo.name === null) {
-    commandObj.error(
-      `You have to register as a provider first. Use '${CLI_NAME} provider register' command for that`,
-    );
+    const providerInfo = await getProviderInfoByAddress(providerAddress);
+
+    if (providerInfo.name === null) {
+      commandObj.error(
+        `You have to register as a provider first. Use '${CLI_NAME} provider register' command for that`,
+      );
+    } else if (address !== providerAddress && address !== providerInfo.managementAddress) {
+      commandObj.error(
+        `You have using nor provider address not provider management address to sign the transaction.`,
+      );
+    }
+
+    return
   }
 }
+
+export async function getOfferOwner(offerId: string): Promise<string> {
+  const { contracts } = await getContracts();
+  const offerData = await contracts.diamond.getOffer(offerId);
+  return offerData.provider;
+}

packages/cli/package/src/lib/const.ts

@@ -198,7 +198,8 @@ export const PRIV_KEY_FLAG = {
   }),
 };
 
-export const ADDRESS_FLAG_NAME = "address";
+export const ADDRESS_FLAG_NAME = "address"
+export const PROVIDER_ADDRESS_FLAG_NAME = "provider";
 
 export const ADDRESS_FLAG = {
   [ADDRESS_FLAG_NAME]: Flags.string({
@@ -214,6 +215,13 @@ export const CLUSTER_ADDRESS_FLAG = {
   }),
 };
 
+export const PROVIDER_ADDRESS_FLAG = {
+  [PROVIDER_ADDRESS_FLAG_NAME]: Flags.string({
+    description: "Provider address. In case using managmenent address to sign transactions",
+    helpValue: "<address>",
+  }),
+};
+
 export const CHAIN_FLAGS = {
   ...ENV_FLAG,
   ...PRIV_KEY_FLAG,

packages/cli/package/src/versions.json

@@ -1,6 +1,6 @@
 {
   "protocolVersion": 2,
-  "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"
+  "chain-rpc": "docker.fluence.dev/chain-rpc:feat-beam-support-f0edb5b-8391-1",
+  "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:feat-beam-support-f0edb5b-8391-1",
+  "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:feat-beam-support-f0edb5b-8391-1"
 }

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"
+    "@fluencelabs/deal-ts-clients": "npm:0.24.3-feat-beam-support-f0edb5b-8391-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.24.2":
-  version: 0.24.2
-  resolution: "@fluencelabs/deal-ts-clients@npm:0.24.2"
+"@fluencelabs/deal-ts-clients@npm:0.24.3-feat-beam-support-f0edb5b-8391-1.0":
+  version: 0.24.3-feat-beam-support-f0edb5b-8391-1.0
+  resolution: "@fluencelabs/deal-ts-clients@npm:0.24.3-feat-beam-support-f0edb5b-8391-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/a8e21d13adb25c6a36e9c26b6292275784bc358a9ef025acd6406240ef46547730255851d5e83a5e2fc2ffbc0235955840dcf79090a735fa4a13a076ed73bbaa
+  checksum: 10c0/2478de8b0eeb12a98f3206dbf2af4501f59da55d413b261dbd84303054ad1053c7f602ce786e4fafb4ce322318605e897d48182759c5875c46685877f5356d58
   languageName: node
   linkType: hard