Merge "Impl ToBech32 and ToNostrUri for Coordinate, CoordinateBorrow and Event"

Closes nostr:nevent1qvzqqqqx25pzpepndn2jthmelfxn4umylktqp493ph8yy9d2fse76al2ppprgjcsqqsvf2k0leg7jptedx9pdt8s9ayrr32qmt06jhdzdrvsesw4j04pzgskh937n

Pull-Request: #1113
Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

crates/nostr/CHANGELOG.md

@@ -44,6 +44,12 @@
 - Add NIP-C7 support (https://github.com/rust-nostr/nostr/pull/1067)
 - Add NIP-60 support (https://github.com/rust-nostr/nostr/pull/1092)
 - Implement `ToBech32` trait for `Nip21`
+- Implement `ToBech32` for `Coordinate`
+- Implement `ToNostrUri` for `Coordinate`
+- Implement `ToBech32` for `CoordinateBorrow`
+- Implement `ToNostrUri` for `CoordinateBorrow`
+- Implement `ToBech32` for `Event`
+- Implement `ToNostrUri` for `Event`
 - Implement `From<&Event>` for `Nip19Event`
 - Add `CowTag::kind` and `CowTag::content`
 - Add `Timestamp::as_secs`

crates/nostr/src/event/mod.rs

@@ -31,6 +31,8 @@ pub use self::kind::Kind;
 pub use self::tag::{Tag, TagKind, TagStandard, Tags};
 pub use self::unsigned::UnsignedEvent;
 use crate::nips::nip01::CoordinateBorrow;
+use crate::nips::nip19::{self, Nip19Event, ToBech32};
+use crate::nips::nip21::ToNostrUri;
 #[cfg(feature = "std")]
 use crate::types::time::Instant;
 use crate::types::time::TimeSupplier;
@@ -294,6 +296,19 @@ impl JsonUtil for Event {
     }
 }
 
+impl ToBech32 for Event {
+    type Err = nip19::Error;
+
+    fn to_bech32(&self) -> Result<String, Self::Err> {
+        match self.coordinate() {
+            Some(coordinate) => coordinate.to_bech32(),
+            None => Nip19Event::from(self).to_bech32(),
+        }
+    }
+}
+
+impl ToNostrUri for Event {}
+
 impl TryFrom<&Event> for Metadata {
     type Error = serde_json::Error;
 

crates/nostr/src/nips/nip01.rs

@@ -17,8 +17,8 @@ use serde::ser::{SerializeMap, Serializer};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use super::nip19::FromBech32;
-use super::nip21::FromNostrUri;
+use super::nip19::{self, FromBech32, Nip19Coordinate, ToBech32};
+use super::nip21::{FromNostrUri, ToNostrUri};
 use crate::types::Url;
 use crate::{key, Filter, JsonUtil, Kind, PublicKey, Tag};
 
@@ -222,6 +222,27 @@ impl FromStr for Coordinate {
     }
 }
 
+impl ToBech32 for Coordinate {
+    type Err = nip19::Error;
+
+    #[inline]
+    fn to_bech32(&self) -> Result<String, Self::Err> {
+        self.borrow().to_bech32()
+    }
+}
+
+impl FromBech32 for Coordinate {
+    type Err = nip19::Error;
+
+    fn from_bech32(addr: &str) -> Result<Self, Self::Err> {
+        let coordinate: Nip19Coordinate = Nip19Coordinate::from_bech32(addr)?;
+        Ok(coordinate.coordinate)
+    }
+}
+
+impl ToNostrUri for Coordinate {}
+impl FromNostrUri for Coordinate {}
+
 /// Borrowed coordinate
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct CoordinateBorrow<'a> {
@@ -246,6 +267,17 @@ impl CoordinateBorrow<'_> {
     }
 }
 
+impl ToBech32 for CoordinateBorrow<'_> {
+    type Err = nip19::Error;
+
+    #[inline]
+    fn to_bech32(&self) -> Result<String, Self::Err> {
+        nip19::coordinate_to_bech32(*self, &[])
+    }
+}
+
+impl ToNostrUri for CoordinateBorrow<'_> {}
+
 /// Metadata
 #[derive(Debug, Clone, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Metadata {

crates/nostr/src/nips/nip19.rs

@@ -18,7 +18,7 @@ use core::str::FromStr;
 
 use bech32::{self, Bech32, Hrp};
 
-use super::nip01::Coordinate;
+use super::nip01::{Coordinate, CoordinateBorrow};
 use super::nip05::Nip05Profile;
 #[cfg(feature = "nip49")]
 use super::nip49::{self, EncryptedSecretKey};
@@ -647,22 +647,6 @@ impl FromBech32 for Nip19Profile {
     }
 }
 
-impl FromBech32 for Coordinate {
-    type Err = Error;
-
-    fn from_bech32(addr: &str) -> Result<Self, Self::Err> {
-        let (hrp, data) = bech32::decode(addr)?;
-
-        if hrp != HRP_COORDINATE {
-            return Err(Error::WrongPrefix);
-        }
-
-        let coordinate = Nip19Coordinate::from_bech32_data(data)?;
-
-        Ok(coordinate.coordinate)
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Nip19Coordinate {
     pub coordinate: Coordinate,
@@ -761,37 +745,47 @@ impl FromBech32 for Nip19Coordinate {
 impl ToBech32 for Nip19Coordinate {
     type Err = Error;
 
+    #[inline]
     fn to_bech32(&self) -> Result<String, Self::Err> {
-        // Allocate capacity
-        let identifier_len: usize = 2 + self.identifier.len();
-        let relays_len: usize = self.relays.iter().map(|u| 2 + u.as_str().len()).sum();
-        let mut bytes: Vec<u8> = Vec::with_capacity(
-            identifier_len + FIXED_1_1_32_BYTES_TVL + FIXED_KIND_BYTES_TVL + relays_len,
-        );
+        coordinate_to_bech32(self.coordinate.borrow(), &self.relays)
+    }
+}
 
-        // Identifier
-        bytes.push(SPECIAL); // Type
-        bytes.push(self.identifier.len() as u8); // Len
-        bytes.extend(self.identifier.as_bytes()); // Value
+pub(super) fn coordinate_to_bech32<'a>(
+    coordinate: CoordinateBorrow<'a>,
+    relays: &[RelayUrl],
+) -> Result<String, Error> {
+    let identifier: &'a str = coordinate.identifier.unwrap_or_default();
 
-        // Author
-        bytes.push(AUTHOR); // Type
-        bytes.push(32); // Len
-        bytes.extend(self.public_key.as_bytes()); // Value
+    // Allocate capacity
+    let identifier_len: usize = 2 + identifier.len();
+    let relays_len: usize = relays.iter().map(|u| 2 + u.as_str().len()).sum();
+    let mut bytes: Vec<u8> = Vec::with_capacity(
+        identifier_len + FIXED_1_1_32_BYTES_TVL + FIXED_KIND_BYTES_TVL + relays_len,
+    );
 
-        // Kind
-        bytes.push(KIND); // Type
-        bytes.push(4); // Len
-        bytes.extend((self.kind.as_u16() as u32).to_be_bytes()); // Value
+    // Identifier
+    bytes.push(SPECIAL); // Type
+    bytes.push(identifier.len() as u8); // Len
+    bytes.extend(identifier.as_bytes()); // Value
 
-        for relay in self.relays.iter() {
-            bytes.push(RELAY); // Type
-            bytes.push(relay.as_str().len() as u8); // Len
-            bytes.extend(relay.as_str().as_bytes()); // Value
-        }
+    // Author
+    bytes.push(AUTHOR); // Type
+    bytes.push(32); // Len
+    bytes.extend(coordinate.public_key.as_bytes()); // Value
+
+    // Kind
+    bytes.push(KIND); // Type
+    bytes.push(4); // Len
+    bytes.extend((coordinate.kind.as_u16() as u32).to_be_bytes()); // Value
 
-        Ok(bech32::encode::<Bech32>(HRP_COORDINATE, &bytes)?)
+    for relay in relays.iter() {
+        bytes.push(RELAY); // Type
+        bytes.push(relay.as_str().len() as u8); // Len
+        bytes.extend(relay.as_str().as_bytes()); // Value
     }
+
+    Ok(bech32::encode::<Bech32>(HRP_COORDINATE, &bytes)?)
 }
 
 #[cfg(test)]

crates/nostr/src/nips/nip21.rs

@@ -11,7 +11,6 @@ use core::convert::Infallible;
 use core::fmt;
 
 use super::nip19::{self, FromBech32, Nip19, Nip19Coordinate, Nip19Event, Nip19Profile, ToBech32};
-use crate::nips::nip01::Coordinate;
 use crate::{EventId, PublicKey};
 
 /// URI scheme
@@ -114,7 +113,6 @@ impl ToNostrUri for Nip19Profile {}
 impl FromNostrUri for Nip19Profile {}
 impl ToNostrUri for Nip19Event {}
 impl FromNostrUri for Nip19Event {}
-impl FromNostrUri for Coordinate {}
 impl ToNostrUri for Nip19Coordinate {}
 impl FromNostrUri for Nip19Coordinate {}