Bring remaining u32 amount types to u64

breez · Oct 28, 2024 · 9a82900 · 9a82900
1 parent b78d53b
commit 9a82900
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 28 deletions.
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/lib/Cargo.lock b/lib/Cargo.lock
diff --git a/lib/core/Cargo.toml b/lib/core/Cargo.toml
@@ -14,7 +14,7 @@ frb = ["dep:flutter_rust_bridge"]
 [dependencies]
 anyhow = { workspace = true }
 bip39 = "2.0.0"
-boltz-client = { git = "https://github.com/hydra-yse/boltz-rust", branch = "yse-fee-calculation" }
+boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust", branch = "trunk" }
 chrono = "0.4"
 env_logger = "0.11"
 flutter_rust_bridge = { version = "=2.4.0", features = [

diff --git a/lib/core/src/buy.rs b/lib/core/src/buy.rs
@@ -54,7 +54,7 @@ impl BuyBitcoinApi for BuyBitcoinService {
                 self.moonpay_provider
                     .buy_bitcoin(
                         create_response.lockup_details.lockup_address,
-                        Some(create_response.lockup_details.amount as u64),
+                        Some(create_response.lockup_details.amount),
                         None,
                         redirect_url,
                     )

diff --git a/lib/core/src/chain_swap.rs b/lib/core/src/chain_swap.rs
@@ -602,7 +602,7 @@ impl ChainSwapHandler {
                     .lowball_fee_rate_msat_per_vbyte()
                     .map(|v| v as f32),
                 &lockup_details.lockup_address,
-                lockup_details.amount as u64,
+                lockup_details.amount,
             )
             .await
         {
@@ -612,7 +612,7 @@ impl ChainSwapHandler {
                     .build_drain_tx(
                         None,
                         &lockup_details.lockup_address,
-                        Some(lockup_details.amount as u64),
+                        Some(lockup_details.amount),
                     )
                     .await
             }
@@ -1114,7 +1114,7 @@ impl ChainSwapHandler {
                 .unblind(&secp, liquid_swap_script.blinding_key.secret_key())?
                 .value;
         }
-        if value < claim_details.amount as u64 {
+        if value < claim_details.amount {
             return Err(anyhow!(
                 "Transaction value {value} sats is less than {} sats",
                 claim_details.amount
@@ -1159,7 +1159,7 @@ impl ChainSwapHandler {
             .filter(|tx_out| tx_out.script_pubkey == address.script_pubkey())
             .map(|tx_out| tx_out.value.to_sat())
             .sum();
-        if value < claim_details.amount as u64 {
+        if value < claim_details.amount {
             return Err(anyhow!(
                 "Transaction value {value} sats is less than {} sats",
                 claim_details.amount

diff --git a/lib/core/src/persist/receive.rs b/lib/core/src/persist/receive.rs
@@ -226,7 +226,7 @@ pub(crate) struct InternalCreateReverseResponse {
     pub lockup_address: String,
     pub refund_public_key: String,
     pub timeout_block_height: u32,
-    pub onchain_amount: u32,
+    pub onchain_amount: u64,
     pub blinding_key: Option<String>,
 }
 impl InternalCreateReverseResponse {

diff --git a/lib/core/src/sdk.rs b/lib/core/src/sdk.rs
@@ -1305,7 +1305,7 @@ impl LiquidSdk {
             claim_public_key: Some(claim_public_key),
             refund_public_key: Some(refund_public_key),
             user_lock_amount: None,
-            server_lock_amount: Some(server_lockup_amount_sat as u32), // TODO update our model
+            server_lock_amount: Some(server_lockup_amount_sat),
             pair_hash: Some(pair.hash),
             referral_id: None,
             webhook,
@@ -1594,7 +1594,7 @@ impl LiquidSdk {
         });
 
         let v2_req = CreateReverseRequest {
-            invoice_amount: payer_amount_sat as u32, // TODO update our model
+            invoice_amount: payer_amount_sat,
             from: "BTC".to_string(),
             to: "L-BTC".to_string(),
             preimage_hash: preimage.sha256,
@@ -1711,7 +1711,7 @@ impl LiquidSdk {
             preimage_hash: preimage.sha256,
             claim_public_key: Some(claim_public_key),
             refund_public_key: Some(refund_public_key),
-            user_lock_amount: Some(user_lockup_amount_sat as u32), // TODO update our model
+            user_lock_amount: Some(user_lockup_amount_sat),
             server_lock_amount: None,
             pair_hash: Some(pair.hash),
             referral_id: None,

diff --git a/lib/core/src/test_utils/persist.rs b/lib/core/src/test_utils/persist.rs
@@ -32,7 +32,7 @@ pub(crate) fn new_send_swap(payment_state: Option<PaymentState>) -> SendSwap {
     let payment_hash = sha256::Hash::from_slice(&[0; 32][..]).expect("Expecting valid hash");
     let invoice = InvoiceBuilder::new(Currency::BitcoinTestnet)
         .description("Test invoice".into())
-        .payment_hash(payment_hash.clone())
+        .payment_hash(payment_hash)
         .payment_secret(PaymentSecret([42u8; 32]))
         .current_timestamp()
         .min_final_cltv_expiry_delta(144)