From 3a34f5c6eb2b6d378ef01011de695e7799eb201e Mon Sep 17 00:00:00 2001 From: Oleksii Kosynskyi Date: Mon, 21 Aug 2023 19:00:22 -0400 Subject: [PATCH] update latest web3 --- libs/ghaction-helper/package.json | 2 +- libs/remix-analyzer/package.json | 2 +- libs/remix-astwalker/package.json | 2 +- libs/remix-debug/package.json | 2 +- libs/remix-lib/package.json | 2 +- libs/remix-lib/src/execution/logsManager.ts | 9 ++------- libs/remix-simulator/package.json | 3 ++- libs/remix-solidity/package.json | 2 +- libs/remix-tests/package.json | 2 +- libs/remix-ws-templates/package.json | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json index f5b1adf1aa..1730e1ae46 100644 --- a/libs/ghaction-helper/package.json +++ b/libs/ghaction-helper/package.json @@ -28,7 +28,7 @@ "@remix-project/remix-simulator": "^0.2.31", "chai": "^4.3.7", "ethers": "^5.7.2", - "web3": "^4.1.0" + "web3": "^4.1.1" }, "types": "./src/index.d.ts", "gitHead": "b11b11623729f741a5ccd387bc60dc5db41f28ab" diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json index 53f17eaa08..bc536fd372 100644 --- a/libs/remix-analyzer/package.json +++ b/libs/remix-analyzer/package.json @@ -31,7 +31,7 @@ "ethers": "^5.4.2", "ethjs-util": "^0.1.6", "string-similarity": "^4.0.4", - "web3": "^4.1.0" + "web3": "^4.1.1" }, "publishConfig": { "access": "public" diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json index 530c588996..41b52f88cc 100644 --- a/libs/remix-astwalker/package.json +++ b/libs/remix-astwalker/package.json @@ -47,7 +47,7 @@ "tape": "^4.10.1", "ts-node": "^8.0.3", "typescript": "^3.4.3", - "web3": "^4.1.0" + "web3": "^4.1.1" }, "devDependencies": { "tap-spec": "^5.0.0" diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json index 4e3bc98044..1ff0a6b90b 100644 --- a/libs/remix-debug/package.json +++ b/libs/remix-debug/package.json @@ -41,7 +41,7 @@ "merge": "^2.1.1", "string-similarity": "^4.0.4", "time-stamp": "^2.2.0", - "web3": "^4.1.0" + "web3": "^4.1.1" }, "devDependencies": { "@babel/core": "^7.4.5", diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json index 93877ef64d..45ef5fe002 100644 --- a/libs/remix-lib/package.json +++ b/libs/remix-lib/package.json @@ -25,7 +25,7 @@ "from-exponential": "1.1.1", "solc": "^0.7.4", "string-similarity": "^4.0.4", - "web3": "^4.1.0", + "web3": "^4.1.1", "web3-validator": "^2.0.0" }, "devDependencies": { diff --git a/libs/remix-lib/src/execution/logsManager.ts b/libs/remix-lib/src/execution/logsManager.ts index 6600c6c9a2..c865f450f2 100644 --- a/libs/remix-lib/src/execution/logsManager.ts +++ b/libs/remix-lib/src/execution/logsManager.ts @@ -19,11 +19,10 @@ export class LogsManager { checkBlock (blockNumber, block, web3) { eachOf(block.transactions, (tx: any, i, next) => { const txHash = '0x' + tx.hash().toString('hex') - const cb = (_error, receipt) => { + web3.eth.getTransactionReceipt(txHash, (_error, receipt) => { for (const log of receipt.logs) { this.oldLogs.push({ type: 'block', blockNumber, block, tx, log, txNumber: i }) const subscriptions = this.getSubscriptionsFor({ type: 'block', blockNumber, block, tx, log }) - for (const subscriptionId of subscriptions) { const result = { logIndex: '0x1', // 1 @@ -45,11 +44,7 @@ export class LogsManager { this.transmit(response) } } - } - const res = web3.eth.getTransactionReceipt(txHash,cb) - if(res && typeof res.then === 'function'){ - res.then((receipt) => cb(null, receipt)).catch(err => cb(err,null)) - } + }) }, (_err) => { }) } diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json index b62369a46e..b449208677 100644 --- a/libs/remix-simulator/package.json +++ b/libs/remix-simulator/package.json @@ -36,7 +36,8 @@ "merge": "^1.2.0", "string-similarity": "^4.0.4", "time-stamp": "^2.0.0", - "web3": "^4.1.0" + "web3": "^4.1.1", + "web3-utils": "^4.0.5" }, "devDependencies": { "@babel/core": "^7.4.5", diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json index 4b2644ed56..4837d99b5c 100644 --- a/libs/remix-solidity/package.json +++ b/libs/remix-solidity/package.json @@ -28,7 +28,7 @@ "semver": "^6.3.0", "solc": "^0.7.4", "string-similarity": "^4.0.4", - "web3": "^4.1.0", + "web3": "^4.1.1", "webworkify-webpack": "^2.1.5" }, "devDependencies": { diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json index e6885ae853..5072aff069 100644 --- a/libs/remix-tests/package.json +++ b/libs/remix-tests/package.json @@ -62,7 +62,7 @@ "string-similarity": "^4.0.4", "time-stamp": "^2.2.0", "tslib": "^2.3.0", - "web3": "^4.1.0", + "web3": "^4.1.1", "winston": "^3.0.0" }, "devDependencies": { diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json index 4f4a0183ad..787c1b379d 100644 --- a/libs/remix-ws-templates/package.json +++ b/libs/remix-ws-templates/package.json @@ -22,7 +22,7 @@ "@openzeppelin/contracts": "^4.7.3", "@openzeppelin/wizard": "^0.1.1", "ethers": "^5.4.2", - "web3": "^4.1.0" + "web3": "^4.1.1" }, "gitHead": "b11b11623729f741a5ccd387bc60dc5db41f28ab" }