From 292c609accb212ecee91beefa6ab450c45c20361 Mon Sep 17 00:00:00 2001 From: Utkir S Date: Mon, 30 Oct 2023 17:48:15 +0500 Subject: [PATCH] fix: bifrost gas estimation (#110) * fix bifrost gas estimation * chore(release): 1.0.16-alpha --- lerna.json | 2 +- package.json | 2 +- packages/api/package.json | 6 +++--- packages/cli/package.json | 12 ++++++------ packages/db/package.json | 4 ++-- packages/executor/package.json | 6 +++--- packages/executor/src/services/BundlingService.ts | 5 ++++- packages/node/package.json | 14 +++++++------- packages/params/package.json | 6 +++--- packages/types/package.json | 2 +- packages/utils/package.json | 4 ++-- 11 files changed, 33 insertions(+), 30 deletions(-) diff --git a/lerna.json b/lerna.json index 503caf27..0d9f2a5e 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,7 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index a60bad62..60f9c418 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index 89e423a7..581005b8 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "The API module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -35,12 +35,12 @@ "class-transformer": "0.5.1", "class-validator": "0.14.0", "ethers": "5.7.2", - "executor": "^1.0.15-alpha", + "executor": "^1.0.16-alpha", "fastify": "4.14.1", "pino": "8.11.0", "pino-pretty": "10.0.0", "reflect-metadata": "0.1.13", - "types": "^1.0.15-alpha" + "types": "^1.0.16-alpha" }, "devDependencies": { "@types/connect": "3.4.35" diff --git a/packages/cli/package.json b/packages/cli/package.json index daa80ca8..06f88757 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "> TODO: description", "author": "zincoshine ", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -38,14 +38,14 @@ "@libp2p/peer-id-factory": "2.0.1", "@libp2p/prometheus-metrics": "1.1.3", "@multiformats/multiaddr": "12.1.3", - "api": "^1.0.15-alpha", - "db": "^1.0.15-alpha", - "executor": "^1.0.15-alpha", + "api": "^1.0.16-alpha", + "db": "^1.0.16-alpha", + "executor": "^1.0.16-alpha", "find-up": "5.0.0", "got": "12.5.3", "js-yaml": "4.1.0", - "node": "^1.0.15-alpha", - "types": "^1.0.15-alpha", + "node": "^1.0.16-alpha", + "types": "^1.0.16-alpha", "yargs": "17.6.2" }, "devDependencies": { diff --git a/packages/db/package.json b/packages/db/package.json index 94592498..df4a0d6c 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "db", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "The DB module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://github.com/etherspot/etherspot-bundler#readme", @@ -33,7 +33,7 @@ "dependencies": { "@chainsafe/ssz": "0.10.1", "@farcaster/rocksdb": "5.5.0", - "types": "^1.0.15-alpha" + "types": "^1.0.16-alpha" }, "devDependencies": { "@types/rocksdb": "3.0.1", diff --git a/packages/executor/package.json b/packages/executor/package.json index 257bfad9..a3d1a108 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -1,6 +1,6 @@ { "name": "executor", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "The Relayer module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -33,7 +33,7 @@ "dependencies": { "async-mutex": "0.4.0", "ethers": "5.7.2", - "params": "^1.0.15-alpha", - "types": "^1.0.15-alpha" + "params": "^1.0.16-alpha", + "types": "^1.0.16-alpha" } } diff --git a/packages/executor/src/services/BundlingService.ts b/packages/executor/src/services/BundlingService.ts index c6d4e389..da4fb5b6 100644 --- a/packages/executor/src/services/BundlingService.ts +++ b/packages/executor/src/services/BundlingService.ts @@ -145,7 +145,10 @@ export class BundlingService { if (!this.config.testingMode) { // check for execution revert try { - const estimatedGasLimit = await wallet.estimateGas(tx); + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const { gasLimit, ...txWithoutGasLimit } = tx; + // some chains, like Bifrost, don't allow setting gasLimit in estimateGas + const estimatedGasLimit = await wallet.estimateGas(txWithoutGasLimit); tx.gasLimit = estimatedGasLimit; } catch (err) { this.logger.error(err); diff --git a/packages/node/package.json b/packages/node/package.json index 961ef41a..48fcbaf9 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -1,6 +1,6 @@ { "name": "node", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "The bundler node module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -56,24 +56,24 @@ "@libp2p/tcp": "6.1.0", "@multiformats/multiaddr": "11.4.0", "abstract-leveldown": "7.2.0", - "api": "^1.0.15-alpha", + "api": "^1.0.16-alpha", "datastore-core": "8.0.1", - "db": "^1.0.15-alpha", + "db": "^1.0.16-alpha", "ethers": "5.7.2", - "executor": "^1.0.15-alpha", + "executor": "^1.0.16-alpha", "it-filter": "1.0.2", "it-map": "1.0.5", "it-sort": "1.0.0", "it-take": "1.0.1", "libp2p": "0.42.2", - "params": "^1.0.15-alpha", + "params": "^1.0.16-alpha", "prettier": "2.8.4", "snappy": "7.2.2", "snappyjs": "0.7.0", "stream-to-it": "0.2.4", "strict-event-emitter-types": "2.0.0", - "types": "^1.0.15-alpha", - "utils": "^1.0.15-alpha", + "types": "^1.0.16-alpha", + "utils": "^1.0.16-alpha", "varint": "6.0.0", "xxhash-wasm": "1.0.2" }, diff --git a/packages/params/package.json b/packages/params/package.json index 674ed171..8a47ec9f 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -1,6 +1,6 @@ { "name": "params", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "Various bundler parameters", "author": "Etherspot", "homepage": "https://github.com/etherspot/skandha#readme", @@ -26,8 +26,8 @@ "@eth-optimism/sdk": "3.0.0", "@mantleio/sdk": "0.2.1", "ethers": "5.7.2", - "types": "^1.0.15-alpha", - "utils": "^1.0.15-alpha" + "types": "^1.0.16-alpha", + "utils": "^1.0.16-alpha" }, "scripts": { "clean": "rm -rf lib && rm -f *.tsbuildinfo", diff --git a/packages/types/package.json b/packages/types/package.json index 088719ae..2c0147ab 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "types", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "The types of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", diff --git a/packages/utils/package.json b/packages/utils/package.json index 510be56b..548bbbb5 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "utils", - "version": "1.0.15-alpha", + "version": "1.0.16-alpha", "description": "utils of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -37,6 +37,6 @@ "case": "^1.6.3", "pino": "8.11.0", "pino-pretty": "10.0.0", - "types": "^1.0.15-alpha" + "types": "^1.0.16-alpha" } }