From f72e1d1503a49cf9b3d5cbc509506e7acc0a056a Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Tue, 1 Nov 2022 23:45:05 +0400 Subject: [PATCH 1/2] chore(deps): Update MarineJS to v0.3.28 --- packages/fluence-js/package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/packages/fluence-js/package.json b/packages/fluence-js/package.json index dd1bacb55..add0c06f0 100644 --- a/packages/fluence-js/package.json +++ b/packages/fluence-js/package.json @@ -29,7 +29,7 @@ "@fluencelabs/connection": "workspace:0.2.0", "@fluencelabs/interfaces": "workspace:0.1.0", "@fluencelabs/keypair": "workspace:0.2.0", - "@fluencelabs/marine-js": "0.3.18", + "@fluencelabs/marine-js": "0.3.28", "async": "3.2.3", "base64-js": "^1.5.1", "browser-or-node": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6972d1362..dc68ff689 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,7 +63,7 @@ importers: '@fluencelabs/fluence-network-environment': ^1.0.13 '@fluencelabs/interfaces': workspace:0.1.0 '@fluencelabs/keypair': workspace:0.2.0 - '@fluencelabs/marine-js': 0.3.18 + '@fluencelabs/marine-js': 0.3.28 '@types/bs58': ^4.0.1 '@types/jest': ^27.5.1 '@types/platform': ^1.3.4 @@ -93,7 +93,7 @@ importers: '@fluencelabs/connection': link:../fluence-connection '@fluencelabs/interfaces': link:../fluence-interfaces '@fluencelabs/keypair': link:../fluence-keypair - '@fluencelabs/marine-js': 0.3.18_rl5xm3oiydas7snsul2pa47p2m + '@fluencelabs/marine-js': 0.3.28_rl5xm3oiydas7snsul2pa47p2m async: 3.2.3 base64-js: 1.5.1 browser-or-node: 2.0.0 @@ -600,6 +600,26 @@ packages: - jest - supports-color - typescript + dev: true + + /@fluencelabs/marine-js/0.3.28_rl5xm3oiydas7snsul2pa47p2m: + resolution: {integrity: sha512-pf8rvdtZ5lSJ57L8Nl1K3dqyUkPpgwhfhDB91jt82fPoQnwm51EAYlU5m4Uo+7DJvquBBfmWklJ2tEq+HSuCxw==} + dependencies: + '@wasmer/wasi': 0.12.0 + '@wasmer/wasmfs': 0.12.0 + browser-or-node: 2.0.0 + buffer: 6.0.3 + threads: 1.7.0 + ts-jest: 27.1.5_rl5xm3oiydas7snsul2pa47p2m + transitivePeerDependencies: + - '@babel/core' + - '@types/jest' + - babel-jest + - esbuild + - jest + - supports-color + - typescript + dev: false /@istanbuljs/load-nyc-config/1.1.0: resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} From 0b4bcf02341a0dd1ee74a84b008ade7a8d391704 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Thu, 3 Nov 2022 20:23:37 +0400 Subject: [PATCH 2/2] Use working version of marine-js --- packages/fluence-js/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/fluence-js/package.json b/packages/fluence-js/package.json index add0c06f0..711193965 100644 --- a/packages/fluence-js/package.json +++ b/packages/fluence-js/package.json @@ -29,7 +29,7 @@ "@fluencelabs/connection": "workspace:0.2.0", "@fluencelabs/interfaces": "workspace:0.1.0", "@fluencelabs/keypair": "workspace:0.2.0", - "@fluencelabs/marine-js": "0.3.28", + "@fluencelabs/marine-js": "0.3.29", "async": "3.2.3", "base64-js": "^1.5.1", "browser-or-node": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc68ff689..4ce60c0f3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,7 +63,7 @@ importers: '@fluencelabs/fluence-network-environment': ^1.0.13 '@fluencelabs/interfaces': workspace:0.1.0 '@fluencelabs/keypair': workspace:0.2.0 - '@fluencelabs/marine-js': 0.3.28 + '@fluencelabs/marine-js': 0.3.29 '@types/bs58': ^4.0.1 '@types/jest': ^27.5.1 '@types/platform': ^1.3.4 @@ -93,7 +93,7 @@ importers: '@fluencelabs/connection': link:../fluence-connection '@fluencelabs/interfaces': link:../fluence-interfaces '@fluencelabs/keypair': link:../fluence-keypair - '@fluencelabs/marine-js': 0.3.28_rl5xm3oiydas7snsul2pa47p2m + '@fluencelabs/marine-js': 0.3.29_rl5xm3oiydas7snsul2pa47p2m async: 3.2.3 base64-js: 1.5.1 browser-or-node: 2.0.0 @@ -602,8 +602,8 @@ packages: - typescript dev: true - /@fluencelabs/marine-js/0.3.28_rl5xm3oiydas7snsul2pa47p2m: - resolution: {integrity: sha512-pf8rvdtZ5lSJ57L8Nl1K3dqyUkPpgwhfhDB91jt82fPoQnwm51EAYlU5m4Uo+7DJvquBBfmWklJ2tEq+HSuCxw==} + /@fluencelabs/marine-js/0.3.29_rl5xm3oiydas7snsul2pa47p2m: + resolution: {integrity: sha512-0FAoheUCTyS6OVOdnDVi+cp6cFBIjfXWcIPGY6Vd5LYNCMHAtqnuNzZT0XfyeYzo3YnXVsCPrl+J6OcezIwaew==} dependencies: '@wasmer/wasi': 0.12.0 '@wasmer/wasmfs': 0.12.0