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

Merge conflicts

Browse Source
This commit is contained in:
wborgeaud 2022-08-26 09:42:55 +02:00
parent 8600a5a46f
commit c4fc9b0ae4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evm/src/cross_table_lookup.rs
View File

@ -492,13 +492,13 @@ impl<'a, F: Field, const D: usize> CtlCheckVarsTarget<'a, F, D> {
pub(crate) fn from_proof(
table: Table,
proof: &StarkProofWithPublicInputsTarget<D>,
proof: &StarkProofTarget<D>,
cross_table_lookups: &'a [CrossTableLookup<F>],
ctl_challenges: &'a GrandProductChallengeSet<Target>,
num_permutation_zs: usize,
) -> Vec<Self> {
let mut ctl_zs = {
let openings = &proof.proof.openings;
let openings = &proof.openings;
let ctl_zs = openings.permutation_ctl_zs.iter().skip(num_permutation_zs);
let ctl_zs_next = openings
.permutation_ctl_zs_next

1
evm/src/recursive_verifier.rs
View File

@ -61,7 +61,6 @@ pub(crate) fn recursively_prove_stark_proof<
) -> Result<ProofWithPublicInputs<F, C, D>>
where
[(); S::COLUMNS]:,
[(); S::PUBLIC_INPUTS]:,
[(); C::Hasher::HASH_SIZE]:,
C::Hasher: AlgebraicHasher<F>,
{