WIP: Add secp256r1

examples/threaded_example/threaded.rs

@@ -36,12 +36,7 @@ use std::{
 use tracing::{debug, info, instrument, span, trace, Level};
 use tracing_subscriber::{self, EnvFilter};
 use tss_ecdsa::{
-    auxinfo::AuxInfoParticipant,
-    keygen::{KeygenParticipant, Output},
-    messages::Message,
-    presign::{self, PresignParticipant},
-    sign::{self, SignParticipant},
-    Identifier, Participant, ParticipantConfig, ParticipantIdentifier, ProtocolParticipant,
+    auxinfo::AuxInfoParticipant, curve_point::CurvePoint, keygen::{KeygenParticipant, Output}, messages::Message, presign::{self, PresignParticipant}, sign::{self, SignParticipant}, Identifier, Participant, ParticipantConfig, ParticipantIdentifier, ProtocolParticipant
 };
 use utils::{MessageFromWorker, SubProtocol};
 use uuid::Uuid;
@@ -326,7 +321,7 @@ struct Worker {
     /// Outputs of successful presign.
     presign_records: StoredOutput<PresignParticipant>,
     /// Signatures generated from successful signing runs.
-    signatures: StoredOutput<SignParticipant>,
+    signatures: StoredOutput<SignParticipant<CurvePoint>>,
     /// Channel for sending messages to the coordinator.
     outgoing: Sender<MessageFromWorker>,
 }
@@ -411,7 +406,7 @@ impl Worker {
     fn new_auxinfo(&mut self, sid: SessionId, key_id: KeyId) -> anyhow::Result<()> {
         // Note: Missing inputs to aux-info see issues
         // #242 and #243.
-        let _output: &Output = self.key_gen_material.retrieve(&key_id);
+        let _output: &Output<tss_ecdsa::curve_point::CurvePoint> = self.key_gen_material.retrieve(&key_id);
         self.new_sub_protocol::<AuxInfoParticipant>(sid, (), key_id)
     }
 
@@ -428,7 +423,7 @@ impl Worker {
         let record = self.presign_records.take(&key_id);
 
         let inputs = sign::Input::new(b"hello world", record, key_shares.to_vec());
-        self.new_sub_protocol::<SignParticipant>(sid, inputs, key_id)
+        self.new_sub_protocol::<SignParticipant<CurvePoint>>(sid, inputs, key_id)
     }
 }
 
@@ -462,7 +457,7 @@ impl Worker {
     }
 
     fn process_sign(&mut self, sid: SessionId, incoming: Message) -> anyhow::Result<()> {
-        let (p, key_id) = self.participants.get_mut::<SignParticipant>(&sid);
+        let (p, key_id) = self.participants.get_mut::<SignParticipant<CurvePoint>>(&sid);
         Self::process_message(p, key_id, incoming, &mut self.signatures, &self.outgoing)
     }
 }

src/auxinfo/auxinfo_commit.rs

@@ -7,12 +7,7 @@
 // of this source tree.
 
 use crate::{
-    auxinfo::{info::AuxInfoPublic, participant::AuxInfoParticipant},
-    errors::{InternalError, Result},
-    messages::{AuxinfoMessageType, Message, MessageType},
-    parameters::PRIME_BITS,
-    participant::{InnerProtocolParticipant, ProtocolParticipant},
-    protocol::{Identifier, ParticipantIdentifier},
+    auxinfo::{info::AuxInfoPublic, participant::AuxInfoParticipant}, errors::{InternalError, Result}, messages::{AuxinfoMessageType, Message, MessageType}, parameters::PRIME_BITS, participant::{InnerProtocolParticipant, ProtocolParticipant}, protocol::{Identifier, ParticipantIdentifier}
 };
 use libpaillier::unknown_order::BigNumber;
 use merlin::Transcript;

src/auxinfo/info.rs

@@ -7,12 +7,7 @@
 // of this source tree.
 
 use crate::{
-    errors::{CallerError, InternalError, Result},
-    paillier::{DecryptionKey, EncryptionKey},
-    ring_pedersen::VerifiedRingPedersen,
-    utils::ParseBytes,
-    zkp::ProofContext,
-    ParticipantIdentifier,
+    errors::{CallerError, InternalError, Result}, paillier::{DecryptionKey, EncryptionKey}, ring_pedersen::VerifiedRingPedersen, utils::ParseBytes, zkp::ProofContext, ParticipantIdentifier
 };
 use k256::elliptic_curve::zeroize::ZeroizeOnDrop;
 use libpaillier::unknown_order::BigNumber;
@@ -210,7 +205,7 @@ impl Debug for AuxInfoWitnesses {
 
 #[cfg(test)]
 mod tests {
-    use crate::{paillier::DecryptionKey, utils::testing::init_testing};
+    use crate::{paillier::DecryptionKey, curve_point::testing::init_testing};
 
     use super::{AuxInfoPrivate, AUXINFO_TAG};
 

src/auxinfo/output.rs

@@ -3,9 +3,7 @@
 use std::collections::HashSet;
 
 use crate::{
-    auxinfo::info::{AuxInfoPrivate, AuxInfoPublic},
-    errors::{CallerError, InternalError, Result},
-    protocol::ParticipantIdentifier,
+    auxinfo::info::{AuxInfoPrivate, AuxInfoPublic}, errors::{CallerError, InternalError, Result}, protocol::ParticipantIdentifier
 };
 use tracing::error;
 
@@ -103,7 +101,7 @@ impl Output {
 mod tests {
     use super::*;
     use crate::{
-        paillier::DecryptionKey, ring_pedersen::VerifiedRingPedersen, utils::testing::init_testing,
+        paillier::DecryptionKey, ring_pedersen::VerifiedRingPedersen, curve_point::testing::init_testing,
         ParticipantConfig,
     };
 

src/auxinfo/participant.rs

@@ -15,18 +15,9 @@ use crate::{
         info::{AuxInfoPrivate, AuxInfoPublic, AuxInfoWitnesses},
         proof::{AuxInfoProof, CommonInput},
         Output,
-    },
-    broadcast::participant::{BroadcastOutput, BroadcastParticipant, BroadcastTag},
-    errors::{CallerError, InternalError, Result},
-    local_storage::LocalStorage,
-    messages::{AuxinfoMessageType, Message, MessageType},
-    paillier::DecryptionKey,
-    participant::{
+    }, broadcast::participant::{BroadcastOutput, BroadcastParticipant, BroadcastTag}, curve_point::CurvePoint, errors::{CallerError, InternalError, Result}, local_storage::LocalStorage, messages::{AuxinfoMessageType, Message, MessageType}, paillier::DecryptionKey, participant::{
         Broadcast, InnerProtocolParticipant, ProcessOutcome, ProtocolParticipant, Status,
-    },
-    protocol::{Identifier, ParticipantIdentifier, ProtocolType, SharedContext},
-    ring_pedersen::VerifiedRingPedersen,
-    run_only_once,
+    }, protocol::{Identifier, ParticipantIdentifier, ProtocolType, SharedContext}, ring_pedersen::VerifiedRingPedersen, run_only_once
 };
 use rand::{CryptoRng, RngCore};
 use tracing::{debug, error, info, instrument};
@@ -221,7 +212,7 @@ impl ProtocolParticipant for AuxInfoParticipant {
 }
 
 impl InnerProtocolParticipant for AuxInfoParticipant {
-    type Context = SharedContext;
+    type Context = SharedContext<CurvePoint>;
 
     fn retrieve_context(&self) -> <Self as InnerProtocolParticipant>::Context {
         SharedContext::collect(self)
@@ -506,7 +497,7 @@ impl AuxInfoParticipant {
                 // ... and use its setup parameters in the proof.
                 let common_input =
                     CommonInput::new(shared_context, sid, global_rid, self.id(), params, &product);
-                let proof = AuxInfoProof::prove(rng, &common_input, &witness.p, &witness.q)?;
+                let proof = AuxInfoProof::prove::<R, CurvePoint>(rng, &common_input, &witness.p, &witness.q)?;
                 Message::new(
                     MessageType::Auxinfo(AuxinfoMessageType::R3Proof),
                     sid,
@@ -561,7 +552,7 @@ impl AuxInfoParticipant {
         );
         // Verify the public parameters for the given participant. Note that
         // this verification verifies _both_ the `𝚷[mod]` and `𝚷[fac]` proofs.
-        proof.verify(&common_input)?;
+        proof.verify::<CurvePoint>(&common_input)?;
 
         self.local_storage
             .store_once::<storage::Public>(message.from(), auxinfo_pub)?;
@@ -621,7 +612,7 @@ impl AuxInfoParticipant {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{utils::testing::init_testing, Identifier, ParticipantConfig};
+    use crate::{curve_point::{testing::init_testing, CurvePoint}, Identifier, ParticipantConfig};
     use rand::{CryptoRng, Rng, RngCore};
     use std::collections::HashMap;
 
@@ -761,7 +752,7 @@ mod tests {
         assert_eq!(outputs.len(), QUORUM_SIZE);
 
         let participant_ids = quorum[0].all_participants();
-        let context = SharedContext::fill_context(participant_ids, sid);
+        let context: SharedContext<CurvePoint> = SharedContext::fill_context(participant_ids, sid);
         // Check returned outputs
         //
         // Every participant should have a public output from every other participant

src/auxinfo/proof.rs

@@ -7,12 +7,7 @@
 // of this source tree.
 
 use crate::{
-    auxinfo::participant::AuxInfoParticipant,
-    errors::Result,
-    messages::{AuxinfoMessageType, Message, MessageType},
-    participant::InnerProtocolParticipant,
-    ring_pedersen::VerifiedRingPedersen,
-    Identifier, ParticipantIdentifier,
+    auxinfo::participant::AuxInfoParticipant, curve_point::{CurvePoint, CurveTrait}, errors::Result, messages::{AuxinfoMessageType, Message, MessageType}, participant::InnerProtocolParticipant, ring_pedersen::VerifiedRingPedersen, Identifier, ParticipantIdentifier
 };
 
 use crate::zkp::{pifac, pimod, Proof, ProofContext};
@@ -86,28 +81,28 @@ impl AuxInfoProof {
     /// Note: The [`VerifiedRingPedersen`] argument **must be** provided by the
     /// verifier!
     #[allow(clippy::too_many_arguments)]
-    pub(crate) fn prove<R: RngCore + CryptoRng>(
+    pub(crate) fn prove<R: RngCore + CryptoRng, C: CurveTrait>(
         rng: &mut R,
         common_input: &CommonInput,
         p: &BigNumber,
         q: &BigNumber,
     ) -> Result<Self> {
         let mut transcript = Self::new_transcript();
-        Self::append_pimod_transcript(
+        Self::append_pimod_transcript::<CurvePoint>(
             &mut transcript,
             common_input.shared_context,
             common_input.sid,
             common_input.rho,
             common_input.pid,
         )?;
-        let pimod = pimod::PiModProof::prove(
+        let pimod: pimod::PiModProof = pimod::PiModProof::prove(
             pimod::CommonInput::new(common_input.modulus),
             pimod::ProverSecret::new(p, q),
             common_input.shared_context,
             &mut transcript,
             rng,
         )?;
-        Self::append_pifac_transcript(
+        Self::append_pifac_transcript::<CurvePoint>(
             &mut transcript,
             common_input.shared_context,
             common_input.sid,
@@ -131,9 +126,9 @@ impl AuxInfoProof {
     ///
     /// Note: The [`VerifiedRingPedersen`] argument **must be** provided by the
     /// verifier!
-    pub(crate) fn verify(self, common_input: &CommonInput) -> Result<()> {
+    pub(crate) fn verify<C: CurveTrait>(self, common_input: &CommonInput) -> Result<()> {
         let mut transcript = Self::new_transcript();
-        Self::append_pimod_transcript(
+        Self::append_pimod_transcript::<CurvePoint>(
             &mut transcript,
             common_input.shared_context,
             common_input.sid,
@@ -145,7 +140,7 @@ impl AuxInfoProof {
             common_input.shared_context,
             &mut transcript,
         )?;
-        Self::append_pifac_transcript(
+        Self::append_pifac_transcript::<CurvePoint>(
             &mut transcript,
             common_input.shared_context,
             common_input.sid,
@@ -162,7 +157,7 @@ impl AuxInfoProof {
 
     /// Append info relevant to the `𝚷[mod]` proof to the provided
     /// [`Transcript`].
-    fn append_pimod_transcript(
+    fn append_pimod_transcript<C: CurveTrait>(
         transcript: &mut Transcript,
         context: &<AuxInfoParticipant as InnerProtocolParticipant>::Context,
         sid: Identifier,
@@ -179,7 +174,7 @@ impl AuxInfoProof {
 
     /// Append info relevant to the `𝚷[fac]` proof to the provided
     /// [`Transcript`].
-    fn append_pifac_transcript(
+    fn append_pifac_transcript<C: CurveTrait>(
         transcript: &mut Transcript,
         context: &<AuxInfoParticipant as InnerProtocolParticipant>::Context,
         sid: Identifier,
@@ -198,7 +193,7 @@ impl AuxInfoProof {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{paillier::prime_gen, protocol::SharedContext, utils::testing::init_testing};
+    use crate::{curve_point::{testing::init_testing, CurvePoint}, paillier::prime_gen, protocol::SharedContext};
     use rand::{rngs::StdRng, Rng, SeedableRng};
 
     fn random_auxinfo_proof<R: RngCore + CryptoRng>(
@@ -214,7 +209,7 @@ mod tests {
         let shared_context = SharedContext::random(rng);
         let common_input =
             CommonInput::new(&shared_context, sid, rho, pid, &setup_params, &modulus);
-        let proof = AuxInfoProof::prove(rng, &common_input, &p, &q).unwrap();
+        let proof = AuxInfoProof::prove::<R, CurvePoint>(rng, &common_input, &p, &q).unwrap();
         test_code(common_input, proof)
     }
 
@@ -230,8 +225,8 @@ mod tests {
         let shared_context = SharedContext::random(&mut rng);
         let common_input =
             CommonInput::new(&shared_context, sid, rho, pid, &setup_params, &modulus);
-        let proof = AuxInfoProof::prove(&mut rng, &common_input, &p, &q)?;
-        assert!(proof.verify(&common_input).is_ok());
+        let proof = AuxInfoProof::prove::<StdRng, CurvePoint>(&mut rng, &common_input, &p, &q)?;
+        assert!(proof.verify::<CurvePoint>(&common_input).is_ok());
         Ok(())
     }
 
@@ -249,8 +244,8 @@ mod tests {
                     pifac: proof1.pifac,
                     pimod: proof.pimod,
                 };
-                assert!(mix_one.verify(&input).is_err());
-                assert!(mix_two.verify(&input1).is_err());
+                assert!(mix_one.verify::<CurvePoint>(&input).is_err());
+                assert!(mix_two.verify::<CurvePoint>(&input1).is_err());
                 Ok(())
             };
             random_auxinfo_proof(&mut rng2, f1)?;
@@ -272,8 +267,8 @@ mod tests {
         let modulus = &p * &q;
         let shared_context = &SharedContext::random(&mut rng);
         let common_input = CommonInput::new(shared_context, sid, rho, pid, &setup_params, &modulus);
-        match AuxInfoProof::prove(&mut rng, &common_input, &p1, &q1) {
-            Ok(proof) => assert!(proof.verify(&common_input).is_err()),
+        match AuxInfoProof::prove::<StdRng, CurvePoint>(&mut rng, &common_input, &p1, &q1) {
+            Ok(proof) => assert!(proof.verify::<CurvePoint>(&common_input).is_err()),
             Err(_) => return Ok(()),
         }
         Ok(())
@@ -306,8 +301,8 @@ mod tests {
             setup_parameters: &setup_params,
             modulus: &modulus,
         };
-        match AuxInfoProof::prove(&mut rng, &common_input, &p, &q) {
-            Ok(proof) => assert!(proof.verify(&bad_common_input).is_err()),
+        match AuxInfoProof::prove::<StdRng, CurvePoint>(&mut rng, &common_input, &p, &q) {
+            Ok(proof) => assert!(proof.verify::<CurvePoint>(&bad_common_input).is_err()),
             Err(_) => return Ok(()),
         }
         Ok(())

src/broadcast/participant.rs

@@ -7,13 +7,7 @@
 // of this source tree.
 
 use crate::{
-    broadcast::data::BroadcastData,
-    errors::{CallerError, InternalError, Result},
-    local_storage::LocalStorage,
-    messages::{BroadcastMessageType, Message, MessageType},
-    participant::{InnerProtocolParticipant, ProcessOutcome, ProtocolParticipant},
-    protocol::{ParticipantIdentifier, ProtocolType, SharedContext},
-    run_only_once_per_tag, Identifier,
+    broadcast::data::BroadcastData, curve_point::CurvePoint, errors::{CallerError, InternalError, Result}, local_storage::LocalStorage, messages::{BroadcastMessageType, Message, MessageType}, participant::{InnerProtocolParticipant, ProcessOutcome, ProtocolParticipant}, protocol::{ParticipantIdentifier, ProtocolType, SharedContext}, run_only_once_per_tag, Identifier
 };
 
 use crate::participant::Status;
@@ -170,7 +164,7 @@ impl ProtocolParticipant for BroadcastParticipant {
 }
 
 impl InnerProtocolParticipant for BroadcastParticipant {
-    type Context = SharedContext;
+    type Context = SharedContext<CurvePoint>;
 
     /// This method is never used.
     fn retrieve_context(&self) -> <Self as InnerProtocolParticipant>::Context {