From cb29322ce1420cbd19dda5bbfe82e835728166f4 Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Tue, 20 Feb 2024 15:35:21 +0100 Subject: [PATCH 1/3] start ProofWithPublicInputsVariable --- plonky2x/core/src/frontend/recursion/mod.rs | 1 + .../src/frontend/recursion/plonky2_proof.rs | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 plonky2x/core/src/frontend/recursion/plonky2_proof.rs diff --git a/plonky2x/core/src/frontend/recursion/mod.rs b/plonky2x/core/src/frontend/recursion/mod.rs index 1f5811bf6..9dd1ed7ed 100644 --- a/plonky2x/core/src/frontend/recursion/mod.rs +++ b/plonky2x/core/src/frontend/recursion/mod.rs @@ -1,4 +1,5 @@ pub mod extension; pub mod fri; pub mod hash; +pub mod plonky2_proof; pub mod polynomial; diff --git a/plonky2x/core/src/frontend/recursion/plonky2_proof.rs b/plonky2x/core/src/frontend/recursion/plonky2_proof.rs new file mode 100644 index 000000000..bc0eced05 --- /dev/null +++ b/plonky2x/core/src/frontend/recursion/plonky2_proof.rs @@ -0,0 +1,26 @@ +use crate::frontend::recursion::extension::ExtensionVariable; +use crate::frontend::recursion::fri::proof::FriProofVariable; +use crate::frontend::recursion::hash::MerkleCapVariable; +use crate::prelude::Variable; +pub struct ProofWithPublicInputsVariable { + proof: ProofVariable, // Add missing generic argument + public_inputs: Vec, +} + +pub struct ProofVariable { + wires_cap: MerkleCapVariable, + plonk_zs_partial_products_cap: MerkleCapVariable, + quotient_polys_cap: MerkleCapVariable, + openings: OpeningSetVariable, + opening_proof: FriProofVariable, +} + +pub struct OpeningSetVariable { + pub constants: Vec>, + pub plonk_sigmas: Vec>, + pub wires: Vec>, + pub plonk_zs: Vec>, + pub plonk_zs_next: Vec>, + pub partial_products: Vec>, + pub quotient_polys: Vec>, +} From 305c568b5023521c7599dd651b8c4590a4d62bc4 Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Tue, 20 Feb 2024 15:36:31 +0100 Subject: [PATCH 2/3] comment --- plonky2x/core/src/frontend/recursion/plonky2_proof.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plonky2x/core/src/frontend/recursion/plonky2_proof.rs b/plonky2x/core/src/frontend/recursion/plonky2_proof.rs index bc0eced05..4229aa419 100644 --- a/plonky2x/core/src/frontend/recursion/plonky2_proof.rs +++ b/plonky2x/core/src/frontend/recursion/plonky2_proof.rs @@ -3,7 +3,7 @@ use crate::frontend::recursion::fri::proof::FriProofVariable; use crate::frontend::recursion::hash::MerkleCapVariable; use crate::prelude::Variable; pub struct ProofWithPublicInputsVariable { - proof: ProofVariable, // Add missing generic argument + proof: ProofVariable, public_inputs: Vec, } From 6457898d59480102bca431b3d8168ac6f15693b5 Mon Sep 17 00:00:00 2001 From: Connor O'Hara Date: Tue, 20 Feb 2024 15:43:31 +0100 Subject: [PATCH 3/3] fix build --- .../core/src/frontend/recursion/plonky2_proof.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plonky2x/core/src/frontend/recursion/plonky2_proof.rs b/plonky2x/core/src/frontend/recursion/plonky2_proof.rs index 4229aa419..86d721a5a 100644 --- a/plonky2x/core/src/frontend/recursion/plonky2_proof.rs +++ b/plonky2x/core/src/frontend/recursion/plonky2_proof.rs @@ -3,16 +3,16 @@ use crate::frontend::recursion::fri::proof::FriProofVariable; use crate::frontend::recursion::hash::MerkleCapVariable; use crate::prelude::Variable; pub struct ProofWithPublicInputsVariable { - proof: ProofVariable, - public_inputs: Vec, + pub proof: ProofVariable, + pub public_inputs: Vec, } pub struct ProofVariable { - wires_cap: MerkleCapVariable, - plonk_zs_partial_products_cap: MerkleCapVariable, - quotient_polys_cap: MerkleCapVariable, - openings: OpeningSetVariable, - opening_proof: FriProofVariable, + pub wires_cap: MerkleCapVariable, + pub plonk_zs_partial_products_cap: MerkleCapVariable, + pub quotient_polys_cap: MerkleCapVariable, + pub openings: OpeningSetVariable, + pub opening_proof: FriProofVariable, } pub struct OpeningSetVariable {