From c9cd7f88961f72d2814e9388551f7643ffbdd6d9 Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Tue, 26 Nov 2024 15:11:16 +0500 Subject: [PATCH 1/2] update getUserOperationByHash --- packages/executor/src/modules/eth.ts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/executor/src/modules/eth.ts b/packages/executor/src/modules/eth.ts index 1fb80617..15667787 100644 --- a/packages/executor/src/modules/eth.ts +++ b/packages/executor/src/modules/eth.ts @@ -336,18 +336,20 @@ export class Eth { hash: string ): Promise { const entry = await this.mempoolService.getEntryByHash(hash); - if (entry && entry.status < MempoolEntryStatus.Submitted) { - let transaction: Partial = {}; - if (entry.transaction) { - transaction = await this.provider.getTransaction(entry.transaction); + if (entry) { + if (entry.status < MempoolEntryStatus.Submitted || entry.transaction) { + let transaction: Partial = {}; + if (entry.transaction) { + transaction = await this.provider.getTransaction(entry.transaction); + } + return { + userOperation: entry.userOp, + entryPoint: entry.entryPoint, + transactionHash: transaction.hash, + blockHash: transaction.blockHash, + blockNumber: transaction.blockNumber, + }; } - return { - userOperation: entry.userOp, - entryPoint: entry.entryPoint, - transactionHash: transaction.hash, - blockHash: transaction.blockHash, - blockNumber: transaction.blockNumber, - }; } // eslint-disable-next-line @typescript-eslint/explicit-function-return-type From 641fb2a3c1a3da8e93dc40ab1bb2d15b4791b48c Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Tue, 26 Nov 2024 15:11:47 +0500 Subject: [PATCH 2/2] chore(release): v1.5.30 --- lerna.json | 2 +- package.json | 2 +- packages/api/package.json | 10 +++++----- packages/cli/package.json | 14 +++++++------- packages/contracts/package.json | 2 +- packages/db/package.json | 4 ++-- packages/executor/package.json | 10 +++++----- 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, 38 insertions(+), 38 deletions(-) diff --git a/lerna.json b/lerna.json index a082da82..0b68c8fe 100644 --- a/lerna.json +++ b/lerna.json @@ -3,7 +3,7 @@ "packages/*" ], "npmClient": "yarn", - "version": "1.5.29", + "version": "1.5.30", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index e03337ba..8fc89413 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "1.5.29", + "version": "1.5.30", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index 1089e822..97a26f82 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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": "^1.5.29", - "@skandha/monitoring": "^1.5.29", - "@skandha/types": "^1.5.29", - "@skandha/utils": "^1.5.29", + "@skandha/executor": "^1.5.30", + "@skandha/monitoring": "^1.5.30", + "@skandha/types": "^1.5.30", + "@skandha/utils": "^1.5.30", "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 02403d46..5c73c772 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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": "^1.5.29", - "@skandha/db": "^1.5.29", - "@skandha/executor": "^1.5.29", - "@skandha/monitoring": "^1.5.29", - "@skandha/node": "^1.5.29", - "@skandha/types": "^1.5.29", + "@skandha/api": "^1.5.30", + "@skandha/db": "^1.5.30", + "@skandha/executor": "^1.5.30", + "@skandha/monitoring": "^1.5.30", + "@skandha/node": "^1.5.30", + "@skandha/types": "^1.5.30", "find-up": "5.0.0", "got": "12.5.3", "js-yaml": "4.1.0", diff --git a/packages/contracts/package.json b/packages/contracts/package.json index b6c39c65..cf18435d 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "description": "Smart contracts of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", diff --git a/packages/db/package.json b/packages/db/package.json index 0464139a..c10fec55 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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": "^1.5.29" + "@skandha/types": "^1.5.30" }, "devDependencies": { "@types/rocksdb": "3.0.1", diff --git a/packages/executor/package.json b/packages/executor/package.json index 95383b7f..777437a0 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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": "^1.5.29", - "@skandha/params": "^1.5.29", - "@skandha/types": "^1.5.29", - "@skandha/utils": "^1.5.29", + "@skandha/monitoring": "^1.5.30", + "@skandha/params": "^1.5.30", + "@skandha/types": "^1.5.30", + "@skandha/utils": "^1.5.30", "async-mutex": "0.4.0", "ethers": "5.7.2", "strict-event-emitter-types": "2.0.0", diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 42f209de..820df0b6 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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": "^1.5.29", + "@skandha/types": "^1.5.30", "prom-client": "^14.2.0" } } diff --git a/packages/node/package.json b/packages/node/package.json index 6a3ca46c..4e93ecdd 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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": "^1.5.29", - "@skandha/db": "^1.5.29", - "@skandha/executor": "^1.5.29", - "@skandha/monitoring": "^1.5.29", - "@skandha/params": "^1.5.29", - "@skandha/types": "^1.5.29", - "@skandha/utils": "^1.5.29", + "@skandha/api": "^1.5.30", + "@skandha/db": "^1.5.30", + "@skandha/executor": "^1.5.30", + "@skandha/monitoring": "^1.5.30", + "@skandha/params": "^1.5.30", + "@skandha/types": "^1.5.30", + "@skandha/utils": "^1.5.30", "@types/varint": "6.0.1", "abstract-leveldown": "7.2.0", "datastore-core": "8.0.1", diff --git a/packages/params/package.json b/packages/params/package.json index 8c1778b2..66ad4be2 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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.10.1", "@mantleio/sdk": "0.2.1", - "@skandha/types": "^1.5.29", - "@skandha/utils": "^1.5.29", + "@skandha/types": "^1.5.30", + "@skandha/utils": "^1.5.30", "ethers": "5.7.2" }, "scripts": { diff --git a/packages/types/package.json b/packages/types/package.json index e500c162..13d7de72 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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 a2693d92..73972865 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "1.5.29", + "version": "1.5.30", "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": "^1.5.29", + "@skandha/types": "^1.5.30", "any-signal": "3.0.1", "bigint-buffer": "1.1.5", "case": "^1.6.3",