get userop by hash v1 (#263)

lerna.json

@@ -3,7 +3,7 @@
     "packages/*"
   ],
   "npmClient": "yarn",
-  "version": "1.5.29",
+  "version": "1.5.30",
   "stream": "true",
   "command": {
     "version": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "root",
   "private": true,
-  "version": "1.5.29",
+  "version": "1.5.30",
   "engines": {
     "node": ">=18.0.0"
   },

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",

packages/cli/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.29",
+  "version": "1.5.30",
   "description": "> TODO: description",
   "author": "zincoshine <[email protected]>",
   "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",

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",

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",

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",

packages/executor/src/modules/eth.ts

@@ -336,18 +336,20 @@ export class Eth {
     hash: string
   ): Promise<UserOperationByHashResponse | null> {
     const entry = await this.mempoolService.getEntryByHash(hash);
-    if (entry && entry.status < MempoolEntryStatus.Submitted) {
-      let transaction: Partial<ethers.providers.TransactionResponse> = {};
-      if (entry.transaction) {
-        transaction = await this.provider.getTransaction(entry.transaction);
+    if (entry) {
+      if (entry.status < MempoolEntryStatus.Submitted || entry.transaction) {
+        let transaction: Partial<ethers.providers.TransactionResponse> = {};
+        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

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"
   }
 }

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",

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": {

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",

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",