From 2133c7f3ba6cc19de66b9af26ed03e807bfb2372 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Sat, 25 Feb 2023 08:55:55 -0800 Subject: [PATCH] Use new plonky2 --- ecdsa/Cargo.toml | 2 +- evm/Cargo.toml | 2 +- evm/src/fixed_recursive_verifier.rs | 12 ++++++------ evm/src/get_challenges.rs | 2 +- insertion/Cargo.toml | 4 ++-- starky/Cargo.toml | 4 ++-- starky/src/get_challenges.rs | 2 +- system_zero/Cargo.toml | 4 ++-- u32/Cargo.toml | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ecdsa/Cargo.toml b/ecdsa/Cargo.toml index 04dbd19c..0a156654 100644 --- a/ecdsa/Cargo.toml +++ b/ecdsa/Cargo.toml @@ -13,7 +13,7 @@ anyhow = { version = "1.0.40", default-features = false } itertools = { version = "0.10.0", default-features = false } plonky2_maybe_rayon = { version = "0.1.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 } serde = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/evm/Cargo.toml b/evm/Cargo.toml index f2c192c8..d9de1d16 100644 --- a/evm/Cargo.toml +++ b/evm/Cargo.toml @@ -25,7 +25,7 @@ num = "0.4.0" once_cell = "1.13.0" pest = "2.1.3" 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" } rand = "0.8.5" rand_chacha = "0.3.1" diff --git a/evm/src/fixed_recursive_verifier.rs b/evm/src/fixed_recursive_verifier.rs index e662874f..0f04cc33 100644 --- a/evm/src/fixed_recursive_verifier.rs +++ b/evm/src/fixed_recursive_verifier.rs @@ -182,7 +182,7 @@ where let mut builder = CircuitBuilder::new(CircuitConfig::standard_recursion_config()); let recursive_proofs = - core::array::from_fn(|i| builder.add_virtual_proof_with_pis::(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| { PublicInputs::from_vec(&recursive_proofs[i].public_inputs, stark_config) }); @@ -303,8 +303,8 @@ where let common = &root.circuit.common; let root_vk = builder.constant_verifier_data(&root.circuit.verifier_only); let is_agg = builder.add_virtual_bool_target_safe(); - let agg_proof = builder.add_virtual_proof_with_pis::(common); - let evm_proof = builder.add_virtual_proof_with_pis::(common); + let agg_proof = builder.add_virtual_proof_with_pis(common); + let evm_proof = builder.add_virtual_proof_with_pis(common); builder .conditionally_verify_cyclic_proof::( is_agg, &agg_proof, &evm_proof, &root_vk, common, @@ -330,8 +330,8 @@ where let mut builder = CircuitBuilder::::new(CircuitConfig::standard_recursion_config()); 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); + 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); let cyclic_vk = builder.add_verifier_data_public_inputs(); builder @@ -579,7 +579,7 @@ where } let mut builder = CircuitBuilder::new(shrinking_config()); - let proof_with_pis_target = builder.add_virtual_proof_with_pis::(&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); builder.verify_proof::(&proof_with_pis_target, &last_vk, &last.common); builder.register_public_inputs(&proof_with_pis_target.public_inputs); // carry PIs forward diff --git a/evm/src/get_challenges.rs b/evm/src/get_challenges.rs index 7e6a1ba7..fdc0e315 100644 --- a/evm/src/get_challenges.rs +++ b/evm/src/get_challenges.rs @@ -199,7 +199,7 @@ impl StarkProofTarget { permutation_challenge_sets, stark_alphas, stark_zeta, - fri_challenges: challenger.fri_challenges::( + fri_challenges: challenger.fri_challenges( builder, commit_phase_merkle_caps, final_poly, diff --git a/insertion/Cargo.toml b/insertion/Cargo.toml index e39e2bd3..125e72e3 100644 --- a/insertion/Cargo.toml +++ b/insertion/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" [dependencies] 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] -plonky2 = { version = "0.1.1" } +plonky2 = { version = "0.1.2" } diff --git a/starky/Cargo.toml b/starky/Cargo.toml index 4f459613..e47184d7 100644 --- a/starky/Cargo.toml +++ b/starky/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "starky" description = "Implementation of STARKs" -version = "0.1.0" +version = "0.1.1" license = "MIT OR Apache-2.0" authors = ["Daniel Lubarov ", "William Borgeaud "] readme = "README.md" @@ -21,7 +21,7 @@ anyhow = { version = "1.0.40", default-features = false } itertools = { version = "0.10.0", default-features = false } log = { version = "0.4.14", 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] env_logger = { version = "0.9.0", default-features = false } diff --git a/starky/src/get_challenges.rs b/starky/src/get_challenges.rs index 2f1a9064..b34b427d 100644 --- a/starky/src/get_challenges.rs +++ b/starky/src/get_challenges.rs @@ -175,7 +175,7 @@ where permutation_challenge_sets, stark_alphas, stark_zeta, - fri_challenges: challenger.fri_challenges::( + fri_challenges: challenger.fri_challenges( builder, commit_phase_merkle_caps, final_poly, diff --git a/system_zero/Cargo.toml b/system_zero/Cargo.toml index b8604984..2595eb03 100644 --- a/system_zero/Cargo.toml +++ b/system_zero/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" anyhow = "1.0.40" itertools = "0.10.0" log = "0.4.14" -plonky2 = { version = "0.1.1" } +plonky2 = { version = "0.1.2" } plonky2_util = { version = "0.1.0" } rand = "0.8.4" rand_chacha = "0.3.1" -starky = { version = "0.1.0" } +starky = { version = "0.1.1" } [dev-dependencies] criterion = "0.4.0" diff --git a/u32/Cargo.toml b/u32/Cargo.toml index 0fd11a4a..bde1b534 100644 --- a/u32/Cargo.toml +++ b/u32/Cargo.toml @@ -10,8 +10,8 @@ edition = "2021" anyhow = { version = "1.0.40", default-features = false } itertools = { version = "0.10.0", 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] -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"] }