From 3f247d69359547ddb7ef92d9f5b67096db4f1819 Mon Sep 17 00:00:00 2001 From: Robin Salen Date: Mon, 2 Dec 2024 19:12:06 -0500 Subject: [PATCH 1/3] Fix uint conversion --- evm_arithmetization/src/witness/operation.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evm_arithmetization/src/witness/operation.rs b/evm_arithmetization/src/witness/operation.rs index 7f674cdbf..284be1f13 100644 --- a/evm_arithmetization/src/witness/operation.rs +++ b/evm_arithmetization/src/witness/operation.rs @@ -208,6 +208,7 @@ pub(crate) fn generate_poseidon_general>( state: &mut T, mut row: CpuColumnsView, ) -> 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>( 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); From b0781baa87d35fb94373ed18c94cc8a8dbeb0ace Mon Sep 17 00:00:00 2001 From: Robin Salen Date: Mon, 2 Dec 2024 19:14:30 -0500 Subject: [PATCH 2/3] Bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- evm_arithmetization/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2375e0ff3..970ea3082 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2020,7 +2020,7 @@ dependencies = [ [[package]] name = "evm_arithmetization" -version = "0.5.0" +version = "0.5.1" dependencies = [ "alloy", "alloy-compat", diff --git a/Cargo.toml b/Cargo.toml index 9759d859e..6314afb14 100644 --- a/Cargo.toml +++ b/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 } diff --git a/evm_arithmetization/Cargo.toml b/evm_arithmetization/Cargo.toml index 94bfa66b9..e571388a2 100644 --- a/evm_arithmetization/Cargo.toml +++ b/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 ", "William Borgeaud ", From f65d81a7bf906b47fe17eecb9b3671886327f66c Mon Sep 17 00:00:00 2001 From: Marko Atanasievski Date: Tue, 3 Dec 2024 13:51:18 +0100 Subject: [PATCH 3/3] fix: workflow cancun test network (#810) * fix: workflow cancun test network * fix: http url --- .github/workflows/jerigon-native.yml | 8 ++++---- .github/workflows/jerigon-zero.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/jerigon-native.yml b/.github/workflows/jerigon-native.yml index 935cf166a..157abdb84 100644 --- a/.github/workflows/jerigon-native.yml +++ b/.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" diff --git a/.github/workflows/jerigon-zero.yml b/.github/workflows/jerigon-zero.yml index 6d8017a6e..b1e6a46ca 100644 --- a/.github/workflows/jerigon-zero.yml +++ b/.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"