Skip to content

Commit

Permalink
Getreceipt fix (#255)
Browse files Browse the repository at this point in the history
  • Loading branch information
0xSulpiride authored Oct 8, 2024
1 parent 6edab35 commit 1e6a6e9
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 51 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages/*"
],
"npmClient": "yarn",
"version": "2.0.22",
"version": "2.0.23",
"stream": "true",
"command": {
"version": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "root",
"private": true,
"version": "2.0.22",
"version": "2.0.23",
"engines": {
"node": ">=18.0.0"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "The API module of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://https://github.com/etherspot/skandha#readme",
Expand Down Expand Up @@ -34,10 +34,10 @@
"dependencies": {
"@fastify/cors": "9.0.1",
"@fastify/websocket": "10.0.1",
"@skandha/executor": "^2.0.22",
"@skandha/monitoring": "^2.0.22",
"@skandha/types": "^2.0.22",
"@skandha/utils": "^2.0.22",
"@skandha/executor": "^2.0.23",
"@skandha/monitoring": "^2.0.23",
"@skandha/types": "^2.0.23",
"@skandha/utils": "^2.0.23",
"class-transformer": "0.5.1",
"class-validator": "0.14.1",
"ethers": "5.7.2",
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "> TODO: description",
"author": "zincoshine <[email protected]>",
"homepage": "https://https://github.com/etherspot/skandha#readme",
Expand Down Expand Up @@ -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.22",
"@skandha/db": "^2.0.22",
"@skandha/executor": "^2.0.22",
"@skandha/monitoring": "^2.0.22",
"@skandha/node": "^2.0.22",
"@skandha/types": "^2.0.22",
"@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",
"find-up": "5.0.0",
"got": "12.5.3",
"js-yaml": "4.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "The DB module of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://github.com/etherspot/etherspot-bundler#readme",
Expand Down Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"@chainsafe/ssz": "0.10.1",
"@farcaster/rocksdb": "5.5.0",
"@skandha/types": "^2.0.22"
"@skandha/types": "^2.0.23"
},
"devDependencies": {
"@types/rocksdb": "3.0.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/executor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "The Relayer module of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://https://github.com/etherspot/skandha#readme",
Expand Down Expand Up @@ -35,10 +35,10 @@
},
"dependencies": {
"@flashbots/ethers-provider-bundle": "0.6.2",
"@skandha/monitoring": "^2.0.22",
"@skandha/params": "^2.0.22",
"@skandha/types": "^2.0.22",
"@skandha/utils": "^2.0.22",
"@skandha/monitoring": "^2.0.23",
"@skandha/params": "^2.0.23",
"@skandha/types": "^2.0.23",
"@skandha/utils": "^2.0.23",
"async-mutex": "0.4.0",
"ethers": "5.7.2",
"strict-event-emitter-types": "2.0.0",
Expand Down
19 changes: 5 additions & 14 deletions packages/executor/src/modules/eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -414,20 +414,11 @@ export class Eth {
blockNumber: transaction.blockNumber,
};
}
try {
const rpcUserOp = await this.entryPointService.getUserOperationByHash(
hash
);
if (!rpcUserOp) {
throw new Error("userop not found");
}
return rpcUserOp;
} catch (err) {
if (this.blockscoutApi) {
return await this.blockscoutApi.getUserOperationByHash(hash);
}
throw err;
const rpcUserOp = await this.entryPointService.getUserOperationByHash(hash);
if (!rpcUserOp && this.blockscoutApi) {
return await this.blockscoutApi.getUserOperationByHash(hash);
}
return rpcUserOp || null;
}

/**
Expand All @@ -444,7 +435,7 @@ export class Eth {
if (!rpcUserOp && this.blockscoutApi) {
return await this.blockscoutApi.getUserOperationReceipt(hash);
}
return null;
return rpcUserOp || null;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/monitoring/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "The Monitoring module of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://github.com/etherspot/etherspot-bundler#readme",
Expand Down Expand Up @@ -32,7 +32,7 @@
"check-readme": "typescript-docs-verifier"
},
"dependencies": {
"@skandha/types": "^2.0.22",
"@skandha/types": "^2.0.23",
"prom-client": "15.1.0"
}
}
16 changes: 8 additions & 8 deletions packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "The bundler node module of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://https://github.com/etherspot/skandha#readme",
Expand Down Expand Up @@ -56,13 +56,13 @@
"@libp2p/prometheus-metrics": "1.1.3",
"@libp2p/tcp": "6.1.0",
"@multiformats/multiaddr": "11.4.0",
"@skandha/api": "^2.0.22",
"@skandha/db": "^2.0.22",
"@skandha/executor": "^2.0.22",
"@skandha/monitoring": "^2.0.22",
"@skandha/params": "^2.0.22",
"@skandha/types": "^2.0.22",
"@skandha/utils": "^2.0.22",
"@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",
"abstract-leveldown": "7.2.0",
"datastore-core": "8.0.1",
"ethers": "5.7.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/params/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "Various bundler parameters",
"author": "Etherspot",
"homepage": "https://github.com/etherspot/skandha#readme",
Expand All @@ -28,8 +28,8 @@
"@arbitrum/sdk": "3.1.4",
"@chainsafe/ssz": "0.16.0",
"@mantleio/sdk": "0.2.1",
"@skandha/types": "^2.0.22",
"@skandha/utils": "^2.0.22",
"@skandha/types": "^2.0.23",
"@skandha/utils": "^2.0.23",
"ethers": "5.7.2"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "The types of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://https://github.com/etherspot/skandha#readme",
Expand Down
4 changes: 2 additions & 2 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "2.0.22",
"version": "2.0.23",
"description": "utils of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://https://github.com/etherspot/skandha#readme",
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@chainsafe/as-sha256": "0.3.1",
"@skandha/types": "^2.0.22",
"@skandha/types": "^2.0.23",
"any-signal": "3.0.1",
"bigint-buffer": "1.1.5",
"case": "^1.6.3",
Expand Down

0 comments on commit 1e6a6e9

Please sign in to comment.