From 95eccc86363118ac8b1854182af6e1344ac1ea7f Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Mon, 6 Mar 2023 13:37:34 +0100 Subject: [PATCH 1/6] Pass custom provider options and publish dev libs --- libs/ghaction-helper/package.json | 8 ++++---- libs/ghaction-helper/src/methods.ts | 7 ++++++- libs/remix-analyzer/package.json | 8 ++++---- libs/remix-astwalker/package.json | 6 +++--- libs/remix-debug/package.json | 12 ++++++------ libs/remix-lib/package.json | 4 ++-- libs/remix-simulator/package.json | 6 +++--- libs/remix-solidity/package.json | 6 +++--- libs/remix-tests/package.json | 10 +++++----- libs/remix-url-resolver/package.json | 4 ++-- libs/remix-ws-templates/package.json | 4 ++-- 11 files changed, 40 insertions(+), 35 deletions(-) diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index b1f397657a..f9087f4ca8 100644 --- a/libs/ghaction-helper/package.json +++ b/libs/ghaction-helper/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/ghaction-helper", - "version": "0.1.6", + "version": "0.1.7-alpha.5", "description": "Solidity Tests GitHub Action Helper", "main": "src/index.js", "scripts": { @@ -19,16 +19,16 @@ }, "homepage": "https://github.com/ethereum/remix-project#readme", "devDependencies": { - "@remix-project/remix-solidity": "^0.5.10", + "@remix-project/remix-solidity": "^0.5.11-alpha.5", "@types/chai": "^4.3.4", "typescript": "^4.9.3" }, "dependencies": { "@ethereum-waffle/chai": "^3.4.4", - "@remix-project/remix-simulator": "^0.2.24", + "@remix-project/remix-simulator": "^0.2.25-alpha.5", "chai": "^4.3.7", "ethers": "^5.7.2" }, "types": "./src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23" + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" } \ No newline at end of file diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts index 46aed363c0..6c73d24c18 100644 --- a/libs/ghaction-helper/src/methods.ts +++ b/libs/ghaction-helper/src/methods.ts @@ -4,8 +4,13 @@ import { Provider } from '@remix-project/remix-simulator' import { getArtifactsByContractName } from './artifacts-helper' import { SignerWithAddress } from './signer' -global.remixProvider = new Provider({ fork: null }) +const providerConfig = { + fork: global.fork || null, + nodeUrl: global.nodeUrl || null, + blockNumber: global.blockNumber || null +} +global.remixProvider = new Provider(providerConfig) const isFactoryOptions = (signerOrOptions: any) => { if (!signerOrOptions || signerOrOptions === undefined || signerOrOptions instanceof ethers.Signer) return false return true diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index e9b700f0ad..4bd6547204 100644 --- a/libs/remix-analyzer/package.json +++ b/libs/remix-analyzer/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-analyzer", - "version": "0.5.33", + "version": "0.5.34-alpha.5", "description": "Tool to perform static analysis on Solidity smart contracts", "scripts": { "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts" @@ -25,8 +25,8 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.54", - "@remix-project/remix-lib": "^0.5.24", + "@remix-project/remix-astwalker": "^0.0.55-alpha.5", + "@remix-project/remix-lib": "^0.5.25-alpha.5", "async": "^2.6.2", "ethers": "^5.4.2", "ethjs-util": "^0.1.6", @@ -50,6 +50,6 @@ "typescript": "^3.7.5" }, "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23", + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", "main": "./src/index.js" } \ No newline at end of file diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json index 50101ee834..e6e61ea74b 100644 --- a/libs/remix-astwalker/package.json +++ b/libs/remix-astwalker/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-astwalker", - "version": "0.0.54", + "version": "0.0.55-alpha.5", "description": "Tool to walk through Solidity AST", "main": "src/index.js", "scripts": { @@ -37,7 +37,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.24", + "@remix-project/remix-lib": "^0.5.25-alpha.5", "@types/tape": "^4.2.33", "async": "^2.6.2", "ethers": "^5.4.2", @@ -53,6 +53,6 @@ "tap-spec": "^5.0.0" }, "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23", + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json index 868fe3d4b5..8c0b1dacc0 100644 --- a/libs/remix-debug/package.json +++ b/libs/remix-debug/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-debug", - "version": "0.5.24", + "version": "0.5.25-alpha.5", "description": "Tool to debug Ethereum transactions", "contributors": [ { @@ -26,10 +26,10 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.54", - "@remix-project/remix-lib": "^0.5.24", - "@remix-project/remix-simulator": "^0.2.24", - "@remix-project/remix-solidity": "^0.5.10", + "@remix-project/remix-astwalker": "^0.0.55-alpha.5", + "@remix-project/remix-lib": "^0.5.25-alpha.5", + "@remix-project/remix-simulator": "^0.2.25-alpha.5", + "@remix-project/remix-solidity": "^0.5.11-alpha.5", "ansi-gray": "^0.1.1", "async": "^2.6.2", "color-support": "^1.1.3", @@ -69,6 +69,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme", "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23", + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json index 12e47f9839..f61c2e0f48 100644 --- a/libs/remix-lib/package.json +++ b/libs/remix-lib/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-lib", - "version": "0.5.24", + "version": "0.5.25-alpha.5", "description": "Library to various Remix tools", "contributors": [ { @@ -51,6 +51,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme", "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23", + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json index 6d07ab48b6..caa05635a3 100644 --- a/libs/remix-simulator/package.json +++ b/libs/remix-simulator/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-simulator", - "version": "0.2.24", + "version": "0.2.25-alpha.5", "description": "Ethereum IDE and tools for the web", "contributors": [ { @@ -22,7 +22,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.24", + "@remix-project/remix-lib": "^0.5.25-alpha.5", "ansi-gray": "^0.1.1", "async": "^3.1.0", "body-parser": "^1.18.2", @@ -67,6 +67,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme", "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23", + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json index 83c8882dc5..a7d24cc3e9 100644 --- a/libs/remix-solidity/package.json +++ b/libs/remix-solidity/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-solidity", - "version": "0.5.10", + "version": "0.5.11-alpha.5", "description": "Tool to load and run Solidity compiler", "main": "src/index.js", "types": "src/index.d.ts", @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.24", + "@remix-project/remix-lib": "^0.5.25-alpha.5", "async": "^2.6.2", "eslint-scope": "^5.0.0", "ethers": "^5.4.2", @@ -57,5 +57,5 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme", "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23" + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" } \ No newline at end of file diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index a395848323..3881f1c972 100644 --- a/libs/remix-tests/package.json +++ b/libs/remix-tests/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-tests", - "version": "0.2.24", + "version": "0.2.25-alpha.5", "description": "Tool to test Solidity smart contracts", "main": "src/index.js", "types": "./src/index.d.ts", @@ -41,9 +41,9 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.24", - "@remix-project/remix-simulator": "^0.2.24", - "@remix-project/remix-solidity": "^0.5.10", + "@remix-project/remix-lib": "^0.5.25-alpha.5", + "@remix-project/remix-simulator": "^0.2.25-alpha.5", + "@remix-project/remix-solidity": "^0.5.11-alpha.5", "@remix-project/remix-url-resolver": "^0.0.42", "ansi-gray": "^0.1.1", "async": "^2.6.0", @@ -78,5 +78,5 @@ "typescript": "^3.3.1" }, "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23" + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" } \ No newline at end of file diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index d66a834954..c54eb64b69 100644 --- a/libs/remix-url-resolver/package.json +++ b/libs/remix-url-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-url-resolver", - "version": "0.0.46", + "version": "0.0.47-alpha.5", "description": "Solidity import url resolver engine", "main": "src/index.js", "types": "src/index.d.ts", @@ -40,5 +40,5 @@ "typescript": "^3.1.6" }, "typings": "src/index.d.ts", - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23" + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" } \ No newline at end of file diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index debc24e3b8..2303466b04 100644 --- a/libs/remix-ws-templates/package.json +++ b/libs/remix-ws-templates/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-ws-templates", - "version": "1.0.11", + "version": "1.0.12-alpha.5", "description": "Create a Remix IDE workspace using different templates", "main": "src/index.js", "types": "src/index.d.ts", @@ -24,5 +24,5 @@ "ethers": "^5.4.2", "web3": "^1.5.1" }, - "gitHead": "c1415e0c3751af8bf53292d67fedf68e15bf3b23" + "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" } \ No newline at end of file From 56caf126c6447116be1f65b6fb406e97bdc60f5c Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Tue, 7 Mar 2023 13:59:38 +0100 Subject: [PATCH 2/6] Added options for fork, nodeUrl and blockNumber to remix-test --- libs/remix-tests/src/run.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/remix-tests/src/run.ts b/libs/remix-tests/src/run.ts index 070b623520..ada8ab2ea8 100644 --- a/libs/remix-tests/src/run.ts +++ b/libs/remix-tests/src/run.ts @@ -52,6 +52,9 @@ commander .option('-o, --optimize ', 'enable/disable optimization', mapOptimize) .option('-r, --runs ', 'set runs (e.g: 150, 250 etc)') .option('-v, --verbose ', 'set verbosity level (0 to 5)', mapVerbosity) + .option('-f, --fork ', 'set hard fork (e.g: istanbul, berlin etc. See full list of hard forks here: https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/common/src/hardforks)') + .option('-n, --nodeUrl ', 'set node url (e.g: https://mainnet.infura.io/v3/your-api-key)') + .option('-b, --blockNumber ', 'set block number (e.g: 123456)') .argument('file_path', 'path to test file or directory') .action(async (file_path) => { const options = commander.opts(); @@ -114,8 +117,17 @@ commander log.info(`Runs set to ${compilerConfig.runs}`) } + if (options.fork && options.nodeUrl) { + log.info('Using hard fork ' + colors.green(options.fork) + ' and node url ' + colors.blue(options.nodeUrl)) + } + + const providerConfig = { + fork: options.fork || null, + nodeUrl: options.nodeUrl || null, + blockNumber: options.blockNumber || null + } const web3 = new Web3() - const provider: any = new Provider() + const provider: any = new Provider(providerConfig) await provider.init() web3.setProvider(provider) extend(web3) From a95f2f7e44d02e718b71091485ee830ed0d6d59b Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Tue, 7 Mar 2023 14:04:23 +0100 Subject: [PATCH 3/6] Publish libs dev version --- libs/ghaction-helper/package.json | 8 ++++---- libs/remix-analyzer/package.json | 8 ++++---- libs/remix-astwalker/package.json | 6 +++--- libs/remix-debug/package.json | 12 ++++++------ libs/remix-lib/package.json | 4 ++-- libs/remix-simulator/package.json | 6 +++--- libs/remix-solidity/package.json | 6 +++--- libs/remix-tests/package.json | 10 +++++----- libs/remix-url-resolver/package.json | 4 ++-- libs/remix-ws-templates/package.json | 4 ++-- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index f9087f4ca8..638944423a 100644 --- a/libs/ghaction-helper/package.json +++ b/libs/ghaction-helper/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/ghaction-helper", - "version": "0.1.7-alpha.5", + "version": "0.1.7-alpha.6", "description": "Solidity Tests GitHub Action Helper", "main": "src/index.js", "scripts": { @@ -19,16 +19,16 @@ }, "homepage": "https://github.com/ethereum/remix-project#readme", "devDependencies": { - "@remix-project/remix-solidity": "^0.5.11-alpha.5", + "@remix-project/remix-solidity": "^0.5.11-alpha.6", "@types/chai": "^4.3.4", "typescript": "^4.9.3" }, "dependencies": { "@ethereum-waffle/chai": "^3.4.4", - "@remix-project/remix-simulator": "^0.2.25-alpha.5", + "@remix-project/remix-simulator": "^0.2.25-alpha.6", "chai": "^4.3.7", "ethers": "^5.7.2" }, "types": "./src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" } \ No newline at end of file diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index 4bd6547204..bc9a631b62 100644 --- a/libs/remix-analyzer/package.json +++ b/libs/remix-analyzer/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-analyzer", - "version": "0.5.34-alpha.5", + "version": "0.5.34-alpha.6", "description": "Tool to perform static analysis on Solidity smart contracts", "scripts": { "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts" @@ -25,8 +25,8 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.55-alpha.5", - "@remix-project/remix-lib": "^0.5.25-alpha.5", + "@remix-project/remix-astwalker": "^0.0.55-alpha.6", + "@remix-project/remix-lib": "^0.5.25-alpha.6", "async": "^2.6.2", "ethers": "^5.4.2", "ethjs-util": "^0.1.6", @@ -50,6 +50,6 @@ "typescript": "^3.7.5" }, "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", "main": "./src/index.js" } \ No newline at end of file diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json index e6e61ea74b..1877cc8ffa 100644 --- a/libs/remix-astwalker/package.json +++ b/libs/remix-astwalker/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-astwalker", - "version": "0.0.55-alpha.5", + "version": "0.0.55-alpha.6", "description": "Tool to walk through Solidity AST", "main": "src/index.js", "scripts": { @@ -37,7 +37,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.5", + "@remix-project/remix-lib": "^0.5.25-alpha.6", "@types/tape": "^4.2.33", "async": "^2.6.2", "ethers": "^5.4.2", @@ -53,6 +53,6 @@ "tap-spec": "^5.0.0" }, "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json index 8c0b1dacc0..e61e3d0489 100644 --- a/libs/remix-debug/package.json +++ b/libs/remix-debug/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-debug", - "version": "0.5.25-alpha.5", + "version": "0.5.25-alpha.6", "description": "Tool to debug Ethereum transactions", "contributors": [ { @@ -26,10 +26,10 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.55-alpha.5", - "@remix-project/remix-lib": "^0.5.25-alpha.5", - "@remix-project/remix-simulator": "^0.2.25-alpha.5", - "@remix-project/remix-solidity": "^0.5.11-alpha.5", + "@remix-project/remix-astwalker": "^0.0.55-alpha.6", + "@remix-project/remix-lib": "^0.5.25-alpha.6", + "@remix-project/remix-simulator": "^0.2.25-alpha.6", + "@remix-project/remix-solidity": "^0.5.11-alpha.6", "ansi-gray": "^0.1.1", "async": "^2.6.2", "color-support": "^1.1.3", @@ -69,6 +69,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme", "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json index f61c2e0f48..ec32c30e5b 100644 --- a/libs/remix-lib/package.json +++ b/libs/remix-lib/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-lib", - "version": "0.5.25-alpha.5", + "version": "0.5.25-alpha.6", "description": "Library to various Remix tools", "contributors": [ { @@ -51,6 +51,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme", "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json index caa05635a3..be95616c77 100644 --- a/libs/remix-simulator/package.json +++ b/libs/remix-simulator/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-simulator", - "version": "0.2.25-alpha.5", + "version": "0.2.25-alpha.6", "description": "Ethereum IDE and tools for the web", "contributors": [ { @@ -22,7 +22,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.5", + "@remix-project/remix-lib": "^0.5.25-alpha.6", "ansi-gray": "^0.1.1", "async": "^3.1.0", "body-parser": "^1.18.2", @@ -67,6 +67,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme", "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd", + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json index a7d24cc3e9..ce0894d032 100644 --- a/libs/remix-solidity/package.json +++ b/libs/remix-solidity/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-solidity", - "version": "0.5.11-alpha.5", + "version": "0.5.11-alpha.6", "description": "Tool to load and run Solidity compiler", "main": "src/index.js", "types": "src/index.d.ts", @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.5", + "@remix-project/remix-lib": "^0.5.25-alpha.6", "async": "^2.6.2", "eslint-scope": "^5.0.0", "ethers": "^5.4.2", @@ -57,5 +57,5 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme", "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" } \ No newline at end of file diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index 3881f1c972..0a8be1650f 100644 --- a/libs/remix-tests/package.json +++ b/libs/remix-tests/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-tests", - "version": "0.2.25-alpha.5", + "version": "0.2.25-alpha.6", "description": "Tool to test Solidity smart contracts", "main": "src/index.js", "types": "./src/index.d.ts", @@ -41,9 +41,9 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.5", - "@remix-project/remix-simulator": "^0.2.25-alpha.5", - "@remix-project/remix-solidity": "^0.5.11-alpha.5", + "@remix-project/remix-lib": "^0.5.25-alpha.6", + "@remix-project/remix-simulator": "^0.2.25-alpha.6", + "@remix-project/remix-solidity": "^0.5.11-alpha.6", "@remix-project/remix-url-resolver": "^0.0.42", "ansi-gray": "^0.1.1", "async": "^2.6.0", @@ -78,5 +78,5 @@ "typescript": "^3.3.1" }, "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" } \ No newline at end of file diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index c54eb64b69..78cbb75c76 100644 --- a/libs/remix-url-resolver/package.json +++ b/libs/remix-url-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-url-resolver", - "version": "0.0.47-alpha.5", + "version": "0.0.47-alpha.6", "description": "Solidity import url resolver engine", "main": "src/index.js", "types": "src/index.d.ts", @@ -40,5 +40,5 @@ "typescript": "^3.1.6" }, "typings": "src/index.d.ts", - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" } \ No newline at end of file diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index 2303466b04..b967d00fa1 100644 --- a/libs/remix-ws-templates/package.json +++ b/libs/remix-ws-templates/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-ws-templates", - "version": "1.0.12-alpha.5", + "version": "1.0.12-alpha.6", "description": "Create a Remix IDE workspace using different templates", "main": "src/index.js", "types": "src/index.d.ts", @@ -24,5 +24,5 @@ "ethers": "^5.4.2", "web3": "^1.5.1" }, - "gitHead": "c033bfd22c72fd3b0c059170019e40b021f6b3cd" + "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" } \ No newline at end of file From 944dec5487180ecea3bde1aa3ee2264eb9d4af90 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Tue, 7 Mar 2023 14:41:47 +0100 Subject: [PATCH 4/6] Fix failing test --- libs/remix-tests/tests/testRunner.cli.spec.ts | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libs/remix-tests/tests/testRunner.cli.spec.ts b/libs/remix-tests/tests/testRunner.cli.spec.ts index 10e04453d5..80bfcbdef9 100644 --- a/libs/remix-tests/tests/testRunner.cli.spec.ts +++ b/libs/remix-tests/tests/testRunner.cli.spec.ts @@ -37,13 +37,19 @@ Arguments: file_path path to test file or directory Options: - -V, --version output the version number - -c, --compiler set compiler version (e.g: 0.6.1, 0.7.1 etc) - -e, --evm set EVM version (e.g: petersburg, istanbul etc) - -o, --optimize enable/disable optimization - -r, --runs set runs (e.g: 150, 250 etc) - -v, --verbose set verbosity level (0 to 5) - -h, --help display help for command +-V, --version output the version number +-c, --compiler set compiler version (e.g: 0.6.1, 0.7.1 etc) +-e, --evm set EVM version (e.g: petersburg, istanbul etc) +-o, --optimize enable/disable optimization +-r, --runs set runs (e.g: 150, 250 etc) +-v, --verbose set verbosity level (0 to 5) +-f, --fork set hard fork (e.g: istanbul, berlin etc. See + full list of hard forks here: + https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/common/src/hardforks) +-n, --nodeUrl set node url (e.g: + https://mainnet.infura.io/v3/your-api-key) +-b, --blockNumber set block number (e.g: 123456) +-h, --help display help for command Commands: version output the version number From 4519c65bda18e157426353868f70db74489f4b0f Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Tue, 7 Mar 2023 15:00:58 +0100 Subject: [PATCH 5/6] Fix failing test --- libs/remix-tests/tests/testRunner.cli.spec.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libs/remix-tests/tests/testRunner.cli.spec.ts b/libs/remix-tests/tests/testRunner.cli.spec.ts index 80bfcbdef9..16bd565cce 100644 --- a/libs/remix-tests/tests/testRunner.cli.spec.ts +++ b/libs/remix-tests/tests/testRunner.cli.spec.ts @@ -34,26 +34,26 @@ describe('testRunner: remix-tests CLI', function(){ const expectedHelp = `Usage: remix-tests [options] [command] Arguments: - file_path path to test file or directory + file_path path to test file or directory Options: --V, --version output the version number --c, --compiler set compiler version (e.g: 0.6.1, 0.7.1 etc) --e, --evm set EVM version (e.g: petersburg, istanbul etc) --o, --optimize enable/disable optimization --r, --runs set runs (e.g: 150, 250 etc) --v, --verbose set verbosity level (0 to 5) --f, --fork set hard fork (e.g: istanbul, berlin etc. See - full list of hard forks here: - https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/common/src/hardforks) --n, --nodeUrl set node url (e.g: - https://mainnet.infura.io/v3/your-api-key) --b, --blockNumber set block number (e.g: 123456) --h, --help display help for command + -V, --version output the version number + -c, --compiler set compiler version (e.g: 0.6.1, 0.7.1 etc) + -e, --evm set EVM version (e.g: petersburg, istanbul etc) + -o, --optimize enable/disable optimization + -r, --runs set runs (e.g: 150, 250 etc) + -v, --verbose set verbosity level (0 to 5) + -f, --fork set hard fork (e.g: istanbul, berlin etc. See + full list of hard forks here: + https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/common/src/hardforks) + -n, --nodeUrl set node url (e.g: + https://mainnet.infura.io/v3/your-api-key) + -b, --blockNumber set block number (e.g: 123456) + -h, --help display help for command Commands: - version output the version number - help output usage information` + version output the version number + help output usage information` expect(res.stdout.toString().trim()).to.equal(expectedHelp) }) From 924dca66c2d2261d916a3c764ed99f5b671ac0c8 Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 9 Mar 2023 10:47:19 +0100 Subject: [PATCH 6/6] Refactor ghaction methods and publish libs --- libs/ghaction-helper/package.json | 11 +++---- libs/ghaction-helper/src/methods.ts | 43 ++++++++++++++-------------- libs/remix-analyzer/package.json | 8 +++--- libs/remix-astwalker/package.json | 6 ++-- libs/remix-debug/package.json | 12 ++++---- libs/remix-lib/package.json | 4 +-- libs/remix-simulator/package.json | 6 ++-- libs/remix-solidity/package.json | 6 ++-- libs/remix-tests/package.json | 10 +++---- libs/remix-url-resolver/package.json | 4 +-- libs/remix-ws-templates/package.json | 4 +-- 11 files changed, 57 insertions(+), 57 deletions(-) diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index 638944423a..e307cac4b1 100644 --- a/libs/ghaction-helper/package.json +++ b/libs/ghaction-helper/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/ghaction-helper", - "version": "0.1.7-alpha.6", + "version": "0.1.7-alpha.10", "description": "Solidity Tests GitHub Action Helper", "main": "src/index.js", "scripts": { @@ -19,16 +19,17 @@ }, "homepage": "https://github.com/ethereum/remix-project#readme", "devDependencies": { - "@remix-project/remix-solidity": "^0.5.11-alpha.6", + "@remix-project/remix-solidity": "^0.5.11-alpha.10", "@types/chai": "^4.3.4", "typescript": "^4.9.3" }, "dependencies": { "@ethereum-waffle/chai": "^3.4.4", - "@remix-project/remix-simulator": "^0.2.25-alpha.6", + "@remix-project/remix-simulator": "^0.2.25-alpha.10", "chai": "^4.3.7", - "ethers": "^5.7.2" + "ethers": "^5.7.2", + "web3": "^1.5.3" }, "types": "./src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" } \ No newline at end of file diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts index 6c73d24c18..fe82378018 100644 --- a/libs/ghaction-helper/src/methods.ts +++ b/libs/ghaction-helper/src/methods.ts @@ -3,14 +3,23 @@ import { ethers } from "ethers" import { Provider } from '@remix-project/remix-simulator' import { getArtifactsByContractName } from './artifacts-helper' import { SignerWithAddress } from './signer' +import Web3 from "web3" -const providerConfig = { - fork: global.fork || null, - nodeUrl: global.nodeUrl || null, - blockNumber: global.blockNumber || null -} +(async () => { + const providerConfig = { + fork: global.fork || null, + nodeUrl: global.nodeUrl || null, + blockNumber: global.blockNumber || null + } + + global.remixProvider = new Provider(providerConfig) + await global.remixProvider.init() + global.web3Provider = new ethers.providers.Web3Provider(global.remixProvider) + global.provider = global.web3Provider + global.ethereum = global.web3Provider + global.web3 = new Web3(global.web3Provider) +})() -global.remixProvider = new Provider(providerConfig) const isFactoryOptions = (signerOrOptions: any) => { if (!signerOrOptions || signerOrOptions === undefined || signerOrOptions instanceof ethers.Signer) return false return true @@ -164,17 +173,15 @@ const resultToArtifact = (result: any) => { } const getContractFactory = async (contractNameOrABI: ethers.ContractInterface, bytecode?: string, signerOrOptions = null) => { - //@ts-ignore - if (!global.remixProvider.Transactions.txRunnerInstance) await remixProvider.init() if (bytecode && contractNameOrABI) { //@ts-ignore - return new ethers.ContractFactory(contractNameOrABI, bytecode, signerOrOptions || (new ethers.providers.Web3Provider(remixProvider)).getSigner()) + return new ethers.ContractFactory(contractNameOrABI, bytecode, signerOrOptions || web3Provider.getSigner()) } else if (typeof contractNameOrABI === 'string') { const contract = await getArtifactsByContractName(contractNameOrABI) if (contract) { //@ts-ignore - return new ethers.ContractFactory(contract.abi, contract.evm.bytecode.object, signerOrOptions || (new ethers.providers.Web3Provider(remixProvider)).getSigner()) + return new ethers.ContractFactory(contract.abi, contract.evm.bytecode.object, signerOrOptions || web3Provider.getSigner()) } else { throw new Error('Contract artifacts not found') } @@ -185,9 +192,7 @@ const getContractFactory = async (contractNameOrABI: ethers.ContractInterface, b const getContractAt = async (contractNameOrABI: ethers.ContractInterface, address: string, signer = null) => { //@ts-ignore - if (!global.remixProvider.Transactions.txRunnerInstance) await remixProvider.init() - //@ts-ignore - const provider = new ethers.providers.Web3Provider(remixProvider) + const provider = web3Provider if(typeof contractNameOrABI === 'string') { const result = await getArtifactsByContractName(contractNameOrABI) @@ -204,9 +209,7 @@ const getContractAt = async (contractNameOrABI: ethers.ContractInterface, addres const getSigner = async (address: string) => { //@ts-ignore - if (!global.remixProvider.Transactions.txRunnerInstance) await remixProvider.init() - //@ts-ignore - const provider = new ethers.providers.Web3Provider(remixProvider) + const provider = web3Provider const signer = provider.getSigner(address) return SignerWithAddress.create(signer) @@ -214,17 +217,13 @@ const getSigner = async (address: string) => { const getSigners = async () => { //@ts-ignore - if (!global.remixProvider.Transactions.txRunnerInstance) await remixProvider.init() - //@ts-ignore - const provider = new ethers.providers.Web3Provider(remixProvider) + const provider = web3Provider const accounts = await provider.listAccounts() return await Promise.all( accounts.map((account: any) => getSigner(account))) } const getContractFactoryFromArtifact = async (artifact: any, signerOrOptions: { signer: any, libraries: any }) => { - //@ts-ignore - if (!global.remixProvider.Transactions.txRunnerInstance) await remixProvider.init() let libraries = {} let signer @@ -250,7 +249,7 @@ If you want to call a contract using ${artifact.contractName} as its interface u const linkedBytecode = await collectLibrariesAndLink(artifact, libraries) //@ts-ignore - return new ethers.ContractFactory(artifact.abi, linkedBytecode || artifact.bytecode, signer || (new ethers.providers.Web3Provider(remixProvider)).getSigner()) + return new ethers.ContractFactory(artifact.abi, linkedBytecode || artifact.bytecode, signer || web3Provider.getSigner()) } const getContractAtFromArtifact = async (artifact: any, address: string, signerOrOptions = null) => { diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index bc9a631b62..6fdd00e1e8 100644 --- a/libs/remix-analyzer/package.json +++ b/libs/remix-analyzer/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-analyzer", - "version": "0.5.34-alpha.6", + "version": "0.5.34-alpha.10", "description": "Tool to perform static analysis on Solidity smart contracts", "scripts": { "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts" @@ -25,8 +25,8 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.55-alpha.6", - "@remix-project/remix-lib": "^0.5.25-alpha.6", + "@remix-project/remix-astwalker": "^0.0.55-alpha.10", + "@remix-project/remix-lib": "^0.5.25-alpha.10", "async": "^2.6.2", "ethers": "^5.4.2", "ethjs-util": "^0.1.6", @@ -50,6 +50,6 @@ "typescript": "^3.7.5" }, "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", "main": "./src/index.js" } \ No newline at end of file diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json index 1877cc8ffa..0546e8aa05 100644 --- a/libs/remix-astwalker/package.json +++ b/libs/remix-astwalker/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-astwalker", - "version": "0.0.55-alpha.6", + "version": "0.0.55-alpha.10", "description": "Tool to walk through Solidity AST", "main": "src/index.js", "scripts": { @@ -37,7 +37,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.6", + "@remix-project/remix-lib": "^0.5.25-alpha.10", "@types/tape": "^4.2.33", "async": "^2.6.2", "ethers": "^5.4.2", @@ -53,6 +53,6 @@ "tap-spec": "^5.0.0" }, "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json index e61e3d0489..7da35447cf 100644 --- a/libs/remix-debug/package.json +++ b/libs/remix-debug/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-debug", - "version": "0.5.25-alpha.6", + "version": "0.5.25-alpha.10", "description": "Tool to debug Ethereum transactions", "contributors": [ { @@ -26,10 +26,10 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-astwalker": "^0.0.55-alpha.6", - "@remix-project/remix-lib": "^0.5.25-alpha.6", - "@remix-project/remix-simulator": "^0.2.25-alpha.6", - "@remix-project/remix-solidity": "^0.5.11-alpha.6", + "@remix-project/remix-astwalker": "^0.0.55-alpha.10", + "@remix-project/remix-lib": "^0.5.25-alpha.10", + "@remix-project/remix-simulator": "^0.2.25-alpha.10", + "@remix-project/remix-solidity": "^0.5.11-alpha.10", "ansi-gray": "^0.1.1", "async": "^2.6.2", "color-support": "^1.1.3", @@ -69,6 +69,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme", "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json index ec32c30e5b..5230b21bcb 100644 --- a/libs/remix-lib/package.json +++ b/libs/remix-lib/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-lib", - "version": "0.5.25-alpha.6", + "version": "0.5.25-alpha.10", "description": "Library to various Remix tools", "contributors": [ { @@ -51,6 +51,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme", "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json index be95616c77..07c815e95e 100644 --- a/libs/remix-simulator/package.json +++ b/libs/remix-simulator/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-simulator", - "version": "0.2.25-alpha.6", + "version": "0.2.25-alpha.10", "description": "Ethereum IDE and tools for the web", "contributors": [ { @@ -22,7 +22,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.6", + "@remix-project/remix-lib": "^0.5.25-alpha.10", "ansi-gray": "^0.1.1", "async": "^3.1.0", "body-parser": "^1.18.2", @@ -67,6 +67,6 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme", "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760", + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json index ce0894d032..42ee0db087 100644 --- a/libs/remix-solidity/package.json +++ b/libs/remix-solidity/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-solidity", - "version": "0.5.11-alpha.6", + "version": "0.5.11-alpha.10", "description": "Tool to load and run Solidity compiler", "main": "src/index.js", "types": "src/index.d.ts", @@ -19,7 +19,7 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.6", + "@remix-project/remix-lib": "^0.5.25-alpha.10", "async": "^2.6.2", "eslint-scope": "^5.0.0", "ethers": "^5.4.2", @@ -57,5 +57,5 @@ }, "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme", "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" } \ No newline at end of file diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index 0a8be1650f..849bb6ee00 100644 --- a/libs/remix-tests/package.json +++ b/libs/remix-tests/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-tests", - "version": "0.2.25-alpha.6", + "version": "0.2.25-alpha.10", "description": "Tool to test Solidity smart contracts", "main": "src/index.js", "types": "./src/index.d.ts", @@ -41,9 +41,9 @@ "@ethereumjs/tx": "^4.0.2", "@ethereumjs/util": "^8.0.3", "@ethereumjs/vm": "^6.3.0", - "@remix-project/remix-lib": "^0.5.25-alpha.6", - "@remix-project/remix-simulator": "^0.2.25-alpha.6", - "@remix-project/remix-solidity": "^0.5.11-alpha.6", + "@remix-project/remix-lib": "^0.5.25-alpha.10", + "@remix-project/remix-simulator": "^0.2.25-alpha.10", + "@remix-project/remix-solidity": "^0.5.11-alpha.10", "@remix-project/remix-url-resolver": "^0.0.42", "ansi-gray": "^0.1.1", "async": "^2.6.0", @@ -78,5 +78,5 @@ "typescript": "^3.3.1" }, "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" } \ No newline at end of file diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index 78cbb75c76..1a771656dc 100644 --- a/libs/remix-url-resolver/package.json +++ b/libs/remix-url-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-url-resolver", - "version": "0.0.47-alpha.6", + "version": "0.0.47-alpha.10", "description": "Solidity import url resolver engine", "main": "src/index.js", "types": "src/index.d.ts", @@ -40,5 +40,5 @@ "typescript": "^3.1.6" }, "typings": "src/index.d.ts", - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" } \ No newline at end of file diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index b967d00fa1..3825d35506 100644 --- a/libs/remix-ws-templates/package.json +++ b/libs/remix-ws-templates/package.json @@ -1,6 +1,6 @@ { "name": "@remix-project/remix-ws-templates", - "version": "1.0.12-alpha.6", + "version": "1.0.12-alpha.10", "description": "Create a Remix IDE workspace using different templates", "main": "src/index.js", "types": "src/index.d.ts", @@ -24,5 +24,5 @@ "ethers": "^5.4.2", "web3": "^1.5.1" }, - "gitHead": "a046bcad1c8fee07e1b32314af14ae859c66b760" + "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" } \ No newline at end of file