chore: merge NUT19 into 12

cashubtc · Nov 18, 2024 · 0af8b0d · 0af8b0d
2 parents 558aeda + 311aa23
commit 0af8b0d
Show file tree

Hide file tree

Showing 30 changed files with 409 additions and 70 deletions.
diff --git a/bindings/cdk-js/src/nuts/nut04.rs b/bindings/cdk-js/src/nuts/nut04.rs
@@ -88,10 +88,18 @@ impl From<MintBolt11Request> for JsMintBolt11Request {
 impl JsMintBolt11Request {
     /// Try From Base 64 String
     #[wasm_bindgen(constructor)]
-    pub fn new(quote: String, outputs: JsValue) -> Result<JsMintBolt11Request> {
+    pub fn new(
+        quote: String,
+        outputs: JsValue,
+        witness: Option<String>,
+    ) -> Result<JsMintBolt11Request> {
         let outputs = serde_wasm_bindgen::from_value(outputs).map_err(into_err)?;
         Ok(JsMintBolt11Request {
-            inner: MintBolt11Request { quote, outputs },
+            inner: MintBolt11Request {
+                quote,
+                outputs,
+                witness,
+            },
         })
     }
 

diff --git a/bindings/cdk-js/src/wallet.rs b/bindings/cdk-js/src/wallet.rs
@@ -93,7 +93,7 @@ impl JsWallet {
     ) -> Result<JsMintQuote> {
         let quote = self
             .inner
-            .mint_quote(amount.into(), description)
+            .mint_quote(amount.into(), description, None)
             .await
             .map_err(into_err)?;
 
@@ -142,7 +142,7 @@ impl JsWallet {
 
         Ok(self
             .inner
-            .mint(&quote_id, target, conditions)
+            .mint(&quote_id, target, conditions, None)
             .await
             .map_err(into_err)?
             .into())

diff --git a/crates/cdk-cli/src/sub_commands/mint.rs b/crates/cdk-cli/src/sub_commands/mint.rs
@@ -69,6 +69,8 @@ pub async fn mint(
                         .expect("Amount must be defined")
                         .into(),
                     description,
+                    // TODO: Get pubkey
+                    None,
                 )
                 .await?
         }
@@ -99,7 +101,9 @@ pub async fn mint(
         sleep(Duration::from_secs(2)).await;
     }
 
-    let receive_amount = wallet.mint(&quote.id, SplitTarget::default(), None).await?;
+    let receive_amount = wallet
+        .mint(&quote.id, SplitTarget::default(), None, None)
+        .await?;
 
     println!("Received {receive_amount} from mint {mint_url}");
 

diff --git a/crates/cdk-cli/src/sub_commands/remint_bolt12.rs b/crates/cdk-cli/src/sub_commands/remint_bolt12.rs
@@ -46,7 +46,10 @@ pub async fn remint(
         }
     };
 
-    let receive_amount = wallet.mint(&quote_id, SplitTarget::default(), None).await?;
+    // TODO: Pubkey
+    let receive_amount = wallet
+        .mint(&quote_id, SplitTarget::default(), None, None)
+        .await?;
 
     println!("Received {receive_amount} from mint {mint_url}");
 

diff --git a/crates/cdk-integration-tests/src/lib.rs b/crates/cdk-integration-tests/src/lib.rs
@@ -127,7 +127,7 @@ pub async fn wallet_mint(
     split_target: SplitTarget,
     description: Option<String>,
 ) -> Result<()> {
-    let quote = wallet.mint_quote(amount, description).await?;
+    let quote = wallet.mint_quote(amount, description, None).await?;
 
     loop {
         let status = wallet.mint_quote_state(&quote.id).await?;
@@ -140,7 +140,7 @@ pub async fn wallet_mint(
         sleep(Duration::from_secs(2)).await;
     }
 
-    let receive_amount = wallet.mint(&quote.id, split_target, None).await?;
+    let receive_amount = wallet.mint(&quote.id, split_target, None, None).await?;
 
     println!("Minted: {}", receive_amount);
 
@@ -163,6 +163,7 @@ pub async fn mint_proofs(
         amount,
         unit: CurrencyUnit::Sat,
         description,
+        pubkey: None,
     };
 
     let mint_quote = wallet_client
@@ -189,6 +190,7 @@ pub async fn mint_proofs(
     let request = MintBolt11Request {
         quote: mint_quote.quote,
         outputs: premint_secrets.blinded_messages(),
+        witness: None,
     };
 
     let mint_response = wallet_client.post_mint(mint_url.parse()?, request).await?;

diff --git a/crates/cdk-integration-tests/tests/fake_wallet.rs b/crates/cdk-integration-tests/tests/fake_wallet.rs
@@ -1,12 +1,13 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use anyhow::Result;
+use anyhow::{bail, Result};
 use bip39::Mnemonic;
 use cdk::amount::SplitTarget;
 use cdk::cdk_database::WalletMemoryDatabase;
 use cdk::nuts::{
-    CurrencyUnit, MeltBolt11Request, MeltQuoteState, MintQuoteState, PreMintSecrets, State,
+    CurrencyUnit, MeltBolt11Request, MeltQuoteState, MintQuoteState, PreMintSecrets, SecretKey,
+    State,
 };
 use cdk::wallet::client::{HttpClient, HttpClientMethods};
 use cdk::wallet::Wallet;
@@ -27,12 +28,12 @@ async fn test_fake_tokens_pending() -> Result<()> {
         None,
     )?;
 
-    let mint_quote = wallet.mint_quote(100.into(), None).await?;
+    let mint_quote = wallet.mint_quote(100.into(), None, None).await?;
 
     wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
 
     let _mint_amount = wallet
-        .mint(&mint_quote.id, SplitTarget::default(), None)
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
         .await?;
 
     let fake_description = FakeInvoiceDescription {
@@ -67,12 +68,12 @@ async fn test_fake_melt_payment_fail() -> Result<()> {
         None,
     )?;
 
-    let mint_quote = wallet.mint_quote(100.into(), None).await?;
+    let mint_quote = wallet.mint_quote(100.into(), None, None).await?;
 
     wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
 
     let _mint_amount = wallet
-        .mint(&mint_quote.id, SplitTarget::default(), None)
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
         .await?;
 
     let fake_description = FakeInvoiceDescription {
@@ -130,12 +131,12 @@ async fn test_fake_melt_payment_fail_and_check() -> Result<()> {
         None,
     )?;
 
-    let mint_quote = wallet.mint_quote(100.into(), None).await?;
+    let mint_quote = wallet.mint_quote(100.into(), None, None).await?;
 
     wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
 
     let _mint_amount = wallet
-        .mint(&mint_quote.id, SplitTarget::default(), None)
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
         .await?;
 
     let fake_description = FakeInvoiceDescription {
@@ -175,12 +176,12 @@ async fn test_fake_melt_payment_return_fail_status() -> Result<()> {
         None,
     )?;
 
-    let mint_quote = wallet.mint_quote(100.into(), None).await?;
+    let mint_quote = wallet.mint_quote(100.into(), None, None).await?;
 
     wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
 
     let _mint_amount = wallet
-        .mint(&mint_quote.id, SplitTarget::default(), None)
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
         .await?;
 
     let fake_description = FakeInvoiceDescription {
@@ -235,12 +236,12 @@ async fn test_fake_melt_payment_error_unknown() -> Result<()> {
         None,
     )?;
 
-    let mint_quote = wallet.mint_quote(100.into(), None).await?;
+    let mint_quote = wallet.mint_quote(100.into(), None, None).await?;
 
     wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
 
     let _mint_amount = wallet
-        .mint(&mint_quote.id, SplitTarget::default(), None)
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
         .await?;
 
     let fake_description = FakeInvoiceDescription {
@@ -296,12 +297,12 @@ async fn test_fake_melt_payment_err_paid() -> Result<()> {
         None,
     )?;
 
-    let mint_quote = wallet.mint_quote(100.into(), None).await?;
+    let mint_quote = wallet.mint_quote(100.into(), None, None).await?;
 
     wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
 
     let _mint_amount = wallet
-        .mint(&mint_quote.id, SplitTarget::default(), None)
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
         .await?;
 
     let fake_description = FakeInvoiceDescription {
@@ -334,12 +335,12 @@ async fn test_fake_melt_change_in_quote() -> Result<()> {
         None,
     )?;
 
-    let mint_quote = wallet.mint_quote(100.into(), None).await?;
+    let mint_quote = wallet.mint_quote(100.into(), None, None).await?;
 
     wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
 
     let _mint_amount = wallet
-        .mint(&mint_quote.id, SplitTarget::default(), None)
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
         .await?;
 
     let fake_description = FakeInvoiceDescription::default();
@@ -378,6 +379,87 @@ async fn test_fake_melt_change_in_quote() -> Result<()> {
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+async fn test_fake_mint_with_witness() -> Result<()> {
+    let wallet = Wallet::new(
+        MINT_URL,
+        CurrencyUnit::Sat,
+        Arc::new(WalletMemoryDatabase::default()),
+        &Mnemonic::generate(12)?.to_seed_normalized(""),
+        None,
+    )?;
+    let secret = SecretKey::generate();
+    let mint_quote = wallet
+        .mint_quote(100.into(), None, Some(secret.public_key()))
+        .await?;
+
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
+    let mint_amount = wallet
+        .mint(&mint_quote.id, SplitTarget::default(), None, Some(secret))
+        .await?;
+
+    assert!(mint_amount == 100.into());
+
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+async fn test_fake_mint_without_witness() -> Result<()> {
+    let wallet = Wallet::new(
+        MINT_URL,
+        CurrencyUnit::Sat,
+        Arc::new(WalletMemoryDatabase::default()),
+        &Mnemonic::generate(12)?.to_seed_normalized(""),
+        None,
+    )?;
+
+    let secret = SecretKey::generate();
+    let mint_quote = wallet
+        .mint_quote(100.into(), None, Some(secret.public_key()))
+        .await?;
+
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+
+    let mint_amount = wallet
+        .mint(&mint_quote.id, SplitTarget::default(), None, None)
+        .await;
+
+    match mint_amount {
+        Err(cdk::error::Error::SecretKeyNotProvided) => Ok(()),
+        _ => bail!("Wrong mint response for minting without witness"),
+    }
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+async fn test_fake_mint_with_wrong_witness() -> Result<()> {
+    let wallet = Wallet::new(
+        MINT_URL,
+        CurrencyUnit::Sat,
+        Arc::new(WalletMemoryDatabase::default()),
+        &Mnemonic::generate(12)?.to_seed_normalized(""),
+        None,
+    )?;
+    let secret = SecretKey::generate();
+    let mint_quote = wallet
+        .mint_quote(100.into(), None, Some(secret.public_key()))
+        .await?;
+
+    wait_for_mint_to_be_paid(&wallet, &mint_quote.id).await?;
+    let secret = SecretKey::generate();
+
+    let mint_amount = wallet
+        .mint(&mint_quote.id, SplitTarget::default(), None, Some(secret))
+        .await;
+
+    match mint_amount {
+        Err(cdk::error::Error::IncorrectSecretKey) => Ok(()),
+        _ => {
+            bail!("Wrong mint response for minting without witness")
+        }
+    }
+}
+
 // Keep polling the state of the mint quote id until it's paid
 async fn wait_for_mint_to_be_paid(wallet: &Wallet, mint_quote_id: &str) -> Result<()> {
     loop {

diff --git a/crates/cdk-integration-tests/tests/mint.rs b/crates/cdk-integration-tests/tests/mint.rs
@@ -85,6 +85,7 @@ async fn mint_proofs(
         Amount::ZERO,
         true,
         vec![],
+        None,
     );
 
     mint.localstore.add_mint_quote(quote.clone()).await?;
@@ -104,6 +105,7 @@ async fn mint_proofs(
     let mint_request = MintBolt11Request {
         quote: quote.id,
         outputs: premint.blinded_messages(),
+        witness: None,
     };
 
     let after_mint = mint.process_mint_request(mint_request).await?;