From 97d4729fa47d6d2026538ad711e6ac07b9170b46 Mon Sep 17 00:00:00 2001
From: Alexis Sellier <self@cloudhead.io>
Date: Mon, 16 Jan 2023 23:36:59 +0100
Subject: [PATCH] Switch to crates.io for `cyphernet`

---
 Cargo.lock                | 114 +++++++++-----------------------------
 Cargo.toml                |   7 ---
 radicle-crypto/Cargo.toml |   2 +-
 radicle-node/Cargo.toml   |   2 +-
 radicle/Cargo.toml        |   2 +-
 5 files changed, 30 insertions(+), 97 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f557e9a3..9683b657 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,15 +8,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "aead"
 version = "0.5.1"
@@ -34,7 +25,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
 dependencies = [
  "cfg-if",
- "cipher 0.4.3",
+ "cipher",
  "cpufeatures",
 ]
 
@@ -311,7 +302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
 dependencies = [
  "byteorder",
- "cipher 0.4.3",
+ "cipher",
 ]
 
 [[package]]
@@ -356,18 +347,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "chacha20"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "zeroize",
-]
-
 [[package]]
 name = "chacha20"
 version = "0.9.0"
@@ -375,33 +354,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08"
 dependencies = [
  "cfg-if",
- "cipher 0.4.3",
+ "cipher",
  "cpufeatures",
 ]
 
-[[package]]
-name = "chacha20poly1305"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
-dependencies = [
- "aead 0.4.3",
- "chacha20 0.8.2",
- "cipher 0.3.0",
- "poly1305 0.7.2",
- "zeroize",
-]
-
 [[package]]
 name = "chacha20poly1305"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
- "aead 0.5.1",
- "chacha20 0.9.0",
- "cipher 0.4.3",
- "poly1305 0.8.0",
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
  "zeroize",
 ]
 
@@ -420,15 +386,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.3"
@@ -592,7 +549,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher 0.4.3",
+ "cipher",
 ]
 
 [[package]]
@@ -655,7 +612,8 @@ dependencies = [
 [[package]]
 name = "cypheraddr"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-cyphernet?rev=7ff92b1540d25658d4810d9ca274507685af0ba6#7ff92b1540d25658d4810d9ca274507685af0ba6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe21bd66fbbd74b706a551b0f56d8ee2488300f5a7cff41febce5973fa05cbc7"
 dependencies = [
  "amplify",
  "base32",
@@ -666,7 +624,8 @@ dependencies = [
 [[package]]
 name = "cyphergraphy"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-cyphernet?rev=7ff92b1540d25658d4810d9ca274507685af0ba6#7ff92b1540d25658d4810d9ca274507685af0ba6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89b94c89b484ddb937306c3ae8122b866749d1d47768b5c4a1e3e8e72ea8270"
 dependencies = [
  "amplify",
  "ed25519-compact",
@@ -677,11 +636,12 @@ dependencies = [
 [[package]]
 name = "cyphernet"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-cyphernet?rev=7ff92b1540d25658d4810d9ca274507685af0ba6#7ff92b1540d25658d4810d9ca274507685af0ba6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c479a27a1c33fe0a146b6e7048fd373f48ed11205bb6c956d05d090fe749d2fe"
 dependencies = [
  "cypheraddr",
  "cyphergraphy",
- "eidolon",
+ "eidolon-auth",
  "noise-framework",
  "socks5-client",
 ]
@@ -819,9 +779,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "eidolon"
+name = "eidolon-auth"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-cyphernet?rev=7ff92b1540d25658d4810d9ca274507685af0ba6#7ff92b1540d25658d4810d9ca274507685af0ba6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d8d05034e0462d2df39fbbd8dbf24b0c0c4337541850ec17ace0b6b42d787"
 dependencies = [
  "amplify",
  "cyphergraphy",
@@ -1444,7 +1405,7 @@ dependencies = [
 [[package]]
 name = "io-reactor"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-netservices?rev=e48011b10db9f9575af3ff1343e077ba9175028d#e48011b10db9f9575af3ff1343e077ba9175028d"
+source = "git+https://github.com/cyphernet-wg/rust-netservices#ee0ae68f5be18977b9a66e709db997801d42ab17"
 dependencies = [
  "amplify",
  "crossbeam-channel",
@@ -1694,11 +1655,9 @@ dependencies = [
 [[package]]
 name = "netservices"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-netservices?rev=e48011b10db9f9575af3ff1343e077ba9175028d#e48011b10db9f9575af3ff1343e077ba9175028d"
+source = "git+https://github.com/cyphernet-wg/rust-netservices#ee0ae68f5be18977b9a66e709db997801d42ab17"
 dependencies = [
  "amplify",
- "chacha20 0.9.0",
- "chacha20poly1305 0.9.1",
  "cyphernet",
  "ed25519-compact",
  "io-reactor",
@@ -1711,10 +1670,11 @@ dependencies = [
 [[package]]
 name = "noise-framework"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-cyphernet?rev=7ff92b1540d25658d4810d9ca274507685af0ba6#7ff92b1540d25658d4810d9ca274507685af0ba6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce256b1337e403d6576c5af917a2152441e94d430bb3202e13b7f952fa53e49"
 dependencies = [
  "amplify",
- "chacha20poly1305 0.10.1",
+ "chacha20poly1305",
  "cyphergraphy",
 ]
 
@@ -2018,17 +1978,6 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
-[[package]]
-name = "poly1305"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
-dependencies = [
- "cpufeatures",
- "opaque-debug",
- "universal-hash 0.4.1",
-]
-
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -2037,7 +1986,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
  "opaque-debug",
- "universal-hash 0.5.0",
+ "universal-hash",
 ]
 
 [[package]]
@@ -2618,7 +2567,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
 dependencies = [
- "cipher 0.4.3",
+ "cipher",
 ]
 
 [[package]]
@@ -2878,7 +2827,8 @@ dependencies = [
 [[package]]
 name = "socks5-client"
 version = "0.1.0"
-source = "git+https://github.com/cyphernet-wg/rust-cyphernet?rev=7ff92b1540d25658d4810d9ca274507685af0ba6#7ff92b1540d25658d4810d9ca274507685af0ba6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d80f67376257f749cbf2835799705650d76833389e80dabd2986082fb2f42072"
 dependencies = [
  "amplify",
  "cypheraddr",
@@ -3404,16 +3354,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "universal-hash"
 version = "0.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index 90dc87c3..e832a785 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,19 +33,12 @@ git = "https://github.com/cloudhead/nakamoto"
 rev = "90cc3eac67aa5cfd5f42cf7cb1e2b155af3214fb"
 version = "0.3.0"
 
-[patch.crates-io.cyphernet]
-git = "https://github.com/cyphernet-wg/rust-cyphernet"
-rev = "7ff92b1540d25658d4810d9ca274507685af0ba6"
-version = "0.1.0"
-
 [patch.crates-io.io-reactor]
 git = "https://github.com/cyphernet-wg/rust-netservices"
-rev = "e48011b10db9f9575af3ff1343e077ba9175028d"
 version = "0.1.0"
 
 [patch.crates-io.netservices]
 git = "https://github.com/cyphernet-wg/rust-netservices"
-rev = "e48011b10db9f9575af3ff1343e077ba9175028d"
 version = "0.1.0"
 
 [patch.crates-io.radicle-git-ext]
diff --git a/radicle-crypto/Cargo.toml b/radicle-crypto/Cargo.toml
index ba48285a..a322080e 100644
--- a/radicle-crypto/Cargo.toml
+++ b/radicle-crypto/Cargo.toml
@@ -15,7 +15,7 @@ ssh = ["base64", "radicle-ssh", "ssh-key"]
 [dependencies]
 amplify = { version = "4.0.0-beta.4" }
 ed25519-compact = { version = "2.0.2", features = ["pem"] }
-cyphernet = { version = "0", optional = true }
+cyphernet = { version = "0.1.0", optional = true }
 multibase = { version = "0.9.1" }
 serde = { version = "1", features = ["derive"] }
 sha2 = { version = "0.10.2" }
diff --git a/radicle-node/Cargo.toml b/radicle-node/Cargo.toml
index 9e4d5409..0a59b871 100644
--- a/radicle-node/Cargo.toml
+++ b/radicle-node/Cargo.toml
@@ -16,7 +16,7 @@ byteorder = { version = "1" }
 chrono = { version = "0.4.0" }
 colored = { version = "1.9.0" }
 crossbeam-channel = { version = "0.5.6" }
-cyphernet = { version = "0", features = ["tor", "dns", "ed25519"] }
+cyphernet = { version = "0.1.0", features = ["tor", "dns", "ed25519", "p2p-ed25519"] }
 fastrand = { version = "1.8.0" }
 git-ref-format = { version = "0", features = ["serde", "macro"] }
 lexopt = { version = "0.2.1" }
diff --git a/radicle/Cargo.toml b/radicle/Cargo.toml
index 0ba95c36..2eb8d010 100644
--- a/radicle/Cargo.toml
+++ b/radicle/Cargo.toml
@@ -14,7 +14,7 @@ sql = ["sqlite"]
 amplify = { version = "4.0.0-beta.7", default-features = false, features = ["std"] }
 crossbeam-channel = { version = "0.5.6" }
 # FIXME: Remove the extra cyphernet features once we're able to.
-cyphernet = { version = "0", features = ["tor", "dns", "i2p", "nym", "ed25519"] }
+cyphernet = { version = "0.1.0", features = ["tor", "dns", "i2p", "nym", "ed25519"] }
 fastrand = { version = "1.8.0" }
 git-ref-format = { version = "0", features = ["serde", "macro"] }
 multibase = { version = "0.9.1" }