Move ConvertCircuit to shielded pool component

penumbra-zone · Jan 3, 2024 · 8aba60e · 8aba60e
1 parent 2f97efc
commit 8aba60e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/...core/component/stake/src/convert_proof.rs → ...re/component/shielded-pool/src/convert.rs b/...core/component/stake/src/convert_proof.rs → ...re/component/shielded-pool/src/convert.rs
diff --git a/crates/core/component/shielded-pool/src/lib.rs b/crates/core/component/shielded-pool/src/lib.rs
@@ -20,10 +20,12 @@ pub use note::{Note, NoteCiphertext, NoteView};
 pub use note_payload::NotePayload;
 pub use rseed::Rseed;
 
+pub mod convert;
 pub mod nullifier_derivation;
 pub mod output;
 pub mod spend;
 
+pub use convert::{ConvertCircuit, ConvertProof, ConvertProofPrivate, ConvertProofPublic};
 pub use nullifier_derivation::{NullifierDerivationCircuit, NullifierDerivationProof};
 pub use output::{Output, OutputCircuit, OutputPlan, OutputProof, OutputView};
 pub use spend::{Spend, SpendCircuit, SpendPlan, SpendProof, SpendView};
diff --git a/crates/core/component/stake/src/lib.rs b/crates/core/component/stake/src/lib.rs
@@ -25,14 +25,12 @@ pub mod undelegate;
 pub mod undelegate_claim;
 pub mod validator;
 
-pub use convert_proof::ConvertCircuit;
 pub use delegate::Delegate;
 pub use undelegate::Undelegate;
 pub use undelegate_claim::{
     UndelegateClaim, UndelegateClaimBody, UndelegateClaimPlan, UndelegateClaimProof,
 };
 
-mod convert_proof;
 mod delegation_token;
 mod governance_key;
 mod identity_key;

diff --git a/crates/core/component/stake/src/undelegate_claim/proof.rs b/crates/core/component/stake/src/undelegate_claim/proof.rs
@@ -7,8 +7,8 @@ use decaf377::{Fq, Fr};
 use penumbra_asset::{asset, balance, STAKING_TOKEN_ASSET_ID};
 use penumbra_num::Amount;
 use penumbra_proof_params::VerifyingKeyExt;
+use penumbra_shielded_pool::{ConvertProof, ConvertProofPrivate, ConvertProofPublic};
 
-use crate::convert_proof::{ConvertProof, ConvertProofPrivate, ConvertProofPublic};
 use crate::Penalty;
 
 #[derive(Clone, Debug)]
@@ -92,7 +92,8 @@ mod tests {
     use proptest::prelude::*;
     use rand_core::OsRng;
 
-    use crate::{convert_proof::ConvertCircuit, IdentityKey, Penalty, UnbondingToken};
+    use crate::{IdentityKey, Penalty, UnbondingToken};
+    use penumbra_shielded_pool::ConvertCircuit;
 
     fn fr_strategy() -> BoxedStrategy<Fr> {
         any::<[u8; 32]>()

diff --git a/crates/crypto/proof-setup/src/all.rs b/crates/crypto/proof-setup/src/all.rs
@@ -23,8 +23,9 @@ use penumbra_dex::{swap::proof::SwapCircuit, swap_claim::proof::SwapClaimCircuit
 use penumbra_governance::DelegatorVoteCircuit;
 use penumbra_proof_params::generate_constraint_matrices;
 use penumbra_proto::tools::summoning::v1alpha1::{self as pb};
-use penumbra_shielded_pool::{NullifierDerivationCircuit, OutputCircuit, SpendCircuit};
-use penumbra_stake::ConvertCircuit;
+use penumbra_shielded_pool::{
+    ConvertCircuit, NullifierDerivationCircuit, OutputCircuit, SpendCircuit,
+};
 
 use rand_core::OsRng;
 

diff --git a/tools/parameter-setup/src/main.rs b/tools/parameter-setup/src/main.rs
@@ -17,8 +17,9 @@ use penumbra_proof_setup::single::{
     circuit_degree, combine, log::Hashable, transition, Phase1CRSElements, Phase1Contribution,
     Phase2Contribution,
 };
-use penumbra_shielded_pool::{NullifierDerivationCircuit, OutputCircuit, SpendCircuit};
-use penumbra_stake::ConvertCircuit;
+use penumbra_shielded_pool::{
+    ConvertCircuit, NullifierDerivationCircuit, OutputCircuit, SpendCircuit,
+};
 use rand_core::OsRng;
 
 fn generate_parameters<D: DummyWitness>() -> (ProvingKey<Bls12_377>, VerifyingKey<Bls12_377>) {