dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Properly distinguish between open blocks which have no previous block, and pruned previous blocks.

Browse source
This commit is contained in:
Colin LeMahieu 2024-08-20 12:35:43 +01:00
commit ed11b94393
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nano/node/json_handler.cpp
View file

@ -2525,9 +2525,11 @@ public:
tree.put ("previous", block_a.hashables.previous.to_string ()); tree.put ("previous", block_a.hashables.previous.to_string ());
} }
auto balance (block_a.hashables.balance.number ()); auto balance (block_a.hashables.balance.number ());
auto previous_balance = handler.node.ledger.any.block_balance (transaction, block_a.hashables.previous); auto previous_balance_raw = handler.node.ledger.any.block_balance (transaction, block_a.hashables.previous);
if (!previous_balance) auto previous_balance = previous_balance_raw.value_or (0);
if (!block_a.hashables.previous.is_zero () && !previous_balance_raw.has_value ())
{ {
// If previous hash is non-zero and we can't query the balance, e.g. it's pruned, we can't determine the block type
if (raw) if (raw)
{ {
tree.put ("subtype", "unknown"); tree.put ("subtype", "unknown");
@ -2537,7 +2539,7 @@ public:
tree.put ("type", "unknown"); tree.put ("type", "unknown");
} }
} }
else if (balance < previous_balance.value ().number ()) else if (balance < previous_balance.number ())
{ {
if (should_ignore_account (block_a.hashables.link.as_account ())) if (should_ignore_account (block_a.hashables.link.as_account ()))
{ {
@ -2553,7 +2555,7 @@ public:
tree.put ("type", "send"); tree.put ("type", "send");
} }
tree.put ("account", block_a.hashables.link.to_account ()); tree.put ("account", block_a.hashables.link.to_account ());
tree.put ("amount", (previous_balance.value ().number () - balance).convert_to<std::string> ()); tree.put ("amount", (previous_balance.number () - balance).convert_to<std::string> ());
} }
else else
{ {
@ -2592,7 +2594,7 @@ public:
{ {
tree.put ("account", source_account.value ().to_account ()); tree.put ("account", source_account.value ().to_account ());
} }
tree.put ("amount", (balance - previous_balance.value ().number ()).convert_to<std::string> ()); tree.put ("amount", (balance - previous_balance.number ()).convert_to<std::string> ());
} }
} }
} }