feat(validation): update tracer & ban invalid opcode (#96)

* update tracer & ban invalid opcode

* chore(release): 1.0.3-alpha

* update spec tests workflow

Author: 0xSulpiride

.github/workflows/bundler-spec-tests.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: eth-infinitism/bundler-spec-tests
-          ref: e193753db1910fb6d0ee2661d96a8d8f79d6c7d8
+          ref: 5b611d592fc55004d1e50fe18da6824206f1b72c
           path: ./bundler-spec-tests
           submodules: true
 
@@ -36,13 +36,13 @@ jobs:
 
       - name: Install Geth
         run: |
-          wget https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.12.2-bed84606.tar.gz
-          tar -xvf geth-linux-amd64-1.12.2-bed84606.tar.gz
+          sudo add-apt-repository -y ppa:ethereum/ethereum && \
+          sudo apt-get update && \
+          sudo apt-get install ethereum
 
       - name: Run Geth
         run: |
-          cd geth-linux-amd64-1.12.2-bed84606 &&
-          ./geth \
+          geth \
           --verbosity 1 \
           --http.vhosts '*,localhost,host.docker.internal' \
           --http \
@@ -68,8 +68,7 @@ jobs:
 
       - name: Fund bundler
         run: |
-          cd geth-linux-amd64-1.12.2-bed84606 &&
-          ./geth \
+          geth \
           --exec "eth.sendTransaction({from: eth.accounts[0], to: \"0x55082761664aEb8062B3427ba5E0455bFb7b68CB\", value: web3.toWei(4337, \"ether\")})" \
           attach http://localhost:8545/
 

lerna.json

@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "1.0.2-alpha",
+  "version": "1.0.3-alpha",
   "stream": "true",
   "command": {
     "version": {

package.json

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

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.0.2-alpha",
+  "version": "1.0.3-alpha",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -35,12 +35,12 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
     "ethers": "5.7.2",
-    "executor": "1.0.2-alpha",
+    "executor": "1.0.3-alpha",
     "fastify": "4.14.1",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
     "reflect-metadata": "0.1.13",
-    "types": "1.0.2-alpha"
+    "types": "1.0.3-alpha"
   },
   "devDependencies": {
     "@types/connect": "3.4.35"

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "1.0.2-alpha",
+  "version": "1.0.3-alpha",
   "description": "> TODO: description",
   "author": "zincoshine <psramanuj@gmail.com>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -38,14 +38,14 @@
     "@libp2p/peer-id-factory": "2.0.1",
     "@libp2p/prometheus-metrics": "1.1.3",
     "@multiformats/multiaddr": "12.1.3",
-    "api": "1.0.2-alpha",
-    "db": "1.0.2-alpha",
-    "executor": "1.0.2-alpha",
+    "api": "1.0.3-alpha",
+    "db": "1.0.3-alpha",
+    "executor": "1.0.3-alpha",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "node": "1.0.2-alpha",
-    "types": "1.0.2-alpha",
+    "node": "1.0.3-alpha",
+    "types": "1.0.3-alpha",
     "yargs": "17.6.2"
   },
   "devDependencies": {

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "1.0.2-alpha",
+  "version": "1.0.3-alpha",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@chainsafe/ssz": "0.10.1",
     "rocksdb": "5.2.1",
-    "types": "1.0.2-alpha"
+    "types": "1.0.3-alpha"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.0.2-alpha",
+  "version": "1.0.3-alpha",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
-    "params": "1.0.2-alpha",
-    "types": "1.0.2-alpha"
+    "params": "1.0.3-alpha",
+    "types": "1.0.3-alpha"
   }
 }

packages/executor/src/services/UserOpValidation/validators/safe.ts

@@ -51,6 +51,7 @@ const bannedOpCodes = new Set([
   "SELFDESTRUCT",
   "RANDOM",
   "PREVRANDAO",
+  "INVALID",
 ]);
 
 // REF: https://github.com/eth-infinitism/bundler/blob/main/packages/bundler/src/modules/ValidationManager.ts

packages/executor/tracer.js

@@ -65,8 +65,8 @@ function bundlerCollectorTracer() {
           if (this.lastThreeOpcodes.length > 3) {
               this.lastThreeOpcodes.shift();
           }
-          if (log.getGas() < log.getCost()) {
-              this.currentLevel.oog = true;
+          if (log.getGas() < log.getCost() || (opcode === 'SSTORE' && log.getGas() < 2300)) {
+            this.currentLevel.oog = true
           }
           if (opcode === 'REVERT' || opcode === 'RETURN') {
               if (log.getDepth() === 1) {

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node",
-  "version": "1.0.2-alpha",
+  "version": "1.0.3-alpha",
   "description": "The bundler node module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -55,25 +55,25 @@
     "@libp2p/tcp": "6.1.0",
     "@multiformats/multiaddr": "11.4.0",
     "abstract-leveldown": "7.2.0",
-    "api": "1.0.2-alpha",
+    "api": "1.0.3-alpha",
     "datastore-core": "8.0.1",
-    "db": "1.0.2-alpha",
+    "db": "1.0.3-alpha",
     "ethers": "5.7.2",
-    "executor": "1.0.2-alpha",
+    "executor": "1.0.3-alpha",
     "it-filter": "1.0.2",
     "it-map": "1.0.5",
     "it-sort": "1.0.0",
     "it-take": "1.0.1",
     "libp2p": "0.42.2",
-    "params": "1.0.2-alpha",
+    "params": "1.0.3-alpha",
     "prettier": "2.8.4",
     "rocksdb": "5.2.1",
     "snappy": "7.2.2",
     "snappyjs": "0.7.0",
     "stream-to-it": "0.2.4",
     "strict-event-emitter-types": "2.0.0",
-    "types": "1.0.2-alpha",
-    "utils": "1.0.2-alpha",
+    "types": "1.0.3-alpha",
+    "utils": "1.0.3-alpha",
     "varint": "6.0.0",
     "xxhash-wasm": "1.0.2"
   },