Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix MissingInputWithEd25519Address error #2207

Merged
merged 5 commits into from
Mar 27, 2024
Merged

Fix MissingInputWithEd25519Address error #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5697e6a
logs
thibault-martinez Mar 27, 2024
4a3d5e6
add log
thibault-martinez Mar 27, 2024
64a0395
Insert mana requirement in first position
thibault-martinez Mar 27, 2024
7ba8a0c
rework amount requirement so it doesn't try to get the allotment befo…
Mar 27, 2024
4c2636e
Remove logs
thibault-martinez Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions sdk/src/client/api/block_builder/transaction_builder/requirement/amount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(());
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/client/api/block_builder/transaction_builder/requirement/mana.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
Expand Down
Loading