From 96ede60099a95a7c105bd1e6f3142ab8661576b2 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Fri, 18 Feb 2022 20:06:37 +0300 Subject: [PATCH] Switch to marine-web based AquaVM runner (#132) --- package-lock.json | 67 +++++++++++++++++++++++++++++++++++++---------- package.json | 5 ++-- 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index b1b6b902..ffda4544 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,9 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@chainsafe/libp2p-noise": "^4.1.1", - "@fluencelabs/avm": " 0.20.5", - "@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", @@ -728,17 +729,17 @@ "dev": true }, "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==", + "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", @@ -825,6 +826,20 @@ "copy-avm": "dist/copyAvm.js" } }, + "node_modules/@fluencelabs/fluence/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/fluence/node_modules/es6-promisify": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz", @@ -1045,6 +1060,14 @@ "multiformats": "^9.4.2" } }, + "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", @@ -10483,14 +10506,14 @@ "dev": true }, "@fluencelabs/avm": { - "version": "0.20.5", - "resolved": "https://registry.npmjs.org/@fluencelabs/avm/-/avm-0.20.5.tgz", - "integrity": "sha512-DhCnSzbG8hSkR1C0G/ci3jF+DciJVKpftO80GOdDYi1AXu6dYuqhZSOyWzMSwiHebprk1TDGZ/GSoQ6AGd4lLw==" + "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", @@ -10570,6 +10593,17 @@ "integrity": "sha512-dDtXh9iJ4U/lZhdS36Dsef55fzeCYGSYVBey1mi+OHzyDtQoxxAkac9HeMlgWWQoZzy9i43JmX0t0iX7tBt+4A==", "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" + } + }, "es6-promisify": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz", @@ -10788,6 +10822,11 @@ } } }, + "@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", diff --git a/package.json b/package.json index 501251d8..abcd5043 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,9 @@ }, "dependencies": { "@chainsafe/libp2p-noise": "^4.1.1", - "@fluencelabs/avm": " 0.20.5", - "@fluencelabs/avm-runner-background": "0.1.2", + "@fluencelabs/avm": "0.20.8", + "@fluencelabs/marine-js": "0.1.0", + "@fluencelabs/avm-runner-background": "0.2.0", "@fluencelabs/avm-runner-interface": "^0.2.0", "async": "3.2.0", "browser-or-node": "^2.0.0",