Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge #339

Browse Source 
339: Bump dependency versions r=thomaseizinger a=thomaseizinger

Otherwise it will take a long time for dependabot to update all of
these.

Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
This commit is contained in:
bors[bot] 2021-03-23 00:09:49 +00:00 committed by GitHub
commit 968502827a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 424 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

810
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
monero-harness/Cargo.toml
View File

@ -12,7 +12,7 @@ port_check = "0.1"
rand = "0.7" rand = "0.7"
spectral = "0.6" spectral = "0.6"
testcontainers = "0.12" testcontainers = "0.12"
tokio = { version = "1.3", default-features = false, features = ["rt-multi-thread", "time", "macros"] } tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "time", "macros"] }
tracing = "0.1" tracing = "0.1"
tracing-log = "0.1" tracing-log = "0.1"
tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter"] } tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter"] }

18
swap/Cargo.toml
View File

@ -11,7 +11,7 @@ name = "swap"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-compression = { version = "0.3", features = ["bzip2", "tokio"] } async-compression = { version = "0.3", features = ["bzip2", "tokio"] }
async-recursion = "0.3.1" async-recursion = "0.3"
async-trait = "0.1" async-trait = "0.1"
atty = "0.2" atty = "0.2"
backoff = { version = "0.3", features = ["tokio"] } backoff = { version = "0.3", features = ["tokio"] }
@ -19,24 +19,24 @@ base64 = "0.13"
bdk = { version = "0.4" } bdk = { version = "0.4" }
big-bytes = "1" big-bytes = "1"
bitcoin = { version = "0.26", features = ["rand", "use-serde"] } bitcoin = { version = "0.26", features = ["rand", "use-serde"] }
config = { version = "0.10", default-features = false, features = ["toml"] } config = { version = "0.11", default-features = false, features = ["toml"] }
conquer-once = "0.3" conquer-once = "0.3"
curve25519-dalek = "3" curve25519-dalek = "3"
dialoguer = "0.8" dialoguer = "0.8"
directories-next = "2" directories-next = "2"
ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["libsecp_compat", "serde"] } ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["libsecp_compat", "serde"] }
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
libp2p = { version = "0.34", default-features = false, features = ["tcp-tokio", "yamux", "mplex", "dns", "noise", "request-response"] } libp2p = { version = "0.36", default-features = false, features = ["tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response"] }
libp2p-async-await = { git = "https://github.com/comit-network/rust-libp2p-async-await", rev = "1429cd780204624b4d244e7d8179fe6ff77988c3" } libp2p-async-await = { git = "https://github.com/comit-network/rust-libp2p-async-await" }
miniscript = { version = "5", features = ["serde"] } miniscript = { version = "5", features = ["serde"] }
monero = { version = "0.10", features = ["serde_support"] } monero = { version = "0.10", features = ["serde_support"] }
monero-rpc = { path = "../monero-rpc" } monero-rpc = { path = "../monero-rpc" }
pem = "0.8" pem = "0.8"
prettytable-rs = "0.8" prettytable-rs = "0.8"
rand = "0.7" rand = "0.7"
rand_chacha = "0.2.0" rand_chacha = "0.2"
reqwest = { version = "0.11", features = ["rustls-tls", "stream"], default-features = false } reqwest = { version = "0.11", features = ["rustls-tls", "stream"], default-features = false }
rust_decimal = "1.10" rust_decimal = "1"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_cbor = "0.11" serde_cbor = "0.11"
serde_json = "1" serde_json = "1"
@ -47,15 +47,15 @@ structopt = "0.3"
strum = { version = "0.20", features = ["derive"] } strum = { version = "0.20", features = ["derive"] }
thiserror = "1" thiserror = "1"
time = "0.2" time = "0.2"
tokio = { version = "1.3", features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs"] } tokio = { version = "1", features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs"] }
tokio-tungstenite = { version = "0.14", features = [ "rustls-tls" ] } tokio-tungstenite = { version = "0.14", features = [ "rustls-tls" ] }
tokio-util = { version = "0.6.3", features = ["io"] } tokio-util = { version = "0.6", features = ["io"] }
toml = "0.5" toml = "0.5"
tracing = { version = "0.1", features = ["attributes"] } tracing = { version = "0.1", features = ["attributes"] }
tracing-futures = { version = "0.2", features = ["std-future", "futures-03"] } tracing-futures = { version = "0.2", features = ["std-future", "futures-03"] }
tracing-log = "0.1" tracing-log = "0.1"
tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter", "chrono"] } tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter", "chrono"] }
url = { version = "2.1", features = ["serde"] } url = { version = "2", features = ["serde"] }
uuid = { version = "0.8", features = ["serde", "v4"] } uuid = { version = "0.8", features = ["serde", "v4"] }
void = "1" void = "1"

4
swap/src/network/transport.rs
View File

@ -3,7 +3,7 @@ use libp2p::core::muxing::StreamMuxerBox;
use libp2p::core::transport::Boxed; use libp2p::core::transport::Boxed;
use libp2p::core::upgrade::{SelectUpgrade, Version}; use libp2p::core::upgrade::{SelectUpgrade, Version};
use libp2p::core::{identity, Transport}; use libp2p::core::{identity, Transport};
use libp2p::dns::DnsConfig; use libp2p::dns::TokioDnsConfig;
use libp2p::mplex::MplexConfig; use libp2p::mplex::MplexConfig;
use libp2p::noise::{self, NoiseConfig, X25519Spec}; use libp2p::noise::{self, NoiseConfig, X25519Spec};
use libp2p::{yamux, PeerId}; use libp2p::{yamux, PeerId};
@ -20,7 +20,7 @@ pub fn build(id_keys: &identity::Keypair) -> Result<SwapTransport> {
let noise = NoiseConfig::xx(dh_keys).into_authenticated(); let noise = NoiseConfig::xx(dh_keys).into_authenticated();
let tcp = TokioTcpConfig::new().nodelay(true); let tcp = TokioTcpConfig::new().nodelay(true);
let dns = DnsConfig::new(tcp)?; let dns = TokioDnsConfig::system(tcp)?;
let transport = dns let transport = dns
.upgrade(Version::V1) .upgrade(Version::V1)