Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-05 04:54:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

deps(build): upgrade ecdsa_fun and sigma_fun

Browse source 
- #1139
- #1140
This commit is contained in:
Byron Hambly 2022-09-13 14:19:58 +02:00
parent 4cfd829cc4
commit 2c2fb7f350
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
swap/src/monero_ext.rs
View file

@ -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::<NonZero>()
.non_zero()
.expect("non-zero scalar")
}
}

6
swap/src/proptest.rs
View file

@ -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<Value = Point> {
scalar()
.prop_map(|mut scalar| Point::even_y_from_scalar_mul(G, &mut scalar).mark::<Normal>())
scalar().prop_map(|mut scalar| Point::even_y_from_scalar_mul(G, &mut scalar).normalize())
}
pub fn scalar() -> impl Strategy<Value = Scalar> {
prop::array::uniform32(0..255u8).prop_filter_map("generated the 0 element", |bytes| {
Scalar::from_bytes_mod_order(bytes).mark::<NonZero>()
Scalar::from_bytes_mod_order(bytes).non_zero()
})
}
}

3
swap/src/protocol.rs
View file

@ -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<HashTranscript<Sha256, rand_chacha::ChaCha20Rng>>,
> = Lazy::new(|| {
CrossCurveDLEQ::<HashTranscript<Sha256, rand_chacha::ChaCha20Rng>>::new(
(*ecdsa_fun::fun::G).mark::<ecdsa_fun::fun::marker::Normal>(),
(*ecdsa_fun::fun::G).normalize(),
curve25519_dalek::constants::ED25519_BASEPOINT_POINT,
)
});