From 3f2ce3fe95830c739465437bf607bb5023950bbb Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 9 Mar 2023 12:37:51 +0100 Subject: [PATCH] Utilize new changes from simulator --- libs/ghaction-helper/package.json | 8 ++++---- libs/ghaction-helper/src/methods.ts | 24 +++++++++++------------- 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-simulator/src/provider.ts | 18 ++++++++++++++++-- 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 ++-- 12 files changed, 61 insertions(+), 49 deletions(-) diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index e307cac4b1..70faee6c6d 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.10", + "version": "0.1.7-alpha.14", "description": "Solidity Tests GitHub Action Helper", "main": "src/index.js", "scripts": { @@ -19,17 +19,17 @@ }, "homepage": "https://github.com/ethereum/remix-project#readme", "devDependencies": { - "@remix-project/remix-solidity": "^0.5.11-alpha.10", + "@remix-project/remix-solidity": "^0.5.11-alpha.14", "@types/chai": "^4.3.4", "typescript": "^4.9.3" }, "dependencies": { "@ethereum-waffle/chai": "^3.4.4", - "@remix-project/remix-simulator": "^0.2.25-alpha.10", + "@remix-project/remix-simulator": "^0.2.25-alpha.14", "chai": "^4.3.7", "ethers": "^5.7.2", "web3": "^1.5.3" }, "types": "./src/index.d.ts", - "gitHead": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8" } \ No newline at end of file diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts index fe82378018..8bea9f5532 100644 --- a/libs/ghaction-helper/src/methods.ts +++ b/libs/ghaction-helper/src/methods.ts @@ -5,20 +5,18 @@ import { getArtifactsByContractName } from './artifacts-helper' import { SignerWithAddress } from './signer' import Web3 from "web3" -(async () => { - const providerConfig = { - fork: global.fork || null, - nodeUrl: global.nodeUrl || null, - blockNumber: global.blockNumber || null - } +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) +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) const isFactoryOptions = (signerOrOptions: any) => { if (!signerOrOptions || signerOrOptions === undefined || signerOrOptions instanceof ethers.Signer) return false diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index 6fdd00e1e8..3a3cb656c9 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.10", + "version": "0.5.34-alpha.14", "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.10", - "@remix-project/remix-lib": "^0.5.25-alpha.10", + "@remix-project/remix-astwalker": "^0.0.55-alpha.14", + "@remix-project/remix-lib": "^0.5.25-alpha.14", "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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8", "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 0546e8aa05..5a3f6e9ac6 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.10", + "version": "0.0.55-alpha.14", "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.10", + "@remix-project/remix-lib": "^0.5.25-alpha.14", "@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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8", "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 7da35447cf..5c0cf525bc 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.10", + "version": "0.5.25-alpha.14", "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.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", + "@remix-project/remix-astwalker": "^0.0.55-alpha.14", + "@remix-project/remix-lib": "^0.5.25-alpha.14", + "@remix-project/remix-simulator": "^0.2.25-alpha.14", + "@remix-project/remix-solidity": "^0.5.11-alpha.14", "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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8", "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 5230b21bcb..0ed7be2811 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.10", + "version": "0.5.25-alpha.14", "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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8", "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 07c815e95e..a6f1dd255f 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.10", + "version": "0.2.25-alpha.14", "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.10", + "@remix-project/remix-lib": "^0.5.25-alpha.14", "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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c", + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8", "types": "./src/index.d.ts" } \ No newline at end of file diff --git a/libs/remix-simulator/src/provider.ts b/libs/remix-simulator/src/provider.ts index 264a9f7b4c..03b2840943 100644 --- a/libs/remix-simulator/src/provider.ts +++ b/libs/remix-simulator/src/provider.ts @@ -18,7 +18,9 @@ export class Provider { Accounts Transactions methods - connected: boolean; + connected: boolean + initialized: boolean + pendingRequests: Array constructor (options: Record = {}) { this.options = options @@ -39,15 +41,27 @@ export class Provider { } async init () { + this.initialized = false + this.pendingRequests = [] await this.vmContext.init() await generateBlock(this.vmContext) await this.Accounts.resetAccounts() this.Transactions.init(this.Accounts.accounts) + this.initialized = true + if (this.pendingRequests.length > 0) { + this.pendingRequests.map((req) => { + this.sendAsync(req.payload, req.callback) + }) + this.pendingRequests = [] + } } sendAsync (payload, callback) { // log.info('payload method is ', payload.method) // commented because, this floods the IDE console - + if (!this.initialized) { + this.pendingRequests.push({ payload, callback }) + return + } const method = this.methods[payload.method] if (this.options.logDetails) { info(payload) diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json index 42ee0db087..fb39eb43e5 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.10", + "version": "0.5.11-alpha.14", "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.10", + "@remix-project/remix-lib": "^0.5.25-alpha.14", "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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8" } \ No newline at end of file diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index 849bb6ee00..ade96aa227 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.10", + "version": "0.2.25-alpha.14", "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.10", - "@remix-project/remix-simulator": "^0.2.25-alpha.10", - "@remix-project/remix-solidity": "^0.5.11-alpha.10", + "@remix-project/remix-lib": "^0.5.25-alpha.14", + "@remix-project/remix-simulator": "^0.2.25-alpha.14", + "@remix-project/remix-solidity": "^0.5.11-alpha.14", "@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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8" } \ No newline at end of file diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json index 1a771656dc..9a821c1a56 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.10", + "version": "0.0.47-alpha.14", "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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8" } \ No newline at end of file diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index 3825d35506..bfb5b6e603 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.10", + "version": "1.0.12-alpha.14", "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": "4ea0d9afb03f04df480fdc57a60b8f85b771ed7c" + "gitHead": "924dca66c2d2261d916a3c764ed99f5b671ac0c8" } \ No newline at end of file