Skip to content

Commit 702ad60

Browse files
author
Akim
authored
fix(deps)!: Update avm to 0.62 (#438)
* Update avm * Update nox image * Fix lint * Bump marine * fix lint * update tag
1 parent 3b1371f commit 702ad60

File tree

12 files changed

+48
-103
lines changed

12 files changed

+48
-103
lines changed

.github/workflows/e2e.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
uses: fluencelabs/aqua/.github/workflows/tests.yml@main
4444
with:
4545
js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
46-
nox-image: "docker.fluence.dev/nox:feat-VM-407-msgpack-particle"
46+
nox-image: "docker.fluence.dev/nox:renovate-avm_4905_1"
4747
flox:
4848
needs:
4949
- js-client
5050

5151
uses: fluencelabs/flox/.github/workflows/tests.yml@main
5252
with:
5353
js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}"
54-
nox-image: "docker.fluence.dev/nox:feat-VM-407-msgpack-particle"
54+
nox-image: "docker.fluence.dev/nox:renovate-avm_4905_1"

.github/workflows/run-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
uses: ./.github/workflows/tests.yml
2929
with:
3030
ref: ${{ github.ref }}
31-
nox-image: "docker.fluence.dev/nox:feat-VM-407-msgpack-particle"
31+
nox-image: "docker.fluence.dev/nox:renovate-avm_4905_1"

packages/core/interfaces/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
"license": "Apache-2.0",
5050
"dependencies": {},
5151
"devDependencies": {
52-
"@multiformats/multiaddr": "11.3.0",
53-
"@fluencelabs/avm": "0.59.0",
5452
"hotscript": "1.0.13"
5553
}
5654
}

packages/core/interfaces/src/future.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { Call, Pipe, Objects, Tuples, Unions, Fn } from "hotscript";
18+
1719
import {
1820
ArrayType,
1921
ArrowType,
@@ -25,8 +27,7 @@ import {
2527
StructType,
2628
TopType,
2729
UnlabeledProductType,
28-
} from "@fluencelabs/interfaces";
29-
import { Call, Pipe, Objects, Tuples, Unions, Fn } from "hotscript";
30+
} from "./compilerSupport/aquaTypeDefinitions.js";
3031

3132
// Type definitions for inferring ts types from air json definition
3233
// In the future we may remove string type declaration and move to type inference.

packages/core/interfaces/src/utils.ts

-21
This file was deleted.

packages/core/js-client-isomorphic/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
}
2323
},
2424
"dependencies": {
25-
"@fluencelabs/avm": "0.59.0",
26-
"@fluencelabs/marine-js": "0.8.0",
25+
"@fluencelabs/avm": "0.62.0",
26+
"@fluencelabs/marine-js": "0.13.0",
2727
"@fluencelabs/marine-worker": "0.5.1",
2828
"@fluencelabs/threads": "^2.0.0"
2929
},

packages/core/js-client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"dependencies": {
3333
"@chainsafe/libp2p-noise": "14.0.0",
3434
"@chainsafe/libp2p-yamux": "6.0.1",
35-
"@fluencelabs/avm": "0.59.0",
35+
"@fluencelabs/avm": "0.62.0",
3636
"@fluencelabs/interfaces": "workspace:*",
3737
"@fluencelabs/js-client-isomorphic": "workspace:*",
3838
"@fluencelabs/marine-worker": "0.5.1",

packages/core/js-client/src/jsPeer/FluencePeer.ts

+9
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,15 @@ export abstract class FluencePeer {
515515
item.callResults,
516516
);
517517

518+
const [, , , forthParam] = args;
519+
520+
if (
521+
typeof forthParam === "object" &&
522+
"hard_limit_enabled" in forthParam
523+
) {
524+
forthParam["hard_limit_enabled"] = false;
525+
}
526+
518527
let avmCallResult: InterpreterResult | Error;
519528

520529
try {

packages/core/js-client/src/services/securityGuard.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const allowServiceFn = (
5555
*/
5656
export const allowExactJsonPath = (jsonPath: string): SecurityGuard => {
5757
return allowTetraplet((t) => {
58-
return t.json_path === jsonPath;
58+
return t.lens === jsonPath;
5959
});
6060
};
6161

packages/core/js-client/src/util/testUtils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ export const makeTestTetraplet = (
221221
peer_pk: initPeerId,
222222
function_name: fnName,
223223
service_id: serviceId,
224-
json_path: "",
224+
lens: "",
225225
},
226226
],
227227
],

packages/core/marine-worker/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"vitest": "0.34.6"
2525
},
2626
"dependencies": {
27-
"@fluencelabs/marine-js": "0.8.0",
27+
"@fluencelabs/marine-js": "0.13.0",
2828
"observable-fns": "0.6.1",
2929
"@fluencelabs/threads": "^2.0.0"
3030
}

0 commit comments

Comments
 (0)