From 07e7a1d8db3f25152cc0d862661ca6dd36f7dd9d Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Thu, 29 Mar 2018 13:40:09 -0400 Subject: [PATCH] Update bootstrap fork resolution to handle open blocks (#760) --- rai/node/bootstrap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rai/node/bootstrap.cpp b/rai/node/bootstrap.cpp index cf2fac4e..02b5c907 100644 --- a/rai/node/bootstrap.cpp +++ b/rai/node/bootstrap.cpp @@ -988,7 +988,7 @@ void rai::bootstrap_attempt::process_fork (MDB_txn * transaction_a, std::shared_ void rai::bootstrap_attempt::try_resolve_fork (MDB_txn * transaction_a, std::shared_ptr block_a, bool from_processor) { std::weak_ptr this_w (shared_from_this ()); - if (!node->store.block_exists (transaction_a, block_a->hash ()) && node->store.block_exists (transaction_a, block_a->root ())) + if (!node->store.block_exists (transaction_a, block_a->hash ()) && (node->store.block_exists (transaction_a, block_a->root ()) || node->store.account_exists (transaction_a, block_a->root ()))) { std::shared_ptr ledger_block (node->ledger.forked_block (transaction_a, *block_a)); if (ledger_block)