diff --git a/crypto/frost/Cargo.toml b/crypto/frost/Cargo.toml index 9f9bff63..929b1eb0 100644 --- a/crypto/frost/Cargo.toml +++ b/crypto/frost/Cargo.toml @@ -16,7 +16,6 @@ hex = "0.4" sha2 = { version = "0.10", optional = true } -ff = "0.12" group = "0.12" elliptic-curve = { version = "0.12", features = ["hash2curve"], optional = true } @@ -24,7 +23,7 @@ p256 = { version = "0.11", features = ["arithmetic", "hash2curve"], optional = t k256 = { version = "0.11", features = ["arithmetic", "hash2curve"], optional = true } dalek-ff-group = { path = "../dalek-ff-group", optional = true } -transcript = { path = "../transcript" } +transcript = { package = "transcript-trait", path = "../transcript" } multiexp = { path = "../multiexp", features = ["batch"] } diff --git a/crypto/frost/src/curves/dalek.rs b/crypto/frost/src/curves/dalek.rs index f3dce609..1ba41918 100644 --- a/crypto/frost/src/curves/dalek.rs +++ b/crypto/frost/src/curves/dalek.rs @@ -4,8 +4,7 @@ use rand_core::{RngCore, CryptoRng}; use sha2::{Digest, Sha512}; -use ff::PrimeField; -use group::Group; +use group::{ff::PrimeField, Group}; use dalek_ff_group::Scalar; diff --git a/crypto/frost/src/curves/kp256.rs b/crypto/frost/src/curves/kp256.rs index e7421c5a..35e466e2 100644 --- a/crypto/frost/src/curves/kp256.rs +++ b/crypto/frost/src/curves/kp256.rs @@ -4,8 +4,7 @@ use rand_core::{RngCore, CryptoRng}; use sha2::{digest::Update, Digest, Sha256}; -use ff::{Field, PrimeField}; -use group::{Group, GroupEncoding}; +use group::{ff::{Field, PrimeField}, Group, GroupEncoding}; use elliptic_curve::{bigint::{Encoding, U384}, hash2curve::{Expander, ExpandMsg, ExpandMsgXmd}}; diff --git a/crypto/frost/src/key_gen.rs b/crypto/frost/src/key_gen.rs index 8f235b6b..fd5f13bb 100644 --- a/crypto/frost/src/key_gen.rs +++ b/crypto/frost/src/key_gen.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use rand_core::{RngCore, CryptoRng}; -use ff::{Field, PrimeField}; +use group::ff::{Field, PrimeField}; use multiexp::{multiexp_vartime, BatchVerifier}; diff --git a/crypto/frost/src/lib.rs b/crypto/frost/src/lib.rs index c96e0333..cd5d8ee2 100644 --- a/crypto/frost/src/lib.rs +++ b/crypto/frost/src/lib.rs @@ -5,8 +5,7 @@ use thiserror::Error; use rand_core::{RngCore, CryptoRng}; -use ff::{Field, PrimeField}; -use group::{Group, GroupOps}; +use group::{ff::{Field, PrimeField}, Group, GroupOps}; mod schnorr; diff --git a/crypto/frost/src/schnorr.rs b/crypto/frost/src/schnorr.rs index c138f05c..22361173 100644 --- a/crypto/frost/src/schnorr.rs +++ b/crypto/frost/src/schnorr.rs @@ -1,6 +1,6 @@ use rand_core::{RngCore, CryptoRng}; -use ff::Field; +use group::ff::Field; use multiexp::BatchVerifier; diff --git a/crypto/frost/src/sign.rs b/crypto/frost/src/sign.rs index 49c1c853..987cec0e 100644 --- a/crypto/frost/src/sign.rs +++ b/crypto/frost/src/sign.rs @@ -3,7 +3,7 @@ use std::{sync::Arc, collections::HashMap}; use rand_core::{RngCore, CryptoRng}; -use ff::Field; +use group::ff::Field; use transcript::Transcript; diff --git a/crypto/frost/src/tests/curve.rs b/crypto/frost/src/tests/curve.rs index eed4e62a..d7327605 100644 --- a/crypto/frost/src/tests/curve.rs +++ b/crypto/frost/src/tests/curve.rs @@ -1,7 +1,6 @@ use rand_core::{RngCore, CryptoRng}; -use ff::Field; -use group::Group; +use group::{ff::Field, Group}; use crate::{Curve, MultisigKeys, tests::key_gen}; diff --git a/crypto/frost/src/tests/mod.rs b/crypto/frost/src/tests/mod.rs index 52fbf515..78bc7425 100644 --- a/crypto/frost/src/tests/mod.rs +++ b/crypto/frost/src/tests/mod.rs @@ -2,7 +2,7 @@ use std::{sync::Arc, collections::HashMap}; use rand_core::{RngCore, CryptoRng}; -use ff::Field; +use group::ff::Field; use crate::{ Curve, diff --git a/crypto/frost/src/tests/schnorr.rs b/crypto/frost/src/tests/schnorr.rs index 684107a7..c9550577 100644 --- a/crypto/frost/src/tests/schnorr.rs +++ b/crypto/frost/src/tests/schnorr.rs @@ -2,7 +2,7 @@ use std::{marker::PhantomData, sync::Arc, collections::HashMap}; use rand_core::{RngCore, CryptoRng}; -use ff::Field; +use group::ff::Field; use crate::{ Curve, MultisigKeys, schnorr::{self, SchnorrSignature}, algorithm::{Hram, Schnorr},