fix rebase issues

Author: OverOrion

crates/nostr/src/event/builder.rs

@@ -5,6 +5,7 @@
 #[cfg(feature = "alloc")]
 use alloc::{
     string::{String, ToString},
+    vec,
     vec::Vec,
 };
 
@@ -33,6 +34,7 @@ pub enum Error {
     #[error(transparent)]
     Key(#[from] key::Error),
     /// Secp256k1 error
+
     #[error("Secp256k1 Error: {0}")]
     Secp256k1(secp256k1::Error),
     /// JSON error
@@ -84,6 +86,12 @@ impl EventBuilder {
     #[cfg(feature = "std")]
     pub fn to_event(self, keys: &Keys) -> Result<Event, Error> {
         let pubkey: XOnlyPublicKey = keys.public_key();
+        Ok(self.to_unsigned_event(pubkey).sign(keys)?)
+    }
+
+    /// Build [`UnsignedEvent`]
+    #[cfg(feature = "std")]
+    pub fn to_unsigned_event(self, pubkey: XOnlyPublicKey) -> UnsignedEvent {
         let created_at: Timestamp = Timestamp::now();
         let id = EventId::new(&pubkey, created_at, &self.kind, &self.tags, &self.content);
         let message = Message::from_slice(id.as_bytes())?;
@@ -102,19 +110,42 @@ impl EventBuilder {
     ) -> Result<Event, Error> {
         let pubkey: XOnlyPublicKey = keys.public_key();
         let id = EventId::new(&pubkey, created_at, &self.kind, &self.tags, &self.content);
-        UnsignedEvent {
+        let message = Message::from_slice(id.as_bytes())?;
+        let signature = keys.sign_schnorr_with_secp(&message, secp)?;
+
+        Self::to_event_internal(self, keys, created_at, id, signature)
+    }
+
+    fn to_event_internal(
+        self,
+        keys: &Keys,
+        created_at: Timestamp,
+        id: EventId,
+        sig: Signature,
+    ) -> Result<Event, Error> {
+        let pubkey: XOnlyPublicKey = keys.public_key();
+
+        Ok(Event {
             id,
             pubkey,
             created_at,
             kind: self.kind,
             tags: self.tags,
             content: self.content,
-        }
+            sig,
+        })
     }
 
     /// Build POW [`Event`]
     #[cfg(feature = "std")]
     pub fn to_pow_event(self, keys: &Keys, difficulty: u8) -> Result<Event, Error> {
+        let pubkey: XOnlyPublicKey = keys.public_key();
+        Ok(self.to_unsigned_pow_event(pubkey, difficulty).sign(keys)?)
+    }
+
+    /// Build unsigned POW [`Event`]
+    #[cfg(feature = "std")]
+    pub fn to_unsigned_pow_event(self, pubkey: XOnlyPublicKey, difficulty: u8) -> UnsignedEvent {
         #[cfg(target_arch = "wasm32")]
         use instant::Instant;
         #[cfg(all(feature = "std", not(target_arch = "wasm32")))]
@@ -123,7 +154,9 @@ impl EventBuilder {
         let now = Instant::now();
 
         use secp256k1::SECP256K1;
-        self.to_pow_event_with_time_supplier_with_secp::<Instant, _>(keys, difficulty, &now, SECP256K1)
+        self.to_pow_event_with_time_supplier_with_secp::<Instant, _>(
+            keys, difficulty, &now, SECP256K1,
+        )
     }
 
     /// Build POW [`Event`] using the given time supplier
@@ -158,8 +191,6 @@ impl EventBuilder {
         #[cfg(all(feature = "alloc", not(feature = "std")))]
         use core::cmp;
 
-    /// Build unsigned POW [`Event`]
-    pub fn to_unsigned_pow_event(self, pubkey: XOnlyPublicKey, difficulty: u8) -> UnsignedEvent {
         let mut nonce: u128 = 0;
         let mut tags: Vec<Tag> = self.tags.clone();
 
@@ -196,7 +227,6 @@ impl EventBuilder {
                 #[cfg(all(feature = "std", not(feature = "alloc")))]
                 let sig = keys.sign_schnorr(&message)?;
 
-
                 return self.to_event_internal(keys, created_at, id, sig);
             }
 
@@ -247,6 +277,7 @@ impl EventBuilder {
     ///
     /// # Example
     /// ```rust,no_run
+    /// use nostr::url::Url;
     /// use nostr::{EventBuilder, Metadata};
     ///
     /// let metadata = Metadata::new()

crates/nostr/src/event/tag.rs

@@ -5,6 +5,7 @@
 
 #[cfg(all(feature = "alloc", not(feature = "std")))]
 use alloc::{
+    borrow::ToOwned,
     fmt, format,
     str::FromStr,
     string::{String, ToString},

crates/nostr/src/key/mod.rs

@@ -220,6 +220,7 @@ impl Keys {
     }
 
     /// Get [`PublicKey`]
+    #[cfg(feature = "std")]
     pub fn normalized_public_key(&self) -> Result<PublicKey, Error> {
         Ok(self.secret_key()?.public_key(SECP256K1))
     }

crates/nostr/src/nips/nip26.rs

@@ -109,7 +109,7 @@ pub fn sign_delegation_with_signer<C: Signing>(
 ) -> Result<Signature, Error> {
     let unhashed_token = DelegationToken::new(delegatee_pk, conditions);
     let hashed_token = Sha256Hash::hash(unhashed_token.as_bytes());
-    let message = Message::from_slice(&hashed_token)?;
+    let message = Message::from_slice(hashed_token.as_byte_array())?;
     Ok(delegator_keys.sign_schnorr_with_secp(&message, secp)?)
 }
 
@@ -139,7 +139,7 @@ pub fn verify_delegation_signature<C: Verification>(
 ) -> Result<(), Error> {
     let unhashed_token = DelegationToken::new(delegatee_public_key, conditions);
     let hashed_token = Sha256Hash::hash(unhashed_token.as_bytes());
-    let message = Message::from_slice(&hashed_token)?;
+    let message = Message::from_slice(hashed_token.as_byte_array())?;
     secp.verify_schnorr(&signature, &message, &delegator_public_key)?;
     Ok(())
 }