MPT: Testing & go library fix

.github/workflows/mpt-witness-generator.yml → .github/workflows/geth-utils.yml

@@ -1,4 +1,4 @@
-name: MPT Witness Generator Checks
+name: Geth-utils Checks
 
 on:
   merge_group:
@@ -19,7 +19,7 @@ jobs:
         with:
           cancel_others: 'true'
           concurrent_skipping: 'same_content_newer'
-          paths: '["mpt-witness-generator/**"]'
+          paths: '["geth-utils/**"]'
 
 
   build:
@@ -35,15 +35,15 @@ jobs:
     - name: Format
       uses: Jerome1337/[email protected]
       with:
-        gofmt-path: './mpt-witness-generator'
+        gofmt-path: './geth-utils'
         gofmt-flags: '-l -d'
 
     - name: Build
-      working-directory: ./mpt-witness-generator
+      working-directory: ./geth-utils
       run: go build -v ./...
 
     - name: Test
-      working-directory: ./mpt-witness-generator
+      working-directory: ./geth-utils
       env:
         NO_GETH: true
       run: go test -v ./...

Cargo.toml

@@ -11,8 +11,7 @@ members = [
     "external-tracer",
     "mock",
     "testool",
-    "mpt-witness-generator/rustlib",
-    "light-client-poc"
+    "bin/mpt-test"
 ]
 
 [patch.crates-io]

bin/mpt-test/.gitignore

@@ -0,0 +1 @@
+web3_rpc_cache.bin

bin/mpt-test/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "mpt-test"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+ethers ={ version = "2.0.10", features = ["abigen", "rustls", "ws", "ethers-solc"] }
+eth-types = { path = "../../eth-types" }
+gadgets = { path = "../../gadgets" }
+geth-utils = { path = "../../geth-utils" }
+zkevm-circuits = { path = "../../zkevm-circuits", features=["test-circuits"]}
+eyre = "0.6.11"
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git",  features=["circuit-params"], tag = "v0.3.0" }
+serde_json = "1.0.111"
+tokio = { version= "1.28.2", features = ["macros", "rt-multi-thread"]  }
+glob = "0.3.1"
+lazy_static = "1.4.0"
+base64 = "0.21.7"
+flate2 = "1.0.28"
+hyper = { version="0.14.27",  features= ["full"]}
+hyper-rustls = "0.24.1"
+serde = "1.0.195"
+hex = "0.4.3"
+
+[features]
+default = ["disable-keccak"]
+disable-keccak = []