logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-09 09:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor

Browse Source
This commit is contained in:
wborgeaud 2022-09-05 08:38:57 +02:00
parent c320a9e8ae
commit da03af2979
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
evm/src/lib.rs
View File

@ -2,7 +2,6 @@
#![allow(clippy::needless_range_loop)] #![allow(clippy::needless_range_loop)]
#![allow(clippy::too_many_arguments)] #![allow(clippy::too_many_arguments)]
#![allow(clippy::type_complexity)] #![allow(clippy::type_complexity)]
#![feature(let_chains)]
#![feature(generic_const_exprs)] #![feature(generic_const_exprs)]
pub mod all_stark; pub mod all_stark;

1
evm/src/proof.rs
View File

@ -31,6 +31,7 @@ impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> A
pub fn nums_ctl_zs(&self) -> [usize; NUM_TABLES] { pub fn nums_ctl_zs(&self) -> [usize; NUM_TABLES] {
std::array::from_fn(|i| self.stark_proofs[i].num_ctl_zs()) std::array::from_fn(|i| self.stark_proofs[i].num_ctl_zs())
} }
}
pub(crate) struct AllProofChallenges<F: RichField + Extendable<D>, const D: usize> { pub(crate) struct AllProofChallenges<F: RichField + Extendable<D>, const D: usize> {
pub stark_challenges: [StarkProofChallenges<F, D>; NUM_TABLES], pub stark_challenges: [StarkProofChallenges<F, D>; NUM_TABLES],

22
evm/src/recursive_verifier.rs
View File

@ -15,7 +15,7 @@ use plonky2::plonk::proof::ProofWithPublicInputs;
use plonky2::util::reducing::ReducingFactorTarget; use plonky2::util::reducing::ReducingFactorTarget;
use plonky2::with_context; use plonky2::with_context;
use crate::all_stark::{AllStark, Table}; use crate::all_stark::{AllStark, Table, NUM_TABLES};
use crate::config::StarkConfig; use crate::config::StarkConfig;
use crate::constraint_consumer::RecursiveConstraintConsumer; use crate::constraint_consumer::RecursiveConstraintConsumer;
use crate::cpu::cpu_stark::CpuStark; use crate::cpu::cpu_stark::CpuStark;
@ -42,7 +42,7 @@ pub(crate) struct AllRecursiveProofs<
C: GenericConfig<D, F = F>, C: GenericConfig<D, F = F>,
const D: usize, const D: usize,
> { > {
pub recursive_proofs: Vec<ProofWithPublicInputs<F, C, D>>, pub recursive_proofs: [ProofWithPublicInputs<F, C, D>; NUM_TABLES],
} }
pub(crate) fn recursively_prove_stark_proof< pub(crate) fn recursively_prove_stark_proof<
@ -115,7 +115,7 @@ pub(crate) fn recursively_prove_all_proofs<
cross_table_lookups: &[CrossTableLookup<F>], cross_table_lookups: &[CrossTableLookup<F>],
inner_config: &StarkConfig, inner_config: &StarkConfig,
circuit_config: CircuitConfig, circuit_config: CircuitConfig,
) -> Result<[ProofWithPublicInputs<F, C, D>; Table::num_tables()]> ) -> Result<[ProofWithPublicInputs<F, C, D>; NUM_TABLES]>
where where
[(); CpuStark::<F, D>::COLUMNS]:, [(); CpuStark::<F, D>::COLUMNS]:,
[(); KeccakStark::<F, D>::COLUMNS]:, [(); KeccakStark::<F, D>::COLUMNS]:,
@ -136,8 +136,8 @@ where
&circuit_config, &circuit_config,
)?, )?,
recursively_prove_stark_proof( recursively_prove_stark_proof(
Table::Cpu, Table::Keccak,
all_stark.cpu_stark, all_stark.keccak_stark,
all_stark, all_stark,
all_proof, all_proof,
cross_table_lookups, cross_table_lookups,
@ -145,8 +145,8 @@ where
&circuit_config, &circuit_config,
)?, )?,
recursively_prove_stark_proof( recursively_prove_stark_proof(
Table::Cpu, Table::KeccakMemory,
all_stark.cpu_stark, all_stark.keccak_memory_stark,
all_stark, all_stark,
all_proof, all_proof,
cross_table_lookups, cross_table_lookups,
@ -154,8 +154,8 @@ where
&circuit_config, &circuit_config,
)?, )?,
recursively_prove_stark_proof( recursively_prove_stark_proof(
Table::Cpu, Table::Logic,
all_stark.cpu_stark, all_stark.logic_stark,
all_stark, all_stark,
all_proof, all_proof,
cross_table_lookups, cross_table_lookups,
@ -163,8 +163,8 @@ where
&circuit_config, &circuit_config,
)?, )?,
recursively_prove_stark_proof( recursively_prove_stark_proof(
Table::Cpu, Table::Memory,
all_stark.cpu_stark, all_stark.memory_stark,
all_stark, all_stark,
all_proof, all_proof,
cross_table_lookups, cross_table_lookups,