feat(deals): support split deal rewards

cli/package.json

@@ -59,7 +59,7 @@
     "@fluencelabs/air-beautify-wasm": "0.3.9",
     "@fluencelabs/aqua-api": "0.14.10",
     "@fluencelabs/aqua-to-js": "0.3.13",
-    "@fluencelabs/deal-ts-clients": "0.18.7",
+    "@fluencelabs/deal-ts-clients": "0.19.0",
     "@fluencelabs/fluence-network-environment": "1.2.2",
     "@fluencelabs/js-client": "0.9.0",
     "@fluencelabs/npm-aqua-compiler": "0.0.3",

cli/src/commands/provider/deal-rewards-info.ts

@@ -59,8 +59,10 @@ export default class DealRewardsInfo extends BaseCommand<
     const rewardAmount = await deal.getRewardAmount(unitId);
 
     commandObj.log(
-      `Deal reward amount: ${color.yellow(
-        await ptFormatWithSymbol(rewardAmount),
+      `Provider reward: ${color.yellow(
+        await ptFormatWithSymbol(rewardAmount.providerReward),
+      )}\n\nStaker reward: ${color.yellow(
+        await ptFormatWithSymbol(rewardAmount.stakerReward),
       )}`,
     );
   }

cli/src/commands/provider/deal-rewards-withdraw.ts

@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { color } from "@oclif/color";
-
 import { BaseCommand, baseFlags } from "../../baseCommand.js";
 import { ptFormatWithSymbol } from "../../lib/chain/currencies.js";
 import { commandObj } from "../../lib/commandObj.js";
@@ -26,11 +24,13 @@ import {
   DEAL_IDS_FLAG_NAME,
   PT_SYMBOL,
 } from "../../lib/const.js";
-import { getDealClient, sign } from "../../lib/dealClient.js";
+import { getDealClient, getEventValue, sign } from "../../lib/dealClient.js";
 import { commaSepStrToArr } from "../../lib/helpers/utils.js";
 import { initCli } from "../../lib/lifeCycle.js";
 import { input } from "../../lib/prompt.js";
 
+const REWARD_WITHDRAWN_EVENT = "RewardWithdrawn";
+
 export default class DealRewardsWithdraw extends BaseCommand<
   typeof DealRewardsWithdraw
 > {
@@ -63,28 +63,72 @@ export default class DealRewardsWithdraw extends BaseCommand<
       const deal = dealClient.getDeal(dealId);
       const workers = await deal.getWorkers();
 
-      const rewardSum = (
-        await Promise.all(
-          workers.map(({ onchainId }) => {
-            return deal.getRewardAmount(onchainId);
-          }),
-        )
-      ).reduce((acc, reward) => {
-        return acc + reward;
-      }, 0n);
+      let providerRewards = 0n;
+      let stakerRewards = 0n;
 
       for (const { onchainId } of workers) {
-        await sign({
-          title: `Withdraw rewards for compute unit ${onchainId}`,
+        const txReceipt = await sign({
+          title: `Withdraw rewards for worker ${onchainId}`,
           method: deal.withdrawRewards,
           args: [onchainId],
         });
+
+        const providerReward = getEventValue({
+          txReceipt,
+          contract: deal,
+          eventName: REWARD_WITHDRAWN_EVENT,
+          value: "providerReward",
+        });
+
+        const stakerReward = getEventValue({
+          txReceipt,
+          contract: deal,
+          eventName: REWARD_WITHDRAWN_EVENT,
+          value: "stakerReward",
+        });
+
+        if (
+          typeof providerReward !== "bigint" ||
+          typeof stakerReward !== "bigint"
+        ) {
+          throw new Error(
+            `Failed to get rewards amount from event ${REWARD_WITHDRAWN_EVENT}. Please make sure event signature is correct`,
+          );
+        }
+
+        providerRewards = providerRewards + providerReward;
+        stakerRewards = stakerRewards + stakerReward;
       }
 
+      const allRewards = [
+        { name: "Provider", val: providerRewards },
+        { name: "Staker", val: stakerRewards },
+      ].filter(({ val }) => {
+        return val > 0n;
+      });
+
+      const rewardsStr =
+        allRewards.length === 0
+          ? "Rewards "
+          : `${(
+              await Promise.all(
+                allRewards.map(async ({ name, val }) => {
+                  return `${name} rewards: ${await ptFormatWithSymbol(val)}`;
+                }),
+              )
+            ).join("\n\n")}\n\n`;
+
+      const totalStr =
+        allRewards.length > 1
+          ? `Total rewards: ${await ptFormatWithSymbol(
+              allRewards.reduce((acc, { val }) => {
+                return acc + val;
+              }, 0n),
+            )}\n\n`
+          : "";
+
       commandObj.logToStderr(
-        `Reward ${color.yellow(
-          await ptFormatWithSymbol(rewardSum),
-        )} was withdrawn from the deal: ${dealId}`,
+        `\n${rewardsStr}${totalStr}were withdrawn from the deal: ${dealId}`,
       );
     }
   }

cli/src/versions.json

@@ -1,9 +1,9 @@
 {
   "protocolVersion": 1,
   "nox": "fluencelabs/nox:0.26.1",
-  "chain-rpc": "fluencelabs/chain-rpc:0.18.7",
-  "chain-deploy-script": "fluencelabs/chain-deploy-script:0.18.7",
-  "subgraph-deploy-script": "fluencelabs/subgraph-deploy-script:0.18.7",
+  "chain-rpc": "fluencelabs/chain-rpc:0.19.0",
+  "chain-deploy-script": "fluencelabs/chain-deploy-script:0.19.0",
+  "subgraph-deploy-script": "fluencelabs/subgraph-deploy-script:0.19.0",
   "rust-toolchain": "nightly-2024-06-10",
   "npm": {
     "@fluencelabs/aqua-lib": "0.11.0",

cli/test/helpers/sharedSteps.ts

@@ -247,6 +247,8 @@ export async function deployDealAndWaitUntilDeployed(
     },
     RUN_DEPLOYED_SERVICES_TIMEOUT,
   );
+
+  return dealId;
 }
 
 export async function createSpellAndAddToDeal(cwd: string, spellName: string) {

cli/test/tests/deal/dealDeploy.test.ts

@@ -40,7 +40,7 @@ describe("fluence deploy tests", () => {
 
       await createSpellAndAddToDeal(cwd, NEW_SPELL_NAME);
 
-      await deployDealAndWaitUntilDeployed(cwd);
+      const dealId = await deployDealAndWaitUntilDeployed(cwd);
 
       await waitUntilShowSubnetReturnsExpected(
         cwd,
@@ -54,6 +54,13 @@ describe("fluence deploy tests", () => {
       });
 
       assertLogsAreValid(logs);
+
+      // works because the same account that deploys is also a provider
+      await fluence({
+        args: ["provider", "deal-rewards-withdraw"],
+        flags: { "deal-ids": dealId },
+        cwd,
+      });
     },
   );
 });

cli/yarn.lock

@@ -436,7 +436,7 @@ __metadata:
     "@fluencelabs/air-beautify-wasm": "npm:0.3.9"
     "@fluencelabs/aqua-api": "npm:0.14.10"
     "@fluencelabs/aqua-to-js": "npm:0.3.13"
-    "@fluencelabs/deal-ts-clients": "npm:0.18.7"
+    "@fluencelabs/deal-ts-clients": "npm:0.19.0"
     "@fluencelabs/fluence-network-environment": "npm:1.2.2"
     "@fluencelabs/js-client": "npm:0.9.0"
     "@fluencelabs/npm-aqua-compiler": "npm:0.0.3"
@@ -509,9 +509,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@fluencelabs/deal-ts-clients@npm:0.18.7":
-  version: 0.18.7
-  resolution: "@fluencelabs/deal-ts-clients@npm:0.18.7"
+"@fluencelabs/deal-ts-clients@npm:0.19.0":
+  version: 0.19.0
+  resolution: "@fluencelabs/deal-ts-clients@npm:0.19.0"
   dependencies:
     "@graphql-typed-document-node/core": "npm:^3.2.0"
     debug: "npm:^4.3.4"
@@ -523,7 +523,7 @@ __metadata:
     graphql-tag: "npm:^2.12.6"
     ipfs-http-client: "npm:^60.0.1"
     multiformats: "npm:^13.0.1"
-  checksum: 10c0/5c753da4e23902676e153e87a0584aff5fa07a9aadf86e355436e17c6cfad13bef1a7617c370666defce2ae2b9db0c160310eb16b101627185a1227cf3153ad3
+  checksum: 10c0/b2002613cb3fe3be36ee149779294990ea21526954f9ceb0d2e2f62e67b41b7790c14f5f13a94e2da1036e1de0717914158756626eb217e9c753dde899a7c1c6
   languageName: node
   linkType: hard