chore: Use fluence-cli to setup network (#441)

* Use fluence-cli to setup network

* F

* Ignore fluence dir

* Change default relay

* Fix peer ID

* Add provider secrets

* Cleanup

* Fix

* Use unstable nox

* Cleanup

---------

Co-authored-by: Akim Mamedov <[email protected]>

Author: nahsi

.fluence/env.yaml

@@ -0,0 +1,9 @@
+# yaml-language-server: $schema=schemas/env.json
+
+# Defines user project preferences
+
+# Documentation: https://github.com/fluencelabs/cli/tree/main/docs/configs/env.md
+
+version: 0
+
+fluenceEnv: local

.fluence/provider-secrets.yaml

@@ -0,0 +1,18 @@
+# yaml-language-server: $schema=schemas/provider-secrets.json
+
+# Defines secrets config used for provider set up
+
+# Documentation: https://github.com/fluencelabs/cli/tree/main/docs/configs/provider-secrets.md
+
+version: 0
+
+noxes:
+  nox-0:
+    networkKey: t/7R5m9TprvbWFwr2ZKe8hm6UW84ulDq4pVbDvHUCdw=
+    signingWallet: "0x3785b85a34b65082664bdb2ccb47fba6aab6984b7c16b36ad54145eecc368e4c"
+  nox-1:
+    networkKey: +5VkzeaILY+Emk9zsLKJ82dzzF3fMmlFkNhkJVwDMdo=
+    signingWallet: "0xd9a5eee84979d0cf118f82f7c97ca6980e6a21db0c7271a3d59248841ed04d83"
+  nox-2:
+    networkKey: YNq7A6KlPhdyJwq7y3meTIPUVQ34HFwW21MlsDjpxsM=
+    signingWallet: "0x16e3984df2918538c5dbba032f00a5ecd5900b9c43a36b38ed89b6be1820a9ba"

.fluence/schemas/env.json

@@ -0,0 +1,29 @@
+{
+  "$id": "https://fluence.dev/schemas/env.yaml",
+  "title": "env.yaml",
+  "type": "object",
+  "description": "Defines user project preferences",
+  "properties": {
+    "fluenceEnv": {
+      "title": "Fluence environment",
+      "description": "Fluence environment to connect to",
+      "type": "string",
+      "enum": [
+        "dar",
+        "stage",
+        "kras",
+        "local",
+        "custom"
+      ],
+      "nullable": true
+    },
+    "version": {
+      "type": "number",
+      "const": 0
+    }
+  },
+  "required": [
+    "version"
+  ],
+  "additionalProperties": false
+}

.github/e2e/docker-compose.yml

@@ -43,12 +43,10 @@ jobs:
     uses: fluencelabs/aqua/.github/workflows/tests.yml@main
     with:
       js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
-      nox-image: "docker.fluence.dev/nox:renovate-avm_4905_1"
   flox:
     needs:
       - js-client
 
     uses: fluencelabs/flox/.github/workflows/tests.yml@main
     with:
       js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
-      nox-image: "docker.fluence.dev/nox:renovate-avm_4905_1"

.github/e2e/ipfs/01-configure.sh

@@ -6,7 +6,7 @@ on:
       nox-image:
         description: "nox image tag"
         type: string
-        default: "fluencelabs/nox:0.4.2"
+        default: "fluencelabs/nox:unstable"
       avm-version:
         description: "@fluencelabs/avm version"
         type: string
@@ -21,9 +21,9 @@ on:
         default: "main"
 
 env:
-  NOX_IMAGE: "${{ inputs.nox-image }}"
   FORCE_COLOR: true
   CI: true
+  FCLI_V_NOX: "${{ inputs.nox-image }}"
 
 jobs:
   js-client:
@@ -70,14 +70,17 @@ jobs:
           repository: fluencelabs/fluence-js
           ref: ${{ inputs.ref }}
 
-      - name: Pull nox image
-        run: docker pull $NOX_IMAGE
+      - name: Setup fcli
+        uses: fluencelabs/setup-fluence@v1
+        with:
+          artifact: fcli
+          version: unstable
+
+      - name: Init local env with fcli
+        run: fluence local init --no-input
 
       - name: Run nox network
-        uses: isbang/[email protected]
-        with:
-          compose-file: ".github/e2e/docker-compose.yml"
-          down-flags: "--volumes"
+        run: fluence local up
 
       - name: Setup pnpm
         uses: pnpm/[email protected]

.github/workflows/e2e.yml

@@ -7,10 +7,12 @@ dist
 build
 public
 
+.fluence
+
 **/CHANGELOG.md
 # TODO: remove after pnpm-set-deps will add \n symbol at the end of these files
 **/package.json
 
 packages/core/js-client-isomorphic/src/versions.ts
 __snapshots__
-packages/@tests/aqua/src/_aqua/**
+packages/@tests/aqua/src/_aqua/**

.github/workflows/tests.yml

@@ -26,8 +26,8 @@ import { wasm } from "./wasmb64.js";
 
 const relay = {
   multiaddr:
-    "/ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR",
-  peerId: "12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR",
+    "/ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWBbMuqJJZT7FTFN4fWg3k3ipUKx6KEy7pDy8mdorK5g5o",
+  peerId: "12D3KooWBbMuqJJZT7FTFN4fWg3k3ipUKx6KEy7pDy8mdorK5g5o",
 };
 
 function generateRandomUint8Array() {

.prettierignore

@@ -2,8 +2,8 @@ import { Fluence, callAquaFunction, randomStage } from "./js-client.min.js";
 
 const relay = {
   multiaddr:
-      "/ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR",
-  peerId: "12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR",
+    "/ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWBbMuqJJZT7FTFN4fWg3k3ipUKx6KEy7pDy8mdorK5g5o",
+  peerId: "12D3KooWBbMuqJJZT7FTFN4fWg3k3ipUKx6KEy7pDy8mdorK5g5o",
 };
 
 const getRelayTime = () => {

packages/@tests/aqua/src/index.ts

@@ -17,8 +17,8 @@
 export const nodes = [
   {
     multiaddr:
-      "/ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR",
-    peerId: "12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR",
+      "/ip4/127.0.0.1/tcp/9991/ws/p2p/12D3KooWBbMuqJJZT7FTFN4fWg3k3ipUKx6KEy7pDy8mdorK5g5o",
+    peerId: "12D3KooWBbMuqJJZT7FTFN4fWg3k3ipUKx6KEy7pDy8mdorK5g5o",
   },
 ] as const;