pool: add support to negentropy v1

Closes #253

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -96,6 +96,7 @@
 * relay-builder: add `MockRelay` ([Yuki Kishimoto])
 * pool: add `RelayPool::disconnect_relay` method ([Yuki Kishimoto])
 * pool: add `RelayPool::relays_with_flag` and `RelayPool::all_relays` ([Yuki Kishimoto])
+* pool: add support to negentropy v1 ([Yuki Kishimoto])
 * sdk: add `Client::add_discovery_relay` ([Yuki Kishimoto])
 * sdk: add `Client::add_read_relay` and `Client::add_write_relay` ([Yuki Kishimoto])
 * sdk: add `Client::stream_events_targeted` ([Yuki Kishimoto])

Cargo.lock

@@ -25,6 +25,8 @@ async-trait = "0.1"
 async-utility = "0.2"
 atomic-destructor = { version = "0.2", default-features = false }
 js-sys = "0.3"
+negentropy = { version = "0.4", default-features = false }
+negentropy-deprecated = { package = "negentropy", version = "0.3", default-features = false }
 nostr = { version = "0.34", path = "./crates/nostr", default-features = false }
 nostr-database = { version = "0.34", path = "./crates/nostr-database", default-features = false }
 nostr-indexeddb = { version = "0.34", path = "./crates/nostr-indexeddb", default-features = false }

Cargo.toml

@@ -36,8 +36,8 @@ pub enum ClientMessageEnum {
     NegOpen {
         subscription_id: String,
         filter: Arc<Filter>,
-        /// ID size (MUST be between 8 and 32, inclusive)
-        id_size: u8,
+        /// ID size (deprecated)
+        id_size: Option<u8>,
         initial_message: String,
     },
     /// Negentropy Message

bindings/nostr-ffi/src/message/client.rs

@@ -20,6 +20,8 @@ nip11 = ["nostr/nip11"]
 async-utility.workspace = true
 async-wsocket = { version = "0.8", features = ["socks"] }
 atomic-destructor = { workspace = true, features = ["tracing"] }
+negentropy = { workspace = true, features = ["std"] }
+negentropy-deprecated = { workspace = true, features = ["std"] }
 nostr = { workspace = true, features = ["std"] }
 nostr-database.workspace = true
 thiserror.workspace = true

crates/nostr-relay-pool/Cargo.toml

@@ -8,7 +8,7 @@ use std::time::Duration;
 use async_utility::thread;
 use nostr::message::relay::NegentropyErrorCode;
 use nostr::message::MessageHandleError;
-use nostr::{event, negentropy, EventId, Kind, PublicKey};
+use nostr::{event, EventId, Kind, PublicKey};
 use nostr_database::DatabaseError;
 use thiserror::Error;
 
@@ -27,6 +27,9 @@ pub enum Error {
     /// Negentropy error
     #[error(transparent)]
     Negentropy(#[from] negentropy::Error),
+    /// Negentropy error
+    #[error(transparent)]
+    NegentropyDeprecated(#[from] negentropy_deprecated::Error),
     /// Database error
     #[error(transparent)]
     Database(#[from] DatabaseError),
@@ -90,8 +93,8 @@ pub enum Error {
     #[error("negentropy reconciliation error: {0}")]
     NegentropyReconciliation(NegentropyErrorCode),
     /// Negentropy not supported
-    #[error("negentropy not supported")]
-    NegentropyNotSupported,
+    #[error("negentropy (maybe) not supported")]
+    NegentropyMaybeNotSupported,
     /// Unknown negentropy error
     #[error("unknown negentropy error")]
     UnknownNegentropyError,