Sync upstream (#11)

* pull, update deps, fix conflicts, fails on duplicate panic handler

* revert cargo.lock, update rpc cache

* update revs

Author: Schaeff

.cargo/config.local.toml

@@ -56,8 +56,18 @@ openvm-rv32im-circuit = { path = "../openvm-org/openvm/extensions/rv32im/circuit
 openvm-rv32im-transpiler = { path = "../openvm-org/openvm/extensions/rv32im/transpiler" }
 openvm-rv32im-guest = { path = "../openvm-org/openvm/extensions/rv32im/guest" }
 
+# Guest Libs
+k256 = { path = "../openvm-org/openvm/guest-libs/k256" }
+p256 = { path = "../openvm-org/openvm/guest-libs/p256" }
+ruint = { path = "../openvm-org/openvm/guest-libs/ruint" }
+openvm-keccak256 = { path = "../openvm-org/openvm/guest-libs/keccak256" }
+openvm-sha2 = { path = "../openvm-org/openvm/guest-libs/sha2" }
+openvm-pairing = { path = "../openvm-org/openvm/guest-libs/pairing" }
 
-# [patch.crates-io]
+[patch.crates-io]
+k256 = { path = "../openvm-org/openvm/guest-libs/k256" }
+p256 = { path = "../openvm-org/openvm/guest-libs/p256" }
+ruint = { path = "../openvm-org/openvm/guest-libs/ruint" }
 # revm = { path = "../revm/crates/revm" }
 # revm-primitives = { path = "../revm/crates/primitives" }
 # revm-interpreter = { path = "../revm/crates/interpreter" }

.cargo/config.toml

@@ -1,3 +1,4 @@
+# # Copy to config.toml for local patches
 # [net]
 # git-fetch-with-cli = true
 
@@ -55,8 +56,18 @@
 # openvm-rv32im-transpiler = { path = "../openvm-org/openvm/extensions/rv32im/transpiler" }
 # openvm-rv32im-guest = { path = "../openvm-org/openvm/extensions/rv32im/guest" }
 
+# # Guest Libs
+# k256 = { path = "../openvm-org/openvm/guest-libs/k256" }
+# p256 = { path = "../openvm-org/openvm/guest-libs/p256" }
+# ruint = { path = "../openvm-org/openvm/guest-libs/ruint" }
+# openvm-keccak256 = { path = "../openvm-org/openvm/guest-libs/keccak256" }
+# openvm-sha2 = { path = "../openvm-org/openvm/guest-libs/sha2" }
+# openvm-pairing = { path = "../openvm-org/openvm/guest-libs/pairing" }
 
-# # [patch.crates-io]
+# [patch.crates-io]
+# k256 = { path = "../openvm-org/openvm/guest-libs/k256" }
+# p256 = { path = "../openvm-org/openvm/guest-libs/p256" }
+# ruint = { path = "../openvm-org/openvm/guest-libs/ruint" }
 # # revm = { path = "../revm/crates/revm" }
 # # revm-primitives = { path = "../revm/crates/primitives" }
 # # revm-interpreter = { path = "../revm/crates/interpreter" }

.github/workflows/compare-bench.yml

@@ -118,7 +118,7 @@ jobs:
 
       - name: Install openvm-prof
         run: |
-          cargo install --git https://github.com/powdr-labs/openvm.git --tag v1.1.2 --profile=dev --force openvm-prof
+          cargo install --git https://github.com/powdr-labs/openvm.git --rev 33abb41 --profile=dev --force openvm-prof
       - name: Compare metrics
         run: |
           ls

.github/workflows/reth-benchmark.yml

@@ -237,7 +237,7 @@ jobs:
       - name: Set build args
         id: set-build-args
         run: |
-          FEATURES="bench-metrics,nightly-features,${{ inputs.memory_allocator || github.event.inputs.memory_allocator || 'jemalloc' }}"
+          FEATURES="bench-metrics,evm-verify,nightly-features,${{ inputs.memory_allocator || github.event.inputs.memory_allocator || 'jemalloc' }}"
           if [[ "${{ inputs.profiling || github.event.inputs.profiling }}" == "guest" ]]; then
             FEATURES="${FEATURES},profiling"
           fi
@@ -285,7 +285,7 @@ jobs:
 
       - name: Install openvm-prof
         run: |
-          cargo install --git https://github.com/powdr-labs/openvm.git --tag v1.1.2 --profile=dev --force openvm-prof
+          cargo install --git https://github.com/powdr-labs/openvm.git --rev 33abb41 --profile=dev --force openvm-prof
       - name: Checkout openvm (for scripts)
         run: |
           git clone --depth=1 https://github.com/powdr-labs/openvm.git
@@ -317,7 +317,7 @@ jobs:
       - name: Install cargo-openvm
         if: steps.cache-guest-elf-restore.outputs.cache-hit != 'true'
         run: |
-          cargo install --git https://github.com/powdr-labs/openvm.git --tag v1.1.2 --locked --force cargo-openvm
+          cargo install --git https://github.com/powdr-labs/openvm.git --rev 33abb41 --locked --force cargo-openvm
       - name: Build Guest ELF
         if: steps.cache-guest-elf-restore.outputs.cache-hit != 'true'
         working-directory: bin/client-eth