From 9da4cadba68833b0072576c4413414c5f3661255 Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Fri, 5 Jul 2024 13:33:58 +0500 Subject: [PATCH 1/2] fix call into entrypoint check --- .../src/services/UserOpValidation/validators/safe.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/executor/src/services/UserOpValidation/validators/safe.ts b/packages/executor/src/services/UserOpValidation/validators/safe.ts index b658d992..8792dfe6 100644 --- a/packages/executor/src/services/UserOpValidation/validators/safe.ts +++ b/packages/executor/src/services/UserOpValidation/validators/safe.ts @@ -195,7 +195,7 @@ export class SafeValidationService { const callStack = parseCallStack(traceCall); - const callInfoEntryPoint = callStack.find( + const callIntoEntryPoint = callStack.find( (call) => call.to === entryPoint && call.from !== entryPoint && @@ -203,9 +203,9 @@ export class SafeValidationService { call.method !== "depositTo" ); - if (callInfoEntryPoint != null) { + if (callIntoEntryPoint != null && callIntoEntryPoint.method) { throw new RpcError( - `illegal call into EntryPoint during validation ${callInfoEntryPoint?.method}`, + `illegal call into EntryPoint during validation ${callIntoEntryPoint.method}`, RpcErrorCodes.INVALID_OPCODE ); } From e474298683a8ae2abc81eff2bad270da33f45f2d Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Fri, 5 Jul 2024 13:34:15 +0500 Subject: [PATCH 2/2] chore(release): v2.0.6 --- lerna.json | 2 +- package.json | 2 +- packages/api/package.json | 10 +++++----- packages/cli/package.json | 14 +++++++------- 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 ++-- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/lerna.json b/lerna.json index 3d5540e2..e1e140ba 100644 --- a/lerna.json +++ b/lerna.json @@ -3,7 +3,7 @@ "packages/*" ], "npmClient": "yarn", - "version": "2.0.5", + "version": "2.0.6", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index cd2759c4..c1d1f739 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "2.0.5", + "version": "2.0.6", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index af456eee..cece83dd 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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.5", - "@skandha/monitoring": "^2.0.5", - "@skandha/types": "^2.0.5", - "@skandha/utils": "^2.0.5", + "@skandha/executor": "^2.0.6", + "@skandha/monitoring": "^2.0.6", + "@skandha/types": "^2.0.6", + "@skandha/utils": "^2.0.6", "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 4bc83b3c..cdd8c90a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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.5", - "@skandha/db": "^2.0.5", - "@skandha/executor": "^2.0.5", - "@skandha/monitoring": "^2.0.5", - "@skandha/node": "^2.0.5", - "@skandha/types": "^2.0.5", + "@skandha/api": "^2.0.6", + "@skandha/db": "^2.0.6", + "@skandha/executor": "^2.0.6", + "@skandha/monitoring": "^2.0.6", + "@skandha/node": "^2.0.6", + "@skandha/types": "^2.0.6", "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 ec73e97a..0df877f9 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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.5" + "@skandha/types": "^2.0.6" }, "devDependencies": { "@types/rocksdb": "3.0.1", diff --git a/packages/executor/package.json b/packages/executor/package.json index 243945ed..755cc7e3 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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.5", - "@skandha/params": "^2.0.5", - "@skandha/types": "^2.0.5", - "@skandha/utils": "^2.0.5", + "@skandha/monitoring": "^2.0.6", + "@skandha/params": "^2.0.6", + "@skandha/types": "^2.0.6", + "@skandha/utils": "^2.0.6", "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 d00dfa94..3c57fb65 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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.5", + "@skandha/types": "^2.0.6", "prom-client": "15.1.0" } } diff --git a/packages/node/package.json b/packages/node/package.json index 433c8c47..405510e7 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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.5", - "@skandha/db": "^2.0.5", - "@skandha/executor": "^2.0.5", - "@skandha/monitoring": "^2.0.5", - "@skandha/params": "^2.0.5", - "@skandha/types": "^2.0.5", - "@skandha/utils": "^2.0.5", + "@skandha/api": "^2.0.6", + "@skandha/db": "^2.0.6", + "@skandha/executor": "^2.0.6", + "@skandha/monitoring": "^2.0.6", + "@skandha/params": "^2.0.6", + "@skandha/types": "^2.0.6", + "@skandha/utils": "^2.0.6", "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 1620e336..430dee0c 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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": "^2.0.5", - "@skandha/utils": "^2.0.5", + "@skandha/types": "^2.0.6", + "@skandha/utils": "^2.0.6", "ethers": "5.7.2" }, "scripts": { diff --git a/packages/types/package.json b/packages/types/package.json index fff25980..8525bb9c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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 c80028ec..e5050ae9 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -4,7 +4,7 @@ "publishConfig": { "access": "public" }, - "version": "2.0.5", + "version": "2.0.6", "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.5", + "@skandha/types": "^2.0.6", "any-signal": "3.0.1", "bigint-buffer": "1.1.5", "case": "^1.6.3",