Refactor and pull updates from ZKasper development (#19)

* remove ssz-multiproofs and refactor guests to avoid features

* bump some crates and remove ssz-multiproof to be a dependency

* switch to new iD in contract

Author: willemolding

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["cli", "guests/membership", "guests/balance_and_exits", "crates/ssz-multiproofs", "crates/gindices", "crates/guest-io", "crates/test-utils", "crates/beacon-state"]
+members = ["cli", "guests/membership", "guests/balance_and_exits", "crates/gindices", "crates/guest-io", "crates/test-utils", "crates/beacon-state"]
 
 [workspace.package]
 version = "0.1.0"
@@ -9,16 +9,15 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 gindices.path = "./crates/gindices"
-ssz-multiproofs.path = "./crates/ssz-multiproofs"
 guest-io.path = "./crates/guest-io"
 membership_builder.path = "./guests/membership"
 balance_and_exits_builder.path = "./guests/balance_and_exits"
 test-utils.path = "./crates/test-utils"
 beacon-state.path = "./crates/beacon-state"
 
 alloy = { version = "0.15", features = ["full"] }
-alloy-primitives = { version = "1.0", default-features = false, features = ["rlp", "serde", "std"] }
-alloy-sol-types = { version = "1.0" }
+alloy-primitives = { version = "1.2.1", default-features = false, features = ["rlp", "serde", "std"] }
+alloy-sol-types = { version = "1.2.1" }
 anyhow = { version = "1.0.75" }
 bincode = { version = "1.3" }
 bytemuck = { version = "1.14" }
@@ -29,13 +28,14 @@ risc0-build = { version = "2.1", features = ["docker"] }
 risc0-build-ethereum = { git = "https://github.com/risc0/risc0-ethereum", tag = "v2.1.0" }
 risc0-ethereum-contracts = { git = "https://github.com/risc0/risc0-ethereum", tag = "v2.1.0" }
 risc0-steel = { git = "https://github.com/risc0/risc0-ethereum", tag = "v2.1.0", default-features = false }
-risc0-zkvm = { version = "2.1" }
-risc0-zkp = { version = "2.0.1" }
-risc0-zkvm-platform = { version = "2.0.2", default-features = false }
+risc0-zkvm = { version = "2.3.1" }
+risc0-zkp = { version = "2.0.2" }
+risc0-zkvm-platform = { version = "2.0.3", default-features = false }
 revm = { version = "23.1", default-features = false, features = ["std"] }
 
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus.git", rev = "ade5ce6c4a19107c1059e5338d8f18855bd2d931", default-features = false, features = ["serde"] }
 ssz_rs = { git = "https://github.com/willemolding/ssz-rs", rev = "d939604c3693aadaff63dcacf9a810d8845fafef"}
+ssz-multiproofs = { git = "https://github.com/boundless-xyz/Signal-Ethereum", tag = "v1.0.0" }
 
 serde = { version = "1.0", features = ["derive", "std"] }
 serde_json = "1.0.133"

Cargo.toml

@@ -5,7 +5,6 @@ edition = { workspace = true }
 
 [features]
 default = []
-sepolia = ["guest-io/sepolia", "membership_builder/sepolia"]
 
 [dependencies]
 ssz-multiproofs.workspace = true

cli/Cargo.toml

@@ -19,12 +19,19 @@ use alloy::{
     signers::local::PrivateKeySigner,
 };
 use anyhow::{Context, Result};
-use balance_and_exits_builder::{BALANCE_AND_EXITS_ELF, BALANCE_AND_EXITS_ID};
+use balance_and_exits_builder::{
+    MAINNET_ELF as BALANCE_AND_EXITS_ELF, MAINNET_ID as BALANCE_AND_EXITS_ID,
+};
 use beacon_client::BeaconClient;
 use clap::Parser;
 use ethereum_consensus::phase0::mainnet::{HistoricalBatch, SLOTS_PER_HISTORICAL_ROOT};
-use guest_io::{ETH_SEPOLIA_CHAIN_SPEC, WITHDRAWAL_CREDENTIALS, WITHDRAWAL_VAULT_ADDRESS};
-use membership_builder::{VALIDATOR_MEMBERSHIP_ELF, VALIDATOR_MEMBERSHIP_ID};
+use guest_io::{
+    mainnet::{WITHDRAWAL_CREDENTIALS, WITHDRAWAL_VAULT_ADDRESS},
+    ETH_SEPOLIA_CHAIN_SPEC,
+};
+use membership_builder::{
+    MAINNET_ELF as VALIDATOR_MEMBERSHIP_ELF, MAINNET_ID as VALIDATOR_MEMBERSHIP_ID,
+};
 use risc0_ethereum_contracts::encode_seal;
 use risc0_steel::{ethereum::EthEvmEnv, Account};
 use risc0_zkvm::{default_prover, ExecutorEnv, ProverOpts, Receipt, VerifierContext};
@@ -283,6 +290,7 @@ async fn build_membership_input<'a>(
 
         tracing::info!("Building input. This may take a few minutes...");
         Input::build_continuation(
+            WITHDRAWAL_CREDENTIALS,
             &prior_beacon_state,
             prior_max_validator_index,
             &beacon_state,
@@ -366,6 +374,7 @@ async fn build_aggregate_input<'a>(
     let evm_input = env.into_input().await?;
 
     let input = guest_io::balance_and_exits::Input::build(
+        WITHDRAWAL_CREDENTIALS,
         &beacon_block_header.message,
         &beacon_state,
         evm_input,

cli/src/main.rs

@@ -41,7 +41,7 @@ contract SecondOpinionOracle is ISecondOpinionOracle, IOracleProofReceiver {
     uint256 public immutable genesis_block_timestamp;
 
     /// @notice Image ID of the only zkVM guest to accept verification from.
-    bytes32 public constant imageId = ImageID.BALANCE_AND_EXITS_ID;
+    bytes32 public constant imageId = ImageID.MAINNET_ID;
 
     /// @notice Seconds per slot
     uint256 public constant SECONDS_PER_SLOT = 12;

contracts/src/SecondOpinionOracle.sol

@@ -27,7 +27,7 @@ contract TestVerifier is ITestVerifier {
     IRiscZeroVerifier public immutable verifier;
 
     /// @notice Image ID of the only zkVM guest to accept verification from.
-    bytes32 public constant imageId = ImageID.BALANCE_AND_EXITS_ID;
+    bytes32 public constant imageId = ImageID.MAINNET_ID;
 
     /// @notice Initialize the contract, binding it to a specified RISC Zero verifier.
     constructor(IRiscZeroVerifier _verifier) {

contracts/src/TestVerifier.sol

@@ -6,7 +6,6 @@ edition = "2021"
 [features]
 default = []
 builder = ["ssz-multiproofs/builder", "dep:ssz_rs", "dep:ethereum-consensus", "dep:gindices", "dep:beacon-state", "risc0-steel/host"]
-sepolia = []
 
 [dependencies]
 ssz-multiproofs = { workspace = true }

crates/guest-io/Cargo.toml

@@ -39,7 +39,6 @@ pub struct InputWithReceipt<T> {
 }
 
 pub mod validator_membership {
-
     use risc0_zkvm::serde::to_vec;
 
     use super::*;
@@ -104,6 +103,7 @@ pub mod validator_membership {
             self_program_id
         ))]
         pub fn build_continuation<D: Into<Digest>>(
+            withdrawal_credentials: B256,
             prior_beacon_state: &BeaconState,
             prior_max_validator_index: u64,
             beacon_state: &BeaconState,
@@ -127,9 +127,7 @@ pub mod validator_membership {
                 .validators()
                 .iter()
                 .take((prior_max_validator_index + 1) as usize)
-                .map(|v| {
-                    v.withdrawal_credentials.as_slice() == crate::WITHDRAWAL_CREDENTIALS.as_slice()
-                })
+                .map(|v| v.withdrawal_credentials.as_slice() == withdrawal_credentials.as_slice())
                 .collect::<BitVec<u32, Lsb0>>();
 
             let (cont_type, hist_summary_multiproof) = if slot == prior_slot {
@@ -144,7 +142,7 @@ pub mod validator_membership {
                 );
                 let hist_summary_multiproof = MultiproofBuilder::new()
                     .with_gindex(historical_batch_gindices::state_roots(prior_slot).try_into()?)
-                    .build(&historical_batch, Option::<(_, usize)>::None)?;
+                    .build(&historical_batch)?;
                 (ContinuationType::LongRange, Some(hist_summary_multiproof))
             } else {
                 return Err(Error::MissingHistoricalBatch);
@@ -259,6 +257,7 @@ pub mod balance_and_exits {
     impl Input<'_> {
         #[tracing::instrument(skip(block_header, beacon_state, evm_input))]
         pub fn build(
+            withdrawal_credentials: B256,
             block_header: &BeaconBlockHeader,
             beacon_state: &BeaconState,
             evm_input: EthEvmInput,
@@ -268,17 +267,15 @@ pub mod balance_and_exits {
             let membership = beacon_state
                 .validators()
                 .iter()
-                .map(|v| {
-                    v.withdrawal_credentials.as_slice() == crate::WITHDRAWAL_CREDENTIALS.as_slice()
-                })
+                .map(|v| v.withdrawal_credentials.as_slice() == withdrawal_credentials.as_slice())
                 .collect::<BitVec<u32, Lsb0>>();
 
             tracing::info!("{} Lido validators detected", membership.count_ones());
 
             let block_multiproof = MultiproofBuilder::new()
                 .with_gindex(beacon_block_gindices::slot().try_into()?)
                 .with_gindex(beacon_block_gindices::state_root().try_into()?)
-                .build(block_header, Option::<(_, usize)>::None)?;
+                .build(block_header)?;
 
             let state_multiproof_builder = MultiproofBuilder::new()
                 .with_gindex(beacon_state_gindices::validator_count().try_into()?)
@@ -330,50 +327,12 @@ fn build_with_versioned_state(
     builder: MultiproofBuilder,
     beacon_state: &BeaconState,
 ) -> Result<Multiproof<'static>> {
-    use beacon_state::mainnet::ElectraBeaconState;
-
     match beacon_state {
-        BeaconState::Phase0(b) => Ok(builder.build(
-            b,
-            Some((
-                BeaconState::generalized_index(&["validators".into()]).unwrap(),
-                beacon_state.validators().clone(),
-            )),
-        )?),
-        BeaconState::Altair(b) => Ok(builder.build(
-            b,
-            Some((
-                BeaconState::generalized_index(&["validators".into()]).unwrap(),
-                beacon_state.validators().clone(),
-            )),
-        )?),
-        BeaconState::Bellatrix(b) => Ok(builder.build(
-            b,
-            Some((
-                BeaconState::generalized_index(&["validators".into()]).unwrap(),
-                beacon_state.validators().clone(),
-            )),
-        )?),
-        BeaconState::Capella(b) => Ok(builder.build(
-            b,
-            Some((
-                BeaconState::generalized_index(&["validators".into()]).unwrap(),
-                beacon_state.validators().clone(),
-            )),
-        )?),
-        BeaconState::Deneb(b) => Ok(builder.build(
-            b,
-            Some((
-                BeaconState::generalized_index(&["validators".into()]).unwrap(),
-                beacon_state.validators().clone(),
-            )),
-        )?),
-        BeaconState::Electra(b) => Ok(builder.build(
-            b,
-            Some((
-                ElectraBeaconState::generalized_index(&["validators".into()]).unwrap(),
-                beacon_state.validators().clone(),
-            )),
-        )?),
+        BeaconState::Phase0(b) => Ok(builder.build(b)?),
+        BeaconState::Altair(b) => Ok(builder.build(b)?),
+        BeaconState::Bellatrix(b) => Ok(builder.build(b)?),
+        BeaconState::Capella(b) => Ok(builder.build(b)?),
+        BeaconState::Deneb(b) => Ok(builder.build(b)?),
+        BeaconState::Electra(b) => Ok(builder.build(b)?),
     }
 }

crates/guest-io/src/io.rs

@@ -15,31 +15,38 @@
 mod error;
 mod io;
 
-use alloy_primitives::{address, Address};
 use revm::primitives::hardfork::SpecId;
 use risc0_steel::config::{ChainSpec, ForkCondition};
 use risc0_steel::ethereum::EthChainSpec;
 pub use risc0_steel::ethereum::ETH_SEPOLIA_CHAIN_SPEC;
 use std::collections::BTreeMap;
 use std::sync::LazyLock;
 
-#[cfg(not(feature = "sepolia"))] // mainnet
-pub const WITHDRAWAL_CREDENTIALS: alloy_primitives::B256 = alloy_primitives::B256::new([
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0xd7, 0x93, 0x48,
-    0x78, 0xb5, 0xfb, 0x96, 0x10, 0xb3, 0xfe, 0x8a, 0x5e, 0x44, 0x1e, 0x8f, 0xad, 0x7e, 0x29, 0x3f,
-]);
+pub mod mainnet {
+    use alloy_primitives::{address, Address};
 
-#[cfg(not(feature = "sepolia"))] // mainnet
-pub const WITHDRAWAL_VAULT_ADDRESS: Address = address!("b9d7934878b5fb9610b3fe8a5e441e8fad7e293f");
+    pub const WITHDRAWAL_CREDENTIALS: alloy_primitives::B256 = alloy_primitives::B256::new([
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0xd7, 0x93,
+        0x48, 0x78, 0xb5, 0xfb, 0x96, 0x10, 0xb3, 0xfe, 0x8a, 0x5e, 0x44, 0x1e, 0x8f, 0xad, 0x7e,
+        0x29, 0x3f,
+    ]);
 
-#[cfg(feature = "sepolia")]
-pub const WITHDRAWAL_CREDENTIALS: alloy_primitives::B256 = alloy_primitives::B256::new([
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0x73, 0x18, 0xaf,
-    0xa6, 0x7e, 0xad, 0x6d, 0x6b, 0xbc, 0x82, 0x24, 0xdf, 0xce, 0x5e, 0xd6, 0xe4, 0xb8, 0x6d, 0x76,
-]);
+    pub const WITHDRAWAL_VAULT_ADDRESS: Address =
+        address!("b9d7934878b5fb9610b3fe8a5e441e8fad7e293f");
+}
 
-#[cfg(feature = "sepolia")]
-pub const WITHDRAWAL_VAULT_ADDRESS: Address = address!("De7318Afa67eaD6d6bbC8224dfCe5ed6e4b86d76");
+pub mod sepolia {
+    use alloy_primitives::{address, Address};
+
+    pub const WITHDRAWAL_CREDENTIALS: alloy_primitives::B256 = alloy_primitives::B256::new([
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0x73, 0x18,
+        0xaf, 0xa6, 0x7e, 0xad, 0x6d, 0x6b, 0xbc, 0x82, 0x24, 0xdf, 0xce, 0x5e, 0xd6, 0xe4, 0xb8,
+        0x6d, 0x76,
+    ]);
+
+    pub const WITHDRAWAL_VAULT_ADDRESS: Address =
+        address!("De7318Afa67eaD6d6bbC8224dfCe5ed6e4b86d76");
+}
 
 pub static ANVIL_CHAIN_SPEC: LazyLock<EthChainSpec> = LazyLock::new(|| ChainSpec {
     chain_id: 31337,