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

Handle rollbacks when cementing

Browse source
This commit is contained in:
Piotr Wójcik 2024-10-12 11:59:17 +02:00
commit 0747d4afe4
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nano/node/confirming_set.cpp
View file

@ -1,6 +1,7 @@
#include <nano/lib/thread_roles.hpp>
#include <nano/node/confirming_set.hpp>
#include <nano/secure/ledger.hpp>
#include <nano/secure/ledger_set_any.hpp>
#include <nano/secure/ledger_set_confirmed.hpp>
#include <nano/store/component.hpp>
#include <nano/store/write_queue.hpp>
@ -180,6 +181,13 @@ void nano::confirming_set::run_batch (std::unique_lock<std::mutex> & lock)
stats.inc (nano::stat::type::confirming_set, nano::stat::detail::cementing);
// The block might be rolled back before it's fully cemented
if (!ledger.any.block_exists (transaction, hash))
{
stats.inc (nano::stat::type::confirming_set, nano::stat::detail::missing_block);
break;
}
auto added = ledger.confirm (transaction, hash, config.max_blocks);
if (!added.empty ())
{

5
nano/secure/ledger.cpp
View file

@ -865,7 +865,10 @@ std::deque<std::shared_ptr<nano::block>> nano::ledger::confirm (secure::write_tr
bool refreshed = transaction.refresh_if_needed ();
if (refreshed)
{
release_assert (any.block_exists (transaction, target_hash), "block was rolled back during cementing");
if (!any.block_exists (transaction, target_hash))
{
break; // Block was rolled back during cementing
}
}
// Early return might leave parts of the dependency tree unconfirmed