diff --git a/package-lock.json b/package-lock.json index c51bece73..9adb664c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -435,9 +435,9 @@ } }, "@fluencelabs/aquamarine-interpreter": { - "version": "0.7.9", - "resolved": "https://registry.npmjs.org/@fluencelabs/aquamarine-interpreter/-/aquamarine-interpreter-0.7.9.tgz", - "integrity": "sha512-VXbHm0d05XMjTSzOTcb+spVRrIuMcrw8/3dl197wH0jx1C3Wou+vAapQLvGNcKzqDhktPOOzJTE4UARYd0lFMw==" + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/aquamarine-interpreter/-/aquamarine-interpreter-0.8.2.tgz", + "integrity": "sha512-WYn3fO3dy/ZTS2DnjpEv59RAFTuPosO65jejb/2QRAbZId4KiaCxma0yvFC6P0j2qoAxCDTRdbKrNZGXzjddYQ==" }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", diff --git a/package.json b/package.json index 10835ff7b..91ddc1efc 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/aquamarine-interpreter": "0.7.9", + "@fluencelabs/aquamarine-interpreter": "0.8.2", "async": "3.2.0", "base64-js": "1.3.1", "bs58": "4.0.1", diff --git a/src/__test__/unit/ast.spec.ts b/src/__test__/unit/ast.spec.ts index e5814623c..53bf87dcb 100644 --- a/src/__test__/unit/ast.spec.ts +++ b/src/__test__/unit/ast.spec.ts @@ -31,7 +31,9 @@ describe('== AST parsing suite', () => { }, }, ], - output: { Scalar: 'output' }, + output: { + Variable: { Scalar: 'output' }, + }, }, }); }); diff --git a/src/internal/aqua/interpreter.ts b/src/internal/aqua/interpreter.ts index b0112d85f..6cd11e5b9 100644 --- a/src/internal/aqua/interpreter.ts +++ b/src/internal/aqua/interpreter.ts @@ -35,8 +35,8 @@ type ImportObject = { './aquamarine_client_bg.js': { // fn call_service_impl(service_id: String, fn_name: String, args: String, security_tetraplets: String) -> String; // prettier-ignore - __wbg_callserviceimpl_d9f9208b7e581e24: (arg0: any, arg1: any, arg2: any, arg3: any, arg4: any, arg5: any, arg6: any, arg7: any, arg8: any, ) => void; - __wbg_getcurrentpeeridimpl_c6a63062490312cd: (arg0: any) => void; + __wbg_callserviceimpl_84d8278762e4c639: (arg0: any, arg1: any, arg2: any, arg3: any, arg4: any, arg5: any, arg6: any, arg7: any, arg8: any, ) => void; + __wbg_getcurrentpeeridimpl_4aca996e28cb8f44: (arg0: any) => void; __wbindgen_throw: (arg: any) => void; }; host: LogImport; @@ -159,7 +159,7 @@ function newImportObject(particleHandler: ParticleHandler, cfg: HostImportsConfi // If so, an error with a new name will be occurred after wasm initialization. './aquamarine_client_bg.js': { // prettier-ignore - __wbg_callserviceimpl_d9f9208b7e581e24: (arg0: any, arg1: any, arg2: any, arg3: any, arg4: any, arg5: any, arg6: any, arg7: any, arg8: any) => { + __wbg_callserviceimpl_84d8278762e4c639: (arg0: any, arg1: any, arg2: any, arg3: any, arg4: any, arg5: any, arg6: any, arg7: any, arg8: any) => { let wasm = cfg.exports; try { let serviceId = getStringFromWasm0(wasm, arg1, arg2); @@ -183,7 +183,7 @@ function newImportObject(particleHandler: ParticleHandler, cfg: HostImportsConfi free(wasm, arg7, arg8); } }, - __wbg_getcurrentpeeridimpl_c6a63062490312cd: (arg0: any) => { + __wbg_getcurrentpeeridimpl_4aca996e28cb8f44: (arg0: any) => { let peerIdStr = peerId.toB58String(); let wasm = cfg.exports; return_current_peer_id(wasm, peerIdStr, arg0); @@ -200,8 +200,8 @@ function newLogImport(cfg: HostImportsConfig): ImportObject { return { host: log_import(cfg), './aquamarine_client_bg.js': { - __wbg_callserviceimpl_d9f9208b7e581e24: (_) => {}, - __wbg_getcurrentpeeridimpl_c6a63062490312cd: (_) => {}, + __wbg_callserviceimpl_84d8278762e4c639: (_) => {}, + __wbg_getcurrentpeeridimpl_4aca996e28cb8f44: (_) => {}, __wbindgen_throw: (_) => {}, }, }; diff --git a/src/internal/builtins.ts b/src/internal/builtins.ts index 6226e2f2a..4b8707384 100644 --- a/src/internal/builtins.ts +++ b/src/internal/builtins.ts @@ -109,16 +109,16 @@ export const getInterfaces = async (client: FluenceClient, ttl?: number): Promis (seq (seq (call relay ("srv" "list") [] services) - (call relay ("op" "identity") [] interfaces[]) + (call relay ("op" "identity") [] $interfaces) ) (fold services s (seq - (call relay ("srv" "get_interface") [s.$.id!] interfaces[]) + (call relay ("srv" "get_interface") [s.$.id!] $interfaces) (next s) ) ) ) - (call myPeerId ("_callback" "${callbackFn}") [interfaces]) + (call myPeerId ("_callback" "${callbackFn}") [$interfaces]) ) `, )