diff --git a/aqua/examples/via.aqua b/aqua/examples/via.aqua index b849739..a04f0b0 100644 --- a/aqua/examples/via.aqua +++ b/aqua/examples/via.aqua @@ -1,8 +1,5 @@ import "@fluencelabs/aqua-lib/builtin.aqua" -service CustomId("cid"): - id(s: string) -> string - func viaArr(node_id: string, viaAr: []string) -> Info: on node_id via viaAr: p <- Peer.identify() diff --git a/package-lock.json b/package-lock.json index de090ce..6eb11d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,7 @@ "license": "MIT", "dependencies": { "@fluencelabs/aqua-dht-ts": "0.1.38", - "@fluencelabs/avm": "0.20.3", - "@fluencelabs/fluence": "0.19.1", + "@fluencelabs/fluence": "0.20.1", "@fluencelabs/fluence-network-environment": "1.0.13", "deep-equal": "^2.0.5" }, @@ -19,7 +18,7 @@ "fldist": "dist/index.js" }, "devDependencies": { - "@fluencelabs/aqua": "0.6.0-274", + "@fluencelabs/aqua": "0.6.1-279", "@fluencelabs/aqua-dht": "0.2.5", "@fluencelabs/aqua-lib": "0.4.0", "@types/jest": "^27.0.2", @@ -697,15 +696,15 @@ "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==" }, "node_modules/@fluencelabs/aqua": { - "version": "0.6.0-274", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.0-274.tgz", - "integrity": "sha512-c/ufNzUHaznq3nYtUewA422//OHOAvO224wBr/fL54t5t4gt8pTf58mE4/e1sd6YQjv6Umnt7XPjwiVgFzGarA==", + "version": "0.6.1-279", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.1-279.tgz", + "integrity": "sha512-SOak1PMEBB6I9W8BToabczaqgpHZCH1f0LToCwQBKSiThiWDnXM5VUNY3qVqtpwjhMfxZa3YuFP+LUycYwmSCA==", "dev": true, "dependencies": { "@fluencelabs/aqua-ipfs": "0.5.2", - "@fluencelabs/aqua-lib": "0.3.2", - "@fluencelabs/avm": "0.20.3", - "@fluencelabs/fluence": "0.19.1", + "@fluencelabs/aqua-lib": "0.4.0", + "@fluencelabs/fluence": "0.19.2", + "@fluencelabs/fluence-network-environment": "1.0.13", "ipfs-http-client": "50.1.2" }, "bin": { @@ -788,24 +787,442 @@ "integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==", "dev": true }, - "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/aqua-lib": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", - "integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==", + "node_modules/@fluencelabs/aqua/node_modules/@chainsafe/libp2p-noise": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@chainsafe/libp2p-noise/-/libp2p-noise-4.1.1.tgz", + "integrity": "sha512-/Fz86sZmnvRSf7FHxMPifzakxx9xK4KVYx6yi35KPZughop9ivJslUSCLhx/UqDHiuj3h9i04pVXET6nIjSJyQ==", + "dev": true, + "dependencies": { + "@stablelib/chacha20poly1305": "^1.0.1", + "@stablelib/hkdf": "^1.0.1", + "@stablelib/sha256": "^1.0.1", + "@stablelib/x25519": "^1.0.1", + "debug": "^4.3.1", + "it-buffer": "^0.1.3", + "it-length-prefixed": "^5.0.3", + "it-pair": "^1.0.0", + "it-pb-rpc": "^0.1.11", + "it-pipe": "^1.1.0", + "libp2p-crypto": "^0.19.7", + "peer-id": "^0.15.3", + "protobufjs": "^6.11.2", + "uint8arrays": "^3.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/@chainsafe/libp2p-noise/node_modules/bl": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", + "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "dev": true, + "dependencies": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/@chainsafe/libp2p-noise/node_modules/it-length-prefixed": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/it-length-prefixed/-/it-length-prefixed-5.0.3.tgz", + "integrity": "sha512-b+jDHLcnOnPDQN79ronmzF5jeBjdJsy0ce2O6i6X4J5tnaO8Fd146ZA/tMbzaLlKnTpXa0eKtofpYhumXGENeg==", + "dev": true, + "dependencies": { + "bl": "^5.0.0", + "buffer": "^6.0.3", + "varint": "^6.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm": { + "version": "0.20.5", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.5.tgz", + "integrity": "sha512-DhCnSzbG8hSkR1C0G/ci3jF+DciJVKpftO80GOdDYi1AXu6dYuqhZSOyWzMSwiHebprk1TDGZ/GSoQ6AGd4lLw==", + "dev": true, + "bin": { + "copy-avm": "dist/copyAvm.js" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/avm-runner-background": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm-runner-background/-/avm-runner-background-0.1.2.tgz", + "integrity": "sha512-06E8l6ZLkWkpWas1TTojVrs+tekOg/OvnNI6/GKdm4zJL/9ePxW1WYE8Ieg1dIk6FpcP+ZxcEfZZKDoDwn68pQ==", + "dev": true, + "dependencies": { + "@fluencelabs/avm-runner-interface": "^0.2.0", + "browser-or-node": "^2.0.0", + "threads": "^1.7.0" + }, + "bin": { + "copy-avm-runner": "dist/copyRunnerScript.js" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.2.tgz", + "integrity": "sha512-kPt8bOP0kx5sT5vc4XvAoXQsfm7fLBwreks3dZqu1RmJkWbBE1V48/qfJH2AupBRciGh5vztXvu3YeI5csmOmA==", + "dev": true, + "dependencies": { + "@chainsafe/libp2p-noise": "^4.1.1", + "@fluencelabs/avm": " 0.20.5", + "@fluencelabs/avm-runner-background": "0.1.2", + "@fluencelabs/avm-runner-interface": "^0.2.0", + "async": "3.2.0", + "browser-or-node": "^2.0.0", + "bs58": "4.0.1", + "buffer": "^6.0.3", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "=0.33.0", + "libp2p-crypto": "=0.20.0", + "libp2p-mplex": "=0.10.2", + "libp2p-websockets": "^0.16.2", + "loglevel": "1.7.0", + "multiaddr": "^10.0.1", + "multiformats": "^9.6.4", + "peer-id": "=0.15.4", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + }, + "bin": { + "copy-avm-public": "dist/tools/copyAvmPublic.js" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence/node_modules/libp2p-crypto": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.20.0.tgz", + "integrity": "sha512-WgIW9rYcWaO/5j2T6NW3R6Q46yvp2ZfFErqRMbi4/pOTL3T7+OROYpL/1iWVksWkXyurU/t2qFsIijWMxR5C4Q==", + "dev": true, + "dependencies": { + "err-code": "^3.0.1", + "iso-random-stream": "^2.0.0", + "keypair": "^1.0.4", + "multiformats": "^9.4.5", + "noble-ed25519": "^1.2.6", + "noble-secp256k1": "^1.2.10", + "node-forge": "^0.10.0", + "pem-jwk": "^2.0.0", + "protobufjs": "^6.11.2", + "uint8arrays": "^3.0.0", + "ursa-optional": "^0.10.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/es6-promisify": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-7.0.0.tgz", + "integrity": "sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/interface-datastore": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/interface-datastore/-/interface-datastore-6.1.0.tgz", + "integrity": "sha512-oNHdsrWBsI/kDwUtEgt+aaZtQFKtQYN0TGZzc3SGiIA6m+plZ6malhmsygtbmDpfpIsNNC7ce9Gyaj+Tki+gVw==", + "dev": true, + "dependencies": { + "interface-store": "^2.0.1", + "nanoid": "^3.0.2", + "uint8arrays": "^3.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/interface-store": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/interface-store/-/interface-store-2.0.2.tgz", + "integrity": "sha512-rScRlhDcz6k199EkHqT8NpM87ebN89ICOzILoBHgaG36/WX50N32BnU/kpZgCGPLhARRAWUUX5/cyaIjt7Kipg==", + "dev": true + }, + "node_modules/@fluencelabs/aqua/node_modules/ipfs-utils": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-9.0.4.tgz", + "integrity": "sha512-cfLKk004KLoEWJhBx4zg3mCro6mkiNhyGIlT7OZX9zxO1UqvLWpvW7cSZ1b1fbUIZ8qI7X2B7PeKlXC7jSfZ7g==", + "dev": true, + "dependencies": { + "any-signal": "^3.0.0", + "buffer": "^6.0.1", + "electron-fetch": "^1.7.2", + "err-code": "^3.0.1", + "is-electron": "^2.2.0", + "iso-url": "^1.1.5", + "it-glob": "^1.0.1", + "it-to-stream": "^1.0.0", + "merge-options": "^3.0.4", + "nanoid": "^3.1.20", + "native-fetch": "^3.0.0", + "node-fetch": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz", + "react-native-fetch-api": "^2.0.0", + "stream-to-it": "^0.2.2" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/ipfs-utils/node_modules/any-signal": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/any-signal/-/any-signal-3.0.0.tgz", + "integrity": "sha512-l1H1GEkGGIXVGfCtvq8N68YI7gHajmfzRdKhmb8sGyAQpLCblirLa8eB09j4uKaiwe7vodAChocUf7AT3mYq5g==", + "dev": true + }, + "node_modules/@fluencelabs/aqua/node_modules/it-glob": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-1.0.2.tgz", + "integrity": "sha512-Ch2Dzhw4URfB9L/0ZHyY+uqOnKvBNeS/SMcRiPmJfpHiM0TsUZn+GkpcZxAoF3dJVdPm/PuIk3A4wlV7SUo23Q==", + "dev": true, + "dependencies": { + "@types/minimatch": "^3.0.4", + "minimatch": "^3.0.4" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/libp2p": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/libp2p/-/libp2p-0.33.0.tgz", + "integrity": "sha512-ZNcxWJWNBmlLa9STcYbZyS3so/JEpI7kNLjIUIhIdntjJC9z+OMbGiqfPFcaMejMpjb/j+qpsqsiayjG0p9qIA==", + "dev": true, + "dependencies": { + "@motrix/nat-api": "^0.3.1", + "@vascosantos/moving-average": "^1.1.0", + "abort-controller": "^3.0.0", + "abortable-iterator": "^3.0.0", + "aggregate-error": "^3.1.0", + "any-signal": "^2.1.1", + "bignumber.js": "^9.0.1", + "class-is": "^1.1.0", + "debug": "^4.3.1", + "err-code": "^3.0.0", + "es6-promisify": "^7.0.0", + "events": "^3.3.0", + "hashlru": "^2.3.0", + "interface-datastore": "^6.0.2", + "it-all": "^1.0.4", + "it-buffer": "^0.1.2", + "it-drain": "^1.0.3", + "it-filter": "^1.0.1", + "it-first": "^1.0.4", + "it-handshake": "^2.0.0", + "it-length-prefixed": "^5.0.2", + "it-map": "^1.0.4", + "it-merge": "^1.0.0", + "it-pipe": "^1.1.0", + "it-take": "^1.0.0", + "libp2p-crypto": "^0.19.4", + "libp2p-interfaces": "^1.0.0", + "libp2p-utils": "^0.4.0", + "mafmt": "^10.0.0", + "merge-options": "^3.0.4", + "multiaddr": "^10.0.0", + "multiformats": "^9.0.0", + "multistream-select": "^2.0.0", + "mutable-proxy": "^1.0.0", + "node-forge": "^0.10.0", + "p-any": "^3.0.0", + "p-fifo": "^1.0.0", + "p-retry": "^4.4.0", + "p-settle": "^4.1.1", + "peer-id": "^0.15.0", + "private-ip": "^2.1.0", + "protobufjs": "^6.10.2", + "retimer": "^3.0.0", + "sanitize-filename": "^1.6.3", + "set-delayed-interval": "^1.0.0", + "streaming-iterables": "^6.0.0", + "timeout-abort-controller": "^1.1.1", + "uint8arrays": "^3.0.0", + "varint": "^6.0.0", + "wherearewe": "^1.0.0", + "xsalsa20": "^1.1.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/libp2p-mplex": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/libp2p-mplex/-/libp2p-mplex-0.10.2.tgz", + "integrity": "sha512-fNdlPTts2MmGalPTYdQtzeGeuM73je9mP+2OvB6Gdn5vP9LeutUzUV4wvD9ISDVi8Gru5BzCsIBiS3WjxQqjdw==", + "dev": true, + "dependencies": { + "abort-controller": "^3.0.0", + "abortable-iterator": "^3.0.0", + "bl": "^4.0.0", + "debug": "^4.3.1", + "err-code": "^2.0.3", + "it-pipe": "^1.1.0", + "it-pushable": "^1.4.1", + "varint": "^6.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/libp2p-mplex/node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "dev": true + }, + "node_modules/@fluencelabs/aqua/node_modules/libp2p-websockets": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/libp2p-websockets/-/libp2p-websockets-0.16.2.tgz", + "integrity": "sha512-QGfo8jX1Ks16yi8C67CCyMW7k9cfCYiQ0lzKVJBud0fV3ymbMO2L8gzU6iXUUZTHILo8ka26zKhwQ4lmUMI+nA==", + "dev": true, + "dependencies": { + "abortable-iterator": "^3.0.0", + "class-is": "^1.1.0", + "debug": "^4.3.1", + "err-code": "^3.0.1", + "ipfs-utils": "^9.0.1", + "it-ws": "^4.0.0", + "libp2p-utils": "^0.4.0", + "mafmt": "^10.0.0", + "multiaddr": "^10.0.0", + "multiaddr-to-uri": "^8.0.0", + "p-defer": "^3.0.0", + "p-timeout": "^4.1.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/libp2p/node_modules/bl": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", + "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "dev": true, + "dependencies": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/libp2p/node_modules/it-length-prefixed": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/it-length-prefixed/-/it-length-prefixed-5.0.3.tgz", + "integrity": "sha512-b+jDHLcnOnPDQN79ronmzF5jeBjdJsy0ce2O6i6X4J5tnaO8Fd146ZA/tMbzaLlKnTpXa0eKtofpYhumXGENeg==", + "dev": true, + "dependencies": { + "bl": "^5.0.0", + "buffer": "^6.0.3", + "varint": "^6.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/multiaddr": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-10.0.1.tgz", + "integrity": "sha512-G5upNcGzEGuTHkzxezPrrD6CaIHR9uo+7MwqhNVcXTs33IInon4y7nMiGxl2CY5hG7chvYQUQhz5V52/Qe3cbg==", + "dev": true, + "dependencies": { + "dns-over-http-resolver": "^1.2.3", + "err-code": "^3.0.1", + "is-ip": "^3.1.0", + "multiformats": "^9.4.5", + "uint8arrays": "^3.0.0", + "varint": "^6.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/node-fetch": { + "name": "@achingbrain/node-fetch", + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/peer-id": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/peer-id/-/peer-id-0.15.4.tgz", + "integrity": "sha512-MDoBIMZYwQIAHaZQUwsIcvoFgdbIl5GtZMwSkXpIYvc5v0TSDv+u8WsTKrKt2Vv28tHFFDJQdVzu3T4qTPzK+w==", + "dev": true, + "dependencies": { + "class-is": "^1.1.0", + "libp2p-crypto": "^0.20.0", + "minimist": "^1.2.5", + "multiformats": "^9.4.5", + "protobufjs": "^6.10.2", + "uint8arrays": "^3.0.0" + }, + "bin": { + "peer-id": "src/bin.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/peer-id/node_modules/libp2p-crypto": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.20.0.tgz", + "integrity": "sha512-WgIW9rYcWaO/5j2T6NW3R6Q46yvp2ZfFErqRMbi4/pOTL3T7+OROYpL/1iWVksWkXyurU/t2qFsIijWMxR5C4Q==", + "dev": true, + "dependencies": { + "err-code": "^3.0.1", + "iso-random-stream": "^2.0.0", + "keypair": "^1.0.4", + "multiformats": "^9.4.5", + "noble-ed25519": "^1.2.6", + "noble-secp256k1": "^1.2.10", + "node-forge": "^0.10.0", + "pem-jwk": "^2.0.0", + "protobufjs": "^6.11.2", + "uint8arrays": "^3.0.0", + "ursa-optional": "^0.10.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/retimer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/retimer/-/retimer-3.0.0.tgz", + "integrity": "sha512-WKE0j11Pa0ZJI5YIk0nflGI7SQsfl2ljihVy7ogh7DeQSeYAUi0ubZ/yEueGtDfUPk6GH5LRw1hBdLq4IwUBWA==", + "dev": true + }, + "node_modules/@fluencelabs/aqua/node_modules/uint8arrays": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-3.0.0.tgz", + "integrity": "sha512-HRCx0q6O9Bfbp+HHSfQQKD7wU70+lydKVt4EghkdOvlK/NlrF90z+eXV34mUd48rNvVJXwkrMSPpCATkct8fJA==", + "dev": true, + "dependencies": { + "multiformats": "^9.4.2" + } + }, + "node_modules/@fluencelabs/aqua/node_modules/varint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", "dev": true }, "node_modules/@fluencelabs/avm": { - "version": "0.20.3", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.3.tgz", - "integrity": "sha512-tkUccevqVDhffKAPxaMocv/Uk99ywebPWp1rp53KkR+jb20qvDYJyOI7xCfHRAWa/gNVuOf/luEIwlu9D7cCGA==", + "version": "0.20.8", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.8.tgz", + "integrity": "sha512-RF5Vb3USgr7gU0gcXCGYgN9rBXcucgwTgGeUjHOYWQIwuzD795DKjGPbgzfKWWCKFWjz5w/Gimi5beTDvbstOQ==", "bin": { "copy-avm": "dist/copyAvm.js" } }, "node_modules/@fluencelabs/avm-runner-background": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm-runner-background/-/avm-runner-background-0.1.2.tgz", - "integrity": "sha512-06E8l6ZLkWkpWas1TTojVrs+tekOg/OvnNI6/GKdm4zJL/9ePxW1WYE8Ieg1dIk6FpcP+ZxcEfZZKDoDwn68pQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm-runner-background/-/avm-runner-background-0.2.0.tgz", + "integrity": "sha512-IP4979IlS+1KwNX9zpDF6maLK112lBjd+Go1D/JIt7yP7o12Ch4CREmx2OxZwWOTxQVwoIRuD7Y+K3iTd4AL7Q==", "dependencies": { "@fluencelabs/avm-runner-interface": "^0.2.0", "browser-or-node": "^2.0.0", @@ -821,16 +1238,19 @@ "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" }, "node_modules/@fluencelabs/fluence": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.1.tgz", - "integrity": "sha512-8htyVZRMuo8KewppF7vbw5Dx7GMZSCTgePVzPdcm+bxh/W03pwfWMd5FBgiMPKaRrsT0nBYMLNoC1GKMNYjCmw==", + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.20.1.tgz", + "integrity": "sha512-fGWmO+9WWyXpKaaBMj0kGjIfSV3Soq5SOckSDtXVFm7z5fbRshrrG5e3iDrmPepaAv2vVzwKIsudrcPVYepD0g==", "dependencies": { "@chainsafe/libp2p-noise": "^4.1.1", - "@fluencelabs/avm": "0.20.0", - "@fluencelabs/avm-runner-background": "0.1.2", + "@fluencelabs/avm": "0.20.8", + "@fluencelabs/avm-runner-background": "0.2.0", "@fluencelabs/avm-runner-interface": "^0.2.0", + "@fluencelabs/marine-js": "0.1.0", "async": "3.2.0", + "browser-or-node": "^2.0.0", "bs58": "4.0.1", + "buffer": "^6.0.3", "cids": "0.8.1", "it-length-prefixed": "3.0.1", "it-pipe": "1.1.0", @@ -840,6 +1260,7 @@ "libp2p-websockets": "^0.16.2", "loglevel": "1.7.0", "multiaddr": "^10.0.1", + "multiformats": "^9.6.4", "peer-id": "=0.15.4", "rxjs": "^7.3.0", "ts-pattern": "^3.3.3", @@ -916,14 +1337,6 @@ "node": ">=12.0.0" } }, - "node_modules/@fluencelabs/fluence/node_modules/@fluencelabs/avm": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz", - "integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A==", - "bin": { - "copy-avm": "dist/copyAvm.js" - } - }, "node_modules/@fluencelabs/fluence/node_modules/buffer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", @@ -1227,6 +1640,14 @@ "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==" }, + "node_modules/@fluencelabs/marine-js": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/marine-js/-/marine-js-0.1.0.tgz", + "integrity": "sha512-vpjrwYLhd54xsvKp24SpY+szgzqNg/t2J+q4NyHCeQkhJK9nVlXfZBvaa60Ji2MYTQ6ikWrCUVldmk0xN/Q0uQ==", + "bin": { + "copy-marine": "dist/copyMarine.js" + } + }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -6936,9 +7357,9 @@ } }, "node_modules/multiformats": { - "version": "9.4.6", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.4.6.tgz", - "integrity": "sha512-ngZRO82P7mPvw/3gu5NQ2QiUJGYTS0LAxvQnEAlWCJakvn7YpK2VAd9JWM5oosYUeqoVbkylH/FsqRc4fc2+ag==" + "version": "9.6.4", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.6.4.tgz", + "integrity": "sha512-fCCB6XMrr6CqJiHNjfFNGT0v//dxOBMrOMqUIzpPc/mmITweLEyhvMpY9bF+jZ9z3vaMAau5E8B68DW77QMXkg==" }, "node_modules/multihashes": { "version": "0.4.21", @@ -7914,11 +8335,11 @@ } }, "node_modules/rxjs": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", - "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz", + "integrity": "sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==", "dependencies": { - "tslib": "~2.1.0" + "tslib": "^2.1.0" } }, "node_modules/safe-buffer": { @@ -8472,14 +8893,14 @@ } }, "node_modules/ts-pattern": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", - "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.5.tgz", + "integrity": "sha512-LD+wFR/RNckk1DrKV0LTH4KIT9wRqnnOjtEf77ovhKcVi8gf83Uf6U7OdywEua6KD9SbHadUdfolayfIUiPxzw==" }, "node_modules/tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -9468,22 +9889,405 @@ } }, "@fluencelabs/aqua": { - "version": "0.6.0-274", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.0-274.tgz", - "integrity": "sha512-c/ufNzUHaznq3nYtUewA422//OHOAvO224wBr/fL54t5t4gt8pTf58mE4/e1sd6YQjv6Umnt7XPjwiVgFzGarA==", + "version": "0.6.1-279", + "resolved": "https://registry.npmjs.org/@fluencelabs/aqua/-/aqua-0.6.1-279.tgz", + "integrity": "sha512-SOak1PMEBB6I9W8BToabczaqgpHZCH1f0LToCwQBKSiThiWDnXM5VUNY3qVqtpwjhMfxZa3YuFP+LUycYwmSCA==", "dev": true, "requires": { "@fluencelabs/aqua-ipfs": "0.5.2", - "@fluencelabs/aqua-lib": "0.3.2", - "@fluencelabs/avm": "0.20.3", - "@fluencelabs/fluence": "0.19.1", + "@fluencelabs/aqua-lib": "0.4.0", + "@fluencelabs/fluence": "0.19.2", + "@fluencelabs/fluence-network-environment": "1.0.13", "ipfs-http-client": "50.1.2" }, "dependencies": { - "@fluencelabs/aqua-lib": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.3.2.tgz", - "integrity": "sha512-8+NKFwRg9SFzpbac1SvvTWcOgHhMoYZwRyb93qJRcNFaN7xjRcA8v0i6CF7Mkjno1zH3xixC9J44+LKQd8uvzA==", + "@chainsafe/libp2p-noise": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@chainsafe/libp2p-noise/-/libp2p-noise-4.1.1.tgz", + "integrity": "sha512-/Fz86sZmnvRSf7FHxMPifzakxx9xK4KVYx6yi35KPZughop9ivJslUSCLhx/UqDHiuj3h9i04pVXET6nIjSJyQ==", + "dev": true, + "requires": { + "@stablelib/chacha20poly1305": "^1.0.1", + "@stablelib/hkdf": "^1.0.1", + "@stablelib/sha256": "^1.0.1", + "@stablelib/x25519": "^1.0.1", + "debug": "^4.3.1", + "it-buffer": "^0.1.3", + "it-length-prefixed": "^5.0.3", + "it-pair": "^1.0.0", + "it-pb-rpc": "^0.1.11", + "it-pipe": "^1.1.0", + "libp2p-crypto": "^0.19.7", + "peer-id": "^0.15.3", + "protobufjs": "^6.11.2", + "uint8arrays": "^3.0.0" + }, + "dependencies": { + "bl": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", + "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "dev": true, + "requires": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "it-length-prefixed": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/it-length-prefixed/-/it-length-prefixed-5.0.3.tgz", + "integrity": "sha512-b+jDHLcnOnPDQN79ronmzF5jeBjdJsy0ce2O6i6X4J5tnaO8Fd146ZA/tMbzaLlKnTpXa0eKtofpYhumXGENeg==", + "dev": true, + "requires": { + "bl": "^5.0.0", + "buffer": "^6.0.3", + "varint": "^6.0.0" + } + } + } + }, + "@fluencelabs/avm": { + "version": "0.20.5", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.5.tgz", + "integrity": "sha512-DhCnSzbG8hSkR1C0G/ci3jF+DciJVKpftO80GOdDYi1AXu6dYuqhZSOyWzMSwiHebprk1TDGZ/GSoQ6AGd4lLw==", + "dev": true + }, + "@fluencelabs/avm-runner-background": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm-runner-background/-/avm-runner-background-0.1.2.tgz", + "integrity": "sha512-06E8l6ZLkWkpWas1TTojVrs+tekOg/OvnNI6/GKdm4zJL/9ePxW1WYE8Ieg1dIk6FpcP+ZxcEfZZKDoDwn68pQ==", + "dev": true, + "requires": { + "@fluencelabs/avm-runner-interface": "^0.2.0", + "browser-or-node": "^2.0.0", + "threads": "^1.7.0" + } + }, + "@fluencelabs/fluence": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.2.tgz", + "integrity": "sha512-kPt8bOP0kx5sT5vc4XvAoXQsfm7fLBwreks3dZqu1RmJkWbBE1V48/qfJH2AupBRciGh5vztXvu3YeI5csmOmA==", + "dev": true, + "requires": { + "@chainsafe/libp2p-noise": "^4.1.1", + "@fluencelabs/avm": " 0.20.5", + "@fluencelabs/avm-runner-background": "0.1.2", + "@fluencelabs/avm-runner-interface": "^0.2.0", + "async": "3.2.0", + "browser-or-node": "^2.0.0", + "bs58": "4.0.1", + "buffer": "^6.0.3", + "cids": "0.8.1", + "it-length-prefixed": "3.0.1", + "it-pipe": "1.1.0", + "libp2p": "=0.33.0", + "libp2p-crypto": "=0.20.0", + "libp2p-mplex": "=0.10.2", + "libp2p-websockets": "^0.16.2", + "loglevel": "1.7.0", + "multiaddr": "^10.0.1", + "multiformats": "^9.6.4", + "peer-id": "=0.15.4", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + }, + "dependencies": { + "libp2p-crypto": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.20.0.tgz", + "integrity": "sha512-WgIW9rYcWaO/5j2T6NW3R6Q46yvp2ZfFErqRMbi4/pOTL3T7+OROYpL/1iWVksWkXyurU/t2qFsIijWMxR5C4Q==", + "dev": true, + "requires": { + "err-code": "^3.0.1", + "iso-random-stream": "^2.0.0", + "keypair": "^1.0.4", + "multiformats": "^9.4.5", + "noble-ed25519": "^1.2.6", + "noble-secp256k1": "^1.2.10", + "node-forge": "^0.10.0", + "pem-jwk": "^2.0.0", + "protobufjs": "^6.11.2", + "uint8arrays": "^3.0.0", + "ursa-optional": "^0.10.1" + } + } + } + }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, + "es6-promisify": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-7.0.0.tgz", + "integrity": "sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q==", + "dev": true + }, + "interface-datastore": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/interface-datastore/-/interface-datastore-6.1.0.tgz", + "integrity": "sha512-oNHdsrWBsI/kDwUtEgt+aaZtQFKtQYN0TGZzc3SGiIA6m+plZ6malhmsygtbmDpfpIsNNC7ce9Gyaj+Tki+gVw==", + "dev": true, + "requires": { + "interface-store": "^2.0.1", + "nanoid": "^3.0.2", + "uint8arrays": "^3.0.0" + } + }, + "interface-store": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/interface-store/-/interface-store-2.0.2.tgz", + "integrity": "sha512-rScRlhDcz6k199EkHqT8NpM87ebN89ICOzILoBHgaG36/WX50N32BnU/kpZgCGPLhARRAWUUX5/cyaIjt7Kipg==", + "dev": true + }, + "ipfs-utils": { + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-9.0.4.tgz", + "integrity": "sha512-cfLKk004KLoEWJhBx4zg3mCro6mkiNhyGIlT7OZX9zxO1UqvLWpvW7cSZ1b1fbUIZ8qI7X2B7PeKlXC7jSfZ7g==", + "dev": true, + "requires": { + "any-signal": "^3.0.0", + "buffer": "^6.0.1", + "electron-fetch": "^1.7.2", + "err-code": "^3.0.1", + "is-electron": "^2.2.0", + "iso-url": "^1.1.5", + "it-glob": "^1.0.1", + "it-to-stream": "^1.0.0", + "merge-options": "^3.0.4", + "nanoid": "^3.1.20", + "native-fetch": "^3.0.0", + "node-fetch": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz", + "react-native-fetch-api": "^2.0.0", + "stream-to-it": "^0.2.2" + }, + "dependencies": { + "any-signal": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/any-signal/-/any-signal-3.0.0.tgz", + "integrity": "sha512-l1H1GEkGGIXVGfCtvq8N68YI7gHajmfzRdKhmb8sGyAQpLCblirLa8eB09j4uKaiwe7vodAChocUf7AT3mYq5g==", + "dev": true + } + } + }, + "it-glob": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-1.0.2.tgz", + "integrity": "sha512-Ch2Dzhw4URfB9L/0ZHyY+uqOnKvBNeS/SMcRiPmJfpHiM0TsUZn+GkpcZxAoF3dJVdPm/PuIk3A4wlV7SUo23Q==", + "dev": true, + "requires": { + "@types/minimatch": "^3.0.4", + "minimatch": "^3.0.4" + } + }, + "libp2p": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/libp2p/-/libp2p-0.33.0.tgz", + "integrity": "sha512-ZNcxWJWNBmlLa9STcYbZyS3so/JEpI7kNLjIUIhIdntjJC9z+OMbGiqfPFcaMejMpjb/j+qpsqsiayjG0p9qIA==", + "dev": true, + "requires": { + "@motrix/nat-api": "^0.3.1", + "@vascosantos/moving-average": "^1.1.0", + "abort-controller": "^3.0.0", + "abortable-iterator": "^3.0.0", + "aggregate-error": "^3.1.0", + "any-signal": "^2.1.1", + "bignumber.js": "^9.0.1", + "class-is": "^1.1.0", + "debug": "^4.3.1", + "err-code": "^3.0.0", + "es6-promisify": "^7.0.0", + "events": "^3.3.0", + "hashlru": "^2.3.0", + "interface-datastore": "^6.0.2", + "it-all": "^1.0.4", + "it-buffer": "^0.1.2", + "it-drain": "^1.0.3", + "it-filter": "^1.0.1", + "it-first": "^1.0.4", + "it-handshake": "^2.0.0", + "it-length-prefixed": "^5.0.2", + "it-map": "^1.0.4", + "it-merge": "^1.0.0", + "it-pipe": "^1.1.0", + "it-take": "^1.0.0", + "libp2p-crypto": "^0.19.4", + "libp2p-interfaces": "^1.0.0", + "libp2p-utils": "^0.4.0", + "mafmt": "^10.0.0", + "merge-options": "^3.0.4", + "multiaddr": "^10.0.0", + "multiformats": "^9.0.0", + "multistream-select": "^2.0.0", + "mutable-proxy": "^1.0.0", + "node-forge": "^0.10.0", + "p-any": "^3.0.0", + "p-fifo": "^1.0.0", + "p-retry": "^4.4.0", + "p-settle": "^4.1.1", + "peer-id": "^0.15.0", + "private-ip": "^2.1.0", + "protobufjs": "^6.10.2", + "retimer": "^3.0.0", + "sanitize-filename": "^1.6.3", + "set-delayed-interval": "^1.0.0", + "streaming-iterables": "^6.0.0", + "timeout-abort-controller": "^1.1.1", + "uint8arrays": "^3.0.0", + "varint": "^6.0.0", + "wherearewe": "^1.0.0", + "xsalsa20": "^1.1.0" + }, + "dependencies": { + "bl": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", + "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "dev": true, + "requires": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "it-length-prefixed": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/it-length-prefixed/-/it-length-prefixed-5.0.3.tgz", + "integrity": "sha512-b+jDHLcnOnPDQN79ronmzF5jeBjdJsy0ce2O6i6X4J5tnaO8Fd146ZA/tMbzaLlKnTpXa0eKtofpYhumXGENeg==", + "dev": true, + "requires": { + "bl": "^5.0.0", + "buffer": "^6.0.3", + "varint": "^6.0.0" + } + } + } + }, + "libp2p-mplex": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/libp2p-mplex/-/libp2p-mplex-0.10.2.tgz", + "integrity": "sha512-fNdlPTts2MmGalPTYdQtzeGeuM73je9mP+2OvB6Gdn5vP9LeutUzUV4wvD9ISDVi8Gru5BzCsIBiS3WjxQqjdw==", + "dev": true, + "requires": { + "abort-controller": "^3.0.0", + "abortable-iterator": "^3.0.0", + "bl": "^4.0.0", + "debug": "^4.3.1", + "err-code": "^2.0.3", + "it-pipe": "^1.1.0", + "it-pushable": "^1.4.1", + "varint": "^6.0.0" + }, + "dependencies": { + "err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "dev": true + } + } + }, + "libp2p-websockets": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/libp2p-websockets/-/libp2p-websockets-0.16.2.tgz", + "integrity": "sha512-QGfo8jX1Ks16yi8C67CCyMW7k9cfCYiQ0lzKVJBud0fV3ymbMO2L8gzU6iXUUZTHILo8ka26zKhwQ4lmUMI+nA==", + "dev": true, + "requires": { + "abortable-iterator": "^3.0.0", + "class-is": "^1.1.0", + "debug": "^4.3.1", + "err-code": "^3.0.1", + "ipfs-utils": "^9.0.1", + "it-ws": "^4.0.0", + "libp2p-utils": "^0.4.0", + "mafmt": "^10.0.0", + "multiaddr": "^10.0.0", + "multiaddr-to-uri": "^8.0.0", + "p-defer": "^3.0.0", + "p-timeout": "^4.1.0" + } + }, + "multiaddr": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/multiaddr/-/multiaddr-10.0.1.tgz", + "integrity": "sha512-G5upNcGzEGuTHkzxezPrrD6CaIHR9uo+7MwqhNVcXTs33IInon4y7nMiGxl2CY5hG7chvYQUQhz5V52/Qe3cbg==", + "dev": true, + "requires": { + "dns-over-http-resolver": "^1.2.3", + "err-code": "^3.0.1", + "is-ip": "^3.1.0", + "multiformats": "^9.4.5", + "uint8arrays": "^3.0.0", + "varint": "^6.0.0" + } + }, + "node-fetch": { + "version": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g==", + "dev": true + }, + "peer-id": { + "version": "0.15.4", + "resolved": "https://registry.npmjs.org/peer-id/-/peer-id-0.15.4.tgz", + "integrity": "sha512-MDoBIMZYwQIAHaZQUwsIcvoFgdbIl5GtZMwSkXpIYvc5v0TSDv+u8WsTKrKt2Vv28tHFFDJQdVzu3T4qTPzK+w==", + "dev": true, + "requires": { + "class-is": "^1.1.0", + "libp2p-crypto": "^0.20.0", + "minimist": "^1.2.5", + "multiformats": "^9.4.5", + "protobufjs": "^6.10.2", + "uint8arrays": "^3.0.0" + }, + "dependencies": { + "libp2p-crypto": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.20.0.tgz", + "integrity": "sha512-WgIW9rYcWaO/5j2T6NW3R6Q46yvp2ZfFErqRMbi4/pOTL3T7+OROYpL/1iWVksWkXyurU/t2qFsIijWMxR5C4Q==", + "dev": true, + "requires": { + "err-code": "^3.0.1", + "iso-random-stream": "^2.0.0", + "keypair": "^1.0.4", + "multiformats": "^9.4.5", + "noble-ed25519": "^1.2.6", + "noble-secp256k1": "^1.2.10", + "node-forge": "^0.10.0", + "pem-jwk": "^2.0.0", + "protobufjs": "^6.11.2", + "uint8arrays": "^3.0.0", + "ursa-optional": "^0.10.1" + } + } + } + }, + "retimer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/retimer/-/retimer-3.0.0.tgz", + "integrity": "sha512-WKE0j11Pa0ZJI5YIk0nflGI7SQsfl2ljihVy7ogh7DeQSeYAUi0ubZ/yEueGtDfUPk6GH5LRw1hBdLq4IwUBWA==", + "dev": true + }, + "uint8arrays": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-3.0.0.tgz", + "integrity": "sha512-HRCx0q6O9Bfbp+HHSfQQKD7wU70+lydKVt4EghkdOvlK/NlrF90z+eXV34mUd48rNvVJXwkrMSPpCATkct8fJA==", + "dev": true, + "requires": { + "multiformats": "^9.4.2" + } + }, + "varint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", "dev": true } } @@ -9570,14 +10374,14 @@ "dev": true }, "@fluencelabs/avm": { - "version": "0.20.3", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.3.tgz", - "integrity": "sha512-tkUccevqVDhffKAPxaMocv/Uk99ywebPWp1rp53KkR+jb20qvDYJyOI7xCfHRAWa/gNVuOf/luEIwlu9D7cCGA==" + "version": "0.20.8", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.8.tgz", + "integrity": "sha512-RF5Vb3USgr7gU0gcXCGYgN9rBXcucgwTgGeUjHOYWQIwuzD795DKjGPbgzfKWWCKFWjz5w/Gimi5beTDvbstOQ==" }, "@fluencelabs/avm-runner-background": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm-runner-background/-/avm-runner-background-0.1.2.tgz", - "integrity": "sha512-06E8l6ZLkWkpWas1TTojVrs+tekOg/OvnNI6/GKdm4zJL/9ePxW1WYE8Ieg1dIk6FpcP+ZxcEfZZKDoDwn68pQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/avm-runner-background/-/avm-runner-background-0.2.0.tgz", + "integrity": "sha512-IP4979IlS+1KwNX9zpDF6maLK112lBjd+Go1D/JIt7yP7o12Ch4CREmx2OxZwWOTxQVwoIRuD7Y+K3iTd4AL7Q==", "requires": { "@fluencelabs/avm-runner-interface": "^0.2.0", "browser-or-node": "^2.0.0", @@ -9590,16 +10394,19 @@ "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" }, "@fluencelabs/fluence": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.19.1.tgz", - "integrity": "sha512-8htyVZRMuo8KewppF7vbw5Dx7GMZSCTgePVzPdcm+bxh/W03pwfWMd5FBgiMPKaRrsT0nBYMLNoC1GKMNYjCmw==", + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.20.1.tgz", + "integrity": "sha512-fGWmO+9WWyXpKaaBMj0kGjIfSV3Soq5SOckSDtXVFm7z5fbRshrrG5e3iDrmPepaAv2vVzwKIsudrcPVYepD0g==", "requires": { "@chainsafe/libp2p-noise": "^4.1.1", - "@fluencelabs/avm": "0.20.0", - "@fluencelabs/avm-runner-background": "0.1.2", + "@fluencelabs/avm": "0.20.8", + "@fluencelabs/avm-runner-background": "0.2.0", "@fluencelabs/avm-runner-interface": "^0.2.0", + "@fluencelabs/marine-js": "0.1.0", "async": "3.2.0", + "browser-or-node": "^2.0.0", "bs58": "4.0.1", + "buffer": "^6.0.3", "cids": "0.8.1", "it-length-prefixed": "3.0.1", "it-pipe": "1.1.0", @@ -9609,6 +10416,7 @@ "libp2p-websockets": "^0.16.2", "loglevel": "1.7.0", "multiaddr": "^10.0.1", + "multiformats": "^9.6.4", "peer-id": "=0.15.4", "rxjs": "^7.3.0", "ts-pattern": "^3.3.3", @@ -9676,11 +10484,6 @@ } } }, - "@fluencelabs/avm": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.0.tgz", - "integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A==" - }, "buffer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", @@ -9959,6 +10762,11 @@ "resolved": "https://registry.npmjs.org/@fluencelabs/fluence-network-environment/-/fluence-network-environment-1.0.13.tgz", "integrity": "sha512-2pci3T0sUHE08jwEs1r/vHKVT4XUh/A3j/QJ0eIhddsxyIjEksjdn05X7DF6STD14CF8GgBVOJEPgav8qaUMpA==" }, + "@fluencelabs/marine-js": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/marine-js/-/marine-js-0.1.0.tgz", + "integrity": "sha512-vpjrwYLhd54xsvKp24SpY+szgzqNg/t2J+q4NyHCeQkhJK9nVlXfZBvaa60Ji2MYTQ6ikWrCUVldmk0xN/Q0uQ==" + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -14580,9 +15388,9 @@ } }, "multiformats": { - "version": "9.4.6", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.4.6.tgz", - "integrity": "sha512-ngZRO82P7mPvw/3gu5NQ2QiUJGYTS0LAxvQnEAlWCJakvn7YpK2VAd9JWM5oosYUeqoVbkylH/FsqRc4fc2+ag==" + "version": "9.6.4", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.6.4.tgz", + "integrity": "sha512-fCCB6XMrr6CqJiHNjfFNGT0v//dxOBMrOMqUIzpPc/mmITweLEyhvMpY9bF+jZ9z3vaMAau5E8B68DW77QMXkg==" }, "multihashes": { "version": "0.4.21", @@ -15315,11 +16123,11 @@ } }, "rxjs": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz", - "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz", + "integrity": "sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==", "requires": { - "tslib": "~2.1.0" + "tslib": "^2.1.0" } }, "safe-buffer": { @@ -15726,14 +16534,14 @@ } }, "ts-pattern": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", - "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.5.tgz", + "integrity": "sha512-LD+wFR/RNckk1DrKV0LTH4KIT9wRqnnOjtEf77ovhKcVi8gf83Uf6U7OdywEua6KD9SbHadUdfolayfIUiPxzw==" }, "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "tunnel-agent": { "version": "0.6.0", diff --git a/package.json b/package.json index b6ccb19..50e19f5 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "do": "aqua dist deploy --addr /dns4/kras-04.fluence.dev/tcp/19001/wss/p2p/12D3KooWFEwNWcHqi9rtsmDhsYcDbRUCDXH84RC4FW6UfsFWaoHi --data-path deploy.json --service tsOracle" }, "devDependencies": { - "@fluencelabs/aqua": "0.6.0-274", + "@fluencelabs/aqua": "0.6.1-279", "@fluencelabs/aqua-dht": "0.2.5", "@fluencelabs/aqua-lib": "0.4.0", "@types/jest": "^27.0.2", @@ -40,8 +40,7 @@ }, "dependencies": { "@fluencelabs/aqua-dht-ts": "0.1.38", - "@fluencelabs/avm": "0.20.3", - "@fluencelabs/fluence": "0.19.1", + "@fluencelabs/fluence": "0.20.1", "@fluencelabs/fluence-network-environment": "1.0.13", "deep-equal": "^2.0.5" }, diff --git a/src/__test__/examples.spec.ts b/src/__test__/examples.spec.ts index bacd67e..f546415 100644 --- a/src/__test__/examples.spec.ts +++ b/src/__test__/examples.spec.ts @@ -14,7 +14,7 @@ import { returnNilCall, returnNoneCall, streamCall } from '../examples/streamCal import {topologyBug205Call, topologyBug394Call, topologyBug427Call, topologyCall} from '../examples/topologyCall'; import { foldJoinCall } from '../examples/foldJoinCall'; import { registerHandlers, returnNull, returnOptionalCall, useOptionalCall } from '../examples/useOptionalCall'; -import { viaCall } from '../examples/viaCall'; +import {viaArrCall, viaOptCall, viaOptNullCall, viaStreamCall} from '../examples/viaCall'; import { nestedFuncsCall } from '../examples/nestedFuncsCall'; import { assignmentCall } from '../examples/assignment'; import { tryCatchCall } from '../examples/tryCatchCall'; @@ -206,7 +206,10 @@ describe('Testing examples', () => { }); it('via.aqua', async () => { - let [res1, res2, res3, res4] = await viaCall(); + let res1 = await viaArrCall(); + let res2 = await viaOptCall(); + let res3 = await viaOptNullCall(); + let res4 = await viaStreamCall(); expect(res1).toEqual(res2); expect(res2).toEqual(res3); expect(res3).toEqual(res4); diff --git a/src/compiled/dht/dht-example.ts b/src/compiled/dht/dht-example.ts index 13350fe..40c4a11 100644 --- a/src/compiled/dht/dht-example.ts +++ b/src/compiled/dht/dht-example.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -58,17 +58,17 @@ export function put_value(...args: any) { (xor (seq (seq - (seq - (call n ("peer" "timestamp_sec") [] t) - (call n ("aqua-dht" "register_key") [initial_peer t false 0]) - ) - (call n ("aqua-dht" "put_value") [initial_peer value t [] [] 0]) + (call n ("peer" "timestamp_sec") [] t) + (call n ("aqua-dht" "register_key") [initial_peer t false 0]) ) - (call -relay- ("op" "noop") []) + (call n ("aqua-dht" "put_value") [initial_peer value t [] [] 0]) ) (null) ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) ) (next n) ) diff --git a/src/compiled/examples/aliases.ts b/src/compiled/examples/aliases.ts index c5c4e18..315256c 100644 --- a/src/compiled/examples/aliases.ts +++ b/src/compiled/examples/aliases.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/assignment.ts b/src/compiled/examples/assignment.ts index 2c01f91..34952b0 100644 --- a/src/compiled/examples/assignment.ts +++ b/src/compiled/examples/assignment.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/callArrow.ts b/src/compiled/examples/callArrow.ts index 4d698f5..be36136 100644 --- a/src/compiled/examples/callArrow.ts +++ b/src/compiled/examples/callArrow.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-SNAPSHOT + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/closures.ts b/src/compiled/examples/closures.ts index 6d00742..61a81dc 100644 --- a/src/compiled/examples/closures.ts +++ b/src/compiled/examples/closures.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -137,7 +137,7 @@ export function closureIn(...args: any) { } -export type ClosureOutResult = { external_addresses: string[]; } +export type ClosureOutResult = { air_version: string; external_addresses: string[]; node_version: string; } export function closureOut( peer2: string, config?: {ttl?: number} diff --git a/src/compiled/examples/co.ts b/src/compiled/examples/co.ts index 02642c7..a89cb9d 100644 --- a/src/compiled/examples/co.ts +++ b/src/compiled/examples/co.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -49,14 +49,14 @@ export function registerCoService(...args: any) { export function coFunc( node: string, - c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise, + c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise, config?: {ttl?: number} ): Promise; export function coFunc( peer: FluencePeer, node: string, - c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise, + c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise, config?: {ttl?: number} ): Promise; diff --git a/src/compiled/examples/complex.ts b/src/compiled/examples/complex.ts index 2a96fa6..2b9b064 100644 --- a/src/compiled/examples/complex.ts +++ b/src/compiled/examples/complex.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/constants.ts b/src/compiled/examples/constants.ts index 6c09556..fd2a7d0 100644 --- a/src/compiled/examples/constants.ts +++ b/src/compiled/examples/constants.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/dataAlias.ts b/src/compiled/examples/dataAlias.ts index 82e23df..180ec24 100644 --- a/src/compiled/examples/dataAlias.ts +++ b/src/compiled/examples/dataAlias.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/example.ts b/src/compiled/examples/example.ts index 5957608..558519c 100644 --- a/src/compiled/examples/example.ts +++ b/src/compiled/examples/example.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/fldist-sample.ts b/src/compiled/examples/fldist-sample.ts index 5d29ef1..b561ae0 100644 --- a/src/compiled/examples/fldist-sample.ts +++ b/src/compiled/examples/fldist-sample.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -17,7 +17,7 @@ import { // Services export interface ReturnDef { - run: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise; + run: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise; } export function registerReturn(service: ReturnDef): void; export function registerReturn(serviceId: string, service: ReturnDef): void; diff --git a/src/compiled/examples/fold.ts b/src/compiled/examples/fold.ts index 3378ee2..2c9cb6c 100644 --- a/src/compiled/examples/fold.ts +++ b/src/compiled/examples/fold.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -82,14 +82,14 @@ export function iterateAndPrint(...args: any) { export function iterateAndPrintParallel( nodes: string[], - c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise, + c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise, config?: {ttl?: number} ): Promise; export function iterateAndPrintParallel( peer: FluencePeer, nodes: string[], - c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise, + c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise, config?: {ttl?: number} ): Promise; @@ -114,11 +114,20 @@ export function iterateAndPrintParallel(...args: any) { (call -relay- ("op" "noop") []) ) (xor - (call %init_peer_id% ("callbackSrv" "c") [ads]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (seq + (call %init_peer_id% ("callbackSrv" "c") [ads]) + (call -relay- ("op" "noop") []) + ) + (seq + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (call -relay- ("op" "noop") []) + ) ) ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) ) ) (next s) diff --git a/src/compiled/examples/foldJoin.ts b/src/compiled/examples/foldJoin.ts index ecdff90..8464be5 100644 --- a/src/compiled/examples/foldJoin.ts +++ b/src/compiled/examples/foldJoin.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -55,18 +55,15 @@ export function getTwoResults(...args: any) { (fold nodes n (par (seq - (seq + (xor (xor - (xor - (call n ("peer" "timestamp_sec") [] $res) - (null) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) - ) + (call n ("peer" "timestamp_sec") [] $res) + (null) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) ) - (call -relay- ("op" "noop") []) ) (call node ("op" "noop") []) ) diff --git a/src/compiled/examples/func.ts b/src/compiled/examples/func.ts index 0b2a301..fc1c07b 100644 --- a/src/compiled/examples/func.ts +++ b/src/compiled/examples/func.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/helloWorld.ts b/src/compiled/examples/helloWorld.ts index 6dd5fd5..f2cfac0 100644 --- a/src/compiled/examples/helloWorld.ts +++ b/src/compiled/examples/helloWorld.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/if.ts b/src/compiled/examples/if.ts index 91f3cc5..52f8185 100644 --- a/src/compiled/examples/if.ts +++ b/src/compiled/examples/if.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/imports_exports/declare.ts b/src/compiled/examples/imports_exports/declare.ts index dc271e7..2ba156b 100644 --- a/src/compiled/examples/imports_exports/declare.ts +++ b/src/compiled/examples/imports_exports/declare.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/imports_exports/exports.ts b/src/compiled/examples/imports_exports/exports.ts index 07e72ac..d49eddc 100644 --- a/src/compiled/examples/imports_exports/exports.ts +++ b/src/compiled/examples/imports_exports/exports.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/imports_exports/gen/OneMore.ts b/src/compiled/examples/imports_exports/gen/OneMore.ts index f2acd48..730b69d 100644 --- a/src/compiled/examples/imports_exports/gen/OneMore.ts +++ b/src/compiled/examples/imports_exports/gen/OneMore.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/imports_exports/import2.ts b/src/compiled/examples/imports_exports/import2.ts index 6ef739f..aa52571 100644 --- a/src/compiled/examples/imports_exports/import2.ts +++ b/src/compiled/examples/imports_exports/import2.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/imports_exports/import3.ts b/src/compiled/examples/imports_exports/import3.ts index d96af39..c1d209b 100644 --- a/src/compiled/examples/imports_exports/import3.ts +++ b/src/compiled/examples/imports_exports/import3.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/imports_exports/imports.ts b/src/compiled/examples/imports_exports/imports.ts index 0d547a7..6c67c38 100644 --- a/src/compiled/examples/imports_exports/imports.ts +++ b/src/compiled/examples/imports_exports/imports.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/imports_exports/subImport.ts b/src/compiled/examples/imports_exports/subImport.ts index 8297e27..013d6b9 100644 --- a/src/compiled/examples/imports_exports/subImport.ts +++ b/src/compiled/examples/imports_exports/subImport.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/join.ts b/src/compiled/examples/join.ts index c32d7bd..87b0f8e 100644 --- a/src/compiled/examples/join.ts +++ b/src/compiled/examples/join.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -204,14 +204,14 @@ export function joinIdx( idx: number, nodes: string[], config?: {ttl?: number} -): Promise<{ external_addresses: string[]; }[]>; +): Promise<{ air_version: string; external_addresses: string[]; node_version: string; }[]>; export function joinIdx( peer: FluencePeer, idx: number, nodes: string[], config?: {ttl?: number} -): Promise<{ external_addresses: string[]; }[]>; +): Promise<{ air_version: string; external_addresses: string[]; node_version: string; }[]>; export function joinIdx(...args: any) { @@ -235,17 +235,20 @@ export function joinIdx(...args: any) { (par (seq (seq - (call -relay- ("op" "noop") []) - (xor - (seq - (call node ("peer" "identify") [] $infos) - (ap node $nodes2) - ) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (seq + (call -relay- ("op" "noop") []) + (xor + (seq + (call node ("peer" "identify") [] $infos) + (ap node $nodes2) + ) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) ) ) + (call -relay- ("op" "noop") []) ) (call %init_peer_id% ("op" "noop") []) ) diff --git a/src/compiled/examples/multiReturn.ts b/src/compiled/examples/multiReturn.ts index af80c5d..f412362 100644 --- a/src/compiled/examples/multiReturn.ts +++ b/src/compiled/examples/multiReturn.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/nestedFuncs.ts b/src/compiled/examples/nestedFuncs.ts index f449bd2..f908a66 100644 --- a/src/compiled/examples/nestedFuncs.ts +++ b/src/compiled/examples/nestedFuncs.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/new-api-full.ts b/src/compiled/examples/new-api-full.ts index 6aca807..6075d0d 100644 --- a/src/compiled/examples/new-api-full.ts +++ b/src/compiled/examples/new-api-full.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/new-api.ts b/src/compiled/examples/new-api.ts index b680868..5d512e1 100644 --- a/src/compiled/examples/new-api.ts +++ b/src/compiled/examples/new-api.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/on.ts b/src/compiled/examples/on.ts index 446c172..db72ab4 100644 --- a/src/compiled/examples/on.ts +++ b/src/compiled/examples/on.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/option.ts b/src/compiled/examples/option.ts index 1a12b87..a3613a8 100644 --- a/src/compiled/examples/option.ts +++ b/src/compiled/examples/option.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/options/option_gen.ts b/src/compiled/examples/options/option_gen.ts index f2c9121..ec07fef 100644 --- a/src/compiled/examples/options/option_gen.ts +++ b/src/compiled/examples/options/option_gen.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/par.ts b/src/compiled/examples/par.ts index 9ba0602..402685c 100644 --- a/src/compiled/examples/par.ts +++ b/src/compiled/examples/par.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -49,14 +49,14 @@ export function registerParService(...args: any) { export function parFunc( node: string, - c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise, + c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise, config?: {ttl?: number} ): Promise; export function parFunc( peer: FluencePeer, node: string, - c: (arg0: { external_addresses: string[]; }, callParams: CallParams<'arg0'>) => void | Promise, + c: (arg0: { air_version: string; external_addresses: string[]; node_version: string; }, callParams: CallParams<'arg0'>) => void | Promise, config?: {ttl?: number} ): Promise; @@ -81,11 +81,20 @@ export function parFunc(...args: any) { (call -relay- ("op" "noop") []) ) (xor - (call %init_peer_id% ("callbackSrv" "c") [t]) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (seq + (call %init_peer_id% ("callbackSrv" "c") [t]) + (call -relay- ("op" "noop") []) + ) + (seq + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (call -relay- ("op" "noop") []) + ) ) ) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2]) + ) ) ) ) diff --git a/src/compiled/examples/passArgs.ts b/src/compiled/examples/passArgs.ts index 4842b6e..f93cf58 100644 --- a/src/compiled/examples/passArgs.ts +++ b/src/compiled/examples/passArgs.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/println.ts b/src/compiled/examples/println.ts index cffcf67..17f7de9 100644 --- a/src/compiled/examples/println.ts +++ b/src/compiled/examples/println.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/pushToStream.ts b/src/compiled/examples/pushToStream.ts index f741145..13e8386 100644 --- a/src/compiled/examples/pushToStream.ts +++ b/src/compiled/examples/pushToStream.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/returnLiteral.ts b/src/compiled/examples/returnLiteral.ts index eabf02d..9aa4038 100644 --- a/src/compiled/examples/returnLiteral.ts +++ b/src/compiled/examples/returnLiteral.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/stream.ts b/src/compiled/examples/stream.ts index a3892f8..ec3645b 100644 --- a/src/compiled/examples/stream.ts +++ b/src/compiled/examples/stream.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/streamArgs.ts b/src/compiled/examples/streamArgs.ts index 3b807bf..1683543 100644 --- a/src/compiled/examples/streamArgs.ts +++ b/src/compiled/examples/streamArgs.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/streamCallback.ts b/src/compiled/examples/streamCallback.ts index 27576ff..833f772 100644 --- a/src/compiled/examples/streamCallback.ts +++ b/src/compiled/examples/streamCallback.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/streamCan.ts b/src/compiled/examples/streamCan.ts index bf7255d..735f989 100644 --- a/src/compiled/examples/streamCan.ts +++ b/src/compiled/examples/streamCan.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/streamRestriction.ts b/src/compiled/examples/streamRestriction.ts index 1ab3570..6be658e 100644 --- a/src/compiled/examples/streamRestriction.ts +++ b/src/compiled/examples/streamRestriction.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/streamResults.ts b/src/compiled/examples/streamResults.ts index 8e02997..9a4eca2 100644 --- a/src/compiled/examples/streamResults.ts +++ b/src/compiled/examples/streamResults.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/subImportUsage.ts b/src/compiled/examples/subImportUsage.ts index 116a632..200f567 100644 --- a/src/compiled/examples/subImportUsage.ts +++ b/src/compiled/examples/subImportUsage.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/topology.ts b/src/compiled/examples/topology.ts index 91adddb..a0bb29a 100644 --- a/src/compiled/examples/topology.ts +++ b/src/compiled/examples/topology.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-SNAPSHOT + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -190,14 +190,17 @@ export function topologyBug427(...args: any) { (par (seq (seq - (call -relay- ("op" "noop") []) - (xor - (call peer ("op" "identity") ["some string"] $results) - (seq - (call -relay- ("op" "noop") []) - (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + (seq + (call -relay- ("op" "noop") []) + (xor + (call peer ("op" "identity") ["some string"] $results) + (seq + (call -relay- ("op" "noop") []) + (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1]) + ) ) ) + (call -relay- ("op" "noop") []) ) (call %init_peer_id% ("op" "noop") []) ) diff --git a/src/compiled/examples/tryCatch.ts b/src/compiled/examples/tryCatch.ts index 129b1cb..89cb205 100644 --- a/src/compiled/examples/tryCatch.ts +++ b/src/compiled/examples/tryCatch.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/tryOtherwise.ts b/src/compiled/examples/tryOtherwise.ts index 47aadca..96aeed0 100644 --- a/src/compiled/examples/tryOtherwise.ts +++ b/src/compiled/examples/tryOtherwise.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; diff --git a/src/compiled/examples/via.ts b/src/compiled/examples/via.ts index 0beecb2..341b300 100644 --- a/src/compiled/examples/via.ts +++ b/src/compiled/examples/via.ts @@ -3,7 +3,7 @@ * This file is auto-generated. Do not edit manually: changes may be erased. * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues - * Aqua version: 0.6.0-263 + * Aqua version: 0.6.1-279 * */ import { Fluence, FluencePeer } from '@fluencelabs/fluence'; @@ -52,7 +52,7 @@ export function registerCustomId(...args: any) { // Functions -export type ViaArrResult = { external_addresses: string[]; } +export type ViaArrResult = { air_version: string; external_addresses: string[]; node_version: string; } export function viaArr( node_id: string, viaAr: string[], @@ -161,7 +161,7 @@ export function viaArr(...args: any) { } -export type ViaStreamResult = { external_addresses: string[]; } +export type ViaStreamResult = { air_version: string; external_addresses: string[]; node_version: string; } export function viaStream( node_id: string, viaStr: string[], @@ -278,7 +278,7 @@ export function viaStream(...args: any) { } -export type ViaOptResult = { external_addresses: string[]; } +export type ViaOptResult = { air_version: string; external_addresses: string[]; node_version: string; } export function viaOpt( relay: string, node_id: string, diff --git a/src/config.ts b/src/config.ts index 416db42..5ac9e84 100644 --- a/src/config.ts +++ b/src/config.ts @@ -22,4 +22,4 @@ export const testNetConfig = { tryCatchError: "Local service error, ret_code is 1, error message is '\"Service with id 'unex' not found (function getStr)\"'" } -export const config = testNetConfig +export const config = krasnodarConfig diff --git a/src/examples/viaCall.ts b/src/examples/viaCall.ts index aed5014..77c93ea 100644 --- a/src/examples/viaCall.ts +++ b/src/examples/viaCall.ts @@ -4,19 +4,34 @@ import { config } from '../config'; const relays = config.relays -export async function viaCall(): Promise { +export async function viaArrCall(): Promise { const relayPeerId = Fluence.getPeer().getStatus().relayPeerId; - registerCustomId({ - id: (args0) => { - return args0; - }, - }); - let res = await viaArr(relays[4].peerId, [relays[2].peerId, relays[1].peerId]); + + return res.external_addresses; +} + +export async function viaOptCall(): Promise { + const relayPeerId = Fluence.getPeer().getStatus().relayPeerId; + let res2 = await viaOpt(relayPeerId, relays[4].peerId, relays[2].peerId); + + return res2.external_addresses; +} + +export async function viaOptNullCall(): Promise { + const relayPeerId = Fluence.getPeer().getStatus().relayPeerId; + let res3 = await viaOpt(relayPeerId, relays[4].peerId, relays[2].peerId || null); + + return res3.external_addresses; +} + +export async function viaStreamCall(): Promise { + const relayPeerId = Fluence.getPeer().getStatus().relayPeerId; + let res4 = await viaStream(relays[4].peerId, [relays[2].peerId, relays[1].peerId]); - return [res.external_addresses, res2.external_addresses, res3.external_addresses, res4.external_addresses]; + return res4.external_addresses; }