From 147e0c19a9183c1a68f865e18e5bed42d33e2103 Mon Sep 17 00:00:00 2001 From: Kasey Huizinga Date: Mon, 19 Aug 2024 19:57:43 -0400 Subject: [PATCH 1/2] upgrade to iroh main --- Cargo.lock | 173 ++++++++++++++++++++++++++++++++++++++++------------- Cargo.toml | 3 + 2 files changed, 135 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61bb98d..e7529e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -158,18 +158,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - [[package]] name = "async-trait" version = "0.1.81" @@ -744,6 +732,12 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "ecdsa" version = "0.16.9" @@ -873,27 +867,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - [[package]] name = "fallible-iterator" version = "0.3.0" @@ -1113,6 +1086,37 @@ dependencies = [ "slab", ] +[[package]] +name = "genawaiter" +version = "0.99.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86bd0361bcbde39b13475e6e36cb24c329964aa2611be285289d1e4b751c1a0" +dependencies = [ + "futures-core", + "genawaiter-macro", + "genawaiter-proc-macro", + "proc-macro-hack", +] + +[[package]] +name = "genawaiter-macro" +version = "0.99.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b32dfe1fdfc0bbde1f22a5da25355514b5e450c33a6af6770884c8750aedfbc" + +[[package]] +name = "genawaiter-proc-macro" +version = "0.99.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784f84eebc366e15251c4a8c3acee82a6a6f427949776ecb88377362a9621738" +dependencies = [ + "proc-macro-error", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -1577,8 +1581,7 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh-base" version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ddb47e8160fb1d563a6f541c813c2f185423a0ad1c9260a6c76891a2300c26" +source = "git+https://github.com/n0-computer/iroh?branch=main#217ac06b2128af9721ed6780a6bb2f0092a46ace" dependencies = [ "aead", "anyhow", @@ -1618,8 +1621,7 @@ dependencies = [ [[package]] name = "iroh-metrics" version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab017d2786c0b77583371cef016d3e76bdbc7d13b66532023cb7e854f65d15a" +source = "git+https://github.com/n0-computer/iroh?branch=main#217ac06b2128af9721ed6780a6bb2f0092a46ace" dependencies = [ "anyhow", "erased_set", @@ -1639,11 +1641,9 @@ dependencies = [ [[package]] name = "iroh-net" version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372fbf01dc303be5427b6ea33b80411b3cfb6443d6389ce1ffc43231f244a51c" +source = "git+https://github.com/n0-computer/iroh?branch=main#217ac06b2128af9721ed6780a6bb2f0092a46ace" dependencies = [ "anyhow", - "async-channel", "backoff", "base64 0.22.1", "bytes", @@ -1655,6 +1655,7 @@ dependencies = [ "futures-lite 2.3.0", "futures-sink", "futures-util", + "genawaiter", "governor", "hex", "hickory-proto", @@ -1846,6 +1847,26 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "mainline" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b751ffb57303217bcae8f490eee6044a5b40eadf6ca05ff476cad37e7b7970d" +dependencies = [ + "bytes", + "crc", + "ed25519-dalek", + "flume", + "lru", + "rand", + "serde", + "serde_bencode", + "serde_bytes", + "sha1_smol", + "thiserror", + "tracing", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -2392,11 +2413,13 @@ checksum = "4548c673cbf8c91b69f7a17d3a042710aa73cffe5e82351db5378f26c3be64d8" dependencies = [ "bytes", "document-features", + "dyn-clone", "ed25519-dalek", "flume", "futures", "js-sys", "lru", + "mainline", "self_cell", "simple-dns", "thiserror", @@ -2576,6 +2599,38 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "proc-macro-error" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "syn-mid", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro2" version = "1.0.86" @@ -3154,6 +3209,25 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_bencode" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a70dfc7b7438b99896e7f8992363ab8e2c4ba26aa5ec675d32d1c3c2c33d413e" +dependencies = [ + "serde", + "serde_bytes", +] + +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" version = "1.0.204" @@ -3209,6 +3283,12 @@ dependencies = [ "digest", ] +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + [[package]] name = "sha2" version = "0.10.8" @@ -3487,6 +3567,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn-mid" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "sync_wrapper" version = "1.0.1" @@ -4050,7 +4141,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45b42a2f611916b5965120a9cde2b60f2db4454826dd9ad5e6f47c24a5b3b259" dependencies = [ - "event-listener 4.0.3", + "event-listener", "futures-util", "parking_lot", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 0b8b475..f753404 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,3 +25,6 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } duct = "0.13.6" nix = { version = "0.29", features = ["signal", "process"] } rand = "0.8.5" + +[patch.crates-io] +iroh-net = { git = "https://github.com/n0-computer/iroh", branch = "main" } From 083019f397d41f56c789a65e32e7bdc486f44f98 Mon Sep 17 00:00:00 2001 From: ramfox Date: Tue, 20 Aug 2024 10:55:20 -0400 Subject: [PATCH 2/2] upgrade to iroh v0.23.0 --- Cargo.lock | 15 +++++++++------ Cargo.toml | 5 +---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e7529e4..1255521 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1580,8 +1580,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh-base" -version = "0.22.0" -source = "git+https://github.com/n0-computer/iroh?branch=main#217ac06b2128af9721ed6780a6bb2f0092a46ace" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8d60492b6099a5e94b674d0f4c564b3fa63a211836a090bc34c14d422721c19" dependencies = [ "aead", "anyhow", @@ -1620,8 +1621,9 @@ dependencies = [ [[package]] name = "iroh-metrics" -version = "0.22.0" -source = "git+https://github.com/n0-computer/iroh?branch=main#217ac06b2128af9721ed6780a6bb2f0092a46ace" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be681eb052594a43afa8d2d2cc093361917c7348c779df3fe92a7169bd2f9c5" dependencies = [ "anyhow", "erased_set", @@ -1640,8 +1642,9 @@ dependencies = [ [[package]] name = "iroh-net" -version = "0.22.0" -source = "git+https://github.com/n0-computer/iroh?branch=main#217ac06b2128af9721ed6780a6bb2f0092a46ace" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b18cd649ce3a342d8480038abee8170e483bc3bec8f111bf57ca9679c5075ce" dependencies = [ "anyhow", "backoff", diff --git a/Cargo.toml b/Cargo.toml index f753404..4e922c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ description = "A cli tool to pipe data over the network, with NAT hole punching" anyhow = "1.0.75" clap = { version = "4.4.10", features = ["derive"] } hex = "0.4.3" -iroh-net = "0.22" +iroh-net = "0.23" quinn = { version = "0.10.5", package = "iroh-quinn" } tokio = { version = "1.34.0", features = ["full"] } tokio-util = "0.7.10" @@ -25,6 +25,3 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } duct = "0.13.6" nix = { version = "0.29", features = ["signal", "process"] } rand = "0.8.5" - -[patch.crates-io] -iroh-net = { git = "https://github.com/n0-computer/iroh", branch = "main" }