Merge pull request #83 from MostroP2P/refactoring-sign-and-verify

Refactoring sign and verify_signature functions

Author: grunch

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mostro-core"
-version = "0.6.25"
+version = "0.6.26"
 edition = "2021"
 license = "MIT"
 authors = ["Francisco Calderón <negrunch@grunch.dev>"]

src/lib.rs

@@ -127,15 +127,18 @@ mod test {
             Some(payload),
         ));
         assert!(test_message.verify());
+        let test_message_json = test_message.as_json().unwrap();
         // Message should be signed with the trade keys
         let trade_keys =
             Keys::parse("110e43647eae221ab1da33ddc17fd6ff423f2b2f49d809b9ffa40794a2ab996c")
                 .unwrap();
-        let sig = test_message.get_inner_message_kind().sign(&trade_keys);
+        let sig = Message::sign(test_message_json.clone(), &trade_keys);
 
-        assert!(test_message
-            .get_inner_message_kind()
-            .verify_signature(trade_keys.public_key(), sig));
+        assert!(Message::verify_signature(
+            test_message_json,
+            trade_keys.public_key(),
+            sig
+        ));
     }
 
     #[test]

src/message.rs

@@ -186,6 +186,27 @@ impl Message {
             | Message::Dm(m) => m.verify(),
         }
     }
+
+    pub fn sign(message: String, keys: &Keys) -> Signature {
+        let hash: Sha256Hash = Sha256Hash::hash(message.as_bytes());
+        let hash = hash.to_byte_array();
+        let hash_str = hex::encode(hash);
+        println!("hash en sign() en core: {:?}", hash_str);
+        let message: BitcoinMessage = BitcoinMessage::from_digest(hash);
+
+        keys.sign_schnorr(&message)
+    }
+
+    pub fn verify_signature(message: String, pubkey: PublicKey, sig: Signature) -> bool {
+        // Create payload hash
+        let hash: Sha256Hash = Sha256Hash::hash(message.as_bytes());
+        let hash = hash.to_byte_array();
+        let message: BitcoinMessage = BitcoinMessage::from_digest(hash);
+        // Create a verification-only context for better performance
+        let secp = Secp256k1::verification_only();
+        // Verify signature
+        pubkey.verify(&secp, &message, &sig).is_ok()
+    }
 }
 
 /// Use this Message to establish communication between users and Mostro
@@ -391,25 +412,4 @@ impl MessageKind {
         }
         (false, 0)
     }
-
-    pub fn sign(&self, keys: &Keys) -> Signature {
-        let message = self.as_json().unwrap();
-        let hash: Sha256Hash = Sha256Hash::hash(message.as_bytes());
-        let hash = hash.to_byte_array();
-        let message: BitcoinMessage = BitcoinMessage::from_digest(hash);
-
-        keys.sign_schnorr(&message)
-    }
-
-    pub fn verify_signature(&self, pubkey: PublicKey, sig: Signature) -> bool {
-        // Create message hash
-        let message = self.as_json().unwrap();
-        let hash: Sha256Hash = Sha256Hash::hash(message.as_bytes());
-        let hash = hash.to_byte_array();
-        let message: BitcoinMessage = BitcoinMessage::from_digest(hash);
-        // Create a verification-only context for better performance
-        let secp = Secp256k1::verification_only();
-        // Verify signature
-        pubkey.verify(&secp, &message, &sig).is_ok()
-    }
 }