Merge branch 'develop' into serge/oxidize-prove-stdio

.github/workflows/jerigon-native.yml

@@ -62,26 +62,26 @@ jobs:
       - name: Run cancun test network
         run: |
           docker pull ghcr.io/0xpolygonzero/erigon:feat-zero
-          kurtosis run --enclave cancun-testnet github.com/ethpandaops/ethereum-package@4.0.0 \
+          kurtosis run --enclave cancun-testnet github.com/ethpandaops/ethereum-package@4.4.0 \
             --args-file jerigon-test-network/network_params.yml
 
       - name: Generate blocks with transactions
         run: |
-          ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
+          ETH_RPC_URL="http://$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           cast rpc eth_blockNumber --rpc-url $ETH_RPC_URL
           cd jerigon-test-network && set -a && source .env && set +a
           bash ./tests/generate_transactions.sh
 
       - name: Run prove blocks with native tracer in test_only mode
         run: |
-          ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
+          ETH_RPC_URL="http://$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           ulimit -n 8192
           cargo xtask prove-rpc "$ETH_RPC_URL" native test 1 -e 15 -c 0 -b 3000 -r 100
           echo "Proving blocks in test_only mode finished"
 
       - name: Run prove blocks with native tracer in real mode
         run: |
-          ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
+          ETH_RPC_URL="http://$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           rm -rf proofs/* circuits/* ./proofs.json test.out verify.out leader.out
           cargo xtask prove-rpc "$ETH_RPC_URL" native verify 4 -e 7 -c 3 -b 3000 -r 100
           echo "Proving blocks in real mode finished"

.github/workflows/jerigon-zero.yml

@@ -62,26 +62,26 @@ jobs:
       - name: Run cancun test network
         run: |
           docker pull ghcr.io/0xpolygonzero/erigon:feat-zero
-          kurtosis run --enclave cancun-testnet github.com/ethpandaops/ethereum-package@4.0.0 \
+          kurtosis run --enclave cancun-testnet github.com/ethpandaops/ethereum-package@4.4.0 \
             --args-file jerigon-test-network/network_params.yml
 
       - name: Generate blocks with transactions
         run: |
-          ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
+          ETH_RPC_URL="http://$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           cast rpc eth_blockNumber --rpc-url $ETH_RPC_URL
           cd jerigon-test-network && set -a && source .env && set +a
           bash ./tests/generate_transactions.sh
 
       - name: Run prove blocks with zero tracer in test_only mode
         run: |
-          ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
+          ETH_RPC_URL="http://$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           ulimit -n 8192
           cargo xtask prove-rpc "$ETH_RPC_URL" jerigon test 1 -e 15 -c 0 -b 3000 -r 100
           echo "Proving blocks in test_only mode finished"
 
       - name: Run prove blocks with zero tracer in real mode
         run: |
-          ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
+          ETH_RPC_URL="http://$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           rm -rf proofs/* circuits/* ./proofs.json test.out verify.out leader.out
           cargo xtask prove-rpc "$ETH_RPC_URL" jerigon verify 2 -e 5 -c 1 -b 3000 -r 100
           echo "Proving blocks in real mode finished"

Cargo.toml

@@ -103,7 +103,7 @@ url = "2.5.2"
 winnow = "0.6.13"
 
 # local dependencies
-evm_arithmetization = { path = "evm_arithmetization", version = "0.5.0", default-features = false }
+evm_arithmetization = { path = "evm_arithmetization", version = "0.5.1", default-features = false }
 mpt_trie = { path = "mpt_trie", version = "0.5.0" }
 smt_trie = { path = "smt_trie", version = "0.2.0" }
 trace_decoder = { path = "trace_decoder", version = "0.7.0", default-features = false }

evm_arithmetization/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "evm_arithmetization"
 description = "Implementation of STARKs for the Ethereum Virtual Machine"
-version = "0.5.0"
+version = "0.5.1"
 authors = [
   "Daniel Lubarov <[email protected]>",
   "William Borgeaud <[email protected]>",

evm_arithmetization/src/witness/operation.rs

@@ -208,6 +208,7 @@ pub(crate) fn generate_poseidon_general<F: RichField, T: Transition<F>>(
     state: &mut T,
     mut row: CpuColumnsView<F>,
 ) -> Result<(), ProgramError> {
+    use alloy_compat::Compat;
     use smt_trie::{code::poseidon_hash_padded_byte_vec, utils::hashout2u};
 
     use crate::{
@@ -250,7 +251,7 @@ pub(crate) fn generate_poseidon_general<F: RichField, T: Transition<F>>(
 
     let hash = hashout2u(poseidon_hash_padded_byte_vec(input.clone()));
 
-    push_no_write(generation_state, hash.into());
+    push_no_write(generation_state, hash.compat());
 
     state.push_poseidon(poseidon_op);