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

Upgrade to latest libp2p branch rev

Browse source
This commit is contained in:
Daniel Karzel 2021-07-01 17:55:14 +10:00
parent 5f70144c63
commit f0a217b1e4
No known key found for this signature in database
GPG key ID: 30C3FC2E438ADB6E
3 changed files with 20 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Cargo.lock generated
View file

@ -1818,7 +1818,7 @@ checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
[[package]] [[package]]
name = "libp2p" name = "libp2p"
version = "0.39.0" version = "0.39.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"atomic", "atomic",
"bytes 1.0.1", "bytes 1.0.1",
@ -1846,7 +1846,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-core" name = "libp2p-core"
version = "0.29.0" version = "0.29.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"asn1_der", "asn1_der",
"bs58", "bs58",
@ -1879,7 +1879,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-dns" name = "libp2p-dns"
version = "0.29.0" version = "0.29.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"futures", "futures",
"libp2p-core", "libp2p-core",
@ -1891,7 +1891,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-mplex" name = "libp2p-mplex"
version = "0.29.0" version = "0.29.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"asynchronous-codec", "asynchronous-codec",
"bytes 1.0.1", "bytes 1.0.1",
@ -1908,7 +1908,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-noise" name = "libp2p-noise"
version = "0.32.0" version = "0.32.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"bytes 1.0.1", "bytes 1.0.1",
"curve25519-dalek", "curve25519-dalek",
@ -1929,7 +1929,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-ping" name = "libp2p-ping"
version = "0.30.0" version = "0.30.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"futures", "futures",
"libp2p-core", "libp2p-core",
@ -1943,7 +1943,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-rendezvous" name = "libp2p-rendezvous"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"asynchronous-codec", "asynchronous-codec",
"bimap", "bimap",
@ -1956,16 +1956,16 @@ dependencies = [
"rand 0.8.3", "rand 0.8.3",
"sha2 0.9.5", "sha2 0.9.5",
"thiserror", "thiserror",
"tokio",
"unsigned-varint 0.7.0", "unsigned-varint 0.7.0",
"uuid", "uuid",
"void", "void",
"wasm-timer",
] ]
[[package]] [[package]]
name = "libp2p-request-response" name = "libp2p-request-response"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes 1.0.1", "bytes 1.0.1",
@ -1984,7 +1984,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-swarm" name = "libp2p-swarm"
version = "0.30.0" version = "0.30.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"either", "either",
"futures", "futures",
@ -1999,7 +1999,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-swarm-derive" name = "libp2p-swarm-derive"
version = "0.23.0" version = "0.23.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"quote 1.0.9", "quote 1.0.9",
"syn 1.0.73", "syn 1.0.73",
@ -2008,7 +2008,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-tcp" name = "libp2p-tcp"
version = "0.29.0" version = "0.29.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"futures", "futures",
"futures-timer", "futures-timer",
@ -2024,7 +2024,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-websocket" name = "libp2p-websocket"
version = "0.30.0" version = "0.30.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"either", "either",
"futures", "futures",
@ -2041,7 +2041,7 @@ dependencies = [
[[package]] [[package]]
name = "libp2p-yamux" name = "libp2p-yamux"
version = "0.33.0" version = "0.33.0"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"futures", "futures",
"libp2p-core", "libp2p-core",
@ -2426,7 +2426,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
[[package]] [[package]]
name = "multistream-select" name = "multistream-select"
version = "0.10.3" version = "0.10.3"
source = "git+https://github.com/comit-network/rust-libp2p?rev=2e143a01aebbbf318231e7841884f9f34638c4e2#2e143a01aebbbf318231e7841884f9f34638c4e2" source = "git+https://github.com/comit-network/rust-libp2p?rev=4cacaf215b334d447faca8f4e361fe19c30d2162#4cacaf215b334d447faca8f4e361fe19c30d2162"
dependencies = [ dependencies = [
"bytes 1.0.1", "bytes 1.0.1",
"futures", "futures",

2
swap/Cargo.toml
View file

@ -29,7 +29,7 @@ ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", default-features =
ed25519-dalek = "1" ed25519-dalek = "1"
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
itertools = "0.10" itertools = "0.10"
libp2p = { git = "https://github.com/comit-network/rust-libp2p", rev = "2e143a01aebbbf318231e7841884f9f34638c4e2", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response", "websocket", "ping", "rendezvous" ] } libp2p = { git = "https://github.com/comit-network/rust-libp2p", rev = "4cacaf215b334d447faca8f4e361fe19c30d2162", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response", "websocket", "ping", "rendezvous" ] }
miniscript = { version = "5", features = [ "serde" ] } miniscript = { version = "5", features = [ "serde" ] }
monero = { version = "0.12", features = [ "serde_support" ] } monero = { version = "0.12", features = [ "serde_support" ] }
monero-rpc = { path = "../monero-rpc" } monero-rpc = { path = "../monero-rpc" }

21
swap/src/asb/event_loop.rs
View file

@ -169,20 +169,12 @@ where
if let Some(rendezvous_reregister_timestamp) = self.rendezvous_reregister_timestamp { if let Some(rendezvous_reregister_timestamp) = self.rendezvous_reregister_timestamp {
if Instant::now() > rendezvous_reregister_timestamp { if Instant::now() > rendezvous_reregister_timestamp {
if self.swarm.is_connected(&self.rendezvous_node_peer_id) { if self.swarm.is_connected(&self.rendezvous_node_peer_id) {
match self.swarm.behaviour_mut().rendezvous.register( self.swarm.behaviour_mut().rendezvous.register(
Namespace::new(self.rendezvous_namespace.to_string()) Namespace::new(self.rendezvous_namespace.to_string())
.expect("our namespace to be a correct string"), .expect("our namespace to be a correct string"),
self.rendezvous_node_peer_id, self.rendezvous_node_peer_id,
None, None,
) { );
Ok(()) => {}
Err(err) => {
tracing::error!(
"Sending registration to rendezvous failed: {:#}",
err
);
}
}
} else { } else {
match Swarm::dial_addr(&mut self.swarm, self.rendezvous_node_addr.clone()) { match Swarm::dial_addr(&mut self.swarm, self.rendezvous_node_addr.clone()) {
Ok(()) => {} Ok(()) => {}
@ -334,16 +326,11 @@ where
} }
if peer == self.rendezvous_node_peer_id { if peer == self.rendezvous_node_peer_id {
match self self
.swarm .swarm
.behaviour_mut() .behaviour_mut()
.rendezvous .rendezvous
.register(Namespace::new(self.rendezvous_namespace.to_string()).expect("our namespace to be a correct string"), self.rendezvous_node_peer_id, None) { .register(Namespace::new(self.rendezvous_namespace.to_string()).expect("our namespace to be a correct string"), self.rendezvous_node_peer_id, None);
Ok(()) => {},
Err(err) => {
tracing::error!("Sending registration to rendezvous failed: {:#}", err);
}
}
} }
} }
Some(SwarmEvent::IncomingConnectionError { send_back_addr: address, error, .. }) => { Some(SwarmEvent::IncomingConnectionError { send_back_addr: address, error, .. }) => {