Merge branch '2.0' into failed-transaction-handling

iotaledger · Mar 27, 2024 · 1469151 · 1469151
2 parents a60ab41 + 1101c72
commit 1469151
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/sdk/src/client/api/block_builder/transaction_builder/requirement/amount.rs b/sdk/src/client/api/block_builder/transaction_builder/requirement/amount.rs
@@ -32,7 +32,7 @@ pub(crate) fn sdruc_not_expired(
 
 impl TransactionBuilder {
     pub(crate) fn fulfill_amount_requirement(&mut self) -> Result<(), TransactionBuilderError> {
-        let (mut input_amount, mut output_amount) = self.amount_balance()?;
+        let (input_amount, output_amount) = self.amount_balance()?;
         if input_amount >= output_amount {
             log::debug!("Amount requirement already fulfilled");
             return Ok(());
@@ -43,22 +43,11 @@ impl TransactionBuilder {
         if !self.allow_additional_input_selection {
             return Err(TransactionBuilderError::AdditionalInputsRequired(Requirement::Amount));
         }
-        if self.available_inputs.is_empty() {
-            return Err(TransactionBuilderError::InsufficientAmount {
-                found: input_amount,
-                required: output_amount,
-            });
-        }
 
-        while let Some(input) = self.next_input_for_amount(output_amount - input_amount, self.latest_slot_commitment_id)
-        {
+        if let Some(input) = self.next_input_for_amount(output_amount - input_amount, self.latest_slot_commitment_id) {
+            self.requirements.push(Requirement::Amount);
             self.select_input(input)?;
-            (input_amount, output_amount) = self.amount_balance()?;
-            if input_amount >= output_amount {
-                break;
-            }
-        }
-        if output_amount > input_amount {
+        } else {
             return Err(TransactionBuilderError::InsufficientAmount {
                 found: input_amount,
                 required: output_amount,

diff --git a/sdk/src/client/api/block_builder/transaction_builder/requirement/mana.rs b/sdk/src/client/api/block_builder/transaction_builder/requirement/mana.rs
@@ -72,7 +72,7 @@ impl TransactionBuilder {
         should_recalculate |= self.get_inputs_for_mana_balance()?;
 
         if should_recalculate && !self.requirements.contains(&Requirement::Mana) {
-            self.requirements.push(Requirement::Mana);
+            self.requirements.insert(0, Requirement::Mana);
         }
 
         Ok(())