feat: use indexer directly [JS-842]

.github/actions/replace-version/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "ncc build index.js"
   },
-  "author": "Fluence Labs",
+  "author": "Cloudless Labs",
   "license": "AGPL-3.0",
   "dependencies": {
     "@actions/core": "^1.10.0"

packages/cli/package/.prettierignore → .prettierignore

@@ -3,6 +3,8 @@ docs
 node_modules
 tmp
 .fluence
-src/lib/compiled-aqua
+compiled-aqua
+gqlSchema.json
+gqlGenerated.ts
 CHANGELOG.md
 .github/workflows

README.md

@@ -92,5 +92,5 @@ you read and follow some basic [rules](./CONTRIBUTING.md).
 
 ## License
 
-All software code is copyright (c) Fluence Labs, Inc. under the
+All software code is copyright (c) Fluence DAO. under the
 [GNU Affero General Public License version 3](./LICENSE) license.

package.json

@@ -10,6 +10,8 @@
     "build": "turbo run build --cache-dir=.turbo",
     "install-yarn-dependencies": "turbo run install-yarn-dependencies --cache-dir=.turbo",
     "install-npm-dependencies": "turbo run install-npm-dependencies --cache-dir=.turbo",
+    "gen-gql-schema": "turbo run gen-gql-schema --cache-dir=.turbo",
+    "gql-codegen": "turbo run gql-codegen --cache-dir=.turbo",
     "pack-ci": "turbo run pack-ci --cache-dir=.turbo && node ./rename-packed.js",
     "pack-linux-x64": "turbo run pack-linux-x64 --cache-dir=.turbo && node ./rename-packed.js",
     "pack-darwin-x64": "turbo run pack-darwin-x64 --cache-dir=.turbo && node ./rename-packed.js",

packages/cli-connector/src/App.tsx

@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// In Firefox: client variable can be undefined - that's why we need to use optional chaining
-
 import { ConnectButton } from "@rainbow-me/rainbowkit";
 import {
   type CLIToConnectorFullMsg,

packages/cli/package.json

@@ -8,6 +8,8 @@
   "scripts": {
     "install-yarn-dependencies": "yarn ./package install",
     "install-npm-dependencies": "npm --prefix ./package/src/cli-aqua-dependencies install",
+    "gen-gql-schema": "yarn ./package gen-gql-schema",
+    "gql-codegen": "yarn ./package gql-codegen",
     "before-build": "yarn ./package before-build",
     "build": "yarn ./package build",
     "pack-ci": "yarn ./package pack-ci",

packages/cli/package/.gitignore

@@ -16,6 +16,7 @@ tmp
 /.f
 .env
 rust-toolchain.toml
+docker-compose.yaml
 
 # recommended by Fluence
 .idea
@@ -27,6 +28,8 @@ rust-toolchain.toml
 # ignore compiled files
 src/lib/compiled-aqua
 src/lib/compiled-aqua-with-tracing
+src/lib/gql/gqlGenerated.ts
+src/lib/gql/gqlSchema.json
 src/versions
 src/aqua-dependencies
 src/common.ts

packages/cli/package/docs/commands/README.md

@@ -1359,10 +1359,9 @@ Exit from deal. Alias: fluence provider de
 ```
 USAGE
   $ fluence provider deal-exit [--no-input] [--env <testnet | mainnet | stage | local>] [--priv-key <private-key>]
-    [--deal-ids <id-1,id-2>] [--all]
+    [--deal-ids <id-1,id-2>]
 
 FLAGS
-  --all                                      To use all deal ids that indexer is aware of for your provider address
   --deal-ids=<id-1,id-2>                     Comma-separated deal ids
   --env=<testnet | mainnet | stage | local>  Fluence Environment to use when running the command
   --no-input                                 Don't interactively ask for any input from the user

packages/cli/package/eslint.config.js

@@ -56,7 +56,7 @@ export default tseslint.config(
             "Please use type-safe to string converter (e.g. numToString)",
         },
         {
-          selector: "Identifier[name='String']",
+          selector: "CallExpression[callee.name='String']",
           message:
             // cause when the variable changes type you will have no way to learn you possibly have to change it's string representation
             "Please use type-safe to string converter (e.g. numToString)",
@@ -186,6 +186,7 @@ export default tseslint.config(
       "bin/dev.js",
       "resources/*",
       ".yarn/*",
+      "src/lib/gql/gqlGenerated.ts",
     ],
   },
 );

packages/cli/package/nsis/custom-installer.nsi

@@ -22,7 +22,7 @@ Section "@fluencelabs/cli CLI ${VERSION}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\fluence" \
                    "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\fluence" \
-                   "Publisher" "Fluence Labs"
+                   "Publisher" "Cloudless Labs"
 
   WriteRegExpandStr ${env_hkcu} "FLUENCE_OCLIF_CLIENT_HOME" "$INSTDIR\client"
   SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000

packages/cli/package/package.json

@@ -10,7 +10,7 @@
   "bugs": "https://github.com/fluencelabs/cli/issues",
   "repository": "fluencelabs/cli",
   "license": "AGPL-3.0",
-  "author": "Fluence Labs",
+  "author": "Cloudless Labs",
   "type": "module",
   "exports": "./lib/index.js",
   "types": "dist/index.d.ts",
@@ -29,6 +29,8 @@
     "lint": "eslint .",
     "lint-fix": "eslint . --fix",
     "find-dead-code": "ts-prune",
+    "gen-gql-schema": "tsx ./src/genGqlSchema.ts",
+    "gql-codegen": "graphql-codegen --config ./src/lib/gql/gqlCodegen.ts",
     "postpack": "shx rm -f oclif.manifest.json",
     "vitest-provider": "vitest run provider.test.ts",
     "vitest-deal-deploy": "vitest run dealDeploy.test.ts",
@@ -45,9 +47,9 @@
     "upload-darwin-x64": "oclif upload tarballs -t \"darwin-x64\" --no-xz",
     "upload-darwin-arm64": "oclif upload tarballs -t \"darwin-arm64\" --no-xz",
     "upload-win32-x64": "oclif upload tarballs -t \"win32-x64\" --no-xz && oclif upload win --targets \"win32-x64\"",
-    "download-marine-and-mrepl": "node --import tsx --no-warnings ./test/setup/downloadMarineAndMrepl.ts",
-    "generate-templates": "node --import tsx --no-warnings ./test/setup/generateTemplates.ts",
-    "local-up": "node --import tsx --no-warnings ./test/setup/localUp.ts",
+    "download-marine-and-mrepl": "tsx ./test/setup/downloadMarineAndMrepl.ts",
+    "generate-templates": "tsx ./test/setup/generateTemplates.ts",
+    "local-up": "tsx ./test/setup/localUp.ts",
     "test": "yarn download-marine-and-mrepl && yarn generate-templates && yarn local-up && yarn vitest",
     "circular": "madge --circular ./dist --exclude cli-connector",
     "on-each-commit": "yarn lint-fix && yarn circular && cd docs/commands && oclif readme --no-aliases && yarn gen-config-docs",
@@ -85,6 +87,9 @@
     "ethers": "6.7.1",
     "express": "4.21.1",
     "filenamify": "6.0.0",
+    "graphql": "^16.9.0",
+    "graphql-request": "^7.1.2",
+    "graphql-tag": "^2.12.6",
     "inquirer": "9.2.20",
     "ipfs-http-client": "60.0.1",
     "lodash-es": "4.17.21",
@@ -104,6 +109,10 @@
   "devDependencies": {
     "@actions/core": "1.11.1",
     "@aws-sdk/lib-storage": "^3.501.0",
+    "@graphql-codegen/cli": "^5.0.3",
+    "@graphql-codegen/typescript": "^4.1.1",
+    "@graphql-codegen/typescript-graphql-request": "^6.2.0",
+    "@graphql-codegen/typescript-operations": "^4.3.1",
     "@tsconfig/node22": "^22.0.0",
     "@tsconfig/strictest": "^2.0.5",
     "@types/debug": "4.1.12",

packages/cli/package/src/commands/deal/logs.ts

@@ -37,10 +37,8 @@ import {
   formatAquaLogsHeader,
   formatAquaLogs,
 } from "../../lib/helpers/formatAquaLogs.js";
-import {
-  LOGS_RESOLVE_SUBNET_ERROR_START,
-  stringifyUnknown,
-} from "../../lib/helpers/utils.js";
+import { stringifyUnknown } from "../../lib/helpers/stringifyUnknown.js";
+import { LOGS_RESOLVE_SUBNET_ERROR_START } from "../../lib/helpers/utils.js";
 import {
   disconnectFluenceClient,
   initFluenceClient,

packages/cli/package/src/commands/deal/workers-remove.ts

@@ -65,12 +65,19 @@ export default class WorkersRemove extends BaseCommand<typeof WorkersRemove> {
       args["WORKER-IDS"] ??
         (await input({
           message: "Enter comma-separated worker ids",
-          validate: (v: string) => {
-            return commaSepStrToArr(v).length > 0;
+          validate(v: string) {
+            return (
+              commaSepStrToArr(v).length > 0 ||
+              "Please provide at least one worker id"
+            );
           },
         })),
     );
 
+    if (workerIds.length === 0) {
+      commandObj.error("No worker ids provided");
+    }
+
     for (const workerId of workerIds) {
       await sign({
         title: `Remove worker ${workerId} from deal`,

packages/cli/package/src/commands/provider/cc-info.ts

@@ -16,10 +16,12 @@
  */
 
 import { BaseCommand } from "../../baseCommand.js";
+import { jsonStringify } from "../../common.js";
 import {
-  printCommitmentsInfo,
-  printCommitmentsInfoJSON,
+  getDetailedCommitmentsInfoGroupedByStatus,
+  stringifyDetailedCommitmentsInfo,
 } from "../../lib/chain/commitment.js";
+import { commandObj } from "../../lib/commandObj.js";
 import { CHAIN_FLAGS, CC_FLAGS, JSON_FLAG } from "../../lib/const.js";
 import { aliasesText } from "../../lib/helpers/aliasesText.js";
 import { initCli } from "../../lib/lifeCycle.js";
@@ -36,10 +38,16 @@ export default class CCInfo extends BaseCommand<typeof CCInfo> {
   async run(): Promise<void> {
     const { flags } = await initCli(this, await this.parse(CCInfo));
 
-    if (flags.json) {
-      await printCommitmentsInfoJSON(flags);
-    } else {
-      await printCommitmentsInfo(flags);
-    }
+    const ccInfo = await getDetailedCommitmentsInfoGroupedByStatus(flags);
+
+    commandObj.log(
+      flags.json
+        ? jsonStringify(
+            ccInfo.flatMap(({ CCs }) => {
+              return CCs;
+            }),
+          )
+        : stringifyDetailedCommitmentsInfo(ccInfo),
+    );
   }
 }

packages/cli/package/src/commands/provider/deal-exit.ts

@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { Flags } from "@oclif/core";
+import type { Contracts } from "@fluencelabs/deal-ts-clients";
 
 import { BaseCommand } from "../../baseCommand.js";
-import { getProviderDeals } from "../../lib/chain/deals.js";
+import { commandObj } from "../../lib/commandObj.js";
 import {
   CHAIN_FLAGS,
   DEAL_IDS_FLAG,
@@ -27,8 +27,10 @@ import {
 import {
   getContracts,
   getSignerAddress,
+  multicallRead,
   populateTx,
   signBatch,
+  type MulticallReadItem,
 } from "../../lib/dealClient.js";
 import { aliasesText } from "../../lib/helpers/aliasesText.js";
 import { commaSepStrToArr } from "../../lib/helpers/utils.js";
@@ -41,51 +43,98 @@ export default class DealExit extends BaseCommand<typeof DealExit> {
   static override flags = {
     ...CHAIN_FLAGS,
     ...DEAL_IDS_FLAG,
-    all: Flags.boolean({
-      default: false,
-      description:
-        "To use all deal ids that indexer is aware of for your provider address",
-    }),
+    // TODO: When we have a way to get all deal ids for a provider address
+    // all: Flags.boolean({
+    //   default: false,
+    //   description:
+    //     "To use all deal ids that indexer is aware of for your provider address",
+    // }),
   };
 
   async run(): Promise<void> {
     const { flags } = await initCli(this, await this.parse(DealExit));
     const { contracts } = await getContracts();
     const signerAddress = await getSignerAddress();
 
-    const dealIds = flags.all
-      ? await getProviderDeals()
-      : commaSepStrToArr(
-          flags[DEAL_IDS_FLAG_NAME] ??
-            (await input({
-              message: "Enter comma-separated deal ids",
-            })),
+    const dealIds =
+      // flags.all
+      //   ? await getProviderDeals()
+      //   :
+      commaSepStrToArr(
+        flags[DEAL_IDS_FLAG_NAME] ??
+          (await input({
+            message: "Enter comma-separated deal ids",
+            validate(input: string) {
+              return (
+                commaSepStrToArr(input).length > 0 ||
+                "Please enter at least one deal id"
+              );
+            },
+          })),
+      );
+
+    if (dealIds.length === 0) {
+      return commandObj.error("No deal ids provided");
+    }
+
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const workersFromRPC = (await multicallRead(
+      dealIds.map((id): MulticallReadItem => {
+        const deal = contracts.getDeal(id);
+        return {
+          target: id,
+          callData: deal.interface.encodeFunctionData("getWorkers"),
+          decode(returnData) {
+            return deal.interface.decodeFunctionResult(
+              "getWorkers",
+              returnData,
+            );
+          },
+        };
+      }),
+    )) as Awaited<ReturnType<ReturnType<Contracts["getDeal"]>["getWorkers"]>>[];
+
+    const workers = dealIds.flatMap((id, i) => {
+      const deal = contracts.getDeal(id);
+      const workers = workersFromRPC[i];
+
+      if (workers === undefined) {
+        commandObj.warn(
+          `Was not able to get workers for deal ${id} from chain. Skipping...`,
         );
 
-    const workers = (
-      await Promise.all(
-        dealIds.map(async (id) => {
-          const deal = contracts.getDeal(id);
-          return (await deal.getWorkers()).map((worker) => {
-            return { deal, worker };
-          });
-        }),
-      )
-    ).flat();
+        return [];
+      }
+
+      return workers
+        .filter((worker) => {
+          return worker.provider.toLowerCase() === signerAddress;
+        })
+        .map((worker) => {
+          return { worker, deal };
+        });
+    });
+
+    const [firstWorker, ...restWorkers] = workers;
+
+    if (firstWorker === undefined) {
+      return commandObj.error(
+        `No workers found for address ${signerAddress} and deal ids: ${dealIds.join(", ")}`,
+      );
+    }
 
     await signBatch(
       `Remove the following workers from deals:\n\n${workers
         .map(({ worker: { onchainId } }) => {
           return onchainId;
         })
         .join("\n")}`,
-      workers
-        .filter(({ worker }) => {
-          return worker.provider.toLowerCase() === signerAddress;
-        })
-        .map(({ deal, worker: { onchainId } }) => {
+      [
+        populateTx(firstWorker.deal.removeWorker, firstWorker.worker.onchainId),
+        ...restWorkers.map(({ deal, worker: { onchainId } }) => {
           return populateTx(deal.removeWorker, onchainId);
         }),
+      ],
     );
   }
 }