Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fixed asset_emission_and_unconfirmed_balance

Browse source
This commit is contained in:
cryptozoidberg 2024-07-24 23:49:00 +04:00
parent 270bb925f5
commit 12c5a0237b
No known key found for this signature in database
GPG key ID: 2E10CC61CAC8F36D
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/wallet/wallet2.cpp
View file

@ -3703,12 +3703,13 @@ bool wallet2::balance(std::unordered_map<crypto::public_key, wallet_public::asse
m_has_bare_unspent_outputs = true;
}
}
std::unordered_map<crypto::public_key, bool> subtransfers_by_assets_map;
for(auto& utx : m_unconfirmed_txs)
{
for (auto& subtransfer : utx.second.subtransfers)
{
wallet_public::asset_balance_entry_base& e = balances[subtransfer.asset_id];
subtransfers_by_assets_map[subtransfer.asset_id] = subtransfer.is_income;
if (subtransfer.is_income)
{
e.total += subtransfer.amount;
@ -3729,16 +3730,27 @@ bool wallet2::balance(std::unordered_map<crypto::public_key, wallet_public::asse
}
}
}
if (utx.second.has_outgoing_entries())
{
//has outgoing entries for each asset
//if (utx.second.has_outgoing_entries())
//{
//collect change to unconfirmed
for (const auto& emp_entry : utx.second.employed_entries.receive)
{
wallet_public::asset_balance_entry_base& e = balances[emp_entry.asset_id];
e.total += emp_entry.amount;
auto it_employed_entry = subtransfers_by_assets_map.find(emp_entry.asset_id);
if (it_employed_entry == subtransfers_by_assets_map.end())
{
LOG_ERROR("Intenral error, check the wallet code at give location");
continue;
}
if (!(it_employed_entry->second)) // if is_incoming == false, then we need to check for change and add it to total
{
wallet_public::asset_balance_entry_base& e = balances[emp_entry.asset_id];
e.total += emp_entry.amount;
}
}
}
//}
}
return true;

2
tests/core_tests/chaingen_main.cpp
View file

@ -1289,7 +1289,7 @@ int main(int argc, char* argv[])
GENERATE_AND_PLAY(zarcanum_block_with_txs);
GENERATE_AND_PLAY(asset_depoyment_and_few_zc_utxos);
GENERATE_AND_PLAY_HF(assets_and_pos_mining, "4-*");
// GENERATE_AND_PLAY_HF(asset_emission_and_unconfirmed_balance, "4-*");
GENERATE_AND_PLAY_HF(asset_emission_and_unconfirmed_balance, "4-*");
GENERATE_AND_PLAY_HF(pos_fuse_test, "4-*");