Always use cashu quote id for PaymentId

Author: benthecarman

orange-sdk/Cargo.toml

@@ -26,14 +26,14 @@ reqwest = { version = "0.12.23", default-features = false, features = ["rustls-t
 spark-wallet = { git = "https://github.com/breez/spark-sdk.git", rev = "6e12f98be3f100fca0411e3209a610decfa32279", default-features = false, features = ["rustls-tls"], optional = true }
 tokio = { version = "1.0", default-features = false, features = ["rt-multi-thread", "sync"] }
 uuid = { version = "1.0", default-features = false, optional = true }
-cdk = { git = "https://github.com/benthecarman/cdk.git", branch = "orange-fork", default-features = false, features = ["wallet"], optional = true }
+cdk = { git = "https://github.com/benthecarman/cdk.git", rev = "7d25e9ae5ed7f47f9ae7e87d8a9ee16797fee8cd", default-features = false, features = ["wallet"], optional = true }
 serde_json = { version = "1.0", optional = true }
 async-trait = "0.1"
 
 corepc-node = { version = "0.8.0", features = ["29_0", "download"], optional = true }
-cdk-ldk-node = { git = "https://github.com/benthecarman/cdk.git", branch = "orange-fork", optional = true }
-cdk-sqlite = { git = "https://github.com/benthecarman/cdk.git", branch = "orange-fork", optional = true }
-cdk-axum = { git = "https://github.com/benthecarman/cdk.git", branch = "orange-fork", optional = true }
+cdk-ldk-node = { git = "https://github.com/benthecarman/cdk.git", rev = "7d25e9ae5ed7f47f9ae7e87d8a9ee16797fee8cd", optional = true }
+cdk-sqlite = { git = "https://github.com/benthecarman/cdk.git", rev = "7d25e9ae5ed7f47f9ae7e87d8a9ee16797fee8cd", optional = true }
+cdk-axum = { git = "https://github.com/benthecarman/cdk.git", rev = "7d25e9ae5ed7f47f9ae7e87d8a9ee16797fee8cd", optional = true }
 axum = { version = "0.8.1", optional = true }
 
 uniffi = { version = "0.29", features = ["cli", "tokio"], optional = true }

orange-sdk/src/trusted_wallet/cashu/mod.rs

@@ -550,7 +550,10 @@ impl Cashu {
 		transaction: Transaction, unit: &CurrencyUnit,
 	) -> Result<Payment, TrustedError> {
 		// Convert transaction ID to a 32-byte array
-		let payment_id = Self::id_to_32_byte_array(&transaction.id().to_string());
+		let id = transaction.quote_id.ok_or(TrustedError::WalletOperationFailed(
+			"Missing quote ID in transaction".to_owned(),
+		))?;
+		let payment_id = Self::id_to_32_byte_array(&id);
 
 		// Convert amounts - CDK amounts are u64 representing sats
 		let amount = convert_amount(transaction.amount, unit)?;
@@ -589,9 +592,12 @@ impl Cashu {
 			// Convert quote ID to a 32-byte payment ID
 			let payment_id = Self::id_to_32_byte_array(&mint_quote.id);
 
-			// Create a payment hash from the quote ID
-			// fixme: can we get the actual payment hash?
-			let hash = Sha256::hash(mint_quote.id.as_bytes());
+			// Parse the invoice to get the payment hash
+			// todo this won't work for bolt12
+			let invoice = Bolt11Invoice::from_str(&mint_quote.request).map_err(|e| {
+				TrustedError::Other(format!("Failed to parse invoice from mint quote: {e}"))
+			})?;
+			let hash = invoice.payment_hash();
 
 			// Send a PaymentReceived event
 			event_queue