Renamed validate_amount function. Fixed 0-amount outputs

KyrylR · KyrylR · commit 116b0eb17c3f · 2026-02-10T07:43:29.000+02:00
diff --git a/crates/contracts/src/sdk/basic/issue_asset.rs b/crates/contracts/src/sdk/basic/issue_asset.rs
@@ -30,7 +30,7 @@ pub fn issue_asset(
 
     let (fee_asset_id, total_lbtc_left) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
 
     let change_recipient_script = fee_tx_out.script_pubkey.clone();
@@ -78,12 +78,14 @@ pub fn issue_asset(
     ));
 
     // LBTC Change
-    pst.add_output(Output::new_explicit(
-        change_recipient_script,
-        total_lbtc_left,
-        fee_asset_id,
-        None,
-    ));
+    if total_lbtc_left != 0 {
+        pst.add_output(Output::new_explicit(
+            change_recipient_script,
+            total_lbtc_left,
+            fee_asset_id,
+            None,
+        ));
+    }
 
     pst.add_output(Output::from_txout(TxOut::new_fee(fee_amount, fee_asset_id)));
 
diff --git a/crates/contracts/src/sdk/basic/reissue_asset.rs b/crates/contracts/src/sdk/basic/reissue_asset.rs
@@ -33,7 +33,7 @@ pub fn reissue_asset(
 
     let (fee_asset_id, total_lbtc_left) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
 
     let change_recipient_script = fee_tx_out.script_pubkey.clone();
@@ -88,12 +88,14 @@ pub fn reissue_asset(
         None,
     ));
 
-    pst.add_output(Output::new_explicit(
-        change_recipient_script,
-        total_lbtc_left,
-        fee_asset_id,
-        None,
-    ));
+    if total_lbtc_left != 0 {
+        pst.add_output(Output::new_explicit(
+            change_recipient_script,
+            total_lbtc_left,
+            fee_asset_id,
+            None,
+        ));
+    }
 
     pst.add_output(Output::from_txout(TxOut::new_fee(fee_amount, fee_asset_id)));
 
diff --git a/crates/contracts/src/sdk/basic/split_native_any.rs b/crates/contracts/src/sdk/basic/split_native_any.rs
@@ -25,7 +25,7 @@ pub fn split_native_any(
 
     let (asset_id, total_lbtc_left) = (
         tx_out.explicit_asset()?,
-        tx_out.validate_amount(fee_amount)?,
+        tx_out.remaining_after_required(fee_amount)?,
     );
 
     let recipient_script = tx_out.script_pubkey.clone();
diff --git a/crates/contracts/src/sdk/basic/transfer_asset.rs b/crates/contracts/src/sdk/basic/transfer_asset.rs
@@ -25,7 +25,7 @@ pub fn transfer_asset(
     let (asset_id, total_input_asset) = asset_tx_out.explicit()?;
     let (fee_asset_id, total_lbtc_left) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
 
     if send_amount > total_input_asset {
diff --git a/crates/contracts/src/sdk/basic/transfer_native.rs b/crates/contracts/src/sdk/basic/transfer_native.rs
@@ -22,7 +22,7 @@ pub fn transfer_native(
 
     let (asset_id, total_lbtc_left) = (
         tx_out.explicit_asset()?,
-        tx_out.validate_amount(amount_to_send + fee_amount)?,
+        tx_out.remaining_after_required(amount_to_send + fee_amount)?,
     );
 
     let change_recipient_script = tx_out.script_pubkey.clone();
@@ -40,12 +40,14 @@ pub fn transfer_native(
         None,
     ));
 
-    pst.add_output(Output::new_explicit(
-        change_recipient_script,
-        total_lbtc_left,
-        asset_id,
-        None,
-    ));
+    if total_lbtc_left != 0 {
+        pst.add_output(Output::new_explicit(
+            change_recipient_script,
+            total_lbtc_left,
+            asset_id,
+            None,
+        ));
+    }
 
     pst.add_output(Output::from_txout(TxOut::new_fee(fee_amount, asset_id)));
 
diff --git a/crates/contracts/src/sdk/finance/option_offer/deposit.rs b/crates/contracts/src/sdk/finance/option_offer/deposit.rs
@@ -47,7 +47,7 @@ pub fn build_option_offer_deposit(
 
     let (fee_asset_id, fee_change) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
     let (collateral_asset_id, total_collateral) = collateral_tx_out.explicit()?;
     let (premium_asset_id, total_premium) = premium_tx_out.explicit()?;
diff --git a/crates/contracts/src/sdk/finance/option_offer/exercise.rs b/crates/contracts/src/sdk/finance/option_offer/exercise.rs
@@ -62,7 +62,7 @@ pub fn build_option_offer_exercise(
 
     let (fee_asset_id, fee_change) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
     let (collateral_asset_id, total_collateral) = collateral_tx_out.explicit()?;
     let (premium_asset_id, total_premium) = premium_tx_out.explicit()?;
diff --git a/crates/contracts/src/sdk/finance/option_offer/expiry.rs b/crates/contracts/src/sdk/finance/option_offer/expiry.rs
@@ -44,7 +44,7 @@ pub fn build_option_offer_expiry(
 
     let (fee_asset_id, fee_change) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
     let (collateral_asset_id, collateral_amount) = collateral_tx_out.explicit()?;
     let (premium_asset_id, premium_amount) = premium_tx_out.explicit()?;
diff --git a/crates/contracts/src/sdk/finance/option_offer/withdraw.rs b/crates/contracts/src/sdk/finance/option_offer/withdraw.rs
@@ -37,7 +37,7 @@ pub fn build_option_offer_withdraw(
 
     let (fee_asset_id, fee_change) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
     let (settlement_asset_id, settlement_amount) = settlement_tx_out.explicit()?;
 
diff --git a/crates/contracts/src/sdk/finance/options/cancellation_option.rs b/crates/contracts/src/sdk/finance/options/cancellation_option.rs
@@ -33,7 +33,7 @@ pub fn build_option_cancellation(
 
     let (fee_asset_id, total_lbtc_left) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
     let (collateral_asset_id, total_collateral) = collateral_tx_out.explicit()?;
 
diff --git a/crates/contracts/src/sdk/finance/options/creation_option.rs b/crates/contracts/src/sdk/finance/options/creation_option.rs
@@ -55,7 +55,7 @@ pub fn build_option_creation(
 
     let total_input_fee = first_value + second_value;
 
-    first_tx_out.validate_amount(fee_amount.saturating_sub(second_value))?;
+    first_tx_out.remaining_after_required(fee_amount.saturating_sub(second_value))?;
 
     let change_recipient_script = first_tx_out.script_pubkey.clone();
 
diff --git a/crates/contracts/src/sdk/finance/options/exercise_option.rs b/crates/contracts/src/sdk/finance/options/exercise_option.rs
@@ -76,7 +76,7 @@ pub fn build_option_exercise(
         if let Some((fee_out_point, fee_tx_out)) = fee_utxo {
             let (fee_asset_id, total_lbtc_left) = (
                 fee_tx_out.explicit_asset()?,
-                fee_tx_out.validate_amount(fee_amount)?,
+                fee_tx_out.remaining_after_required(fee_amount)?,
             );
 
             if asset_amount_to_pay > total_asset_amount {
diff --git a/crates/contracts/src/sdk/finance/options/expiry_option.rs b/crates/contracts/src/sdk/finance/options/expiry_option.rs
@@ -31,7 +31,7 @@ pub fn build_option_expiry(
 
     let (fee_asset_id, total_lbtc_left) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
     let (collateral_asset_id, total_collateral) = collateral_tx_out.explicit()?;
     let (grantor_token_id, total_grantor_token_amount) = grantor_tx_out.explicit()?;
diff --git a/crates/contracts/src/sdk/finance/options/funding_option.rs b/crates/contracts/src/sdk/finance/options/funding_option.rs
@@ -131,7 +131,7 @@ pub fn build_option_funding(
     ));
 
     let utxos = if let Some((_, fee_tx_out)) = fee_utxo {
-        let total_fee = fee_tx_out.validate_amount(fee_amount)?;
+        let total_fee = fee_tx_out.remaining_after_required(fee_amount)?;
 
         let is_collateral_change_needed = total_collateral != collateral_amount;
         let is_fee_change_needed = total_fee != 0;
diff --git a/crates/contracts/src/sdk/finance/options/settlement_option.rs b/crates/contracts/src/sdk/finance/options/settlement_option.rs
@@ -32,7 +32,7 @@ pub fn build_option_settlement(
 
     let (fee_asset_id, total_lbtc_left) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
     let (settlement_asset_id, available_settlement_asset) = settlement_tx_out.explicit()?;
     let (grantor_token_id, total_grantor_token_amount) = grantor_tx_out.explicit()?;
diff --git a/crates/contracts/src/sdk/storage/transfer_from_storage_address.rs b/crates/contracts/src/sdk/storage/transfer_from_storage_address.rs
@@ -46,7 +46,7 @@ pub fn transfer_asset_with_storage(
     let (storage_asset_id, total_input_storage_amount) = storage_tx_out.explicit()?;
     let (fee_asset_id, change_amount) = (
         fee_tx_out.explicit_asset()?,
-        fee_tx_out.validate_amount(fee_amount)?,
+        fee_tx_out.remaining_after_required(fee_amount)?,
     );
 
     let mut pst = PartiallySignedTransaction::new_v2();
diff --git a/crates/contracts/src/sdk/validation.rs b/crates/contracts/src/sdk/validation.rs
@@ -36,7 +36,7 @@ pub trait TxOutExt {
     /// Returns an error if:
     /// - The value is confidential
     /// - The available amount is less than required
-    fn validate_amount(&self, required: u64) -> Result<u64, ValidationError>;
+    fn remaining_after_required(&self, required: u64) -> Result<u64, ValidationError>;
 
     /// Validates that this UTXO can cover the required fee with the expected asset.
     ///
@@ -48,7 +48,11 @@ pub trait TxOutExt {
     /// - The value or asset is confidential
     /// - The asset doesn't match the expected fee asset
     /// - The available amount is less than required
-    fn validate_fee(&self, required: u64, expected_asset: AssetId) -> Result<u64, ValidationError>;
+    fn remaining_fee_after_required(
+        &self,
+        required: u64,
+        expected_asset: AssetId,
+    ) -> Result<u64, ValidationError>;
 }
 
 impl TxOutExt for TxOut {
@@ -72,8 +76,7 @@ impl TxOutExt for TxOut {
             })
     }
 
-    // TODO: Change this validation to another func
-    fn validate_amount(&self, required: u64) -> Result<u64, ValidationError> {
+    fn remaining_after_required(&self, required: u64) -> Result<u64, ValidationError> {
         let available = self.explicit_value()?;
 
         if available < required {
@@ -87,7 +90,11 @@ impl TxOutExt for TxOut {
         Ok(available - required)
     }
 
-    fn validate_fee(&self, required: u64, expected_asset: AssetId) -> Result<u64, ValidationError> {
+    fn remaining_fee_after_required(
+        &self,
+        required: u64,
+        expected_asset: AssetId,
+    ) -> Result<u64, ValidationError> {
         let asset = self.explicit_asset()?;
 
         if asset != expected_asset {
@@ -98,6 +105,6 @@ impl TxOutExt for TxOut {
             });
         }
 
-        self.validate_amount(required)
+        self.remaining_after_required(required)
     }
 }
