nostr: impl ToBech32 for CoordinateBorrow

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

Author: yukibtc

crates/nostr/CHANGELOG.md

@@ -44,6 +44,7 @@
 - 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 `CoordinateBorrow`
 - Implement `From<&Event>` for `Nip19Event`
 - Add `CowTag::kind` and `CowTag::content`
 - Add `Timestamp::as_secs`

crates/nostr/src/nips/nip01.rs

@@ -17,7 +17,7 @@ use serde::ser::{SerializeMap, Serializer};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use super::nip19::FromBech32;
+use super::nip19::{self, FromBech32, ToBech32};
 use super::nip21::FromNostrUri;
 use crate::types::Url;
 use crate::{key, Filter, JsonUtil, Kind, PublicKey, Tag};
@@ -246,6 +246,15 @@ impl CoordinateBorrow<'_> {
     }
 }
 
+impl ToBech32 for CoordinateBorrow<'_> {
+    type Err = nip19::Error;
+
+    #[inline]
+    fn to_bech32(&self) -> Result<String, Self::Err> {
+        nip19::coordinate_to_bech32(*self, &[])
+    }
+}
+
 /// 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};
@@ -761,37 +761,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)]