rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwoodff0cdaf62b66a6171c0076460db898279f4fcf5c
{
"request": "trigger",
"version": 1,
"event_type": "patch",
"repository": {
"id": "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5",
"name": "heartwood",
"description": "Radicle Heartwood Protocol & Stack",
"private": false,
"default_branch": "master",
"delegates": [
"did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
"did:key:z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW",
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"did:key:z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz",
"did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz"
]
},
"action": "Created",
"patch": {
"id": "4dac0345790332a6de9cdbe36b755e2ae9c6391e",
"author": {
"id": "did:key:z6MkvhE7y5XGMf6HK6so7pnjMyXwZJsSyqKtFErLntbD9sDE",
"alias": null
},
"title": "node: patch dependencies fixing tor/socks5 support",
"state": {
"status": "merged",
"conflicts": []
},
"before": "6dd52c94fb1472e251110e439fe656aaed74019f",
"after": "ff0cdaf62b66a6171c0076460db898279f4fcf5c",
"commits": [
"ff0cdaf62b66a6171c0076460db898279f4fcf5c",
"620c655b03a7572c7ff891e2454338d1021d4959"
],
"target": "6cfed884bf37cba1e0d8e97fa8b0e94df4a04b1f",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "4dac0345790332a6de9cdbe36b755e2ae9c6391e",
"author": {
"id": "did:key:z6MkvhE7y5XGMf6HK6so7pnjMyXwZJsSyqKtFErLntbD9sDE",
"alias": null
},
"description": "",
"base": "6dd52c94fb1472e251110e439fe656aaed74019f",
"oid": "620c655b03a7572c7ff891e2454338d1021d4959",
"timestamp": 1714848856
},
{
"id": "7bf6fab8a0393a26cd4130579d201dc916dbcbc0",
"author": {
"id": "did:key:z6MkvhE7y5XGMf6HK6so7pnjMyXwZJsSyqKtFErLntbD9sDE",
"alias": null
},
"description": "Improve wire session type definition.\n\nUpdate dependencies with a fixed version of netservices\n(now socks5 properly passes control to upper layer if proxy\nis not provided or not needed).",
"base": "6dd52c94fb1472e251110e439fe656aaed74019f",
"oid": "ff0cdaf62b66a6171c0076460db898279f4fcf5c",
"timestamp": 1714951180
},
{
"id": "b5dfb509f7dea0337245bc018bdc2a2e545d4e4d",
"author": {
"id": "did:key:z6MkvhE7y5XGMf6HK6so7pnjMyXwZJsSyqKtFErLntbD9sDE",
"alias": null
},
"description": "Update.",
"base": "72db6dd7dd3d0d9ff430e8c700a4cafaa09d873c",
"oid": "153be9ede433ee2adae4a74ec6cf24cac5bbc54a",
"timestamp": 1715027137
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "cbe9d494-0171-4378-b36a-73a0eeea2a99"
},
"info_url": "https://cci.rad.levitte.org//cbe9d494-0171-4378-b36a-73a0eeea2a99.html"
}
Started at: 2025-10-21 20:53:10.415962+02:00
Commands:
$ rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 .
✓ Creating checkout in ./...
✓ Remote cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT added
✓ Remote-tracking branch cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/master created for z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT
✓ Remote cloudhead@z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW added
✓ Remote-tracking branch cloudhead@z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW/master created for z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW
✓ Remote fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM added
✓ Remote-tracking branch fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/master created for z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM
✓ Remote erikli@z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz added
✓ Remote-tracking branch erikli@z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz/master created for z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz
✓ Remote lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz added
✓ Remote-tracking branch lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz/master created for z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz
✓ Repository successfully cloned under /opt/radcis/ci.rad.levitte.org/cci/state/cbe9d494-0171-4378-b36a-73a0eeea2a99/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 125 issues · 15 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout 4dac0345790332a6de9cdbe36b755e2ae9c6391e
✓ Switched to branch patch/4dac034 at revision 7bf6fab
✓ Branch patch/4dac034 setup to track rad/patches/4dac0345790332a6de9cdbe36b755e2ae9c6391e
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout ff0cdaf62b66a6171c0076460db898279f4fcf5c
HEAD is now at ff0cdaf6 node: improve wire session type definition. Update dependencies
Exit code: 0
$ git show ff0cdaf62b66a6171c0076460db898279f4fcf5c
commit ff0cdaf62b66a6171c0076460db898279f4fcf5c
Author: Dr Maxim Orlovsky <orlovsky@cyphernet.io>
Date: Mon May 6 00:11:05 2024 +0200
node: improve wire session type definition. Update dependencies
diff --git a/Cargo.lock b/Cargo.lock
index a49e99e0..6d89f286 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -629,7 +629,7 @@ dependencies = [
[[package]]
name = "cypheraddr"
version = "0.3.0"
-source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"
dependencies = [
"amplify",
"base32",
@@ -640,7 +640,7 @@ dependencies = [
[[package]]
name = "cyphergraphy"
version = "0.3.0"
-source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"
dependencies = [
"amplify",
"ec25519",
@@ -651,7 +651,7 @@ dependencies = [
[[package]]
name = "cyphernet"
version = "0.5.0"
-source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"
dependencies = [
"cypheraddr",
"cyphergraphy",
@@ -1627,6 +1627,7 @@ dependencies = [
"amplify",
"crossbeam-channel",
"libc",
+ "log",
"popol",
]
@@ -1755,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"
@@ -1855,12 +1859,13 @@ dependencies = [
[[package]]
name = "netservices"
version = "0.8.0"
-source = "git+https://github.com/cyphernet-dao/rust-netservices?branch=v0.8#34b239dc52f70f34673d140cc799f94624be237e"
+source = "git+https://github.com/cyphernet-dao/rust-netservices?branch=v0.8#1805ced7841776b74b36b70eee982e5b1c997351"
dependencies = [
"amplify",
"cyphernet",
"io-reactor",
"libc",
+ "log",
"rand",
"socket2",
]
@@ -1877,7 +1882,7 @@ dependencies = [
[[package]]
name = "noise-framework"
version = "0.3.0"
-source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"
dependencies = [
"amplify",
"chacha20poly1305",
@@ -3025,7 +3030,7 @@ dependencies = [
[[package]]
name = "socks5-client"
version = "0.4.0"
-source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"
dependencies = [
"amplify",
"cypheraddr",
@@ -3688,6 +3693,12 @@ version = "0.1.0"
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"
diff --git a/radicle-node/Cargo.toml b/radicle-node/Cargo.toml
index b873f4f8..431683b5 100644
--- a/radicle-node/Cargo.toml
+++ b/radicle-node/Cargo.toml
@@ -26,7 +26,7 @@ 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", 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 }
diff --git a/radicle-node/src/tests/e2e.rs b/radicle-node/src/tests/e2e.rs
index ccdc9662..c8772202 100644
--- a/radicle-node/src/tests/e2e.rs
+++ b/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();
diff --git a/radicle-node/src/wire/protocol.rs b/radicle-node/src/wire/protocol.rs
index 67de456a..be54c789 100644
--- a/radicle-node/src/wire/protocol.rs
+++ b/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).
Exit code: 0
shell: 'cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny clippy::all cargo build --all-targets --workspace cargo doc --workspace cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name cbe9d494-0171-4378-b36a-73a0eeea2a99 -v /opt/radcis/ci.rad.levitte.org/cci/state/cbe9d494-0171-4378-b36a-73a0eeea2a99/s:/cbe9d494-0171-4378-b36a-73a0eeea2a99/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/cbe9d494-0171-4378-b36a-73a0eeea2a99/w:/cbe9d494-0171-4378-b36a-73a0eeea2a99/w -w /cbe9d494-0171-4378-b36a-73a0eeea2a99/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:bookworm bash /cbe9d494-0171-4378-b36a-73a0eeea2a99/s/script.sh
+ cargo --version
info: syncing channel updates for '1.77-x86_64-unknown-linux-gnu'
info: latest update on 2024-04-09, rust version 1.77.2 (25ef9e3d8 2024-04-09)
info: downloading component 'cargo'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: installing component 'cargo'
info: installing component 'rust-std'
info: installing component 'rustc'
cargo 1.77.2 (e52e36006 2024-03-26)
+ rustc --version
rustc 1.77.2 (25ef9e3d8 2024-04-09)
+ cargo fmt --check
error: 'cargo-fmt' is not installed for the toolchain '1.77-x86_64-unknown-linux-gnu'.
To install, run `rustup component add --toolchain 1.77-x86_64-unknown-linux-gnu rustfmt`
Exit code: 1
{
"response": "finished",
"result": "failure"
}