From 5697e6a42213c6a59e6dbaf76afa422389cd72de Mon Sep 17 00:00:00 2001
From: Thibault Martinez <thibault@iota.org>
Date: Wed, 27 Mar 2024 09:39:51 +0100
Subject: [PATCH] logs

---
 .../api/block_builder/transaction_builder/mod.rs     | 12 ++++++++----
 .../block_builder/transaction_builder/remainder.rs   | 10 +++++++---
 .../transaction_builder/requirement/mana.rs          |  5 ++++-
 sdk/src/client/secret/mod.rs                         |  5 ++++-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/sdk/src/client/api/block_builder/transaction_builder/mod.rs b/sdk/src/client/api/block_builder/transaction_builder/mod.rs
index 1d5f68bb38..c6f0fb0659 100644
--- a/sdk/src/client/api/block_builder/transaction_builder/mod.rs
+++ b/sdk/src/client/api/block_builder/transaction_builder/mod.rs
@@ -379,10 +379,14 @@ impl TransactionBuilder {
             return Err(TransactionBuilderError::InvalidInputCount(self.selected_inputs.len()));
         }
 
-        let remainder_address = self
-            .get_remainder_address()?
-            .ok_or(TransactionBuilderError::MissingInputWithEd25519Address)?
-            .0;
+        let remainder_address = match self.get_remainder_address()? {
+            Some(a) => a,
+            None => {
+                log::debug!("MissingInputWithEd25519Address from finish");
+                return Err(TransactionBuilderError::MissingInputWithEd25519Address);
+            }
+        }
+        .0;
 
         let mut added_amount_mana = HashMap::<Option<ChainId>, (u64, u64)>::new();
         for (chain_id, added_amount) in self.remainders.added_amount.drain() {
diff --git a/sdk/src/client/api/block_builder/transaction_builder/remainder.rs b/sdk/src/client/api/block_builder/transaction_builder/remainder.rs
index 66dcb1cf5e..838f1b498c 100644
--- a/sdk/src/client/api/block_builder/transaction_builder/remainder.rs
+++ b/sdk/src/client/api/block_builder/transaction_builder/remainder.rs
@@ -62,9 +62,13 @@ impl TransactionBuilder {
             mana_diff = mana_diff.saturating_sub(self.initial_mana_excess()?);
         }
 
-        let (remainder_address, chain) = self
-            .get_remainder_address()?
-            .ok_or(TransactionBuilderError::MissingInputWithEd25519Address)?;
+        let (remainder_address, chain) = match self.get_remainder_address()? {
+            Some(a) => a,
+            None => {
+                log::debug!("MissingInputWithEd25519Address from update_remainders");
+                return Err(TransactionBuilderError::MissingInputWithEd25519Address);
+            }
+        };
 
         // Amount can be just multiplied, because all remainder outputs with a native token have the same storage
         // cost.
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
index 78ee783059..0cbcb957d8 100644
--- a/sdk/src/client/api/block_builder/transaction_builder/requirement/mana.rs
+++ b/sdk/src/client/api/block_builder/transaction_builder/requirement/mana.rs
@@ -201,7 +201,10 @@ impl TransactionBuilder {
                     // than the current block index
                     match &required_address {
                         Address::Ed25519(_) | Address::ImplicitAccountCreation(_) => {}
-                        _ => Err(TransactionBuilderError::MissingInputWithEd25519Address)?,
+                        _ => {
+                            log::debug!("MissingInputWithEd25519Address from null_transaction_unlocks required_address {required_address:?}");
+                            Err(TransactionBuilderError::MissingInputWithEd25519Address)?
+                        }
                     }
 
                     let block = SignatureUnlock::new(
diff --git a/sdk/src/client/secret/mod.rs b/sdk/src/client/secret/mod.rs
index dccb4e6839..da2c480bbb 100644
--- a/sdk/src/client/secret/mod.rs
+++ b/sdk/src/client/secret/mod.rs
@@ -609,7 +609,10 @@ where
                 // than the current block index
                 match &required_address {
                     Address::Ed25519(_) | Address::ImplicitAccountCreation(_) => {}
-                    _ => Err(TransactionBuilderError::MissingInputWithEd25519Address)?,
+                    _ => {
+                        log::debug!("MissingInputWithEd25519Address from default_transaction_unlocks, required_address {required_address:?}");
+                        Err(TransactionBuilderError::MissingInputWithEd25519Address)?
+                    }
                 }
 
                 let chain = input.chain.ok_or(ClientError::MissingBip32Chain)?;