Fixes in post merge sync + change sepolia configs (#4086)

* NLog * uncomment fcu Code * fastSyncTransition fix for sync? * ignore pivot comment * Make PeerRefresher more sophisticated with batching (cherry picked from commit a553d9c) # Conflicts: # src/Nethermind/Nethermind.Synchronization.Test/SynchronizerTests.cs * Move to mainnet-shadowfork-5 (cherry picked from commit c62619c) * all peers? * fix build * cleanup in beacon pivot * NLog change * more logging - block tree * more logs * hive plugin fix && sepolia fast sync * fix sepolia.cfg & edit sepolia bootnodes * fix eth tests * cleanup * revert NLog changes * Engine api handlers refactorings and cleanups * fix test * change run-run-merge-hive-tests on-push * fix build * refactoring to StateReader * add logs, fix PoSSwitcher decoding * one more fix? * refactoring BlockchainProcessor * fix ignore parent not on main chain Co-authored-by: lukasz.rozmej <lukasz.rozmej@gmail.com>
NethermindEth · Jun 1, 2022 · ac0b971 · ac0b971
1 parent 3a43e36
commit ac0b971
Show file tree

Hide file tree

Showing 68 changed files with 731 additions and 639 deletions.
diff --git a/.github/workflows/run-merge-hive-tests.yml b/.github/workflows/run-merge-hive-tests.yml
@@ -1,8 +1,11 @@
 name: '[RUN] Merge Hive Tests'
+
 on: 
   push:
-    branches: [ kiln ]
+    tags:
+    - '*'
   workflow_dispatch:
+
 jobs:
   build-dockers:
     runs-on: ubuntu-latest

diff --git a/src/Nethermind/Chains/mainnet_shadowfork.json b/src/Nethermind/Chains/mainnet_shadowfork.json
@@ -180,7 +180,7 @@
     "eip3198Transition": "0xC5D488",
     "eip3529Transition": "0xC5D488",
     "eip3541Transition": "0xC5D488",
-    "MergeForkIdTransition": "0xeef7a3"
+    "MergeForkIdTransition": "0xef2e92"
   },
   "genesis": {
     "seal": {
@@ -3847,47 +3847,9 @@
     ]
   },
   "nodes": [
-    "enode://3121479bdb80ad8addab60694083ee83706e47c05523cdda4cbdaf5683794d67b3dbcad848a085dd823d9fb60df3483b50459950d5d9ec23e3373e7bd58e5819@165.227.100.193:30303",
-    "enode://06899e1abf67b53dd0c6e10dafa238c7b71e361583353c928fed2aa7642d05e3d7755cb3f934bfdcf4fe563996720fb8c74de356d5dda0329b65d1d23a389c90@143.110.188.48:30303",
-    "enode://36ad5c6e0a10e58234cf9e17bd07107f1ed69659d27d3f0510bc9d8c109d6898d4bb7e20a64e69ee13fc8cc67e0a7291a09f6efd5a6ee26b26ad99d8f8458717@157.230.27.43:30303",
-    "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
-    "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303",
-    "enode://8499da03c47d637b20eee24eec3c356c9a2e6148d6fe25ca195c7949ab8ec2c03e3556126b0d7ed644675e78c4318b08691b7b57de10e5f0d40d05b09238fa0a@52.187.207.27:30303",
-    "enode://103858bdb88756c71f15e9b5e09b56dc1be52f0a5021d46301dbbfb7e130029cc9d0d6f73f693bc29b665770fff7da4d34f3c6379fe12721b5d7a0bcb5ca1fc1@191.234.162.198:30303",
-    "enode://715171f50508aba88aecd1250af392a45a330af91d7b90701c436b618c86aaa1589c9184561907bebbb56439b8f8787bc01f49a7c77276c58c1b09822d75e8e8@52.231.165.108:30303",
-    "enode://5d6d7cd20d6da4bb83a1d28cadb5d409b64edf314c0335df658c1a54e32c7c4a7ab7823d57c39b6a757556e68ff1df17c748b698544a55cb488b52479a92b60f@104.42.217.25:30303",
-    "enode://81863f47e9bd652585d3f78b4b2ee07b93dad603fd9bc3c293e1244250725998adc88da0cef48f1de89b15ab92b15db8f43dc2b6fb8fbd86a6f217a1dd886701@193.70.55.37:30303",
-    "enode://4afb3a9137a88267c02651052cf6fb217931b8c78ee058bb86643542a4e2e0a8d24d47d871654e1b78a276c363f3c1bc89254a973b00adc359c9e9a48f140686@144.217.139.5:30303",
-    "enode://c16d390b32e6eb1c312849fe12601412313165df1a705757d671296f1ac8783c5cff09eab0118ac1f981d7148c85072f0f26407e5c68598f3ad49209fade404d@139.99.51.203:30303",
-    "enode://4faf867a2e5e740f9b874e7c7355afee58a2d1ace79f7b692f1d553a1134eddbeb5f9210dd14dc1b774a46fd5f063a8bc1fa90579e13d9d18d1f59bac4a4b16b@139.99.160.213:30303",
-    "enode://6a868ced2dec399c53f730261173638a93a40214cf299ccf4d42a76e3fa54701db410669e8006347a4b3a74fa090bb35af0320e4bc8d04cf5b7f582b1db285f5@163.172.131.191:30303",
-    "enode://66a483383882a518fcc59db6c017f9cd13c71261f13c8d7e67ed43adbbc82a932d88d2291f59be577e9425181fc08828dc916fdd053af935a9491edf9d6006ba@212.47.247.103:30303",
-    "enode://cd6611461840543d5b9c56fbf088736154c699c43973b3a1a32390cf27106f87e58a818a606ccb05f3866de95a4fe860786fea71bf891ea95f234480d3022aa3@163.172.157.114:30303",
-    "enode://1d1f7bcb159d308eb2f3d5e32dc5f8786d714ec696bb2f7e3d982f9bcd04c938c139432f13aadcaf5128304a8005e8606aebf5eebd9ec192a1471c13b5e31d49@138.201.223.35:30303",
-    "enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
-    "enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303",
-    "enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303",
-    "enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303",
-    "enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
-    "enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303",
-    "enode://0cc5f5ffb5d9098c8b8c62325f3797f56509bff942704687b6530992ac706e2cb946b90a34f1f19548cd3c7baccbcaea354531e5983c7d1bc0dee16ce4b6440b@40.118.3.223:30305",
-    "enode://1c7a64d76c0334b0418c004af2f67c50e36a3be60b5e4790bdac0439d21603469a85fad36f2473c9a80eb043ae60936df905fa28f1ff614c3e5dc34f15dcd2dc@40.118.3.223:30308",
-    "enode://85c85d7143ae8bb96924f2b54f1b3e70d8c4d367af305325d30a61385a432f247d2c75c45c6b4a60335060d072d7f5b35dd1d4c45f76941f62a4f83b6e75daaf@40.118.3.223:30309",
-    "enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303",
-    "enode://4cd540b2c3292e17cff39922e864094bf8b0741fcc8c5dcea14957e389d7944c70278d872902e3d0345927f621547efa659013c400865485ab4bfa0c6596936f@138.201.144.135:30303",
-    "enode://01f76fa0561eca2b9a7e224378dd854278735f1449793c46ad0c4e79e8775d080c21dcc455be391e90a98153c3b05dcc8935c8440de7b56fe6d67251e33f4e3c@51.15.42.252:30303",
-    "enode://2c9059f05c352b29d559192fe6bca272d965c9f2290632a2cfda7f83da7d2634f3ec45ae3a72c54dd4204926fb8082dcf9686e0d7504257541c86fc8569bcf4b@163.172.171.38:30303",
-    "enode://efe4f2493f4aff2d641b1db8366b96ddacfe13e7a6e9c8f8f8cf49f9cdba0fdf3258d8c8f8d0c5db529f8123c8f1d95f36d54d590ca1bb366a5818b9a4ba521c@163.172.187.252:30303",
-    "enode://bcc7240543fe2cf86f5e9093d05753dd83343f8fda7bf0e833f65985c73afccf8f981301e13ef49c4804491eab043647374df1c4adf85766af88a624ecc3330e@136.243.154.244:30303",
-    "enode://ed4227681ca8c70beb2277b9e870353a9693f12e7c548c35df6bca6a956934d6f659999c2decb31f75ce217822eefca149ace914f1cbe461ed5a2ebaf9501455@88.212.206.70:30303",
-    "enode://cadc6e573b6bc2a9128f2f635ac0db3353e360b56deef239e9be7e7fce039502e0ec670b595f6288c0d2116812516ad6b6ff8d5728ff45eba176989e40dead1e@37.128.191.230:30303",
-    "enode://595a9a06f8b9bc9835c8723b6a82105aea5d55c66b029b6d44f229d6d135ac3ecdd3e9309360a961ea39d7bee7bac5d03564077a4e08823acc723370aace65ec@46.20.235.22:30303",
-    "enode://029178d6d6f9f8026fc0bc17d5d1401aac76ec9d86633bba2320b5eed7b312980c0a210b74b20c4f9a8b0b2bf884b111fa9ea5c5f916bb9bbc0e0c8640a0f56c@216.158.85.185:30303",
-    "enode://fdd1b9bb613cfbc200bba17ce199a9490edc752a833f88d4134bf52bb0d858aa5524cb3ec9366c7a4ef4637754b8b15b5dc913e4ed9fdb6022f7512d7b63f181@212.47.247.103:30303",
-    "enode://cc26c9671dffd3ee8388a7c8c5b601ae9fe75fc0a85cedb72d2dd733d5916fad1d4f0dcbebad5f9518b39cc1f96ba214ab36a7fa5103aaf17294af92a89f227b@52.79.241.155:30303",
-    "enode://140872ce4eee37177fbb7a3c3aa4aaebe3f30bdbf814dd112f6c364fc2e325ba2b6a942f7296677adcdf753c33170cb4999d2573b5ff7197b4c1868f25727e45@52.78.149.82:30303",
-    "enode://2b252ab6a1d0f971d9722cb839a42cb81db019ba44c08754628ab4a823487071b5695317c8ccd085219c3a03af063495b2f1da8d18218da2d6a82981b45e6ffc@65.108.70.101:30303",
-    "enode://4aeb4ab6c14b23e2c4cfdce879c04b0748a20d8e9b59e25ded2a08143e265c6c25936e74cbc8e641e3312ca288673d91f2f93f8e277de3cfa444ecdaaf982052@157.90.35.166:30303"
+    "enode://ca855d0f6058d39596226031dccca3177a3aff85bec21fcba07fef475494070b9e8625aa3304aca00e9d81604c5d514cece14a9f2e00acced648dc00a4ca0d85@161.35.156.235:30303",
+    "enode://3dce2b885ad1980507d1df9fe04ec3d499c8b91e845503a33396a6a5e01b24e0196edc8f16d57e2513783678e624206c399caf1d06c6df97f7dab22723db672d@161.35.157.54:30303",
+    "enode://b23ca7fbd0425b0a4cb4bb131c9bfb71fa7bedc4510a1afc893ccd3862512ecb11ea8f3b6e31884858656baf37c94baef5f8f5087bce3080324630a5a3362985@104.248.15.135:30303"
   ],
   "accounts": {
     "0x0000000000000000000000000000000000000001": {

diff --git a/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs b/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs
@@ -169,6 +169,7 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
                 blockTree,
                 blockProcessor,
                 new RecoverSignatures(ecdsa, NullTxPool.Instance, specProvider, _logManager),
+                stateReader,
                 _logManager,
                 BlockchainProcessor.Options.NoReceipts);
 

diff --git a/src/Nethermind/Nethermind.Blockchain.Test/BlockchainProcessorTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/BlockchainProcessorTests.cs
@@ -32,6 +32,8 @@
 using Nethermind.Logging;
 using Nethermind.State.Repositories;
 using Nethermind.Db.Blooms;
+using Nethermind.State;
+using Nethermind.Trie.Pruning;
 using Nethermind.TxPool;
 using NUnit.Framework;
 
@@ -193,12 +195,15 @@ public ProcessingTestContext(bool startProcessor)
                 MemDb blockDb = new();
                 MemDb blockInfoDb = new();
                 MemDb headersDb = new();
+
+                MemDb stateDb = new();
                 Block genesis = Build.A.Block.Genesis.TestObject;
+
 
                 _blockTree = new BlockTree(blockDb, headersDb, blockInfoDb, new ChainLevelInfoRepository(blockInfoDb), MainnetSpecProvider.Instance, NullBloomStorage.Instance, LimboLogs.Instance);
                 _blockProcessor = new BlockProcessorMock(_logManager);
                 _recoveryStep = new RecoveryStepMock(_logManager);
-                _processor = new BlockchainProcessor(_blockTree, _blockProcessor, _recoveryStep, LimboLogs.Instance, BlockchainProcessor.Options.Default);
+                _processor = new BlockchainProcessor(_blockTree, _blockProcessor, _recoveryStep, new StateReader(new TrieStore(stateDb, LimboLogs.Instance), new MemDb(), LimboLogs.Instance), LimboLogs.Instance, BlockchainProcessor.Options.Default);
                 _resetEvent = new AutoResetEvent(false);
 
                 _blockTree.NewHeadBlock += (sender, args) =>

diff --git a/src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs
@@ -70,6 +70,7 @@ public void Test()
                 trieStore,
                 dbProvider.RegisteredDbs[DbNames.Code],
                 LimboLogs.Instance);
+            StateReader stateReader = new(trieStore, dbProvider.GetDb<IDb>(DbNames.State), LimboLogs.Instance);
             StorageProvider storageProvider = new(trieStore, stateProvider, LimboLogs.Instance);
             BlockhashProvider blockhashProvider = new(blockTree, LimboLogs.Instance);
             VirtualMachine virtualMachine = new(
@@ -96,6 +97,7 @@ public void Test()
                 blockTree,
                 blockProcessor,
                 NullRecoveryStep.Instance,
+                stateReader,
                 LimboLogs.Instance,
                 BlockchainProcessor.Options.Default);
             BuildBlocksWhenRequested trigger = new();

diff --git a/src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs
@@ -57,7 +57,8 @@ public void Setup()
         {
             IDbProvider memDbProvider = TestMemDbProvider.Init();
             TrieStore trieStore = new (new MemDb(), LimboLogs.Instance);
-            StateProvider stateProvider = new (trieStore, memDbProvider.CodeDb, LimboLogs.Instance);
+            StateProvider stateProvider = new(trieStore, memDbProvider.CodeDb, LimboLogs.Instance);
+            StateReader stateReader = new(trieStore, memDbProvider.CodeDb, LimboLogs.Instance);
             StorageProvider storageProvider = new (trieStore, stateProvider, LimboLogs.Instance);
             ChainLevelInfoRepository chainLevelInfoRepository = new (memDbProvider);
             ISpecProvider specProvider = MainnetSpecProvider.Instance;
@@ -109,6 +110,7 @@ public void Setup()
                     txPool,
                     specProvider,
                     LimboLogs.Instance),
+                stateReader,
                 LimboLogs.Instance, BlockchainProcessor.Options.Default);
         }
 

diff --git a/src/Nethermind/Nethermind.Blockchain.Test/Visitors/StartupTreeFixerTests.cs b/src/Nethermind/Nethermind.Blockchain.Test/Visitors/StartupTreeFixerTests.cs
@@ -118,7 +118,7 @@ public async Task Suggesting_blocks_works_correctly_after_processor_restart(int
 
             // simulating restarts - we stopped the old blockchain processor and create the new one
             BlockchainProcessor newBlockchainProcessor = new(tree, testRpc.BlockProcessor,
-                testRpc.BlockPreprocessorStep, LimboLogs.Instance, BlockchainProcessor.Options.Default);
+                testRpc.BlockPreprocessorStep, testRpc.StateReader, LimboLogs.Instance, BlockchainProcessor.Options.Default);
             newBlockchainProcessor.Start();
             testRpc.BlockchainProcessor = newBlockchainProcessor;
 
@@ -151,7 +151,7 @@ public async Task Fixer_should_not_suggest_block_without_state(int suggestedBloc
 
             // simulating restarts - we stopped the old blockchain processor and create the new one
             BlockchainProcessor newBlockchainProcessor = new(tree, testRpc.BlockProcessor,
-                testRpc.BlockPreprocessorStep, LimboLogs.Instance, BlockchainProcessor.Options.Default);
+                testRpc.BlockPreprocessorStep, testRpc.StateReader, LimboLogs.Instance, BlockchainProcessor.Options.Default);
             newBlockchainProcessor.Start();
             testRpc.BlockchainProcessor = newBlockchainProcessor;
 
@@ -174,7 +174,7 @@ public async Task Fixer_should_not_suggest_block_with_null_block()
 
             // simulating restarts - we stopped the old blockchain processor and create the new one
             BlockchainProcessor newBlockchainProcessor = new(tree, testRpc.BlockProcessor,
-                testRpc.BlockPreprocessorStep, LimboLogs.Instance, BlockchainProcessor.Options.Default);
+                testRpc.BlockPreprocessorStep, testRpc.StateReader, LimboLogs.Instance, BlockchainProcessor.Options.Default);
             newBlockchainProcessor.Start();
             testRpc.BlockchainProcessor = newBlockchainProcessor;
 

diff --git a/src/Nethermind/Nethermind.Blockchain/BlockTree.cs b/src/Nethermind/Nethermind.Blockchain/BlockTree.cs
@@ -719,9 +719,12 @@ private AddBlockResult Suggest(Block? block, BlockHeader header,
             if (_logger.IsTrace)
                 _logger.Trace(
                     $"Suggesting a new block. BestSuggestedBlock {BestSuggestedBody}, BestSuggestedBlock TD {BestSuggestedBody?.TotalDifficulty}, Block TD {block?.TotalDifficulty}, Head: {Head}, Head TD: {Head?.TotalDifficulty}, Block {block?.ToString(Block.Format.FullHashAndNumber)}. ShouldProcess: {shouldProcess}, TryProcessKnownBlock: {fillBeaconBlock}");
+
+            if (_logger.IsTrace && shouldProcess == true && fillBeaconBlock == false)
+                _logger.Trace($"StackTrace: {new System.Diagnostics.StackTrace()}");
 #if DEBUG
-            /* this is just to make sure that we do not fall into this trap when creating tests */
-            if (header.StateRoot is null && !header.IsGenesis)
+        /* this is just to make sure that we do not fall into this trap when creating tests */
+        if (header.StateRoot is null && !header.IsGenesis)
             {
                 throw new InvalidDataException($"State root is null in {header.ToString(BlockHeader.Format.Short)}");
             }

diff --git a/src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs b/src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs
@@ -147,7 +147,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                     NullWitnessCollector.Instance,
                     nodeLogManager);
 
-                BlockchainProcessor processor = new(blockTree, blockProcessor, new AuthorRecoveryStep(snapshotManager), nodeLogManager, BlockchainProcessor.Options.NoReceipts);
+                BlockchainProcessor processor = new(blockTree, blockProcessor, new AuthorRecoveryStep(snapshotManager), stateReader, nodeLogManager, BlockchainProcessor.Options.NoReceipts);
                 processor.Start();
 
                 IReadOnlyTrieStore minerTrieStore = trieStore.AsReadOnly();
@@ -168,7 +168,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                     NullWitnessCollector.Instance,
                     nodeLogManager);
 
-                BlockchainProcessor minerProcessor = new(blockTree, minerBlockProcessor, new AuthorRecoveryStep(snapshotManager), nodeLogManager, BlockchainProcessor.Options.NoReceipts);
+                BlockchainProcessor minerProcessor = new(blockTree, minerBlockProcessor, new AuthorRecoveryStep(snapshotManager), stateReader, nodeLogManager, BlockchainProcessor.Options.NoReceipts);
 
                 if (withGenesisAlreadyProcessed)
                 {

diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs b/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs
@@ -257,6 +257,7 @@ BlockProducerEnv Create()
                         readOnlyBlockTree,
                         blockProcessor,
                         _api.BlockPreprocessor,
+                        txProcessingEnv.StateReader,
                         _api.LogManager,
                         BlockchainProcessor.Options.NoReceipts);
 

diff --git a/src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs b/src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs
@@ -126,6 +126,7 @@ public Task<IBlockProducer> InitBlockProducer(IBlockProductionTrigger? blockProd
                 readOnlyBlockTree,
                 producerProcessor,
                 getFromApi.BlockPreprocessor,
+                getFromApi.StateReader,
                 getFromApi.LogManager,
                 BlockchainProcessor.Options.NoReceipts);
 

diff --git a/src/Nethermind/Nethermind.Consensus.Ethash/NethDevPlugin.cs b/src/Nethermind/Nethermind.Consensus.Ethash/NethDevPlugin.cs
@@ -99,6 +99,7 @@ public Task<IBlockProducer> InitBlockProducer(IBlockProductionTrigger? blockProd
                 readOnlyBlockTree,
                 producerProcessor,
                 getFromApi.BlockPreprocessor,
+                getFromApi.StateReader,
                 getFromApi.LogManager,
                 BlockchainProcessor.Options.NoReceipts);
 

diff --git a/src/Nethermind/Nethermind.Consensus/IPoSSwitcher.cs b/src/Nethermind/Nethermind.Consensus/IPoSSwitcher.cs
@@ -32,10 +32,15 @@ public interface IPoSSwitcher
 
         UInt256? TerminalTotalDifficulty { get; }
 
-        // Final total difficulty is total difficulty of the last PoW block. FinalTotalDifficulty >= TerminalTotalDifficulty.
-        // TerminalTotalDifficulty is trigger for transition process. However, the last PoW block will be bigger than TTD.
-        // Thanks to this variable, we can simplify many things in our code. For example, we can insert newPayload with FinalTotalDifficulty
-        // This value will be known after the merge transition, and we can configure it in the first release after the merge.
+        /// <summary>
+        /// Total difficulty is total difficulty of the last PoW block.
+        /// </summary>
+        /// <remarks>
+        /// FinalTotalDifficulty >= TerminalTotalDifficulty.
+        /// TerminalTotalDifficulty is trigger for transition process. However, the last PoW block will be bigger than TTD.
+        /// Thanks to this variable, we can simplify many things in our code. For example, we can insert newPayload with FinalTotalDifficulty
+        /// This value will be known after the merge transition, and we can configure it in the first release after the merge.
+        /// </remarks>
         UInt256? FinalTotalDifficulty { get; }
 
         bool TransitionFinished { get; }
@@ -55,4 +60,11 @@ public interface IPoSSwitcher
 
         bool IsPostMerge(BlockHeader header);
     }
+
+    public static class PoSSwitcherExtensions
+    {
+        public static bool MisconfiguredTerminalTotalDifficulty(this IPoSSwitcher poSSwitcher) => poSSwitcher.TerminalTotalDifficulty is null;
+
+        public static bool BlockBeforeTerminalTotalDifficulty(this IPoSSwitcher poSSwitcher, BlockHeader blockHeader) => blockHeader.TotalDifficulty < poSSwitcher.TerminalTotalDifficulty;
+    }
 }