From c06b4ec3ba134124506c1a88661198e4dce917d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thoralf=20M=C3=BCller?= Date: Wed, 8 May 2024 17:20:00 +0200 Subject: [PATCH] Update check --- .../transaction_builder/requirement/mana.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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 cb7039a6ef..bdece56298 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 @@ -427,10 +427,9 @@ impl TransactionBuilder { work_score += self.protocol_parameters.work_score(&output); if let Some(allotment) = self.min_mana_allotment { // If we're allotting to this output account, we will have more mana from the reduction. - if output - .as_account_opt() - .is_some_and(|account| account.account_id() == &allotment.issuer_id) - { + if output.as_account_opt().is_some_and(|account| { + account.is_block_issuer() && account.account_id() == &allotment.issuer_id + }) { // We can regain as much as the full account mana value // by reducing the mana on the account. let new_required_allotment = allotment.required_allotment.unwrap_or_default() @@ -438,6 +437,7 @@ impl TransactionBuilder { mana_gained += new_required_allotment.min(output.mana()); } } + mana_gained = mana_gained.saturating_sub(output.mana()); } else if input.output.native_token().is_some() { remainder_work_score += self.protocol_parameters.work_score(self.native_token_remainder()) } else if mana_gained > missing_mana { @@ -450,7 +450,14 @@ impl TransactionBuilder { mana_gained = mana_gained.saturating_sub(work_score as u64 * allotment.reference_mana_cost); } - if mana_gained == 0 { + if mana_gained == 0 + && !(input.output.as_account_opt().is_some_and(|account| { + account.is_block_issuer() + && self + .min_mana_allotment + .is_some_and(|allotment| *account.account_id() == allotment.issuer_id) + })) + { return None; }