diff --git a/lerna.json b/lerna.json index 358b1d13..37664b51 100644 --- a/lerna.json +++ b/lerna.json @@ -3,7 +3,7 @@ "packages/*" ], "npmClient": "yarn", - "version": "2.0.23", + "version": "2.0.24", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index aab70f4e..d797ac4c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "2.0.23", + "version": "2.0.24", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index f738e862..156f8f80 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23", - "@skandha/monitoring": "^2.0.23", - "@skandha/types": "^2.0.23", - "@skandha/utils": "^2.0.23", + "@skandha/executor": "^2.0.24", + "@skandha/monitoring": "^2.0.24", + "@skandha/types": "^2.0.24", + "@skandha/utils": "^2.0.24", "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 f7c43c44..e51ddb0c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23", - "@skandha/db": "^2.0.23", - "@skandha/executor": "^2.0.23", - "@skandha/monitoring": "^2.0.23", - "@skandha/node": "^2.0.23", - "@skandha/types": "^2.0.23", + "@skandha/api": "^2.0.24", + "@skandha/db": "^2.0.24", + "@skandha/executor": "^2.0.24", + "@skandha/monitoring": "^2.0.24", + "@skandha/node": "^2.0.24", + "@skandha/types": "^2.0.24", "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 86a85121..c5871700 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23" + "@skandha/types": "^2.0.24" }, "devDependencies": { "@types/rocksdb": "3.0.1", diff --git a/packages/executor/package.json b/packages/executor/package.json index b66e3630..fab5782e 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23", - "@skandha/params": "^2.0.23", - "@skandha/types": "^2.0.23", - "@skandha/utils": "^2.0.23", + "@skandha/monitoring": "^2.0.24", + "@skandha/params": "^2.0.24", + "@skandha/types": "^2.0.24", + "@skandha/utils": "^2.0.24", "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 5b381632..d2cd5dae 100644 --- a/packages/executor/src/modules/eth.ts +++ b/packages/executor/src/modules/eth.ts @@ -401,18 +401,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, - }; } const rpcUserOp = await this.entryPointService.getUserOperationByHash(hash); if (!rpcUserOp && this.blockscoutApi) { diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index a8ca84ad..6331f41b 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23", + "@skandha/types": "^2.0.24", "prom-client": "15.1.0" } } diff --git a/packages/node/package.json b/packages/node/package.json index 576e1066..6815f085 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23", - "@skandha/db": "^2.0.23", - "@skandha/executor": "^2.0.23", - "@skandha/monitoring": "^2.0.23", - "@skandha/params": "^2.0.23", - "@skandha/types": "^2.0.23", - "@skandha/utils": "^2.0.23", + "@skandha/api": "^2.0.24", + "@skandha/db": "^2.0.24", + "@skandha/executor": "^2.0.24", + "@skandha/monitoring": "^2.0.24", + "@skandha/params": "^2.0.24", + "@skandha/types": "^2.0.24", + "@skandha/utils": "^2.0.24", "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 4cf0ae88..c16c1a06 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23", - "@skandha/utils": "^2.0.23", + "@skandha/types": "^2.0.24", + "@skandha/utils": "^2.0.24", "ethers": "5.7.2" }, "scripts": { diff --git a/packages/types/package.json b/packages/types/package.json index e0b33530..ace094c1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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 1ff3f518..6804a99e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.23", + "version": "2.0.24", "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.23", + "@skandha/types": "^2.0.24", "any-signal": "3.0.1", "bigint-buffer": "1.1.5", "case": "^1.6.3", diff --git a/tsconfig.build.json b/tsconfig.build.json index d0e38040..4b811146 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -18,6 +18,7 @@ "noImplicitAny": true, "noImplicitThis": true, "noImplicitReturns": true, + "skipLibCheck": true, "esModuleInterop": true, "declaration": true,