Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blockscout followup #248

Merged
merged 3 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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": "1.5.25",
"version": "1.5.26",
"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": "1.5.25",
"version": "1.5.26",
"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": "1.5.25",
"version": "1.5.26",
"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": "^1.5.25",
"@skandha/monitoring": "^1.5.25",
"@skandha/types": "^1.5.25",
"@skandha/utils": "^1.5.25",
"@skandha/executor": "^1.5.26",
"@skandha/monitoring": "^1.5.26",
"@skandha/types": "^1.5.26",
"@skandha/utils": "^1.5.26",
"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": "1.5.25",
"version": "1.5.26",
"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": "^1.5.25",
"@skandha/db": "^1.5.25",
"@skandha/executor": "^1.5.25",
"@skandha/monitoring": "^1.5.25",
"@skandha/node": "^1.5.25",
"@skandha/types": "^1.5.25",
"@skandha/api": "^1.5.26",
"@skandha/db": "^1.5.26",
"@skandha/executor": "^1.5.26",
"@skandha/monitoring": "^1.5.26",
"@skandha/node": "^1.5.26",
"@skandha/types": "^1.5.26",
"find-up": "5.0.0",
"got": "12.5.3",
"js-yaml": "4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "1.5.25",
"version": "1.5.26",
"description": "Smart contracts of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://https://github.com/etherspot/skandha#readme",
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": "1.5.25",
"version": "1.5.26",
"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": "^1.5.25"
"@skandha/types": "^1.5.26"
},
"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": "1.5.25",
"version": "1.5.26",
"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": "^1.5.25",
"@skandha/params": "^1.5.25",
"@skandha/types": "^1.5.25",
"@skandha/utils": "^1.5.25",
"@skandha/monitoring": "^1.5.26",
"@skandha/params": "^1.5.26",
"@skandha/types": "^1.5.26",
"@skandha/utils": "^1.5.26",
"async-mutex": "0.4.0",
"ethers": "5.7.2",
"strict-event-emitter-types": "2.0.0",
Expand Down
94 changes: 51 additions & 43 deletions packages/executor/src/modules/eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -349,46 +349,32 @@ export class Eth {
blockNumber: transaction.blockNumber,
};
}
const [entryPoint, event] = await this.getUserOperationEvent(hash);
if (!entryPoint || !event) {
if (this.blockscoutApi)
return await this.blockscoutApi.getUserOperationByHash(hash);
return null;
}
const tx = await event.getTransaction();
if (tx.to !== entryPoint.address) {
throw new Error("unable to parse transaction");
}
const parsed = entryPoint.interface.parseTransaction(tx);
const ops: UserOperationStruct[] = parsed?.args.ops;
if (ops.length == 0) {
throw new Error("failed to parse transaction");
}
const op = ops.find(
(o) =>
o.sender === event.args.sender &&
BigNumber.from(o.nonce).eq(event.args.nonce)
);
if (!op) {
throw new Error("unable to find userOp in transaction");
}

const {
sender,
nonce,
initCode,
callData,
callGasLimit,
verificationGasLimit,
preVerificationGas,
maxFeePerGas,
maxPriorityFeePerGas,
paymasterAndData,
signature,
} = op;
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
const getUserOpFromRpc = async () => {
const [entryPoint, event] = await this.getUserOperationEvent(hash);
if (!entryPoint || !event) {
throw new Error("not found");
}
const tx = await event.getTransaction();
if (tx.to !== entryPoint.address) {
throw new Error("unable to parse transaction");
}
const parsed = entryPoint.interface.parseTransaction(tx);
const ops: UserOperationStruct[] = parsed?.args.ops;
if (ops.length == 0) {
throw new Error("failed to parse transaction");
}
const op = ops.find(
(o) =>
o.sender === event.args.sender &&
BigNumber.from(o.nonce).eq(event.args.nonce)
);
if (!op) {
throw new Error("unable to find userOp in transaction");
}

return deepHexlify({
userOperation: {
const {
sender,
nonce,
initCode,
Expand All @@ -400,11 +386,33 @@ export class Eth {
maxPriorityFeePerGas,
paymasterAndData,
signature,
},
entryPoint: entryPoint.address,
transactionHash: tx.hash,
blockHash: tx.blockHash ?? "",
blockNumber: tx.blockNumber ?? 0,
} = op;

return deepHexlify({
userOperation: {
sender,
nonce,
initCode,
callData,
callGasLimit,
verificationGasLimit,
preVerificationGas,
maxFeePerGas,
maxPriorityFeePerGas,
paymasterAndData,
signature,
},
entryPoint: entryPoint.address,
transactionHash: tx.hash,
blockHash: tx.blockHash ?? "",
blockNumber: tx.blockNumber ?? 0,
});
};

return getUserOpFromRpc().catch((_) => {
if (this.blockscoutApi)
return this.blockscoutApi.getUserOperationByHash(hash);
return 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": "1.5.25",
"version": "1.5.26",
"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": "^1.5.25",
"@skandha/types": "^1.5.26",
"prom-client": "^14.2.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": "1.5.25",
"version": "1.5.26",
"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": "^1.5.25",
"@skandha/db": "^1.5.25",
"@skandha/executor": "^1.5.25",
"@skandha/monitoring": "^1.5.25",
"@skandha/params": "^1.5.25",
"@skandha/types": "^1.5.25",
"@skandha/utils": "^1.5.25",
"@skandha/api": "^1.5.26",
"@skandha/db": "^1.5.26",
"@skandha/executor": "^1.5.26",
"@skandha/monitoring": "^1.5.26",
"@skandha/params": "^1.5.26",
"@skandha/types": "^1.5.26",
"@skandha/utils": "^1.5.26",
"@types/varint": "6.0.1",
"abstract-leveldown": "7.2.0",
"datastore-core": "8.0.1",
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": "1.5.25",
"version": "1.5.26",
"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.10.1",
"@mantleio/sdk": "0.2.1",
"@skandha/types": "^1.5.25",
"@skandha/utils": "^1.5.25",
"@skandha/types": "^1.5.26",
"@skandha/utils": "^1.5.26",
"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": "1.5.25",
"version": "1.5.26",
"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": "1.5.25",
"version": "1.5.26",
"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": "^1.5.25",
"@skandha/types": "^1.5.26",
"any-signal": "3.0.1",
"bigint-buffer": "1.1.5",
"case": "^1.6.3",
Expand Down
Loading