fix(deps)!: Update avm to 0.62 (#438)

* Update avm * Update nox image * Fix lint * Bump marine * fix lint * update tag
fluencelabs · Feb 23, 2024 · 702ad60 · 702ad60
1 parent 3b1371f
commit 702ad60
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 103 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -43,12 +43,12 @@ 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:feat-VM-407-msgpack-particle"
+      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:feat-VM-407-msgpack-particle"
+      nox-image: "docker.fluence.dev/nox:renovate-avm_4905_1"
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -28,4 +28,4 @@ jobs:
     uses: ./.github/workflows/tests.yml
     with:
       ref: ${{ github.ref }}
-      nox-image: "docker.fluence.dev/nox:feat-VM-407-msgpack-particle"
+      nox-image: "docker.fluence.dev/nox:renovate-avm_4905_1"
diff --git a/packages/core/interfaces/package.json b/packages/core/interfaces/package.json
@@ -49,8 +49,6 @@
   "license": "Apache-2.0",
   "dependencies": {},
   "devDependencies": {
-    "@multiformats/multiaddr": "11.3.0",
-    "@fluencelabs/avm": "0.59.0",
     "hotscript": "1.0.13"
   }
 }
diff --git a/packages/core/interfaces/src/future.ts b/packages/core/interfaces/src/future.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { Call, Pipe, Objects, Tuples, Unions, Fn } from "hotscript";
+
 import {
   ArrayType,
   ArrowType,
@@ -25,8 +27,7 @@ import {
   StructType,
   TopType,
   UnlabeledProductType,
-} from "@fluencelabs/interfaces";
-import { Call, Pipe, Objects, Tuples, Unions, Fn } from "hotscript";
+} from "./compilerSupport/aquaTypeDefinitions.js";
 
 // Type definitions for inferring ts types from air json definition
 // In the future we may remove string type declaration and move to type inference.

diff --git a/packages/core/interfaces/src/utils.ts b/packages/core/interfaces/src/utils.ts
diff --git a/packages/core/js-client-isomorphic/package.json b/packages/core/js-client-isomorphic/package.json
@@ -22,8 +22,8 @@
     }
   },
   "dependencies": {
-    "@fluencelabs/avm": "0.59.0",
-    "@fluencelabs/marine-js": "0.8.0",
+    "@fluencelabs/avm": "0.62.0",
+    "@fluencelabs/marine-js": "0.13.0",
     "@fluencelabs/marine-worker": "0.5.1",
     "@fluencelabs/threads": "^2.0.0"
   },

diff --git a/packages/core/js-client/package.json b/packages/core/js-client/package.json
@@ -32,7 +32,7 @@
   "dependencies": {
     "@chainsafe/libp2p-noise": "14.0.0",
     "@chainsafe/libp2p-yamux": "6.0.1",
-    "@fluencelabs/avm": "0.59.0",
+    "@fluencelabs/avm": "0.62.0",
     "@fluencelabs/interfaces": "workspace:*",
     "@fluencelabs/js-client-isomorphic": "workspace:*",
     "@fluencelabs/marine-worker": "0.5.1",

diff --git a/packages/core/js-client/src/jsPeer/FluencePeer.ts b/packages/core/js-client/src/jsPeer/FluencePeer.ts
@@ -515,6 +515,15 @@ export abstract class FluencePeer {
           item.callResults,
         );
 
+        const [, , , forthParam] = args;
+
+        if (
+          typeof forthParam === "object" &&
+          "hard_limit_enabled" in forthParam
+        ) {
+          forthParam["hard_limit_enabled"] = false;
+        }
+
         let avmCallResult: InterpreterResult | Error;
 
         try {

diff --git a/packages/core/js-client/src/services/securityGuard.ts b/packages/core/js-client/src/services/securityGuard.ts
@@ -55,7 +55,7 @@ export const allowServiceFn = (
  */
 export const allowExactJsonPath = (jsonPath: string): SecurityGuard => {
   return allowTetraplet((t) => {
-    return t.json_path === jsonPath;
+    return t.lens === jsonPath;
   });
 };
 

diff --git a/packages/core/js-client/src/util/testUtils.ts b/packages/core/js-client/src/util/testUtils.ts
@@ -221,7 +221,7 @@ export const makeTestTetraplet = (
           peer_pk: initPeerId,
           function_name: fnName,
           service_id: serviceId,
-          json_path: "",
+          lens: "",
         },
       ],
     ],

diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json
@@ -24,7 +24,7 @@
     "vitest": "0.34.6"
   },
   "dependencies": {
-    "@fluencelabs/marine-js": "0.8.0",
+    "@fluencelabs/marine-js": "0.13.0",
     "observable-fns": "0.6.1",
     "@fluencelabs/threads": "^2.0.0"
   }