mirror of
https://github.com/serai-dex/serai.git
synced 2025-12-09 12:49:23 +00:00
Reorganize FROST's handling of curves
This commit is contained in:
@@ -10,8 +10,7 @@ use curve25519_dalek::{
|
||||
};
|
||||
|
||||
use transcript::{Transcript, RecommendedTranscript};
|
||||
use frost::curves::Curve;
|
||||
pub use frost::curves::dalek::Ed25519;
|
||||
use frost::curve::{Curve, Ed25519};
|
||||
use dalek_ff_group as dfg;
|
||||
|
||||
use crate::random_scalar;
|
||||
|
||||
@@ -14,12 +14,12 @@ use curve25519_dalek::{
|
||||
use group::Group;
|
||||
|
||||
use transcript::{Transcript, RecommendedTranscript};
|
||||
use frost::{FrostError, MultisigView, algorithm::Algorithm};
|
||||
use frost::{curve::Ed25519, FrostError, MultisigView, algorithm::Algorithm};
|
||||
use dalek_ff_group as dfg;
|
||||
|
||||
use crate::{
|
||||
hash_to_point,
|
||||
frost::{MultisigError, Ed25519, DLEqProof, read_dleq},
|
||||
frost::{MultisigError, DLEqProof, read_dleq},
|
||||
ringct::clsag::{ClsagInput, Clsag}
|
||||
};
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@ use curve25519_dalek::{constants::ED25519_BASEPOINT_TABLE, scalar::Scalar};
|
||||
|
||||
#[cfg(feature = "multisig")]
|
||||
use transcript::RecommendedTranscript;
|
||||
#[cfg(feature = "multisig")]
|
||||
use frost::curve::Ed25519;
|
||||
|
||||
use crate::{
|
||||
Commitment,
|
||||
@@ -15,7 +17,7 @@ use crate::{
|
||||
ringct::clsag::{ClsagInput, Clsag}
|
||||
};
|
||||
#[cfg(feature = "multisig")]
|
||||
use crate::{frost::{Ed25519, MultisigError}, ringct::clsag::{ClsagDetails, ClsagMultisig}};
|
||||
use crate::{frost::MultisigError, ringct::clsag::{ClsagDetails, ClsagMultisig}};
|
||||
|
||||
#[cfg(feature = "multisig")]
|
||||
use frost::tests::{key_gen, algorithm_machines, sign};
|
||||
|
||||
@@ -7,6 +7,7 @@ use curve25519_dalek::{traits::Identity, scalar::Scalar, edwards::{EdwardsPoint,
|
||||
|
||||
use transcript::{Transcript, RecommendedTranscript};
|
||||
use frost::{
|
||||
curve::Ed25519,
|
||||
FrostError, MultisigKeys,
|
||||
sign::{
|
||||
PreprocessMachine, SignMachine, SignatureMachine,
|
||||
@@ -15,7 +16,6 @@ use frost::{
|
||||
};
|
||||
|
||||
use crate::{
|
||||
frost::Ed25519,
|
||||
random_scalar, ringct::{clsag::{ClsagInput, ClsagDetails, ClsagMultisig}, bulletproofs::Bulletproofs, RctPrunable},
|
||||
transaction::{Input, Transaction},
|
||||
rpc::Rpc,
|
||||
|
||||
@@ -14,7 +14,9 @@ use curve25519_dalek::constants::ED25519_BASEPOINT_TABLE;
|
||||
#[cfg(feature = "multisig")]
|
||||
use dalek_ff_group::Scalar;
|
||||
#[cfg(feature = "multisig")]
|
||||
use frost::tests::{THRESHOLD, key_gen, sign};
|
||||
use transcript::RecommendedTranscript;
|
||||
#[cfg(feature = "multisig")]
|
||||
use frost::{curve::Ed25519, tests::{THRESHOLD, key_gen, sign}};
|
||||
|
||||
use monero::{
|
||||
network::Network,
|
||||
@@ -26,11 +28,6 @@ use monero_serai::{random_scalar, wallet::SignableTransaction};
|
||||
mod rpc;
|
||||
use crate::rpc::{rpc, mine_block};
|
||||
|
||||
#[cfg(feature = "multisig")]
|
||||
use transcript::RecommendedTranscript;
|
||||
#[cfg(feature = "multisig")]
|
||||
use monero_serai::frost::Ed25519;
|
||||
|
||||
lazy_static! {
|
||||
static ref SEQUENTIAL: Mutex<()> = Mutex::new(());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user