From 418e1f23c31f824453a1175b43bb7c112d0d6d9d Mon Sep 17 00:00:00 2001 From: Ivan Boldyrev Date: Mon, 22 Jan 2024 20:29:38 +0100 Subject: [PATCH 1/9] feat(particle)!: Multiformat MsgPack for particle data --- .../src/connection/RelayConnection.ts | 11 +++++----- .../core/js-client/src/particle/Particle.ts | 22 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/core/js-client/src/connection/RelayConnection.ts b/packages/core/js-client/src/connection/RelayConnection.ts index 2e5e96be0..e7d92d9bd 100644 --- a/packages/core/js-client/src/connection/RelayConnection.ts +++ b/packages/core/js-client/src/connection/RelayConnection.ts @@ -37,7 +37,7 @@ import { IParticle } from "../particle/interfaces.js"; import { buildParticleMessage, Particle, - serializeToString, + serializeParticle, } from "../particle/Particle.js"; import { throwHasNoPeerId } from "../util/libp2pUtils.js"; import { logger } from "../util/logger.js"; @@ -216,7 +216,7 @@ export class RelayConnection implements IConnection { const sink = stream.sink; - await pipe([fromString(serializeToString(particle))], encode, sink); + await pipe([serializeParticle(particle)], encode, sink); log.trace( "particle %s sent to %s", @@ -225,11 +225,11 @@ export class RelayConnection implements IConnection { ); } - private async processIncomingMessage(msg: string) { + private async processIncomingMessage(msg: Uint8array) { let particle: Particle | undefined; try { - particle = Particle.fromString(msg); + particle = Particle.deserialize(msg); log.trace( "received particle %s from %s", @@ -290,7 +290,8 @@ export class RelayConnection implements IConnection { decode, (source) => { return map(source, (buf) => { - return toString(buf.subarray()); + // TODO is subarray really needed now? + return buf.subarray(); }); }, async (source) => { diff --git a/packages/core/js-client/src/particle/Particle.ts b/packages/core/js-client/src/particle/Particle.ts index cf3db44a9..b7670648c 100644 --- a/packages/core/js-client/src/particle/Particle.ts +++ b/packages/core/js-client/src/particle/Particle.ts @@ -16,7 +16,7 @@ import { CallResultsArray } from "@fluencelabs/avm"; import { JSONValue } from "@fluencelabs/interfaces"; -import { fromUint8Array, toUint8Array } from "js-base64"; +import { MulticodecRepr, MsgPackRepr } from "@fluencelabs/avm" import { concat } from "uint8arrays/concat"; import { v4 as uuidv4 } from "uuid"; import { z } from "zod"; @@ -27,11 +27,13 @@ import { numberToLittleEndianBytes } from "../util/bytes.js"; import { IParticle } from "./interfaces.js"; +const particleRepr = new MulticodecRepr(new MsgPackRepr()); + const particleSchema = z.object({ id: z.string(), timestamp: z.number().positive(), script: z.string(), - data: z.string(), + data: z.array(z.number()), ttl: z.number().positive(), init_peer_id: z.string(), signature: z.array(z.number()), @@ -73,10 +75,10 @@ export class Particle implements IParticle { ); } - static fromString(str: string): Particle { - const json = JSON.parse(str); + static deserialize(bytes: Uint8Array): Particle { + const obj = particleRepr.fromBinary(bytes); - const res = particleSchema.safeParse(json); + const res = particleSchema.safeParse(obj); if (!res.success) { throw new Error( @@ -92,7 +94,7 @@ export class Particle implements IParticle { data.id, data.timestamp, data.script, - toUint8Array(data.data), + new Uint8Array(data.data), data.ttl, data.init_peer_id, new Uint8Array(data.signature), @@ -154,16 +156,16 @@ export const cloneWithNewData = ( /** * Serializes particle into string suitable for sending through network */ -export const serializeToString = (particle: IParticle): string => { - return JSON.stringify({ +export const serializeParticle = (particle: IParticle): Uint8Array => { + return particleRepr.serialize({ action: "Particle", id: particle.id, init_peer_id: particle.initPeerId, timestamp: particle.timestamp, ttl: particle.ttl, script: particle.script, - signature: Array.from(particle.signature), - data: fromUint8Array(particle.data), + signature: particle.signature, + data: particle.data, }); }; From 0cd75383f5955ac01c98a17d3e54646555bfad74 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 23 Jan 2024 18:17:31 +0700 Subject: [PATCH 2/9] Fix types --- packages/core/js-client/package.json | 4 +- .../src/connection/RelayConnection.ts | 5 +- .../core/js-client/src/particle/Particle.ts | 17 ++++--- pnpm-lock.yaml | 48 +++++++++++++++++-- 4 files changed, 58 insertions(+), 16 deletions(-) diff --git a/packages/core/js-client/package.json b/packages/core/js-client/package.json index dd81c4a72..9ccb47719 100644 --- a/packages/core/js-client/package.json +++ b/packages/core/js-client/package.json @@ -30,10 +30,9 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@libp2p/utils": "5.2.2", "@chainsafe/libp2p-noise": "14.0.0", "@chainsafe/libp2p-yamux": "6.0.1", - "@fluencelabs/avm": "0.55.0", + "@fluencelabs/avm": "0.58.0", "@fluencelabs/interfaces": "workspace:*", "@fluencelabs/js-client-isomorphic": "workspace:*", "@fluencelabs/marine-worker": "0.5.1", @@ -44,6 +43,7 @@ "@libp2p/peer-id": "4.0.5", "@libp2p/peer-id-factory": "4.0.5", "@libp2p/ping": "1.0.10", + "@libp2p/utils": "5.2.2", "@libp2p/websockets": "8.0.12", "@multiformats/multiaddr": "12.1.12", "bs58": "5.0.0", diff --git a/packages/core/js-client/src/connection/RelayConnection.ts b/packages/core/js-client/src/connection/RelayConnection.ts index e7d92d9bd..315d710d4 100644 --- a/packages/core/js-client/src/connection/RelayConnection.ts +++ b/packages/core/js-client/src/connection/RelayConnection.ts @@ -29,8 +29,6 @@ import map from "it-map"; import { pipe } from "it-pipe"; import { createLibp2p, Libp2p } from "libp2p"; import { Subject } from "rxjs"; -import { fromString } from "uint8arrays/from-string"; -import { toString } from "uint8arrays/to-string"; import { KeyPair } from "../keypair/index.js"; import { IParticle } from "../particle/interfaces.js"; @@ -225,7 +223,7 @@ export class RelayConnection implements IConnection { ); } - private async processIncomingMessage(msg: Uint8array) { + private async processIncomingMessage(msg: Uint8Array) { let particle: Particle | undefined; try { @@ -290,7 +288,6 @@ export class RelayConnection implements IConnection { decode, (source) => { return map(source, (buf) => { - // TODO is subarray really needed now? return buf.subarray(); }); }, diff --git a/packages/core/js-client/src/particle/Particle.ts b/packages/core/js-client/src/particle/Particle.ts index b7670648c..77625c44a 100644 --- a/packages/core/js-client/src/particle/Particle.ts +++ b/packages/core/js-client/src/particle/Particle.ts @@ -14,9 +14,12 @@ * limitations under the License. */ -import { CallResultsArray } from "@fluencelabs/avm"; +import { + CallResultsArray, + MulticodecRepr, + MsgPackRepr, +} from "@fluencelabs/avm"; import { JSONValue } from "@fluencelabs/interfaces"; -import { MulticodecRepr, MsgPackRepr } from "@fluencelabs/avm" import { concat } from "uint8arrays/concat"; import { v4 as uuidv4 } from "uuid"; import { z } from "zod"; @@ -33,10 +36,10 @@ const particleSchema = z.object({ id: z.string(), timestamp: z.number().positive(), script: z.string(), - data: z.array(z.number()), + data: z.instanceof(Uint8Array), ttl: z.number().positive(), init_peer_id: z.string(), - signature: z.array(z.number()), + signature: z.instanceof(Uint8Array), }); export class Particle implements IParticle { @@ -94,10 +97,10 @@ export class Particle implements IParticle { data.id, data.timestamp, data.script, - new Uint8Array(data.data), + data.data, data.ttl, data.init_peer_id, - new Uint8Array(data.signature), + data.signature, ); } } @@ -157,7 +160,7 @@ export const cloneWithNewData = ( * Serializes particle into string suitable for sending through network */ export const serializeParticle = (particle: IParticle): Uint8Array => { - return particleRepr.serialize({ + return particleRepr.toBinary({ action: "Particle", id: particle.id, init_peer_id: particle.initPeerId, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fbe77c786..9fb2ba152 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -215,8 +215,8 @@ importers: specifier: 6.0.1 version: 6.0.1 '@fluencelabs/avm': - specifier: 0.55.0 - version: 0.55.0 + specifier: 0.58.0 + version: 0.58.0 '@fluencelabs/interfaces': specifier: workspace:* version: link:../interfaces @@ -2747,6 +2747,13 @@ packages: /@fluencelabs/avm@0.55.0: resolution: {integrity: sha512-4KaVnSCkWtoyXSX1UezKX5KRKkBdR+VmXdZwAGqgcqsDKuzTFstfsMO6SCp/njbCOK1Wm/t5Fb1HFDob/6vIog==} + /@fluencelabs/avm@0.58.0: + resolution: {integrity: sha512-ZDRgh4dPxWXTXCe0YJGzYhigz0ZYs7FbXroru0YMsytVEUcK0Yorn0Zvh/1gj5Mq5m++qG7NWF8u7sSqmoN3nQ==} + dependencies: + msgpack-lite: 0.1.26 + multicodec: 3.2.1 + dev: false + /@fluencelabs/marine-js@0.8.0: resolution: {integrity: sha512-exxp0T0Dk69dxnbpAiVc/qp66s8Jq/P71TRB9aeQZLZy3EQtVAMCBJvwQY8LzVVlYEyVjmqQkFG/N0rAeYU1vg==} dependencies: @@ -7781,6 +7788,10 @@ packages: resolution: {integrity: sha512-KGft0ldl31BZVV//jj+IAIGCxkvvUkkON+ScH6zfoX+l+omX6001ggyRSpI0Io2Hlro0ThXotswCtfzS8UkIiQ==} dev: false + /event-lite@0.1.3: + resolution: {integrity: sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw==} + dev: false + /eventemitter3@4.0.7: resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} @@ -8756,6 +8767,10 @@ packages: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} dev: false + /int64-buffer@0.1.10: + resolution: {integrity: sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==} + dev: false + /interface-datastore@8.2.10: resolution: {integrity: sha512-D8RuxMdjOPB+j6WMDJ+I2aXTDzUT6DIVjgzo1E+ODL7w8WrSFl9FXD2SYmgj6vVzdb7Kb5qmAI9pEnDZJz7ifg==} dependencies: @@ -10528,6 +10543,16 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + /msgpack-lite@0.1.26: + resolution: {integrity: sha512-SZ2IxeqZ1oRFGo0xFGbvBJWMp3yLIY9rlIJyxy8CGrwZn1f0ZK4r6jV/AM1r0FZMDUkWkglOk/eeKIL9g77Nxw==} + hasBin: true + dependencies: + event-lite: 0.1.3 + ieee754: 1.2.1 + int64-buffer: 0.1.10 + isarray: 1.0.0 + dev: false + /multicast-dns@7.2.5: resolution: {integrity: sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==} hasBin: true @@ -10536,6 +10561,14 @@ packages: thunky: 1.1.0 dev: false + /multicodec@3.2.1: + resolution: {integrity: sha512-+expTPftro8VAW8kfvcuNNNBgb9gPeNYV9dn+z1kJRWF2vih+/S79f2RVeIwmrJBUJ6NT9IUPWnZDQvegEh5pw==} + deprecated: This module has been superseded by the multiformats module + dependencies: + uint8arrays: 3.1.1 + varint: 6.0.0 + dev: false + /multiformats@11.0.1: resolution: {integrity: sha512-atWruyH34YiknSdL5yeIir00EDlJRpHzELYQxG7Iy29eCyL+VrZHpPrX5yqlik3jnuqpLpRKVZ0SGVb9UzKaSA==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} @@ -10554,6 +10587,10 @@ packages: resolution: {integrity: sha512-bt3R5iXe2O8xpp3wkmQhC73b/lC4S2ihU8Dndwcsysqbydqb8N+bpP116qMcClZ17g58iSIwtXUTcg2zT4sniA==} dev: false + /multiformats@9.9.0: + resolution: {integrity: sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==} + dev: false + /mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} dependencies: @@ -14127,6 +14164,12 @@ packages: uint8arrays: 5.0.1 dev: false + /uint8arrays@3.1.1: + resolution: {integrity: sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg==} + dependencies: + multiformats: 9.9.0 + dev: false + /uint8arrays@4.0.10: resolution: {integrity: sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==} dependencies: @@ -14348,7 +14391,6 @@ packages: /varint@6.0.0: resolution: {integrity: sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==} - dev: true /vary@1.1.2: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} From 7528091e03a81169200fa11762d4ce5f009e2a95 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Wed, 24 Jan 2024 18:31:06 -0300 Subject: [PATCH 3/9] fix(ci): use nox with msgpack protocol --- .github/workflows/e2e.yml | 4 ++-- .github/workflows/run-tests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index f266cf0a9..1e35cd068 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -43,7 +43,7 @@ jobs: uses: fluencelabs/aqua/.github/workflows/tests.yml@main with: js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" - nox-image: "fluencelabs/nox:unstable" + nox-image: "docker.fluence.dev/nox:feat-VM-407-msgpack-particle" flox: needs: - js-client @@ -51,4 +51,4 @@ jobs: uses: fluencelabs/flox/.github/workflows/tests.yml@main with: js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" - nox-image: "fluencelabs/nox:unstable" \ No newline at end of file + nox-image: "docker.fluence.dev/nox:feat-VM-407-msgpack-particle" \ No newline at end of file diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7cfd8bf95..f2c4691ba 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -28,4 +28,4 @@ jobs: uses: ./.github/workflows/tests.yml with: ref: ${{ github.ref }} - nox-image: "fluencelabs/nox:unstable" + nox-image: "docker.fluence.dev/nox:feat-VM-407-msgpack-particle" From 68faaae145c935c09635538470310cea140b1269 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Wed, 24 Jan 2024 20:02:36 -0300 Subject: [PATCH 4/9] fix(avm): avm 0.59.0 --- packages/core/interfaces/package.json | 2 +- .../core/js-client-isomorphic/package.json | 2 +- packages/core/js-client/package.json | 2 +- pnpm-lock.yaml | 31 +++++++------------ 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/packages/core/interfaces/package.json b/packages/core/interfaces/package.json index da6a1a975..72d187b53 100644 --- a/packages/core/interfaces/package.json +++ b/packages/core/interfaces/package.json @@ -50,7 +50,7 @@ "dependencies": {}, "devDependencies": { "@multiformats/multiaddr": "11.3.0", - "@fluencelabs/avm": "0.55.0", + "@fluencelabs/avm": "0.59.0", "hotscript": "1.0.13" } } diff --git a/packages/core/js-client-isomorphic/package.json b/packages/core/js-client-isomorphic/package.json index 022970b16..6866dd735 100644 --- a/packages/core/js-client-isomorphic/package.json +++ b/packages/core/js-client-isomorphic/package.json @@ -23,7 +23,7 @@ } }, "dependencies": { - "@fluencelabs/avm": "0.55.0", + "@fluencelabs/avm": "0.59.0", "@fluencelabs/marine-js": "0.8.0", "@fluencelabs/marine-worker": "0.5.1", "@fluencelabs/threads": "^2.0.0" diff --git a/packages/core/js-client/package.json b/packages/core/js-client/package.json index 9ccb47719..d9e3dba57 100644 --- a/packages/core/js-client/package.json +++ b/packages/core/js-client/package.json @@ -32,7 +32,7 @@ "dependencies": { "@chainsafe/libp2p-noise": "14.0.0", "@chainsafe/libp2p-yamux": "6.0.1", - "@fluencelabs/avm": "0.58.0", + "@fluencelabs/avm": "0.59.0", "@fluencelabs/interfaces": "workspace:*", "@fluencelabs/js-client-isomorphic": "workspace:*", "@fluencelabs/marine-worker": "0.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9fb2ba152..8a72d385d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -197,8 +197,8 @@ importers: packages/core/interfaces: devDependencies: '@fluencelabs/avm': - specifier: 0.55.0 - version: 0.55.0 + specifier: 0.59.0 + version: 0.59.0 '@multiformats/multiaddr': specifier: 11.3.0 version: 11.3.0 @@ -215,8 +215,8 @@ importers: specifier: 6.0.1 version: 6.0.1 '@fluencelabs/avm': - specifier: 0.58.0 - version: 0.58.0 + specifier: 0.59.0 + version: 0.59.0 '@fluencelabs/interfaces': specifier: workspace:* version: link:../interfaces @@ -330,8 +330,8 @@ importers: packages/core/js-client-isomorphic: dependencies: '@fluencelabs/avm': - specifier: 0.55.0 - version: 0.55.0 + specifier: 0.59.0 + version: 0.59.0 '@fluencelabs/marine-js': specifier: 0.8.0 version: 0.8.0 @@ -1898,6 +1898,8 @@ packages: uint8arraylist: 2.4.8 uint8arrays: 4.0.10 wherearewe: 2.0.1 + transitivePeerDependencies: + - supports-color dev: false /@chainsafe/libp2p-yamux@6.0.1: @@ -2744,15 +2746,11 @@ packages: resolution: {integrity: sha512-+JVbWmHeGB+X/BSqmk6/B0gwWJ4bEAxkepVTN8l0mVrJ5zRRmYaCKVplWy6Z3W012m3VVK3A1o3rm/fgfVrQkw==} dev: true - /@fluencelabs/avm@0.55.0: - resolution: {integrity: sha512-4KaVnSCkWtoyXSX1UezKX5KRKkBdR+VmXdZwAGqgcqsDKuzTFstfsMO6SCp/njbCOK1Wm/t5Fb1HFDob/6vIog==} - - /@fluencelabs/avm@0.58.0: - resolution: {integrity: sha512-ZDRgh4dPxWXTXCe0YJGzYhigz0ZYs7FbXroru0YMsytVEUcK0Yorn0Zvh/1gj5Mq5m++qG7NWF8u7sSqmoN3nQ==} + /@fluencelabs/avm@0.59.0: + resolution: {integrity: sha512-dm6CMCAq5HLEInbYICd17PlhDiKR5kxVFL4v4O0BfQhKskSA4riC+E/6pcQqj8XK7I3bKkFZCoY4bq1q6LDarw==} dependencies: msgpack-lite: 0.1.26 multicodec: 3.2.1 - dev: false /@fluencelabs/marine-js@0.8.0: resolution: {integrity: sha512-exxp0T0Dk69dxnbpAiVc/qp66s8Jq/P71TRB9aeQZLZy3EQtVAMCBJvwQY8LzVVlYEyVjmqQkFG/N0rAeYU1vg==} @@ -3148,6 +3146,8 @@ packages: protons-runtime: 5.2.2 uint8arraylist: 2.4.8 uint8arrays: 4.0.10 + transitivePeerDependencies: + - supports-color dev: false /@libp2p/crypto@4.0.1: @@ -7790,7 +7790,6 @@ packages: /event-lite@0.1.3: resolution: {integrity: sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw==} - dev: false /eventemitter3@4.0.7: resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} @@ -8769,7 +8768,6 @@ packages: /int64-buffer@0.1.10: resolution: {integrity: sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==} - dev: false /interface-datastore@8.2.10: resolution: {integrity: sha512-D8RuxMdjOPB+j6WMDJ+I2aXTDzUT6DIVjgzo1E+ODL7w8WrSFl9FXD2SYmgj6vVzdb7Kb5qmAI9pEnDZJz7ifg==} @@ -9053,7 +9051,6 @@ packages: /isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} - dev: false /isarray@2.0.5: resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} @@ -10551,7 +10548,6 @@ packages: ieee754: 1.2.1 int64-buffer: 0.1.10 isarray: 1.0.0 - dev: false /multicast-dns@7.2.5: resolution: {integrity: sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==} @@ -10567,7 +10563,6 @@ packages: dependencies: uint8arrays: 3.1.1 varint: 6.0.0 - dev: false /multiformats@11.0.1: resolution: {integrity: sha512-atWruyH34YiknSdL5yeIir00EDlJRpHzELYQxG7Iy29eCyL+VrZHpPrX5yqlik3jnuqpLpRKVZ0SGVb9UzKaSA==} @@ -10589,7 +10584,6 @@ packages: /multiformats@9.9.0: resolution: {integrity: sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==} - dev: false /mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} @@ -14168,7 +14162,6 @@ packages: resolution: {integrity: sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg==} dependencies: multiformats: 9.9.0 - dev: false /uint8arrays@4.0.10: resolution: {integrity: sha512-AnJNUGGDJAgFw/eWu/Xb9zrVKEGlwJJCaeInlf3BkecE/zcTobk5YXYIPNQJO1q5Hh1QZrQQHf0JvcHqz2hqoA==} From 57eb726c0ebeac405553366d20a2517d7bb8b55f Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Thu, 25 Jan 2024 21:55:52 +0700 Subject: [PATCH 5/9] Fix uint64 --- packages/core/js-client/package.json | 1 + packages/core/js-client/src/particle/Particle.ts | 3 ++- pnpm-lock.yaml | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/core/js-client/package.json b/packages/core/js-client/package.json index d9e3dba57..0ac84ccae 100644 --- a/packages/core/js-client/package.json +++ b/packages/core/js-client/package.json @@ -48,6 +48,7 @@ "@multiformats/multiaddr": "12.1.12", "bs58": "5.0.0", "debug": "4.3.4", + "int64-buffer": "1.0.1", "it-length-prefixed": "9.0.3", "it-map": "3.0.5", "it-pipe": "3.0.1", diff --git a/packages/core/js-client/src/particle/Particle.ts b/packages/core/js-client/src/particle/Particle.ts index 77625c44a..a18e4bce1 100644 --- a/packages/core/js-client/src/particle/Particle.ts +++ b/packages/core/js-client/src/particle/Particle.ts @@ -20,6 +20,7 @@ import { MsgPackRepr, } from "@fluencelabs/avm"; import { JSONValue } from "@fluencelabs/interfaces"; +import { Uint64BE } from "int64-buffer"; import { concat } from "uint8arrays/concat"; import { v4 as uuidv4 } from "uuid"; import { z } from "zod"; @@ -164,7 +165,7 @@ export const serializeParticle = (particle: IParticle): Uint8Array => { action: "Particle", id: particle.id, init_peer_id: particle.initPeerId, - timestamp: particle.timestamp, + timestamp: new Uint64BE(particle.timestamp), ttl: particle.ttl, script: particle.script, signature: particle.signature, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a72d385d..6b3bc8848 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -262,6 +262,9 @@ importers: debug: specifier: 4.3.4 version: 4.3.4 + int64-buffer: + specifier: 1.0.1 + version: 1.0.1 it-length-prefixed: specifier: 9.0.3 version: 9.0.3 @@ -8769,6 +8772,11 @@ packages: /int64-buffer@0.1.10: resolution: {integrity: sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==} + /int64-buffer@1.0.1: + resolution: {integrity: sha512-+3azY4pXrjAupJHU1V9uGERWlhoqNswJNji6aD/02xac7oxol508AsMC5lxKhEqyZeDFy3enq5OGWXF4u75hiw==} + engines: {node: '>= 4.5.0'} + dev: false + /interface-datastore@8.2.10: resolution: {integrity: sha512-D8RuxMdjOPB+j6WMDJ+I2aXTDzUT6DIVjgzo1E+ODL7w8WrSFl9FXD2SYmgj6vVzdb7Kb5qmAI9pEnDZJz7ifg==} dependencies: From 0922bef40129122ab5c550d302e8d3ffabbbf36c Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Fri, 26 Jan 2024 00:21:55 +0700 Subject: [PATCH 6/9] Fix --- packages/core/js-client/src/particle/Particle.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/js-client/src/particle/Particle.ts b/packages/core/js-client/src/particle/Particle.ts index a18e4bce1..0ad720876 100644 --- a/packages/core/js-client/src/particle/Particle.ts +++ b/packages/core/js-client/src/particle/Particle.ts @@ -168,8 +168,8 @@ export const serializeParticle = (particle: IParticle): Uint8Array => { timestamp: new Uint64BE(particle.timestamp), ttl: particle.ttl, script: particle.script, - signature: particle.signature, - data: particle.data, + signature: Array.from(particle.signature), + data: Array.from(particle.data), }); }; From ce5bc2e26346ceaead466d2ceaeb25d22a75fe49 Mon Sep 17 00:00:00 2001 From: folex <0xdxdy@gmail.com> Date: Thu, 25 Jan 2024 14:44:53 -0300 Subject: [PATCH 7/9] fix(ci): enable nox debug logs --- .github/e2e/docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index 76a0665f2..bbde12dde 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -37,7 +37,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" + RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" command: - --aqua-pool-size=2 - -t=7771 @@ -68,7 +68,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" + RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" command: - --aqua-pool-size=2 - -t=7772 @@ -98,7 +98,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" + RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" command: - --aqua-pool-size=2 - -t=7773 @@ -128,7 +128,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" + RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" command: - --aqua-pool-size=2 - -t=7774 @@ -158,7 +158,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" + RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" command: - --aqua-pool-size=2 - -t=7775 @@ -188,7 +188,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" + RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" command: - --aqua-pool-size=2 - -t=7776 From f644244c05b1ec3af5771a660e0c66027729d4d4 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Mon, 29 Jan 2024 21:24:20 +0700 Subject: [PATCH 8/9] Fix commonJS import --- packages/core/js-client/src/particle/Particle.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/js-client/src/particle/Particle.ts b/packages/core/js-client/src/particle/Particle.ts index 0ad720876..9d8c7025c 100644 --- a/packages/core/js-client/src/particle/Particle.ts +++ b/packages/core/js-client/src/particle/Particle.ts @@ -20,7 +20,7 @@ import { MsgPackRepr, } from "@fluencelabs/avm"; import { JSONValue } from "@fluencelabs/interfaces"; -import { Uint64BE } from "int64-buffer"; +import int64Buffer from "int64-buffer"; import { concat } from "uint8arrays/concat"; import { v4 as uuidv4 } from "uuid"; import { z } from "zod"; @@ -165,7 +165,7 @@ export const serializeParticle = (particle: IParticle): Uint8Array => { action: "Particle", id: particle.id, init_peer_id: particle.initPeerId, - timestamp: new Uint64BE(particle.timestamp), + timestamp: new int64Buffer.Uint64BE(particle.timestamp), ttl: particle.ttl, script: particle.script, signature: Array.from(particle.signature), From a9a365e63037df333abd0e3f0247653db625f5e0 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Mon, 29 Jan 2024 21:48:51 +0700 Subject: [PATCH 9/9] Revert "fix(ci): enable nox debug logs" This reverts commit ce5bc2e26346ceaead466d2ceaeb25d22a75fe49. --- .github/e2e/docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml index bbde12dde..76a0665f2 100644 --- a/.github/e2e/docker-compose.yml +++ b/.github/e2e/docker-compose.yml @@ -37,7 +37,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" + RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" command: - --aqua-pool-size=2 - -t=7771 @@ -68,7 +68,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" + RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" command: - --aqua-pool-size=2 - -t=7772 @@ -98,7 +98,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" + RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" command: - --aqua-pool-size=2 - -t=7773 @@ -128,7 +128,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" + RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" command: - --aqua-pool-size=2 - -t=7774 @@ -158,7 +158,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" + RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" command: - --aqua-pool-size=2 - -t=7775 @@ -188,7 +188,7 @@ services: FLUENCE_ENV_CONNECTOR_CONTRACT_ADDRESS: "0xea6777e8c011E7968605fd012A9Dd49401ec386C" FLUENCE_ENV_CONNECTOR_FROM_BLOCK: earliest FLUENCE_ENV_AQUA_IPFS_LOCAL_API_MULTIADDR: "/ip4/10.50.10.100/tcp/5001" - RUST_LOG: "debug,execution=trace,expired=info,effectors=info,dispatcher=info,aquamarine::plumber=info,aquamarine::partice_functions=debug,aquamarine::log=debug,aquamarine=info,aquamarine::aqua_runtime=warn,aquamarine::particle_executor=warn,ipfs_effector=off,ipfs_pure=off,system_services=debug,marine_core::module::marine_module=info,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=trace,wasmtime_cranelift=off,wasmtime_jit=off,libp2p_tcp=off,libp2p_swarm=off,particle_protocol::libp2p_protocol::upgrade=info,libp2p_mplex=off,particle_reap=debug" + RUST_LOG: "info,aquamarine=warn,tokio_threadpool=info,tokio_reactor=info,mio=info,tokio_io=info,soketto=info,yamux=info,multistream_select=info,libp2p_secio=info,libp2p_websocket::framed=info,libp2p_ping=info,libp2p_core::upgrade::apply=info,libp2p_kad::kbucket=info,cranelift_codegen=info,wasmer_wasi=info,cranelift_codegen=info,wasmer_wasi=info,run-console=debug" command: - --aqua-pool-size=2 - -t=7776