Merge branch 'release-0.6.32'

Author: grunch

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mostro-core"
-version = "0.6.31"
+version = "0.6.32"
 edition = "2021"
 license = "MIT"
 authors = ["Francisco Calderón <negrunch@grunch.dev>"]
@@ -32,10 +32,10 @@ sqlx-crud = { version = "0.4.0", features = [
   "runtime-tokio-rustls",
 ], optional = true }
 wasm-bindgen = { version = "0.2.92", optional = true }
-nostr-sdk = "0.38.0"
+nostr-sdk = "0.39.0"
 bitcoin = "0.32.5"
 bitcoin_hashes = "0.16.0"
-rand = "0.8.5"
+rand = "0.9.0"
 
 [features]
 default = ["wasm"]

src/dispute.rs

@@ -105,6 +105,7 @@ impl SolverDisputeInfo {
     pub fn new(
         order: &Order,
         dispute: &Dispute,
+        initiator_tradekey: String,
         counterpart: &User,
         initiator: &User,
         initiator_operating_days: u64,
@@ -116,7 +117,7 @@ impl SolverDisputeInfo {
             status: order.status.clone(),
             hash: order.hash.clone(),
             preimage: order.preimage.clone(),
-            initiator_pubkey: initiator.pubkey.clone(),
+            initiator_pubkey: initiator_tradekey,
             buyer_pubkey: order.buyer_pubkey.clone(),
             buyer_token: dispute.buyer_token,
             seller_pubkey: order.seller_pubkey.clone(),
@@ -158,14 +159,14 @@ impl Dispute {
     /// Create new dispute record and generate security tokens
     /// Returns a tuple of the initiator's token and the counterpart's token
     pub fn create_tokens(&mut self, is_buyer_dispute: bool) -> (Option<u16>, Option<u16>) {
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         let mut buyer_token;
         let mut seller_token;
 
         // Ensure tokens are unique
         loop {
-            buyer_token = rng.gen_range(TOKEN_MIN..=TOKEN_MAX);
-            seller_token = rng.gen_range(TOKEN_MIN..=TOKEN_MAX);
+            buyer_token = rng.random_range(TOKEN_MIN..=TOKEN_MAX);
+            seller_token = rng.random_range(TOKEN_MIN..=TOKEN_MAX);
             if buyer_token != seller_token {
                 break;
             }

src/message.rs

@@ -204,7 +204,10 @@ impl Message {
         // Create a verification-only context for better performance
         let secp = Secp256k1::verification_only();
         // Verify signature
-        pubkey.verify(&secp, &message, &sig).is_ok()
+        pubkey
+            .xonly()
+            .map(|xonly| xonly.verify(&secp, &message, &sig).is_ok())
+            .unwrap_or(false)
     }
 }