diff --git a/aqua/package.json b/aqua/package.json index 7dac2e4..a87f0d9 100644 --- a/aqua/package.json +++ b/aqua/package.json @@ -30,6 +30,6 @@ }, "homepage": "https://github.com/fluencelabs/registry", "devDependencies": { - "@fluencelabs/aqua": "^0.7.0-285" + "@fluencelabs/aqua": "0.7.1-298" } } diff --git a/example/package-lock.json b/example/package-lock.json index d787dea..576ff1b 100644 --- a/example/package-lock.json +++ b/example/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@fluencelabs/aqua": "0.7.1-297", "@fluencelabs/aqua-lib": "^0.4.3", - "@fluencelabs/fluence": "0.21.8", + "@fluencelabs/fluence": "0.22.0", "@fluencelabs/fluence-network-environment": "^1.0.13", "@fluencelabs/registry": "../aqua", "@fluencelabs/trust-graph": "^3.0.1" @@ -30,7 +30,7 @@ "@fluencelabs/trust-graph": "^3.0.1" }, "devDependencies": { - "@fluencelabs/aqua": "^0.7.0-285" + "@fluencelabs/aqua": "0.7.1-298" } }, "node_modules/@chainsafe/libp2p-noise": { @@ -152,6 +152,62 @@ "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.0.tgz", "integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==" }, + "node_modules/@fluencelabs/aqua/node_modules/@fluencelabs/fluence": { + "version": "0.21.8", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.8.tgz", + "integrity": "sha512-QeCYdPZhCsxZTxlMzXGOKPqP9rzkVh/FpNZaf60JcmMu07tMcpOxvhu26wDni2QugifRvh26/tkSQ6GN3ceg3A==", + "dependencies": { + "@chainsafe/libp2p-noise": "^4.1.1", + "@fluencelabs/avm": "^0.21.3", + "@fluencelabs/avm-runner-background": "0.2.0", + "@fluencelabs/avm-runner-interface": "^0.2.0", + "@fluencelabs/marine-js": "0.1.0", + "async": "3.2.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", + "platform": "^1.3.6", + "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/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "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/avm": { "version": "0.21.6", "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.21.6.tgz", @@ -179,9 +235,9 @@ "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" }, "node_modules/@fluencelabs/fluence": { - "version": "0.21.8", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.8.tgz", - "integrity": "sha512-QeCYdPZhCsxZTxlMzXGOKPqP9rzkVh/FpNZaf60JcmMu07tMcpOxvhu26wDni2QugifRvh26/tkSQ6GN3ceg3A==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.22.0.tgz", + "integrity": "sha512-53pgxoxguLg3mKKVtc4lTNBQa2Y3VHwKE5Zdnl6ZiHeNu7JUhSw/aK65Y93ZIL0Hmql/HWlGi+NNBT9uKby93A==", "dependencies": { "@chainsafe/libp2p-noise": "^4.1.1", "@fluencelabs/avm": "^0.21.3", @@ -4334,6 +4390,45 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/@fluencelabs/aqua-lib/-/aqua-lib-0.4.0.tgz", "integrity": "sha512-bad282cCZrE//I+Hzsl/vWgudwXuNiaqJOonv11xkgOBBvL7Gg3SIap8HioNvkaDxIvylVB+POjYJ7E5sGNoVQ==" + }, + "@fluencelabs/fluence": { + "version": "0.21.8", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.8.tgz", + "integrity": "sha512-QeCYdPZhCsxZTxlMzXGOKPqP9rzkVh/FpNZaf60JcmMu07tMcpOxvhu26wDni2QugifRvh26/tkSQ6GN3ceg3A==", + "requires": { + "@chainsafe/libp2p-noise": "^4.1.1", + "@fluencelabs/avm": "^0.21.3", + "@fluencelabs/avm-runner-background": "0.2.0", + "@fluencelabs/avm-runner-interface": "^0.2.0", + "@fluencelabs/marine-js": "0.1.0", + "async": "3.2.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", + "platform": "^1.3.6", + "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", + "uuid": "8.3.0" + } + }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } } } }, @@ -4378,9 +4473,9 @@ "integrity": "sha512-Y41pL+UwZZVdormxju8cJQsNRp6tdER0VqJ9Kg9gH2wd1KJAaYTJkyVbn8NB7fEFRUbqfbb1BXHi9wWBYOgGYQ==" }, "@fluencelabs/fluence": { - "version": "0.21.8", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.21.8.tgz", - "integrity": "sha512-QeCYdPZhCsxZTxlMzXGOKPqP9rzkVh/FpNZaf60JcmMu07tMcpOxvhu26wDni2QugifRvh26/tkSQ6GN3ceg3A==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.22.0.tgz", + "integrity": "sha512-53pgxoxguLg3mKKVtc4lTNBQa2Y3VHwKE5Zdnl6ZiHeNu7JUhSw/aK65Y93ZIL0Hmql/HWlGi+NNBT9uKby93A==", "requires": { "@chainsafe/libp2p-noise": "^4.1.1", "@fluencelabs/avm": "^0.21.3", @@ -4431,7 +4526,7 @@ "@fluencelabs/registry": { "version": "file:../aqua", "requires": { - "@fluencelabs/aqua": "^0.7.0-285", + "@fluencelabs/aqua": "0.7.1-298", "@fluencelabs/aqua-lib": "^0.4.3", "@fluencelabs/trust-graph": "^3.0.1" } diff --git a/example/package.json b/example/package.json index 667eb50..a3e5011 100644 --- a/example/package.json +++ b/example/package.json @@ -20,7 +20,7 @@ "@fluencelabs/registry": "../aqua", "@fluencelabs/aqua-lib": "^0.4.3", "@fluencelabs/aqua": "0.7.1-297", - "@fluencelabs/fluence": "0.21.8", + "@fluencelabs/fluence": "0.22.0", "@fluencelabs/fluence-network-environment": "^1.0.13", "@fluencelabs/trust-graph": "^3.0.1" }, diff --git a/example/src/example.ts b/example/src/example.ts index ab13966..f331b55 100644 --- a/example/src/example.ts +++ b/example/src/example.ts @@ -1,5 +1,5 @@ import {Fluence, KeyPair} from "@fluencelabs/fluence"; -import { krasnodar, Node, } from "@fluencelabs/fluence-network-environment"; +import { krasnodar, Node,stage } from "@fluencelabs/fluence-network-environment"; import { allowServiceFn, and, or } from "@fluencelabs/fluence/dist/internal/builtins/Sig"; import {createResourceAndRegisterProvider, registerNodeProvider, createResourceAndRegisterNodeProvider, createResource, registerProvider, resolveProviders, timestamp_sec} from "./generated/export"; import assert from "assert"; @@ -24,15 +24,12 @@ let local: Node[] = [ async function main() { // connect to the Fluence network - await Fluence.start({ connectTo: krasnodar[0] }); + await Fluence.start({ connectTo: krasnodar[1] }); console.log( "📗 created a fluence peer %s with relay %s", Fluence.getStatus().peerId, Fluence.getStatus().relayPeerId ); - // TODO: remove after fluence-js update - let sig = Fluence.getPeer().getServices().sig; - sig.securityGuard = or(sig.securityGuard, allowServiceFn("registry", "get_key_bytes")); let label = "myLabel"; let value = "myValue"; @@ -41,7 +38,7 @@ async function main() { assert(resource_id !== null, create_error.toString()); console.log("resource %s created successfully", resource_id); - let node_provider = krasnodar[1].peerId; + let node_provider = krasnodar[3].peerId; let [node_success, reg_node_error] = await registerNodeProvider(node_provider, resource_id, value, "identity"); assert(node_success, reg_node_error.toString()); console.log("node %s registered as provider successfully", node_provider);