From 04d5ea1b6156d1fc6ae05ad1c302211c0cf2cfe4 Mon Sep 17 00:00:00 2001 From: Artsiom Shamsutdzinau Date: Wed, 12 Feb 2025 16:42:07 +0100 Subject: [PATCH] use separate getDealV2 --- packages/cli/package/package.json | 2 +- .../cli/package/src/commands/provider/deal-exit.ts | 6 +++--- .../package/src/commands/provider/deal-rewards-info.ts | 2 +- .../src/commands/provider/deal-rewards-withdraw.ts | 2 +- packages/cli/package/src/versions.json | 6 +++--- packages/cli/package/yarn.lock | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/cli/package/package.json b/packages/cli/package/package.json index ef3cbe104..be1dd147b 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-1ae16d9-7758-1.0", + "@fluencelabs/deal-ts-clients": "0.23.2-update-deal-interface-c153307-7773-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/commands/provider/deal-exit.ts b/packages/cli/package/src/commands/provider/deal-exit.ts index 1be87546e..b0166e83e 100644 --- a/packages/cli/package/src/commands/provider/deal-exit.ts +++ b/packages/cli/package/src/commands/provider/deal-exit.ts @@ -78,7 +78,7 @@ export default class DealExit extends BaseCommand { // eslint-disable-next-line @typescript-eslint/consistent-type-assertions const workerIdsFromRPC = (await multicallRead( dealIds.map((id): MulticallReadItem => { - const deal = contracts.getDeal(id); + const deal = contracts.getDealV2(id); return { target: id, callData: deal.interface.encodeFunctionData("getWorkerIds"), @@ -91,11 +91,11 @@ export default class DealExit extends BaseCommand { }; }), )) as Awaited< - ReturnType["getWorkerIds"]> + ReturnType["getWorkerIds"]> >[]; const dealWorkerIds = dealIds.map((dealId, i) => { - const deal = contracts.getDeal(dealId); + const deal = contracts.getDealV2(dealId); const workerIds = workerIdsFromRPC[i] ?? []; return { dealId, deal, workerIds }; }); diff --git a/packages/cli/package/src/commands/provider/deal-rewards-info.ts b/packages/cli/package/src/commands/provider/deal-rewards-info.ts index 03773f09c..f8279d783 100644 --- a/packages/cli/package/src/commands/provider/deal-rewards-info.ts +++ b/packages/cli/package/src/commands/provider/deal-rewards-info.ts @@ -56,7 +56,7 @@ export default class DealRewardsInfo extends BaseCommand< (await input({ message: "Enter on-chain worker id" })); const { readonlyContracts } = await getReadonlyContracts(); - const deal = readonlyContracts.getDeal(dealAddress); + const deal = readonlyContracts.getDealV2(dealAddress); const rewardAmount = await deal.getRewardAmount(onChainWorkerId); commandObj.log( diff --git a/packages/cli/package/src/commands/provider/deal-rewards-withdraw.ts b/packages/cli/package/src/commands/provider/deal-rewards-withdraw.ts index d957eb022..79dd75d60 100644 --- a/packages/cli/package/src/commands/provider/deal-rewards-withdraw.ts +++ b/packages/cli/package/src/commands/provider/deal-rewards-withdraw.ts @@ -68,7 +68,7 @@ export default class DealRewardsWithdraw extends BaseCommand< const { contracts } = await getContracts(); for (const dealId of dealIds) { - const deal = contracts.getDeal(dealId); + const deal = contracts.getDealV2(dealId); const workersIds = await deal.getWorkerIds(); let providerRewards = 0n; diff --git a/packages/cli/package/src/versions.json b/packages/cli/package/src/versions.json index 47176d6dc..2f0478932 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-1ae16d9-7758-1", - "chain-deploy-script": "docker.fluence.dev/chain-deploy-script:update-deal-interface-1ae16d9-7758-1", - "subgraph-deploy-script": "docker.fluence.dev/subgraph-deploy-script:update-deal-interface-1ae16d9-7758-1" + "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" } diff --git a/packages/cli/package/yarn.lock b/packages/cli/package/yarn.lock index 2247d0a77..2dd6b5995 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-1ae16d9-7758-1.0" + "@fluencelabs/deal-ts-clients": "npm:0.23.2-update-deal-interface-c153307-7773-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-1ae16d9-7758-1.0": - version: 0.23.2-update-deal-interface-1ae16d9-7758-1.0 - resolution: "@fluencelabs/deal-ts-clients@npm:0.23.2-update-deal-interface-1ae16d9-7758-1.0" +"@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" 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/be15e80213fa02049f0e65c49631a7af135d5c807b9502e5e51fd48d8afd1b819bfb29235e373e4efca12d83d3ba358d653f2aa49318f7bae484003a7fc2ea3e + checksum: 10c0/b35fabbd4db97676a50b221805e048912553c84b65c9bd0b09274d5ced72a56f209ef20ddfd0a087fce36e8a82047a2ccfdbb906a94fe996f1d75c011f5f57cf languageName: node linkType: hard