From 7eb64cb97eabdc2cfd96deff4f4ff64dee93bb92 Mon Sep 17 00:00:00 2001
From: nazeh <ar.nazeh@gmail.com>
Date: Tue, 11 Feb 2025 12:23:14 +0300
Subject: [PATCH] chore: use published versions of pkarr and pkarr-relay

---
 Cargo.lock                  | 51 ++++++++-----------------------------
 pubky-common/Cargo.toml     |  2 +-
 pubky-homeserver/Cargo.toml |  4 +--
 pubky/Cargo.toml            |  2 +-
 4 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d9f675..a6959a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 
 [[package]]
 name = "mainline"
-version = "5.0.0-rc.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40903d61c43712efd2d9151eeb3d53e8081e26efb2b69d7bb0693c49dfa195a"
+checksum = "5390cadf8fe89752b97a486edb3180199c4f84b66e7640fd29763491fa644ad0"
 dependencies = [
  "crc",
  "document-features",
@@ -2012,41 +2012,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkarr"
-version = "3.0.0-rc.1"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41060323086a60c20f28bf52afc915eafc971493bf8b887907c0909004731807"
-dependencies = [
- "async-compat",
- "base32",
- "byteorder",
- "bytes",
- "cfg_aliases",
- "document-features",
- "dyn-clone",
- "ed25519-dalek",
- "futures-lite",
- "getrandom",
- "heed",
- "log",
- "lru",
- "mainline",
- "page_size",
- "pubky-timestamp 0.3.0",
- "rand",
- "self_cell",
- "serde",
- "sha1_smol",
- "simple-dns",
- "thiserror 2.0.11",
- "tokio",
- "tracing",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "pkarr"
-version = "3.0.0-rc.1"
-source = "git+https://github.com/Pubky/pkarr#3a0cd3180616b19588162d7b89fc04bad6f7cbd9"
+checksum = "a1e77ba80d75120dbcdd92a9855dd9aa0f3a17d50679441e28daf1f5493bfa21"
 dependencies = [
  "async-compat",
  "base32",
@@ -2084,7 +2052,8 @@ dependencies = [
 [[package]]
 name = "pkarr-relay"
 version = "0.1.0"
-source = "git+https://github.com/Pubky/pkarr#3a0cd3180616b19588162d7b89fc04bad6f7cbd9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff203c41d090ae24a8b2d76747cf56f645ed1373d2bd1ae6f5fd3df73aa0dddf"
 dependencies = [
  "anyhow",
  "axum 0.8.1",
@@ -2096,7 +2065,7 @@ dependencies = [
  "http",
  "httpdate",
  "mainline",
- "pkarr 3.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkarr",
  "pubky-timestamp 0.3.0",
  "rustls",
  "serde",
@@ -2206,7 +2175,7 @@ dependencies = [
  "js-sys",
  "log",
  "mainline",
- "pkarr 3.0.0-rc.1 (git+https://github.com/Pubky/pkarr)",
+ "pkarr",
  "pubky-common",
  "pubky-homeserver",
  "reqwest",
@@ -2230,7 +2199,7 @@ dependencies = [
  "ed25519-dalek",
  "js-sys",
  "once_cell",
- "pkarr 3.0.0-rc.1 (git+https://github.com/Pubky/pkarr)",
+ "pkarr",
  "postcard",
  "pubky-timestamp 0.2.0",
  "rand",
@@ -2258,7 +2227,7 @@ dependencies = [
  "httpdate",
  "mainline",
  "page_size",
- "pkarr 3.0.0-rc.1 (git+https://github.com/Pubky/pkarr)",
+ "pkarr",
  "pkarr-relay",
  "postcard",
  "pubky-common",
diff --git a/pubky-common/Cargo.toml b/pubky-common/Cargo.toml
index 04e17c8..99ae6ad 100644
--- a/pubky-common/Cargo.toml
+++ b/pubky-common/Cargo.toml
@@ -21,7 +21,7 @@ argon2 = { version = "0.5.3", features = ["std"] }
 
 pubky-timestamp = { version = "0.2.0", features = ["full"] }
 serde = { version = "1.0.216", features = ["derive"] }
-pkarr = { git = "https://github.com/Pubky/pkarr", package = "pkarr", default-features = false, features = ["keys"] }
+pkarr = { version = "3.0.0", default-features = false, features = ["keys"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = "0.3.76"
diff --git a/pubky-homeserver/Cargo.toml b/pubky-homeserver/Cargo.toml
index 4d499b1..2589c3c 100644
--- a/pubky-homeserver/Cargo.toml
+++ b/pubky-homeserver/Cargo.toml
@@ -17,7 +17,7 @@ heed = "0.21.0"
 hex = "0.4.3"
 httpdate = "1.0.3"
 postcard = { version = "1.1.1", features = ["alloc"] }
-pkarr = { git = "https://github.com/Pubky/pkarr", package = "pkarr", features = ["dht", "lmdb-cache", "tls"] }
+pkarr = { version = "3.0.0", features = ["dht", "lmdb-cache", "tls"] }
 pubky-common = { version = "0.1.0", path = "../pubky-common" }
 serde = { version = "1.0.216", features = ["derive"] }
 tokio = { version = "1.42.0", features = ["full"] }
@@ -31,6 +31,6 @@ axum-server = { version = "0.7.1", features = ["tls-rustls-no-provider"] }
 tower = "0.5.1"
 page_size = "0.6.0"
 
-pkarr-relay = { git = "https://github.com/Pubky/pkarr", package = "pkarr-relay" }
+pkarr-relay = "0.1.0"
 mainline = "5.0.0-rc.1"
 http-relay = { version = "0.1.0", path = "../http-relay" }
diff --git a/pubky/Cargo.toml b/pubky/Cargo.toml
index c41e7f4..317d6c7 100644
--- a/pubky/Cargo.toml
+++ b/pubky/Cargo.toml
@@ -17,7 +17,7 @@ url = "2.5.4"
 bytes = "^1.9.0"
 base64 = "0.22.1"
 
-pkarr = { git = "https://github.com/Pubky/pkarr", package = "pkarr", features = ["full"] }
+pkarr = { version = "3.0.0", features = ["full"] }
 mainline = "5.0.0-rc.1"
 pubky-common = { version = "0.1.0", path = "../pubky-common" }
 cookie = "0.18.1"