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

Merge pull request #892 from mir-protocol/bump_plonky2

Browse Source 
Use new plonky2
This commit is contained in:
Daniel Lubarov 2023-02-25 09:57:44 -08:00 committed by GitHub
commit db893831b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecdsa/Cargo.toml
View File

@ -13,7 +13,7 @@ anyhow = { version = "1.0.40", default-features = false }
itertools = { version = "0.10.0", default-features = false } itertools = { version = "0.10.0", default-features = false }
plonky2_maybe_rayon = { version = "0.1.0", default-features = false } plonky2_maybe_rayon = { version = "0.1.0", default-features = false }
num = { version = "0.4.0", default-features = false } num = { version = "0.4.0", default-features = false }
plonky2 = { version = "0.1.1", default-features = false } plonky2 = { version = "0.1.2", default-features = false }
plonky2_u32 = { version = "0.1.0", default-features = false } plonky2_u32 = { version = "0.1.0", default-features = false }
serde = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0", default-features = false, features = ["derive"] }

2
evm/Cargo.toml
View File

@ -25,7 +25,7 @@ num = "0.4.0"
once_cell = "1.13.0" once_cell = "1.13.0"
pest = "2.1.3" pest = "2.1.3"
pest_derive = "2.1.0" pest_derive = "2.1.0"
plonky2 = { version = "0.1.1", default-features = false, features = ["timing"] } plonky2 = { version = "0.1.2", default-features = false, features = ["timing"] }
plonky2_util = { version = "0.1.0" } plonky2_util = { version = "0.1.0" }
rand = "0.8.5" rand = "0.8.5"
rand_chacha = "0.3.1" rand_chacha = "0.3.1"

12
evm/src/fixed_recursive_verifier.rs
View File

@ -182,7 +182,7 @@ where
let mut builder = CircuitBuilder::new(CircuitConfig::standard_recursion_config()); let mut builder = CircuitBuilder::new(CircuitConfig::standard_recursion_config());
let recursive_proofs = let recursive_proofs =
core::array::from_fn(|i| builder.add_virtual_proof_with_pis::<C>(inner_common_data[i])); core::array::from_fn(|i| builder.add_virtual_proof_with_pis(inner_common_data[i]));
let pis: [_; NUM_TABLES] = core::array::from_fn(|i| { let pis: [_; NUM_TABLES] = core::array::from_fn(|i| {
PublicInputs::from_vec(&recursive_proofs[i].public_inputs, stark_config) PublicInputs::from_vec(&recursive_proofs[i].public_inputs, stark_config)
}); });
@ -303,8 +303,8 @@ where
let common = &root.circuit.common; let common = &root.circuit.common;
let root_vk = builder.constant_verifier_data(&root.circuit.verifier_only); let root_vk = builder.constant_verifier_data(&root.circuit.verifier_only);
let is_agg = builder.add_virtual_bool_target_safe(); let is_agg = builder.add_virtual_bool_target_safe();
let agg_proof = builder.add_virtual_proof_with_pis::<C>(common); let agg_proof = builder.add_virtual_proof_with_pis(common);
let evm_proof = builder.add_virtual_proof_with_pis::<C>(common); let evm_proof = builder.add_virtual_proof_with_pis(common);
builder builder
.conditionally_verify_cyclic_proof::<C>( .conditionally_verify_cyclic_proof::<C>(
is_agg, &agg_proof, &evm_proof, &root_vk, common, is_agg, &agg_proof, &evm_proof, &root_vk, common,
@ -330,8 +330,8 @@ where
let mut builder = CircuitBuilder::<F, D>::new(CircuitConfig::standard_recursion_config()); let mut builder = CircuitBuilder::<F, D>::new(CircuitConfig::standard_recursion_config());
let has_parent_block = builder.add_virtual_bool_target_safe(); let has_parent_block = builder.add_virtual_bool_target_safe();
let parent_block_proof = builder.add_virtual_proof_with_pis::<C>(&expected_common_data); let parent_block_proof = builder.add_virtual_proof_with_pis(&expected_common_data);
let agg_root_proof = builder.add_virtual_proof_with_pis::<C>(&agg.circuit.common); let agg_root_proof = builder.add_virtual_proof_with_pis(&agg.circuit.common);
let cyclic_vk = builder.add_verifier_data_public_inputs(); let cyclic_vk = builder.add_verifier_data_public_inputs();
builder builder
@ -579,7 +579,7 @@ where
} }
let mut builder = CircuitBuilder::new(shrinking_config()); let mut builder = CircuitBuilder::new(shrinking_config());
let proof_with_pis_target = builder.add_virtual_proof_with_pis::<C>(&last.common); let proof_with_pis_target = builder.add_virtual_proof_with_pis(&last.common);
let last_vk = builder.constant_verifier_data(&last.verifier_only); let last_vk = builder.constant_verifier_data(&last.verifier_only);
builder.verify_proof::<C>(&proof_with_pis_target, &last_vk, &last.common); builder.verify_proof::<C>(&proof_with_pis_target, &last_vk, &last.common);
builder.register_public_inputs(&proof_with_pis_target.public_inputs); // carry PIs forward builder.register_public_inputs(&proof_with_pis_target.public_inputs); // carry PIs forward

2
evm/src/get_challenges.rs
View File

@ -199,7 +199,7 @@ impl<const D: usize> StarkProofTarget<D> {
permutation_challenge_sets, permutation_challenge_sets,
stark_alphas, stark_alphas,
stark_zeta, stark_zeta,
fri_challenges: challenger.fri_challenges::<C>( fri_challenges: challenger.fri_challenges(
builder, builder,
commit_phase_merkle_caps, commit_phase_merkle_caps,
final_poly, final_poly,

4
insertion/Cargo.toml
View File

@ -6,8 +6,8 @@ edition = "2021"
[dependencies] [dependencies]
anyhow = { version = "1.0.40", default-features = false } anyhow = { version = "1.0.40", default-features = false }
plonky2 = { version = "0.1.1", default-features = false } plonky2 = { version = "0.1.2", default-features = false }
[dev-dependencies] [dev-dependencies]
plonky2 = { version = "0.1.1" } plonky2 = { version = "0.1.2" }

4
starky/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "starky" name = "starky"
description = "Implementation of STARKs" description = "Implementation of STARKs"
version = "0.1.0" version = "0.1.1"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
authors = ["Daniel Lubarov <daniel@lubarov.com>", "William Borgeaud <williamborgeaud@gmail.com>"] authors = ["Daniel Lubarov <daniel@lubarov.com>", "William Borgeaud <williamborgeaud@gmail.com>"]
readme = "README.md" readme = "README.md"
@ -21,7 +21,7 @@ anyhow = { version = "1.0.40", default-features = false }
itertools = { version = "0.10.0", default-features = false } itertools = { version = "0.10.0", default-features = false }
log = { version = "0.4.14", default-features = false } log = { version = "0.4.14", default-features = false }
plonky2_maybe_rayon = { version = "0.1.0", default-features = false } plonky2_maybe_rayon = { version = "0.1.0", default-features = false }
plonky2 = { version = "0.1.1", default-features = false } plonky2 = { version = "0.1.2", default-features = false }
[dev-dependencies] [dev-dependencies]
env_logger = { version = "0.9.0", default-features = false } env_logger = { version = "0.9.0", default-features = false }

2
starky/src/get_challenges.rs
View File

@ -175,7 +175,7 @@ where
permutation_challenge_sets, permutation_challenge_sets,
stark_alphas, stark_alphas,
stark_zeta, stark_zeta,
fri_challenges: challenger.fri_challenges::<C>( fri_challenges: challenger.fri_challenges(
builder, builder,
commit_phase_merkle_caps, commit_phase_merkle_caps,
final_poly, final_poly,

4
system_zero/Cargo.toml
View File

@ -8,11 +8,11 @@ edition = "2021"
anyhow = "1.0.40" anyhow = "1.0.40"
itertools = "0.10.0" itertools = "0.10.0"
log = "0.4.14" log = "0.4.14"
plonky2 = { version = "0.1.1" } plonky2 = { version = "0.1.2" }
plonky2_util = { version = "0.1.0" } plonky2_util = { version = "0.1.0" }
rand = "0.8.4" rand = "0.8.4"
rand_chacha = "0.3.1" rand_chacha = "0.3.1"
starky = { version = "0.1.0" } starky = { version = "0.1.1" }
[dev-dependencies] [dev-dependencies]
criterion = "0.4.0" criterion = "0.4.0"

4
u32/Cargo.toml
View File

@ -10,8 +10,8 @@ edition = "2021"
anyhow = { version = "1.0.40", default-features = false } anyhow = { version = "1.0.40", default-features = false }
itertools = { version = "0.10.0", default-features = false } itertools = { version = "0.10.0", default-features = false }
num = { version = "0.4", default-features = false } num = { version = "0.4", default-features = false }
plonky2 = { version = "0.1.1", default-features = false } plonky2 = { version = "0.1.2", default-features = false }
[dev-dependencies] [dev-dependencies]
plonky2 = { version = "0.1.1", default-features = false, features = ["gate_testing"] } plonky2 = { version = "0.1.2", default-features = false, features = ["gate_testing"] }
rand = { version = "0.8.4", default-features = false, features = ["getrandom"] } rand = { version = "0.8.4", default-features = false, features = ["getrandom"] }