From 58a2134a780d0c9cd575f38696288c2fb6f32f8f Mon Sep 17 00:00:00 2001 From: "Utkir S." Date: Thu, 12 Sep 2024 15:31:22 +0500 Subject: [PATCH] cgl issue (#245) - cgl issue --- lerna.json | 2 +- package.json | 2 +- packages/api/package.json | 10 +++++----- packages/cli/package.json | 14 +++++++------- packages/db/package.json | 4 ++-- packages/executor/package.json | 10 +++++----- packages/executor/src/modules/eth.ts | 23 +++++++++-------------- packages/monitoring/package.json | 4 ++-- packages/node/package.json | 16 ++++++++-------- packages/params/package.json | 6 +++--- packages/types/package.json | 2 +- packages/utils/package.json | 4 ++-- 12 files changed, 46 insertions(+), 51 deletions(-) diff --git a/lerna.json b/lerna.json index 4b44b5e8..275d2ccc 100644 --- a/lerna.json +++ b/lerna.json @@ -3,7 +3,7 @@ "packages/*" ], "npmClient": "yarn", - "version": "2.0.20", + "version": "2.0.21", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index 649c9ff6..1609208d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "2.0.20", + "version": "2.0.21", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index 682f2c2b..f1f39730 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "The API module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -34,10 +34,10 @@ "dependencies": { "@fastify/cors": "9.0.1", "@fastify/websocket": "10.0.1", - "@skandha/executor": "^2.0.20", - "@skandha/monitoring": "^2.0.20", - "@skandha/types": "^2.0.20", - "@skandha/utils": "^2.0.20", + "@skandha/executor": "^2.0.21", + "@skandha/monitoring": "^2.0.21", + "@skandha/types": "^2.0.21", + "@skandha/utils": "^2.0.21", "class-transformer": "0.5.1", "class-validator": "0.14.1", "ethers": "5.7.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2f6f369b..fe1987e1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "> TODO: description", "author": "zincoshine ", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -40,12 +40,12 @@ "@libp2p/peer-id-factory": "2.0.1", "@libp2p/prometheus-metrics": "1.1.3", "@multiformats/multiaddr": "12.1.3", - "@skandha/api": "^2.0.20", - "@skandha/db": "^2.0.20", - "@skandha/executor": "^2.0.20", - "@skandha/monitoring": "^2.0.20", - "@skandha/node": "^2.0.20", - "@skandha/types": "^2.0.20", + "@skandha/api": "^2.0.21", + "@skandha/db": "^2.0.21", + "@skandha/executor": "^2.0.21", + "@skandha/monitoring": "^2.0.21", + "@skandha/node": "^2.0.21", + "@skandha/types": "^2.0.21", "find-up": "5.0.0", "got": "12.5.3", "js-yaml": "4.1.0", diff --git a/packages/db/package.json b/packages/db/package.json index dc8df2e0..0980af07 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "The DB module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://github.com/etherspot/etherspot-bundler#readme", @@ -34,7 +34,7 @@ "dependencies": { "@chainsafe/ssz": "0.10.1", "@farcaster/rocksdb": "5.5.0", - "@skandha/types": "^2.0.20" + "@skandha/types": "^2.0.21" }, "devDependencies": { "@types/rocksdb": "3.0.1", diff --git a/packages/executor/package.json b/packages/executor/package.json index 7af57fe8..cbd98288 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "The Relayer module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -35,10 +35,10 @@ }, "dependencies": { "@flashbots/ethers-provider-bundle": "0.6.2", - "@skandha/monitoring": "^2.0.20", - "@skandha/params": "^2.0.20", - "@skandha/types": "^2.0.20", - "@skandha/utils": "^2.0.20", + "@skandha/monitoring": "^2.0.21", + "@skandha/params": "^2.0.21", + "@skandha/types": "^2.0.21", + "@skandha/utils": "^2.0.21", "async-mutex": "0.4.0", "ethers": "5.7.2", "strict-event-emitter-types": "2.0.0", diff --git a/packages/executor/src/modules/eth.ts b/packages/executor/src/modules/eth.ts index a247918c..9b0ad710 100644 --- a/packages/executor/src/modules/eth.ts +++ b/packages/executor/src/modules/eth.ts @@ -198,17 +198,7 @@ export class Eth { const { cglMarkup } = this.config; // calculate callGasLimit based on paid fee const totalGas: BigNumber = BigNumber.from(paid).div(userOp.maxFeePerGas); - const paidFeeCGL = totalGas - .sub(preOpGas) - .mul(10000 + this.config.cglMarkupPercent) - .div(10000) // % markup - .add(cglMarkup || 0); - - // callGasLimit based on binary search - binarySearchCGL = binarySearchCGL - .mul(10000 + this.config.cglMarkupPercent) - .div(10000) // % markup - .add(cglMarkup || 0); + const paidFeeCGL = totalGas.sub(preOpGas); //< checking for execution revert const ethEstimateGas = await this.provider @@ -239,11 +229,10 @@ export class Eth { }); } - const prevCGL = callGasLimit; - callGasLimit = minBn(ethEstimateGas, callGasLimit); - // check between eth_estimateGas & binary search & paid fee cgl if (userOp.factoryData !== undefined && userOp.factoryData.length <= 2) { + const prevCGL = callGasLimit; + callGasLimit = minBn(ethEstimateGas, callGasLimit); await this.provider .estimateGas({ from: entryPoint, @@ -255,6 +244,12 @@ export class Eth { callGasLimit = maxBn(callGasLimit, prevCGL); }); } + + callGasLimit = callGasLimit + .mul(10000 + this.config.cglMarkupPercent) // % markup + .div(10000) + .add(cglMarkup || 0); + this.logger.debug( { callGasLimit, diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 39f004f2..b0ae10ef 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "The Monitoring module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://github.com/etherspot/etherspot-bundler#readme", @@ -32,7 +32,7 @@ "check-readme": "typescript-docs-verifier" }, "dependencies": { - "@skandha/types": "^2.0.20", + "@skandha/types": "^2.0.21", "prom-client": "15.1.0" } } diff --git a/packages/node/package.json b/packages/node/package.json index 56877c92..f1ac44fa 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "The bundler node module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -56,13 +56,13 @@ "@libp2p/prometheus-metrics": "1.1.3", "@libp2p/tcp": "6.1.0", "@multiformats/multiaddr": "11.4.0", - "@skandha/api": "^2.0.20", - "@skandha/db": "^2.0.20", - "@skandha/executor": "^2.0.20", - "@skandha/monitoring": "^2.0.20", - "@skandha/params": "^2.0.20", - "@skandha/types": "^2.0.20", - "@skandha/utils": "^2.0.20", + "@skandha/api": "^2.0.21", + "@skandha/db": "^2.0.21", + "@skandha/executor": "^2.0.21", + "@skandha/monitoring": "^2.0.21", + "@skandha/params": "^2.0.21", + "@skandha/types": "^2.0.21", + "@skandha/utils": "^2.0.21", "abstract-leveldown": "7.2.0", "datastore-core": "8.0.1", "ethers": "5.7.2", diff --git a/packages/params/package.json b/packages/params/package.json index 2a4ddb1c..81a383c8 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "Various bundler parameters", "author": "Etherspot", "homepage": "https://github.com/etherspot/skandha#readme", @@ -28,8 +28,8 @@ "@arbitrum/sdk": "3.1.4", "@chainsafe/ssz": "0.16.0", "@mantleio/sdk": "0.2.1", - "@skandha/types": "^2.0.20", - "@skandha/utils": "^2.0.20", + "@skandha/types": "^2.0.21", + "@skandha/utils": "^2.0.21", "ethers": "5.7.2" }, "scripts": { diff --git a/packages/types/package.json b/packages/types/package.json index 87d8d682..bbf63387 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "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 6e6be54f..fb74bb80 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.20", + "version": "2.0.21", "description": "utils of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -33,7 +33,7 @@ }, "dependencies": { "@chainsafe/as-sha256": "0.3.1", - "@skandha/types": "^2.0.20", + "@skandha/types": "^2.0.21", "any-signal": "3.0.1", "bigint-buffer": "1.1.5", "case": "^1.6.3",