diff --git a/Cargo.lock b/Cargo.lock index 6b1c1b4d..6a41358e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -980,7 +980,7 @@ checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "ecdsa_fun" version = "0.7.1" -source = "git+https://github.com/LLFourn/secp256kfun#7c3d592bae20cd4b4309ed6cf6551dc971fed43e" +source = "git+https://github.com/LLFourn/secp256kfun#8b2f3012e151cbab5296ec3bdc4510d3404dad75" dependencies = [ "bincode", "rand_chacha 0.3.1", @@ -3416,7 +3416,7 @@ dependencies = [ [[package]] name = "secp256kfun" version = "0.7.1" -source = "git+https://github.com/LLFourn/secp256kfun#7c3d592bae20cd4b4309ed6cf6551dc971fed43e" +source = "git+https://github.com/LLFourn/secp256kfun#8b2f3012e151cbab5296ec3bdc4510d3404dad75" dependencies = [ "digest 0.10.3", "rand_core 0.6.2", @@ -3625,7 +3625,7 @@ dependencies = [ [[package]] name = "sigma_fun" version = "0.4.1" -source = "git+https://github.com/LLFourn/secp256kfun#7c3d592bae20cd4b4309ed6cf6551dc971fed43e" +source = "git+https://github.com/LLFourn/secp256kfun#8b2f3012e151cbab5296ec3bdc4510d3404dad75" dependencies = [ "curve25519-dalek-ng", "digest 0.10.3", diff --git a/swap/src/monero_ext.rs b/swap/src/monero_ext.rs index 7d3ce2a3..96ca5116 100644 --- a/swap/src/monero_ext.rs +++ b/swap/src/monero_ext.rs @@ -1,5 +1,5 @@ use crate::bitcoin::Scalar; -use ecdsa_fun::fun::marker::{Mark, NonZero, Secret}; +use ecdsa_fun::fun::marker::{NonZero, Secret}; pub trait ScalarExt { fn to_secpfun_scalar(&self) -> ecdsa_fun::fun::Scalar; @@ -14,7 +14,7 @@ impl ScalarExt for crate::monero::Scalar { ecdsa_fun::fun::Scalar::from_bytes(big_endian_bytes) .expect("valid scalar") - .mark::() + .non_zero() .expect("non-zero scalar") } } diff --git a/swap/src/proptest.rs b/swap/src/proptest.rs index 1fa7e7e6..7ad8fb9a 100644 --- a/swap/src/proptest.rs +++ b/swap/src/proptest.rs @@ -2,17 +2,15 @@ use proptest::prelude::*; pub mod ecdsa_fun { use super::*; - use ::ecdsa_fun::fun::marker::{Mark, NonZero, Normal}; use ::ecdsa_fun::fun::{Point, Scalar, G}; pub fn point() -> impl Strategy { - scalar() - .prop_map(|mut scalar| Point::even_y_from_scalar_mul(G, &mut scalar).mark::()) + scalar().prop_map(|mut scalar| Point::even_y_from_scalar_mul(G, &mut scalar).normalize()) } pub fn scalar() -> impl Strategy { prop::array::uniform32(0..255u8).prop_filter_map("generated the 0 element", |bytes| { - Scalar::from_bytes_mod_order(bytes).mark::() + Scalar::from_bytes_mod_order(bytes).non_zero() }) } } diff --git a/swap/src/protocol.rs b/swap/src/protocol.rs index 88077bc3..5bf1f5b4 100644 --- a/swap/src/protocol.rs +++ b/swap/src/protocol.rs @@ -6,7 +6,6 @@ use crate::{bitcoin, monero}; use anyhow::Result; use async_trait::async_trait; use conquer_once::Lazy; -use ecdsa_fun::fun::marker::Mark; use libp2p::{Multiaddr, PeerId}; use serde::{Deserialize, Serialize}; use sha2::Sha256; @@ -22,7 +21,7 @@ pub static CROSS_CURVE_PROOF_SYSTEM: Lazy< CrossCurveDLEQ>, > = Lazy::new(|| { CrossCurveDLEQ::>::new( - (*ecdsa_fun::fun::G).mark::(), + (*ecdsa_fun::fun::G).normalize(), curve25519_dalek::constants::ED25519_BASEPOINT_POINT, ) });