Merge pull request #16 from comit-network/update-deps

Update dependency to cross-curve-dleq and ecdsa_fun
This commit is contained in:
Lucas Soriano 2020-10-21 16:33:35 +11:00 committed by GitHub
commit ea064c95b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 4 deletions

View File

@ -76,4 +76,6 @@ jobs:
- name: Cargo test
run: cargo test --workspace --all-features
env:
# To avoid stack overflows
RUST_MIN_STACK: 100000000
MONERO_ADDITIONAL_SLEEP_PERIOD: 60000

View File

@ -8,9 +8,9 @@ edition = "2018"
anyhow = "1"
async-trait = "0.1"
bitcoin = { version = "0.23", features = ["rand"] }
cross-curve-dleq = { git = "https://github.com/comit-network/cross-curve-dleq", rev = "a3e57a70d332b4ce9600663453b9bd02936d76bf" }
cross-curve-dleq = { git = "https://github.com/comit-network/cross-curve-dleq", rev = "49171f5e08473d46f951fb1fc338fe437d974d3c" }
curve25519-dalek = "2"
ecdsa_fun = { version = "0.3.1", features = ["libsecp_compat"] }
ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", rev = "510d48ef6a2b19805f7f5c70c598e5b03f668e7a", features = ["libsecp_compat"] }
ed25519-dalek = "1.0.0-pre.4" # Cannot be 1 because they depend on curve25519-dalek version 3
miniscript = "1"
monero = "0.9"

View File

@ -188,7 +188,7 @@ impl State0 {
pub fn receive(self, msg: bob::Message0) -> Result<State1> {
msg.dleq_proof_s_b.verify(
&msg.S_b_bitcoin.clone().into(),
msg.S_b_bitcoin.clone().into(),
msg.S_b_monero
.point
.decompress()

View File

@ -160,7 +160,7 @@ impl State0 {
W: BuildTxLockPsbt,
{
msg.dleq_proof_s_a.verify(
&msg.S_a_bitcoin.clone().into(),
msg.S_a_bitcoin.clone().into(),
msg.S_a_monero
.point
.decompress()

View File

@ -142,6 +142,11 @@ pub async fn init_test<'a>(
}
mod tests {
// NOTE: For some reason running these tests overflows the stack. In order to
// mitigate this run them with:
//
// RUST_MIN_STACK=100000000 cargo test
use crate::{
harness,
harness::node::{run_alice_until, run_bob_until},