Radish alpha
h
heartwood
rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
Radicle Heartwood Protocol & Stack
Radicle
Git
Patches › 4dac0345
node: patch dependencies fixing tor/socks5 support
Merged did:key:z6MkvhE7...9sDE opened 1 year ago
Activity Changes +44 -31
7 files changed +44 -31 72db6dd7 → 153be9ed
modified Cargo.lock
@@ -629,8 +629,7 @@ dependencies = [
[[package]]

name = "cypheraddr"

version = "0.3.0"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "e64c60d980ec55006d2a1229923a5fa73046de824455569cccb6cb2e4a64ae31"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "base32",
@@ -640,9 +639,8 @@ dependencies = [


[[package]]

name = "cyphergraphy"
- 
version = "0.2.0"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "3c8e45921460ef188da680742fd641f9b2a85d0de6bce12ce26e64c0f4913b41"
+ 
version = "0.3.0"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "ec25519",
@@ -652,9 +650,8 @@ dependencies = [


[[package]]

name = "cyphernet"
- 
version = "0.4.1"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "2f8be7cc6e24cfea2c126bddaaddfd3c3054865b4cd52882eae9dfea6ee8aac1"
+ 
version = "0.5.0"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "cypheraddr",

 "cyphergraphy",
@@ -1623,13 +1620,14 @@ dependencies = [


[[package]]

name = "io-reactor"
- 
version = "0.5.0"
+ 
version = "0.5.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "bd2eb3f6ef3b908c8144cd1d1a3069ecfdb60cbc795a303fd2d17b96c1c67c77"
+ 
checksum = "c71ec6bafb8035aa398cb4fe00d881f646938ec87a8ed879a6f283b720cfe76c"

dependencies = [

 "amplify",

 "crossbeam-channel",

 "libc",
+ 
 "log",

 "popol",

]
@@ -1683,9 +1681,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"


[[package]]

name = "libc"
- 
version = "0.2.153"
+ 
version = "0.2.154"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+ 
checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"



[[package]]

name = "libgit2-sys"
@@ -1758,6 +1756,9 @@ name = "log"
version = "0.4.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+ 
dependencies = [
+ 
 "value-bag",
+ 
]



[[package]]

name = "lru"
@@ -1857,14 +1858,14 @@ dependencies = [


[[package]]

name = "netservices"
- 
version = "0.8.0-beta.1"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "56bee0bcdc62d83ff53321dde78c51a1ec2d727da9342ffafa8ae5df892e5a7d"
+ 
version = "0.8.0"
+ 
source = "git+https://github.com/cyphernet-dao/rust-netservices?branch=v0.8#1805ced7841776b74b36b70eee982e5b1c997351"

dependencies = [

 "amplify",

 "cyphernet",

 "io-reactor",

 "libc",
+ 
 "log",

 "rand",

 "socket2",

]
@@ -1881,8 +1882,7 @@ dependencies = [
[[package]]

name = "noise-framework"

version = "0.3.0"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "a1bff54756fd54be6b45e160390d5ec3462331c2bf2aae26df78b4833e1206bb"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "chacha20poly1305",
@@ -3019,9 +3019,9 @@ dependencies = [


[[package]]

name = "socket2"
- 
version = "0.5.6"
+ 
version = "0.5.7"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+ 
checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"

dependencies = [

 "libc",

 "windows-sys 0.52.0",
@@ -3029,9 +3029,8 @@ dependencies = [


[[package]]

name = "socks5-client"
- 
version = "0.3.0"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "c0c27f4545b26cb6e14990e7477c38a8b493b2e8738166fa2a1f5f174ef3fa5f"
+ 
version = "0.4.0"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "cypheraddr",
@@ -3695,6 +3694,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"



[[package]]
+ 
name = "value-bag"
+ 
version = "1.9.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+
+ 
[[package]]

name = "vcpkg"

version = "0.2.15"

source = "registry+https://github.com/rust-lang/crates.io-index"
modified Cargo.toml
@@ -34,3 +34,11 @@ resolver = "2"
inherits = "release"

debug = true

incremental = false
+
+ 
[patch.crates-io]
+ 
cypheraddr = { git = "https://github.com/cyphernet-dao/rust-cyphernet", branch = "v0.5" }
+ 
cyphergraphy = { git = "https://github.com/cyphernet-dao/rust-cyphernet", branch = "v0.5" }
+ 
socks5-client = { git = "https://github.com/cyphernet-dao/rust-cyphernet", branch = "v0.5" }
+ 
noise-framework = { git = "https://github.com/cyphernet-dao/rust-cyphernet", branch = "v0.5" }
+ 
cyphernet = { git = "https://github.com/cyphernet-dao/rust-cyphernet", branch = "v0.5" }
+ 
netservices = { git = "https://github.com/cyphernet-dao/rust-netservices", branch = "v0.8" }
modified radicle-crypto/Cargo.toml
@@ -17,7 +17,7 @@ ssh = ["radicle-ssh", "ssh-key"]


[dependencies]

amplify = { version = "4.0.0" }
- 
cyphernet = { version = "0.4.1", optional = true, features = ["ed25519"] }
+ 
cyphernet = { version = "0.5.0", optional = true, features = ["ed25519"] }

fastrand = { version = "2.0.0", default-features = false, optional = true }

multibase = { version = "0.9.1" }

ec25519 = { version = "0.1.0", features = [] }
modified radicle-node/Cargo.toml
@@ -19,14 +19,14 @@ byteorder = { version = "1" }
chrono = { version = "0.4.0", default-features = false, features = ["clock"] }

colored = { version = "2.1.0" }

crossbeam-channel = { version = "0.5.6" }
- 
cyphernet = { version = "0.4.1", features = ["tor", "dns", "ed25519", "p2p-ed25519"] }
+ 
cyphernet = { version = "0.5.0", features = ["tor", "dns", "ed25519", "p2p-ed25519"] }

fastrand = { version = "2.0.0" }
- 
io-reactor = { version = "0.5.0", features = ["popol"] }
+ 
io-reactor = { version = "0.5.1", features = ["popol"] }

lexopt = { version = "0.3.0" }

libc = { version = "0.2.137" }

log = { version = "0.4.17", features = ["std"] }

localtime = { version = "1.2.0" }
- 
netservices = { version = "0.8.0-beta.1", features = ["io-reactor", "socket2"] }
+ 
netservices = { version = "0.8.0", features = ["io-reactor", "socket2", "log"] }

nonempty = { version = "0.9.0", features = ["serialize"] }

once_cell = { version = "1.13" }

qcheck = { version = "1", default-features = false, optional = true }
modified radicle-node/src/tests/e2e.rs
@@ -36,7 +36,7 @@ mod config {
//     alice -- bob

//

fn test_inventory_sync_basic() {
- 
    logger::init(log::Level::Debug);
+ 
    logger::init(log::Level::Trace);



    let tmp = tempfile::tempdir().unwrap();
modified radicle-node/src/wire/protocol.rs
@@ -16,8 +16,8 @@ use cyphernet::proxy::socks5;
use cyphernet::{Digest, EcSk, Ecdh, Sha256};

use localtime::LocalTime;

use netservices::resource::{ListenerEvent, NetAccept, NetTransport, SessionEvent};
- 
use netservices::session::{ProtocolArtifact, Socks5Session};
- 
use netservices::{NetConnection, NetProtocol, NetReader, NetWriter};
+ 
use netservices::session::{NoiseSession, ProtocolArtifact, Socks5Session};
+ 
use netservices::{NetConnection, NetReader, NetWriter};

use reactor::{ResourceId, ResourceType, Timestamp};



use radicle::collections::RandomMap;
@@ -66,7 +66,7 @@ pub enum Control {
}



/// Peer session type.
- 
pub type WireSession<G> = NetProtocol<NoiseState<G, Sha256>, Socks5Session<net::TcpStream>>;
+ 
pub type WireSession<G> = NoiseSession<G, Sha256, Socks5Session<net::TcpStream>>;

/// Peer session type (read-only).

pub type WireReader = NetReader<Socks5Session<net::TcpStream>>;

/// Peer session type (write-only).
modified radicle/Cargo.toml
@@ -17,7 +17,7 @@ logger = ["colored", "chrono"]
amplify = { version = "4.0.0", default-features = false, features = ["std"] }

base64 = { version = "0.21.3" }

crossbeam-channel = { version = "0.5.6" }
- 
cyphernet = { version = "0.4.1", features = ["tor", "dns", "p2p-ed25519"] }
+ 
cyphernet = { version = "0.5.0", features = ["tor", "dns", "p2p-ed25519"] }

fastrand = { version = "2.0.0" }

multibase = { version = "0.9.1" }

localtime = { version = "1.2.0", features = ["serde"] }