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

refactor: improve calculate_required_asset_amounts for contract calls #1576

Merged
merged 6 commits into from
Jan 17, 2025
Merged

refactor: improve calculate_required_asset_amounts for contract calls #1576

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31bb7e1
chore: improve calculate_require_asset_amounts fn
hal3e Jan 14, 2025
ed9f8fe
refactor: improve `calculate_required_asset_amounts` for contract calls
hal3e Jan 15, 2025
7a9bf56
Merge branch 'master' into hal3e/calculate-required-asset-amount-impr…
hal3e Jan 16, 2025
9a60109
merge master
hal3e Jan 17, 2025
39d54b1
Merge branch 'master' into hal3e/calculate-required-asset-amount-impr…
hal3e Jan 17, 2025
a3877c6
Merge branch 'master' into hal3e/calculate-required-asset-amount-impr…
hal3e Jan 17, 2025
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
49 changes: 15 additions & 34 deletions packages/fuels-programs/src/calls/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,46 +131,27 @@ pub(crate) fn calculate_required_asset_amounts(
calls: &[ContractCall],
base_asset_id: AssetId,
) -> Vec<(AssetId, u64)> {
let call_param_assets = calls
.iter()
.filter_map(|call| {
(call.call_parameters.amount() != 0).then_some((
call.call_parameters.asset_id().unwrap_or(base_asset_id),
call.call_parameters.amount(),
))
})
.collect::<Vec<_>>();
let call_param_assets = calls.iter().map(|call| {
(
call.call_parameters.asset_id().unwrap_or(base_asset_id),
call.call_parameters.amount(),
)
});

let custom_assets = calls
let grouped_assets = calls
.iter()
.flat_map(|call| call.custom_assets.iter().collect::<Vec<_>>())
.group_by(|custom| custom.0 .0)
.into_iter()
.map(|(asset_id, groups_w_same_asset_id)| {
let total_amount_in_group = groups_w_same_asset_id.map(|(_, amount)| amount).sum();
(asset_id, total_amount_in_group)
})
.collect::<Vec<_>>();

let merged_assets = chain!(call_param_assets, custom_assets).collect::<Vec<_>>();

sum_up_amounts_for_each_asset_id(merged_assets)
}

/// Sum up the amounts required in each call for each asset ID, so you can get a total for each
/// asset over all calls.
fn sum_up_amounts_for_each_asset_id(
amounts_per_asset_id: Vec<(AssetId, u64)>,
) -> Vec<(AssetId, u64)> {
amounts_per_asset_id
.into_iter()
.flat_map(|call| call.custom_assets.clone())
.map(|((asset_id, _), amount)| (asset_id, amount))
.chain(call_param_assets)
.sorted_by_key(|(asset_id, _)| *asset_id)
.group_by(|(asset_id, _)| *asset_id)
.group_by(|(asset_id, _)| *asset_id);

grouped_assets
.into_iter()
.map(|(asset_id, groups_w_same_asset_id)| {
.filter_map(|(asset_id, groups_w_same_asset_id)| {
let total_amount_in_group = groups_w_same_asset_id.map(|(_, amount)| amount).sum();

(asset_id, total_amount_in_group)
(total_amount_in_group != 0).then_some((asset_id, total_amount_in_group))
})
.collect()
}
Expand Down
Loading