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

Remove delegation and implicit accounts amounts from available balance #2181

Merged
merged 9 commits into from
Mar 20, 2024
Merged

Remove delegation and implicit accounts amounts from available balance #2181

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
133ff7e
Remove delegation and implicit accounts amounts from available balance
Thoralf-M Mar 14, 2024
6790654
Merge branch '2.0' into balance-delegation-implicit-accounts
Thoralf-M Mar 14, 2024
14c34de
Merge branch '2.0' into balance-delegation-implicit-accounts
thibault-martinez Mar 20, 2024
208e26c
Merge delegation_implicit_accounts_amount with locked_amount
Thoralf-M Mar 20, 2024
bde0f66
Merge branch '2.0' into balance-delegation-implicit-accounts
Thoralf-M Mar 20, 2024
87e0c1f
Merge delegation_implicit_accounts_amount with locked_amount
Thoralf-M Mar 20, 2024
cabcb91
Use is_implicit_account_creation()
Thoralf-M Mar 20, 2024
f197796
Remove unused import
Thoralf-M Mar 20, 2024
acd4139
Merge branch '2.0' into balance-delegation-implicit-accounts
Mar 20, 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
21 changes: 17 additions & 4 deletions sdk/src/wallet/operations/balance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ use primitive_types::U256;

use crate::{
client::secret::SecretManage,
types::block::output::{
unlock_condition::UnlockCondition, DecayedMana, FoundryId, MinimumOutputAmount, NativeTokensBuilder, Output,
types::block::{
address::ImplicitAccountCreationAddress,
output::{
unlock_condition::UnlockCondition, DecayedMana, FoundryId, MinimumOutputAmount, NativeTokensBuilder, Output,
},
},
wallet::{
operations::{helpers::time::can_output_be_unlocked_from_now_on, output_claiming::OutputsToClaim},
Expand All @@ -32,6 +35,7 @@ impl<S: 'static + SecretManage> Wallet<S> {

let mut balance = Balance::default();
let mut total_storage_cost = 0;
let mut delegation_implicit_accounts_amount = 0;
let mut total_native_tokens = NativeTokensBuilder::default();

#[cfg(feature = "participation")]
Expand Down Expand Up @@ -110,6 +114,7 @@ impl<S: 'static + SecretManage> Wallet<S> {
Output::Delegation(delegation) => {
// Add amount
balance.base_coin.total += delegation.amount();
delegation_implicit_accounts_amount += delegation.amount();
// Add mana rewards
reward_outputs.insert(*output_id);
// Add storage deposit
Expand All @@ -124,7 +129,7 @@ impl<S: 'static + SecretManage> Wallet<S> {
_ => {
// If there is only an [AddressUnlockCondition], then we can spend the output at any time
// without restrictions
if let [UnlockCondition::Address(_)] = output
if let [UnlockCondition::Address(address_unlock_cond)] = output
.unlock_conditions()
.expect("output needs to have unlock conditions")
.as_ref()
Expand All @@ -137,6 +142,9 @@ impl<S: 'static + SecretManage> Wallet<S> {

// Add amount
balance.base_coin.total += output.amount();
if address_unlock_cond.address().kind() == ImplicitAccountCreationAddress::KIND {
thibault-martinez marked this conversation as resolved.
Show resolved Hide resolved
delegation_implicit_accounts_amount += output.amount();
}
// Add decayed mana
balance.mana.total += output.decayed_mana(
&protocol_parameters,
Expand Down Expand Up @@ -338,13 +346,18 @@ impl<S: 'static + SecretManage> Wallet<S> {

#[cfg(not(feature = "participation"))]
{
balance.base_coin.available = balance.base_coin.total.saturating_sub(locked_amount);
balance.base_coin.available = balance
.base_coin
.total
.saturating_sub(delegation_implicit_accounts_amount)
DaughterOfMars marked this conversation as resolved.
Show resolved Hide resolved
.saturating_sub(locked_amount);
thibault-martinez marked this conversation as resolved.
Show resolved Hide resolved
}
#[cfg(feature = "participation")]
{
balance.base_coin.available = balance
.base_coin
.total
.saturating_sub(delegation_implicit_accounts_amount)
.saturating_sub(locked_amount)
.saturating_sub(balance.base_coin.voting_power);
}
Expand Down
Loading