From 6253a68ea56eecb9428636557494eb036feb15b1 Mon Sep 17 00:00:00 2001 From: Linda Guiga Date: Wed, 21 Jun 2023 20:05:39 +0200 Subject: [PATCH] Change public values into public inputs --- evm/src/fixed_recursive_verifier.rs | 239 +++++++++++++++------------ evm/src/generation/mod.rs | 4 +- evm/src/proof.rs | 86 +++++++++- evm/src/recursive_verifier.rs | 80 ++++++--- evm/tests/empty_txn_list.rs | 59 ++----- plonky2/src/plonk/circuit_builder.rs | 6 + 6 files changed, 298 insertions(+), 176 deletions(-) diff --git a/evm/src/fixed_recursive_verifier.rs b/evm/src/fixed_recursive_verifier.rs index 1f8f0615..65e6ac01 100644 --- a/evm/src/fixed_recursive_verifier.rs +++ b/evm/src/fixed_recursive_verifier.rs @@ -2,7 +2,6 @@ use core::mem::{self, MaybeUninit}; use std::collections::BTreeMap; use std::ops::Range; -use ethereum_types::BigEndianHash; use hashbrown::HashMap; use itertools::{zip_eq, Itertools}; use plonky2::field::extension::Extendable; @@ -33,7 +32,7 @@ use crate::config::StarkConfig; use crate::cpu::cpu_stark::CpuStark; use crate::cpu::kernel::constants::global_metadata::GlobalMetadata; use crate::cross_table_lookup::{verify_cross_table_lookups_circuit, CrossTableLookup}; -use crate::generation::GenerationInputs; +use crate::generation::{self, GenerationInputs}; use crate::keccak::keccak_stark::KeccakStark; use crate::keccak_sponge::keccak_sponge_stark::KeccakSpongeStark; use crate::logic::LogicStark; @@ -43,11 +42,15 @@ use crate::memory::{NUM_CHANNELS, VALUE_LIMBS}; use crate::permutation::{ get_grand_product_challenge_set_target, GrandProductChallenge, GrandProductChallengeSet, }; -use crate::proof::{BlockMetadataTarget, PublicValues, StarkProofWithMetadata}; +use crate::proof::{ + BlockMetadata, BlockMetadataTarget, PublicValues, PublicValuesTarget, StarkProofWithMetadata, + TrieRootsTarget, +}; use crate::prover::prove; use crate::recursive_verifier::{ - add_common_recursion_gates, add_virtual_trie_roots, recursive_stark_circuit, - PlonkWrapperCircuit, PublicInputs, StarkWrapperCircuit, + add_common_recursion_gates, add_virtual_public_values, add_virtual_trie_roots, + recursive_stark_circuit, set_block_metadata_target, set_trie_roots_target, PlonkWrapperCircuit, + PublicInputs, StarkWrapperCircuit, }; use crate::stark::Stark; use crate::util::h160_limbs; @@ -88,6 +91,8 @@ where /// For each table, various inner circuits may be used depending on the initial table size. /// This target holds the index of the circuit (within `final_circuits()`) that was used. index_verifier_data: [Target; NUM_TABLES], + /// Public inputs containing public values. + public_values: PublicValuesTarget, /// Public inputs used for cyclic verification. These aren't actually used for EVM root /// proofs; the circuit has them just to match the structure of aggregation proofs. cyclic_vk: VerifierCircuitTarget, @@ -111,6 +116,7 @@ where for index in self.index_verifier_data { buffer.write_target(index)?; } + self.public_values.to_buffer(buffer)?; buffer.write_target_verifier_circuit(&self.cyclic_vk)?; Ok(()) } @@ -129,12 +135,14 @@ where for _ in 0..NUM_TABLES { index_verifier_data.push(buffer.read_target()?); } + let public_values = PublicValuesTarget::from_buffer(buffer)?; let cyclic_vk = buffer.read_target_verifier_circuit()?; Ok(Self { circuit, proof_with_pis: proof_with_pis.try_into().unwrap(), index_verifier_data: index_verifier_data.try_into().unwrap(), + public_values, cyclic_vk, }) } @@ -151,6 +159,7 @@ where pub circuit: CircuitData, lhs: AggregationChildTarget, rhs: AggregationChildTarget, + public_values: PublicValuesTarget, cyclic_vk: VerifierCircuitTarget, } @@ -167,6 +176,7 @@ where ) -> IoResult<()> { buffer.write_circuit_data(&self.circuit, gate_serializer, generator_serializer)?; buffer.write_target_verifier_circuit(&self.cyclic_vk)?; + self.public_values.to_buffer(buffer)?; self.lhs.to_buffer(buffer)?; self.rhs.to_buffer(buffer)?; Ok(()) @@ -179,12 +189,14 @@ where ) -> IoResult { let circuit = buffer.read_circuit_data(gate_serializer, generator_serializer)?; let cyclic_vk = buffer.read_target_verifier_circuit()?; + let public_values = PublicValuesTarget::from_buffer(buffer)?; let lhs = AggregationChildTarget::from_buffer(buffer)?; let rhs = AggregationChildTarget::from_buffer(buffer)?; Ok(Self { circuit, lhs, rhs, + public_values, cyclic_vk, }) } @@ -227,6 +239,7 @@ where has_parent_block: BoolTarget, parent_block_proof: ProofWithPublicInputsTarget, agg_root_proof: ProofWithPublicInputsTarget, + public_values: PublicValuesTarget, cyclic_vk: VerifierCircuitTarget, } @@ -245,6 +258,7 @@ where buffer.write_target_bool(self.has_parent_block)?; buffer.write_target_proof_with_public_inputs(&self.parent_block_proof)?; buffer.write_target_proof_with_public_inputs(&self.agg_root_proof)?; + self.public_values.to_buffer(buffer)?; buffer.write_target_verifier_circuit(&self.cyclic_vk)?; Ok(()) } @@ -258,12 +272,14 @@ where let has_parent_block = buffer.read_target_bool()?; let parent_block_proof = buffer.read_target_proof_with_public_inputs()?; let agg_root_proof = buffer.read_target_proof_with_public_inputs()?; + let public_values = PublicValuesTarget::from_buffer(buffer)?; let cyclic_vk = buffer.read_target_verifier_circuit()?; Ok(Self { circuit, has_parent_block, parent_block_proof, agg_root_proof, + public_values, cyclic_vk, }) } @@ -346,8 +362,6 @@ where pub fn new( all_stark: &AllStark, degree_bits_ranges: &[Range; NUM_TABLES], - public_values: &PublicValues, - cpu_trace_len: usize, stark_config: &StarkConfig, ) -> Self { let arithmetic = RecursiveCircuitsForTable::new( @@ -394,7 +408,7 @@ where ); let by_table = [arithmetic, cpu, keccak, keccak_sponge, logic, memory]; - let root = Self::create_root_circuit(public_values, cpu_trace_len, &by_table, stark_config); + let root = Self::create_root_circuit(&by_table, stark_config); let aggregation = Self::create_aggregation_circuit(&root); let block = Self::create_block_circuit(&aggregation); Self { @@ -406,8 +420,6 @@ where } fn create_root_circuit( - public_values: &PublicValues, - cpu_trace_len: usize, by_table: &[RecursiveCircuitsForTable; NUM_TABLES], stark_config: &StarkConfig, ) -> RootCircuitData { @@ -416,6 +428,8 @@ where let mut builder = CircuitBuilder::new(CircuitConfig::standard_recursion_config()); + let public_values = add_virtual_public_values(&mut builder); + let recursive_proofs = core::array::from_fn(|i| builder.add_virtual_proof_with_pis(inner_common_data[i])); let pis: [_; NUM_TABLES] = core::array::from_fn(|i| { @@ -476,8 +490,7 @@ where extra_looking_products[Table::Memory as usize].push( Self::get_memory_extra_looking_products_circuit( &mut builder, - public_values, - cpu_trace_len, + &public_values, ctl_challenges.challenges[c], ), ); @@ -532,6 +545,7 @@ where circuit: builder.build::(), proof_with_pis: recursive_proofs, index_verifier_data, + public_values, cyclic_vk, } } @@ -539,57 +553,37 @@ where /// Recursive version of `get_memory_extra_looking_products`. pub(crate) fn get_memory_extra_looking_products_circuit( builder: &mut CircuitBuilder, - public_values: &PublicValues, - cpu_trace_len: usize, + public_values: &PublicValuesTarget, challenge: GrandProductChallenge, ) -> Target { let mut prod = builder.constant(F::ONE); // Add metadata writes. - let metadata_target = BlockMetadataTarget { - block_beneficiary: builder.add_virtual_target_arr::<5>(), - block_timestamp: builder.constant(F::from_canonical_u64( - public_values.block_metadata.block_timestamp.as_u64(), - )), - block_difficulty: builder.constant(F::from_canonical_u64( - public_values.block_metadata.block_difficulty.as_u64(), - )), - block_number: builder.constant(F::from_canonical_u64( - public_values.block_metadata.block_number.as_u64(), - )), - block_gaslimit: builder.constant(F::from_canonical_u64( - public_values.block_metadata.block_gaslimit.as_u64(), - )), - block_chain_id: builder.constant(F::from_canonical_u64( - public_values.block_metadata.block_chain_id.as_u64(), - )), - block_base_fee: builder.constant(F::from_canonical_u64( - public_values.block_metadata.block_base_fee.as_u64(), - )), - }; - - let beneficiary_limbs = h160_limbs(public_values.block_metadata.block_beneficiary); - for i in 0..5 { - let limb_target = builder.constant(beneficiary_limbs[i]); - builder.connect(metadata_target.block_beneficiary[i], limb_target); - } - let block_fields_without_beneficiary = [ ( GlobalMetadata::BlockTimestamp, - metadata_target.block_timestamp, + public_values.block_metadata.block_timestamp, + ), + ( + GlobalMetadata::BlockNumber, + public_values.block_metadata.block_number, ), - (GlobalMetadata::BlockNumber, metadata_target.block_number), ( GlobalMetadata::BlockDifficulty, - metadata_target.block_difficulty, + public_values.block_metadata.block_difficulty, ), ( GlobalMetadata::BlockGasLimit, - metadata_target.block_gaslimit, + public_values.block_metadata.block_gaslimit, + ), + ( + GlobalMetadata::BlockChainId, + public_values.block_metadata.block_chain_id, + ), + ( + GlobalMetadata::BlockBaseFee, + public_values.block_metadata.block_base_fee, ), - (GlobalMetadata::BlockChainId, metadata_target.block_chain_id), - (GlobalMetadata::BlockBaseFee, metadata_target.block_base_fee), ]; let zero = builder.constant(F::ZERO); @@ -610,7 +604,10 @@ where builder.connect(row[3], field_target); // values for j in 0..5 { - builder.connect(row[4 + j], metadata_target.block_beneficiary[j]); + builder.connect( + row[4 + j], + public_values.block_metadata.block_beneficiary[j], + ); } for j in 5..VALUE_LIMBS { builder.connect(row[4 + j], zero); @@ -644,75 +641,38 @@ where }); // Add public values reads. - let tries_before_target = add_virtual_trie_roots(builder); - for (targets, hash) in [ - tries_before_target.state_root, - tries_before_target.transactions_root, - tries_before_target.receipts_root, - ] - .iter() - .zip([ - public_values.trie_roots_before.state_root, - public_values.trie_roots_before.transactions_root, - public_values.trie_roots_before.receipts_root, - ]) { - for (i, limb) in hash.into_uint().0.into_iter().enumerate() { - let low_limb_target = builder.constant(F::from_canonical_u32(limb as u32)); - let high_limb_target = builder.constant(F::from_canonical_u32((limb >> 32) as u32)); - builder.connect(targets[2 * i], low_limb_target); - builder.connect(targets[2 * i + 1], high_limb_target); - } - } - - let tries_after_target = add_virtual_trie_roots(builder); - for (targets, hash) in [ - tries_after_target.state_root, - tries_after_target.transactions_root, - tries_after_target.receipts_root, - ] - .iter() - .zip([ - public_values.trie_roots_after.state_root, - public_values.trie_roots_after.transactions_root, - public_values.trie_roots_after.receipts_root, - ]) { - for (i, limb) in hash.into_uint().0.into_iter().enumerate() { - let low_limb_target = builder.constant(F::from_canonical_u32(limb as u32)); - let high_limb_target = builder.constant(F::from_canonical_u32((limb >> 32) as u32)); - builder.connect(targets[2 * i], low_limb_target); - builder.connect(targets[2 * i + 1], high_limb_target); - } - } - let trie_fields = [ ( GlobalMetadata::StateTrieRootDigestBefore, - tries_before_target.state_root, + public_values.trie_roots_before.state_root, ), ( GlobalMetadata::TransactionTrieRootDigestBefore, - tries_before_target.transactions_root, + public_values.trie_roots_before.transactions_root, ), ( GlobalMetadata::ReceiptTrieRootDigestBefore, - tries_before_target.receipts_root, + public_values.trie_roots_before.receipts_root, ), ( GlobalMetadata::StateTrieRootDigestAfter, - tries_after_target.state_root, + public_values.trie_roots_after.state_root, ), ( GlobalMetadata::TransactionTrieRootDigestAfter, - tries_after_target.transactions_root, + public_values.trie_roots_after.transactions_root, ), ( GlobalMetadata::ReceiptTrieRootDigestAfter, - tries_after_target.receipts_root, + public_values.trie_roots_after.receipts_root, ), ]; - let timestamp_target = - builder.constant(F::from_canonical_usize(cpu_trace_len * NUM_CHANNELS + 1)); + let mut timestamp_target = builder.mul_const( + F::from_canonical_usize(NUM_CHANNELS), + public_values.cpu_trace_len, + ); + timestamp_target = builder.add_const(timestamp_target, F::ONE); trie_fields.map(|(field, targets)| { let row = builder.add_virtual_targets(13); // is_read @@ -742,6 +702,7 @@ where root: &RootCircuitData, ) -> AggregationCircuitData { let mut builder = CircuitBuilder::::new(root.circuit.common.config.clone()); + let public_values = add_virtual_public_values(&mut builder); let cyclic_vk = builder.add_verifier_data_public_inputs(); let lhs = Self::add_agg_child(&mut builder, root); let rhs = Self::add_agg_child(&mut builder, root); @@ -756,6 +717,7 @@ where circuit, lhs, rhs, + public_values, cyclic_vk, } } @@ -793,6 +755,7 @@ where }; let mut builder = CircuitBuilder::::new(CircuitConfig::standard_recursion_config()); + let public_values = add_virtual_public_values(&mut builder); let has_parent_block = builder.add_virtual_bool_target_safe(); let parent_block_proof = builder.add_virtual_proof_with_pis(&expected_common_data); let agg_root_proof = builder.add_virtual_proof_with_pis(&agg.circuit.common); @@ -815,6 +778,7 @@ where has_parent_block, parent_block_proof, agg_root_proof, + public_values, cyclic_vk, } } @@ -826,7 +790,7 @@ where config: &StarkConfig, generation_inputs: GenerationInputs, timing: &mut TimingTree, - ) -> anyhow::Result> { + ) -> anyhow::Result<(ProofWithPublicInputs, PublicValues)> { let all_proof = prove::(all_stark, config, generation_inputs, timing)?; let mut root_inputs = PartialWitness::new(); @@ -853,7 +817,30 @@ where &self.aggregation.circuit.verifier_only, ); - self.root.circuit.prove(root_inputs) + set_block_metadata_target( + &mut root_inputs, + &self.root.public_values.block_metadata, + &all_proof.public_values.block_metadata, + ); + + root_inputs.set_target( + self.root.public_values.cpu_trace_len, + F::from_canonical_usize(all_proof.public_values.cpu_trace_len), + ); + set_trie_roots_target( + &mut root_inputs, + &self.root.public_values.trie_roots_before, + &all_proof.public_values.trie_roots_before, + ); + set_trie_roots_target( + &mut root_inputs, + &self.root.public_values.trie_roots_after, + &all_proof.public_values.trie_roots_after, + ); + + let root_proof = self.root.circuit.prove(root_inputs)?; + + Ok((root_proof, all_proof.public_values)) } pub fn verify_root(&self, agg_proof: ProofWithPublicInputs) -> anyhow::Result<()> { @@ -866,7 +853,8 @@ where lhs_proof: &ProofWithPublicInputs, rhs_is_agg: bool, rhs_proof: &ProofWithPublicInputs, - ) -> anyhow::Result> { + public_values: PublicValues, + ) -> anyhow::Result<(ProofWithPublicInputs, PublicValues)> { let mut agg_inputs = PartialWitness::new(); agg_inputs.set_bool_target(self.aggregation.lhs.is_agg, lhs_is_agg); @@ -882,7 +870,29 @@ where &self.aggregation.circuit.verifier_only, ); - self.aggregation.circuit.prove(agg_inputs) + set_block_metadata_target( + &mut agg_inputs, + &self.aggregation.public_values.block_metadata, + &public_values.block_metadata, + ); + + agg_inputs.set_target( + self.aggregation.public_values.cpu_trace_len, + F::from_canonical_usize(public_values.cpu_trace_len), + ); + set_trie_roots_target( + &mut agg_inputs, + &self.aggregation.public_values.trie_roots_before, + &public_values.trie_roots_before, + ); + set_trie_roots_target( + &mut agg_inputs, + &self.aggregation.public_values.trie_roots_after, + &public_values.trie_roots_after, + ); + + let aggregation_proof = self.aggregation.circuit.prove(agg_inputs)?; + Ok((aggregation_proof, public_values)) } pub fn verify_aggregation( @@ -901,7 +911,8 @@ where &self, opt_parent_block_proof: Option<&ProofWithPublicInputs>, agg_root_proof: &ProofWithPublicInputs, - ) -> anyhow::Result> { + public_values: PublicValues, + ) -> anyhow::Result<(ProofWithPublicInputs, PublicValues)> { let mut block_inputs = PartialWitness::new(); block_inputs.set_bool_target( @@ -927,7 +938,29 @@ where block_inputs .set_verifier_data_target(&self.block.cyclic_vk, &self.block.circuit.verifier_only); - self.block.circuit.prove(block_inputs) + set_block_metadata_target( + &mut block_inputs, + &self.block.public_values.block_metadata, + &public_values.block_metadata, + ); + + block_inputs.set_target( + self.block.public_values.cpu_trace_len, + F::from_canonical_usize(public_values.cpu_trace_len), + ); + set_trie_roots_target( + &mut block_inputs, + &self.block.public_values.trie_roots_before, + &public_values.trie_roots_before, + ); + set_trie_roots_target( + &mut block_inputs, + &self.block.public_values.trie_roots_after, + &public_values.trie_roots_after, + ); + + let block_proof = self.block.circuit.prove(block_inputs)?; + Ok((block_proof, public_values)) } pub fn verify_block(&self, block_proof: &ProofWithPublicInputs) -> anyhow::Result<()> { diff --git a/evm/src/generation/mod.rs b/evm/src/generation/mod.rs index 867d6749..d011ec76 100644 --- a/evm/src/generation/mod.rs +++ b/evm/src/generation/mod.rs @@ -38,7 +38,6 @@ use crate::witness::util::mem_write_log; #[derive(Clone, Debug, Deserialize, Serialize, Default)] pub struct GenerationInputs { pub signed_txns: Vec>, - pub tries: TrieInputs, /// Mapping between smart contract code hashes and the contract byte code. @@ -153,7 +152,7 @@ fn apply_trie_memops, const D: usize>( state.traces.memory_ops.extend(ops); } -pub(crate) fn generate_traces, const D: usize>( +pub fn generate_traces, const D: usize>( all_stark: &AllStark, inputs: GenerationInputs, config: &StarkConfig, @@ -201,6 +200,7 @@ pub(crate) fn generate_traces, const D: usize>( trie_roots_before, trie_roots_after, block_metadata: inputs.block_metadata, + cpu_trace_len: state.traces.clock(), }; let tables = timed!( diff --git a/evm/src/proof.rs b/evm/src/proof.rs index 3767714f..0356473a 100644 --- a/evm/src/proof.rs +++ b/evm/src/proof.rs @@ -52,9 +52,10 @@ pub struct PublicValues { pub trie_roots_before: TrieRoots, pub trie_roots_after: TrieRoots, pub block_metadata: BlockMetadata, + pub cpu_trace_len: usize, } -#[derive(Debug, Clone, Default)] +#[derive(Debug, Clone, Default, Serialize, Deserialize)] pub struct TrieRoots { pub state_root: H256, pub transactions_root: H256, @@ -74,18 +75,101 @@ pub struct BlockMetadata { /// Memory values which are public. /// Note: All the larger integers are encoded with 32-bit limbs in little-endian order. +#[derive(Eq, PartialEq, Debug)] pub struct PublicValuesTarget { pub trie_roots_before: TrieRootsTarget, pub trie_roots_after: TrieRootsTarget, pub block_metadata: BlockMetadataTarget, + pub cpu_trace_len: Target, } +impl PublicValuesTarget { + pub fn to_buffer(&self, buffer: &mut Vec) -> IoResult<()> { + let TrieRootsTarget { + state_root: state_root_before, + transactions_root: transactions_root_before, + receipts_root: receipts_root_before, + } = self.trie_roots_before; + + buffer.write_target_vec(&state_root_before)?; + buffer.write_target_vec(&transactions_root_before)?; + buffer.write_target_vec(&receipts_root_before)?; + + let TrieRootsTarget { + state_root: state_root_after, + transactions_root: transactions_root_after, + receipts_root: receipts_root_after, + } = self.trie_roots_after; + + buffer.write_target_vec(&state_root_after)?; + buffer.write_target_vec(&transactions_root_after)?; + buffer.write_target_vec(&receipts_root_after)?; + + let BlockMetadataTarget { + block_beneficiary, + block_timestamp, + block_number, + block_difficulty, + block_gaslimit, + block_chain_id, + block_base_fee, + } = self.block_metadata; + + buffer.write_target_vec(&block_beneficiary)?; + buffer.write_target(block_timestamp)?; + buffer.write_target(block_number)?; + buffer.write_target(block_difficulty)?; + buffer.write_target(block_gaslimit)?; + buffer.write_target(block_chain_id)?; + buffer.write_target(block_base_fee)?; + + buffer.write_target(self.cpu_trace_len)?; + + Ok(()) + } + + pub fn from_buffer(buffer: &mut Buffer) -> IoResult { + let trie_roots_before = TrieRootsTarget { + state_root: buffer.read_target_vec()?.try_into().unwrap(), + transactions_root: buffer.read_target_vec()?.try_into().unwrap(), + receipts_root: buffer.read_target_vec()?.try_into().unwrap(), + }; + + let trie_roots_after = TrieRootsTarget { + state_root: buffer.read_target_vec()?.try_into().unwrap(), + transactions_root: buffer.read_target_vec()?.try_into().unwrap(), + receipts_root: buffer.read_target_vec()?.try_into().unwrap(), + }; + + let block_metadata = BlockMetadataTarget { + block_beneficiary: buffer.read_target_vec()?.try_into().unwrap(), + block_timestamp: buffer.read_target()?, + block_number: buffer.read_target()?, + block_difficulty: buffer.read_target()?, + block_gaslimit: buffer.read_target()?, + block_chain_id: buffer.read_target()?, + block_base_fee: buffer.read_target()?, + }; + + let cpu_trace_len = buffer.read_target()?; + + Ok(Self { + trie_roots_before, + trie_roots_after, + block_metadata, + cpu_trace_len, + }) + } +} + +#[derive(Eq, PartialEq, Debug)] pub struct TrieRootsTarget { pub state_root: [Target; 8], pub transactions_root: [Target; 8], pub receipts_root: [Target; 8], } +#[derive(Eq, PartialEq, Debug)] pub struct BlockMetadataTarget { pub block_beneficiary: [Target; 5], pub block_timestamp: Target, diff --git a/evm/src/recursive_verifier.rs b/evm/src/recursive_verifier.rs index 00c5e8c2..b8b87e71 100644 --- a/evm/src/recursive_verifier.rs +++ b/evm/src/recursive_verifier.rs @@ -1,6 +1,7 @@ use std::fmt::Debug; use anyhow::{ensure, Result}; +use ethereum_types::BigEndianHash; use plonky2::field::extension::Extendable; use plonky2::field::types::Field; use plonky2::fri::witness_util::set_fri_proof_target; @@ -509,26 +510,27 @@ fn eval_l_0_and_l_last_circuit, const D: usize>( ) } -#[allow(unused)] // TODO: used later? pub(crate) fn add_virtual_public_values, const D: usize>( builder: &mut CircuitBuilder, ) -> PublicValuesTarget { let trie_roots_before = add_virtual_trie_roots(builder); let trie_roots_after = add_virtual_trie_roots(builder); let block_metadata = add_virtual_block_metadata(builder); + let cpu_trace_len = builder.add_virtual_public_input(); PublicValuesTarget { trie_roots_before, trie_roots_after, block_metadata, + cpu_trace_len, } } pub(crate) fn add_virtual_trie_roots, const D: usize>( builder: &mut CircuitBuilder, ) -> TrieRootsTarget { - let state_root = builder.add_virtual_target_arr(); - let transactions_root = builder.add_virtual_target_arr(); - let receipts_root = builder.add_virtual_target_arr(); + let state_root = builder.add_virtual_public_input_arr(); + let transactions_root = builder.add_virtual_public_input_arr(); + let receipts_root = builder.add_virtual_public_input_arr(); TrieRootsTarget { state_root, transactions_root, @@ -539,13 +541,13 @@ pub(crate) fn add_virtual_trie_roots, const D: usiz pub(crate) fn add_virtual_block_metadata, const D: usize>( builder: &mut CircuitBuilder, ) -> BlockMetadataTarget { - let block_beneficiary = builder.add_virtual_target_arr(); - let block_timestamp = builder.add_virtual_target(); - let block_number = builder.add_virtual_target(); - let block_difficulty = builder.add_virtual_target(); - let block_gaslimit = builder.add_virtual_target(); - let block_chain_id = builder.add_virtual_target(); - let block_base_fee = builder.add_virtual_target(); + let block_beneficiary = builder.add_virtual_public_input_arr(); + let block_timestamp = builder.add_virtual_public_input(); + let block_number = builder.add_virtual_public_input(); + let block_difficulty = builder.add_virtual_public_input(); + let block_gaslimit = builder.add_virtual_public_input(); + let block_chain_id = builder.add_virtual_public_input(); + let block_base_fee = builder.add_virtual_public_input(); BlockMetadataTarget { block_beneficiary, block_timestamp, @@ -668,18 +670,50 @@ pub(crate) fn set_trie_roots_target( F: RichField + Extendable, W: Witness, { - witness.set_target_arr( - &trie_roots_target.state_root, - &h256_limbs(trie_roots.state_root), - ); - witness.set_target_arr( - &trie_roots_target.transactions_root, - &h256_limbs(trie_roots.transactions_root), - ); - witness.set_target_arr( - &trie_roots_target.receipts_root, - &h256_limbs(trie_roots.receipts_root), - ); + for (i, limb) in trie_roots.state_root.into_uint().0.into_iter().enumerate() { + witness.set_target( + trie_roots_target.state_root[2 * i], + F::from_canonical_u32(limb as u32), + ); + witness.set_target( + trie_roots_target.state_root[2 * i + 1], + F::from_canonical_u32((limb >> 32) as u32), + ); + } + + for (i, limb) in trie_roots + .transactions_root + .into_uint() + .0 + .into_iter() + .enumerate() + { + witness.set_target( + trie_roots_target.transactions_root[2 * i], + F::from_canonical_u32(limb as u32), + ); + witness.set_target( + trie_roots_target.transactions_root[2 * i + 1], + F::from_canonical_u32((limb >> 32) as u32), + ); + } + + for (i, limb) in trie_roots + .receipts_root + .into_uint() + .0 + .into_iter() + .enumerate() + { + witness.set_target( + trie_roots_target.receipts_root[2 * i], + F::from_canonical_u32(limb as u32), + ); + witness.set_target( + trie_roots_target.receipts_root[2 * i + 1], + F::from_canonical_u32((limb >> 32) as u32), + ); + } } pub(crate) fn set_block_metadata_target( diff --git a/evm/tests/empty_txn_list.rs b/evm/tests/empty_txn_list.rs index 59913787..fae020c4 100644 --- a/evm/tests/empty_txn_list.rs +++ b/evm/tests/empty_txn_list.rs @@ -15,8 +15,8 @@ use plonky2::util::timing::TimingTree; use plonky2_evm::all_stark::AllStark; use plonky2_evm::config::StarkConfig; use plonky2_evm::fixed_recursive_verifier::AllRecursiveCircuits; -use plonky2_evm::generation::{GenerationInputs, TrieInputs}; -use plonky2_evm::proof::BlockMetadata; +use plonky2_evm::generation::{generate_traces, GenerationInputs, TrieInputs}; +use plonky2_evm::proof::{BlockMetadata, TrieRoots}; use plonky2_evm::prover::prove; use plonky2_evm::verifier::verify_proof; use plonky2_evm::Node; @@ -27,7 +27,7 @@ type C = PoseidonGoldilocksConfig; /// Execute the empty list of transactions, i.e. a no-op. #[test] -#[ignore] // Too slow to run on CI. +//#[ignore] // Too slow to run on CI. fn test_empty_txn_list() -> anyhow::Result<()> { init_logger(); @@ -41,10 +41,6 @@ fn test_empty_txn_list() -> anyhow::Result<()> { let receipts_trie = HashedPartialTrie::from(Node::Empty); let storage_tries = vec![]; - let state_trie_root = state_trie.hash(); - let txns_trie_root = transactions_trie.hash(); - let receipts_trie_root = receipts_trie.hash(); - let mut contract_code = HashMap::new(); contract_code.insert(keccak(vec![]), vec![]); @@ -61,46 +57,9 @@ fn test_empty_txn_list() -> anyhow::Result<()> { addresses: vec![], }; - let mut timing = TimingTree::new("prove", log::Level::Debug); - // TODO: This is redundant; prove_root below calls this prove method internally. - // Just keeping it for now because the root proof returned by prove_root doesn't contain public - // values yet, and we want those for the assertions below. - let proof = prove::(&all_stark, &config, inputs.clone(), &mut timing)?; - timing.filter(Duration::from_millis(100)).print(); - - assert_eq!( - proof.public_values.trie_roots_before.state_root, - state_trie_root - ); - assert_eq!( - proof.public_values.trie_roots_after.state_root, - state_trie_root - ); - assert_eq!( - proof.public_values.trie_roots_before.transactions_root, - txns_trie_root - ); - assert_eq!( - proof.public_values.trie_roots_after.transactions_root, - txns_trie_root - ); - assert_eq!( - proof.public_values.trie_roots_before.receipts_root, - receipts_trie_root - ); - assert_eq!( - proof.public_values.trie_roots_after.receipts_root, - receipts_trie_root - ); - - verify_proof(&all_stark, proof.clone(), &config)?; - - let cpu_trace_len = 1 << proof.stark_proofs[1].proof.recover_degree_bits(&config); let all_circuits = AllRecursiveCircuits::::new( &all_stark, &[16..17, 14..15, 14..15, 9..10, 12..13, 18..19], // Minimal ranges to prove an empty list - &proof.public_values, - cpu_trace_len, &config, ); @@ -133,12 +92,18 @@ fn test_empty_txn_list() -> anyhow::Result<()> { } let mut timing = TimingTree::new("prove", log::Level::Info); - let root_proof = all_circuits.prove_root(&all_stark, &config, inputs, &mut timing)?; + let (root_proof, public_values) = + all_circuits.prove_root(&all_stark, &config, inputs, &mut timing)?; timing.filter(Duration::from_millis(100)).print(); all_circuits.verify_root(root_proof.clone())?; - let agg_proof = all_circuits.prove_aggregation(false, &root_proof, false, &root_proof)?; - all_circuits.verify_aggregation(&agg_proof) + // We can duplicate the proofs here because the state hasn't mutated. + let (agg_proof, public_values) = + all_circuits.prove_aggregation(false, &root_proof, false, &root_proof, public_values)?; + all_circuits.verify_aggregation(&agg_proof)?; + + let (block_proof, _) = all_circuits.prove_block(None, &agg_proof, public_values)?; + all_circuits.verify_block(&block_proof) } fn init_logger() { diff --git a/plonky2/src/plonk/circuit_builder.rs b/plonky2/src/plonk/circuit_builder.rs index 3cf48de0..82d4ee89 100644 --- a/plonky2/src/plonk/circuit_builder.rs +++ b/plonky2/src/plonk/circuit_builder.rs @@ -323,6 +323,12 @@ impl, const D: usize> CircuitBuilder { t } + pub fn add_virtual_public_input_arr(&mut self) -> [Target; N] { + let ts = [0; N].map(|_| self.add_virtual_target()); + self.register_public_inputs(&ts); + ts + } + pub fn add_virtual_verifier_data(&mut self, cap_height: usize) -> VerifierCircuitTarget { VerifierCircuitTarget { constants_sigmas_cap: self.add_virtual_cap(cap_height),