From 07484ea18fc31aa78dc19e7932eda4a3e605475d Mon Sep 17 00:00:00 2001 From: Matias Romeo Date: Mon, 18 Dec 2023 17:30:47 -0300 Subject: [PATCH 1/2] ExecutionEngine::insert_block: Remove block cache check to allow reinsertion of blocks --- silkworm/node/stagedsync/execution_engine.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/silkworm/node/stagedsync/execution_engine.cpp b/silkworm/node/stagedsync/execution_engine.cpp index 4f9564b5..bffcd2c5 100644 --- a/silkworm/node/stagedsync/execution_engine.cpp +++ b/silkworm/node/stagedsync/execution_engine.cpp @@ -69,7 +69,6 @@ void ExecutionEngine::insert_blocks(const std::vector>& b bool ExecutionEngine::insert_block(const std::shared_ptr block) { Hash header_hash{block->header.hash()}; - if (block_cache_.get(header_hash)) return true; // ignore repeated blocks block_cache_.put(header_hash, block); if (block_progress_ < block->header.number) block_progress_ = block->header.number; From 4b94009719c04b2eb1d312136d877ae25f511c02 Mon Sep 17 00:00:00 2001 From: Matias Romeo Date: Mon, 18 Dec 2023 17:32:17 -0300 Subject: [PATCH 2/2] Add ExecutionEngine tests to verify A->B->A fork type --- .../node/stagedsync/execution_engine_test.cpp | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/silkworm/node/stagedsync/execution_engine_test.cpp b/silkworm/node/stagedsync/execution_engine_test.cpp index d38acb58..2887d10a 100644 --- a/silkworm/node/stagedsync/execution_engine_test.cpp +++ b/silkworm/node/stagedsync/execution_engine_test.cpp @@ -365,4 +365,62 @@ TEST_CASE("ExecutionEngine") { } } +TEST_CASE("ExecutionEngine test fork A->B->A") { + test::SetLogVerbosityGuard log_guard(log::Level::kNone); + + asio::io_context io; + asio::executor_work_guard work{io.get_executor()}; + + test::Context context; + context.add_genesis_data(); + context.commit_txn(); + + PreverifiedHashes::current.clear(); // disable preverified hashes + Environment::set_stop_before_stage(db::stages::kSendersKey); // only headers, block hashes and bodies + + db::RWAccess db_access{context.env()}; + ExecutionEngine_ForTest exec_engine{io, context.node_settings(), db_access}; + exec_engine.open(); + + auto& tx = exec_engine.main_chain_.tx(); // mdbx refuses to open a ROTxn when there is a RWTxn in the same thread + + auto header0_hash = db::read_canonical_hash(tx, 0); + REQUIRE(header0_hash.has_value()); + + auto header0 = db::read_canonical_header(tx, 0); + REQUIRE(header0.has_value()); + + SECTION("fork A->B->A") { + auto block1 = generateSampleChildrenBlock(*header0); + auto block2 = generateSampleChildrenBlock(block1->header); + auto block3 = generateSampleChildrenBlock(block2->header); + + // inserting & verifying the block + exec_engine.insert_block(block1); + exec_engine.insert_block(block2); + exec_engine.insert_block(block3); + + auto verification = exec_engine.verify_chain(block3->header.hash()).get(); + REQUIRE(holds_alternative(verification)); + + // creating a fork and changing the head (trigger unwind) + auto block2b = generateSampleChildrenBlock(block1->header); + block2b->header.extra_data = string_view_to_byte_view("I'm different"); // to make it different from block2 + exec_engine.insert_block(block2b); + + verification = exec_engine.verify_chain(block2b->header.hash()).get(); + REQUIRE(holds_alternative(verification)); + + // insert block3 again and verify + exec_engine.insert_block(block3); + verification = exec_engine.verify_chain(block3->header.hash()).get(); + REQUIRE(holds_alternative(verification)); + + CHECK(exec_engine.get_header(block1->header.hash()).has_value()); // we do not remove old blocks + CHECK(exec_engine.get_header(block2->header.hash()).has_value()); // we do not remove old blocks + CHECK(exec_engine.get_header(block2b->header.hash()).has_value()); // we do not remove old blocks + CHECK(exec_engine.get_header(block3->header.hash()).has_value()); // we do not remove old blocks + } +} + } // namespace silkworm