From cfcd1e7170c34693a0d83948a6367e4aa7d4fd0a Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Fri, 4 Dec 2020 16:56:08 +1100 Subject: [PATCH] Clean-up dep versions - Use bitcoin-harness 0.2 - Use cross-curve-dleq latest master commit --- Cargo.lock | 7 ++++--- swap/Cargo.toml | 2 +- xmr-btc/Cargo.toml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 116a079b..caf57c6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -253,8 +253,9 @@ dependencies = [ [[package]] name = "bitcoin-harness" -version = "0.1.0" -source = "git+https://github.com/d4nte/bitcoin-harness-rs?branch=rust-bitcoin-0.25#e773e37a070fb38f982c5b80919071420e4ead21" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4cd49a4bc53eaeab332d66022a158515f0b5bb4b381a1583a07a0c667ac280" dependencies = [ "base64 0.12.3", "bitcoin", @@ -605,7 +606,7 @@ dependencies = [ [[package]] name = "cross-curve-dleq" version = "0.1.0" -source = "git+https://github.com/comit-network/cross-curve-dleq?rev=b43c73ac93a79fdce90cd11a458564c613048f0e#b43c73ac93a79fdce90cd11a458564c613048f0e" +source = "git+https://github.com/comit-network/cross-curve-dleq?rev=eddcdea1d1f16fa33ef581d1744014ece535c920#eddcdea1d1f16fa33ef581d1744014ece535c920" dependencies = [ "bit-vec", "curve25519-dalek 2.1.0", diff --git a/swap/Cargo.toml b/swap/Cargo.toml index 0b21b322..84feae6c 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -13,7 +13,7 @@ atty = "0.2" backoff = { version = "0.2", features = ["tokio"] } base64 = "0.12" bitcoin = { version = "0.25", features = ["rand", "use-serde"] } -bitcoin-harness = { git = "https://github.com/d4nte/bitcoin-harness-rs", branch = "rust-bitcoin-0.25" } +bitcoin-harness = "0.2" conquer-once = "0.3" derivative = "2" ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", rev = "cdfbc766045ea678a41780919d6228dd5acee3be", features = ["libsecp_compat", "serde"] } diff --git a/xmr-btc/Cargo.toml b/xmr-btc/Cargo.toml index 4a8ba4f8..eced65e7 100644 --- a/xmr-btc/Cargo.toml +++ b/xmr-btc/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1" async-trait = "0.1" bitcoin = { version = "0.25", features = ["rand", "serde"] } conquer-once = "0.3" -cross-curve-dleq = { git = "https://github.com/comit-network/cross-curve-dleq", rev = "b43c73ac93a79fdce90cd11a458564c613048f0e", features = ["serde"] } +cross-curve-dleq = { git = "https://github.com/comit-network/cross-curve-dleq", rev = "eddcdea1d1f16fa33ef581d1744014ece535c920", features = ["serde"] } curve25519-dalek = "2" ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", rev = "cdfbc766045ea678a41780919d6228dd5acee3be", features = ["libsecp_compat", "serde"] } ed25519-dalek = { version = "1.0.0-pre.4", features = ["serde"] }# Cannot be 1 because they depend on curve25519-dalek version 3 @@ -29,7 +29,7 @@ tracing = "0.1" [dev-dependencies] backoff = { version = "0.2", features = ["tokio"] } base64 = "0.12" -bitcoin-harness = { git = "https://github.com/d4nte/bitcoin-harness-rs", branch = "rust-bitcoin-0.25" } +bitcoin-harness = "0.2" futures = "0.3" monero-harness = { path = "../monero-harness" } reqwest = { version = "0.10", default-features = false }