Deprecate FastBlock Flag

src/Nethermind/Nethermind.Blockchain/Synchronization/ISyncConfig.cs

@@ -28,7 +28,8 @@ public interface ISyncConfig : IConfig
     [ConfigItem(Description = "In Fast sync mode, the min height threshold limit up to which the Full sync, if already on, stays on when the chain is behind the network head. If the limit is exceeded, it switches back to Fast sync. For regular usage scenarios, setting this value lower than 32 is not recommended as this can cause issues with chain reorgs. Note that the last 2 blocks are always processed in Full sync, so setting it lower than 2 has no effect.", DefaultValue = "8192")]
     long? FastSyncCatchUpHeightDelta { get; set; }
 
-    [ConfigItem(Description = "Whether to first download blocks from the provided pivot number downwards in the Fast sync mode. This allows for parallelization of requests with many sync peers and with no need to worry about syncing a valid branch (syncing downwards to 0). You need to provide the pivot block number, hash, and total difficulty from a trusted source (e.g., Etherscan) and confirm with other sources if you want to change it.", DefaultValue = "false")]
+    [Obsolete]
+    [ConfigItem(Description = "Deprecated.", DefaultValue = "false", HiddenFromDocs = true)]
     bool FastBlocks { get; set; }
 
     [ConfigItem(Description = "Whether to make smaller requests, in Fast Blocks mode, to avoid Geth from disconnecting. On the Geth-heavy networks (e.g., Mainnet), it's  a desired behavior while on Nethermind- or OpenEthereum-heavy networks (Goerli, Aura), it slows down the sync by a factor of ~4.", DefaultValue = "true")]

src/Nethermind/Nethermind.Blockchain/Synchronization/SyncConfig.cs

@@ -1,6 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
-
 using Nethermind.Config;
 using Nethermind.Db;
 
@@ -13,10 +12,9 @@ public class SyncConfig : ISyncConfig
         private bool _fastSync;
 
         public static ISyncConfig Default { get; } = new SyncConfig();
-        public static ISyncConfig WithFullSyncOnly { get; } = new SyncConfig { FastSync = false, FastBlocks = false };
+        public static ISyncConfig WithFullSyncOnly { get; } = new SyncConfig { FastSync = false };
         public static ISyncConfig WithFastSync { get; } = new SyncConfig { FastSync = true };
-        public static ISyncConfig WithFastBlocks { get; } = new SyncConfig { FastSync = true, FastBlocks = true };
-        public static ISyncConfig WithEth2Merge { get; } = new SyncConfig { FastSync = false, FastBlocks = false, BlockGossipEnabled = false };
+        public static ISyncConfig WithEth2Merge { get; } = new SyncConfig { FastSync = false, BlockGossipEnabled = false };
 
         public bool NetworkingEnabled { get; set; } = true;
 
@@ -27,7 +25,7 @@ public bool SynchronizationEnabled
         }
 
         public long? FastSyncCatchUpHeightDelta { get; set; } = 8192;
-        public bool FastBlocks { get; set; }
+        bool ISyncConfig.FastBlocks { get; set; }
         public bool UseGethLimitsInFastBlocks { get; set; } = true;
         public bool FastSync { get => _fastSync || SnapSync; set => _fastSync = value; }
         public bool DownloadHeadersInFastSync { get; set; } = true;

src/Nethermind/Nethermind.Facade.Test/Eth/EthSyncingInfoTests.cs

@@ -169,7 +169,6 @@ public void IsSyncing_ReturnsFalseOnFastSyncWithoutPivot(long bestHeader, long c
             {
                 FastSync = true,
                 SnapSync = true,
-                FastBlocks = true,
                 PivotNumber = "0", // Equivalent to not having a pivot
             };
             EthSyncingInfo ethSyncingInfo = new(blockTree, receiptStorage, syncConfig,

src/Nethermind/Nethermind.Init/MemoryHintMan.cs

@@ -144,7 +144,7 @@ private void AssignTxPoolMemory(ITxPoolConfig txPoolConfig)
 
         private void AssignFastBlocksMemory(ISyncConfig syncConfig)
         {
-            if (syncConfig.FastBlocks)
+            if (syncConfig.FastSync)
             {
                 if (!syncConfig.DownloadBodiesInFastSync && !syncConfig.DownloadReceiptsInFastSync)
                 {

src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Synchronization.cs

@@ -843,7 +843,6 @@ public async Task Blocks_before_pivots_should_not_be_added_if_node_has_never_bee
         ISyncConfig syncConfig = new SyncConfig
         {
             FastSync = true,
-            FastBlocks = true,
             PivotNumber = syncedBlockTree.Head?.Number.ToString() ?? "",
             PivotHash = syncedBlockTree.HeadHash?.ToString() ?? "",
             PivotTotalDifficulty = syncedBlockTree.Head?.TotalDifficulty?.ToString() ?? ""
@@ -865,7 +864,6 @@ public async Task Blocks_before_pivots_should_not_be_added_if_node_has_been_sync
         ISyncConfig syncConfig = new SyncConfig
         {
             FastSync = true,
-            FastBlocks = true,
             PivotNumber = syncedBlockTree.Head?.Number.ToString() ?? "",
             PivotHash = syncedBlockTree.HeadHash?.ToString() ?? "",
             PivotTotalDifficulty = syncedBlockTree.Head?.TotalDifficulty?.ToString() ?? ""
@@ -891,7 +889,6 @@ public async Task Maintain_correct_pointers_for_beacon_sync_in_fast_sync()
         ISyncConfig syncConfig = new SyncConfig
         {
             FastSync = true,
-            FastBlocks = true,
             PivotNumber = syncedBlockTree.Head?.Number.ToString() ?? "",
             PivotHash = syncedBlockTree.HeadHash?.ToString() ?? "",
             PivotTotalDifficulty = syncedBlockTree.Head?.TotalDifficulty?.ToString() ?? ""

src/Nethermind/Nethermind.Merge.Plugin.Test/Synchronization/BeaconHeadersSyncTests.cs

@@ -153,7 +153,6 @@ public async Task Can_keep_returning_nulls_after_all_batches_were_prepared()
             SyncConfig = new SyncConfig
             {
                 FastSync = true,
-                FastBlocks = true,
                 PivotNumber = "1000",
                 PivotHash = Keccak.Zero.ToString(),
                 PivotTotalDifficulty = "1000"
@@ -184,7 +183,6 @@ public async Task Finishes_when_all_downloaded()
         ISyncConfig syncConfig = new SyncConfig
         {
             FastSync = true,
-            FastBlocks = true,
             PivotNumber = "1000",
             PivotHash = Keccak.Zero.ToString(),
             PivotTotalDifficulty = "1000"
@@ -221,7 +219,6 @@ public void Feed_able_to_sync_when_new_pivot_is_set()
         ISyncConfig syncConfig = new SyncConfig
         {
             FastSync = true,
-            FastBlocks = true,
             PivotNumber = "500",
             PivotHash = Keccak.Zero.ToString(),
             PivotTotalDifficulty = "1000000" // default difficulty in block tree builder
@@ -308,7 +305,6 @@ public async Task When_pivot_changed_during_header_sync_after_chain_merged__do_n
         ISyncConfig syncConfig = new SyncConfig
         {
             FastSync = true,
-            FastBlocks = true,
             PivotNumber = "0",
             PivotHash = Keccak.Zero.ToString(),
             PivotTotalDifficulty = "0"

src/Nethermind/Nethermind.Merge.Plugin.Test/Synchronization/BeaconPivotTests.cs

@@ -27,7 +27,6 @@ public void Setup()
         _syncConfig = new SyncConfig
         {
             FastSync = true,
-            FastBlocks = true,
             PivotNumber = "1000",
             PivotHash = Keccak.Zero.ToString(),
             PivotTotalDifficulty = "1000"

src/Nethermind/Nethermind.Runner.Test/ConfigFilesTests.cs

@@ -41,15 +41,15 @@ public void Required_config_files_exist(string configWildcard)
             }
         }
 
-        [TestCase("validators", true, true)]
-        [TestCase("poacore_validator.cfg", true, true)]
-        [TestCase("spaceneth", false, false)]
-        [TestCase("archive", false, false)]
-        [TestCase("fast", true, true)]
-        public void Sync_defaults_are_correct(string configWildcard, bool fastSyncEnabled, bool fastBlocksEnabled)
+        // maybe leave in test since deprecation has not fully happened?
+        [TestCase("validators", true)]
+        [TestCase("poacore_validator.cfg", true)]
+        [TestCase("spaceneth", false)]
+        [TestCase("archive", false)]
+        [TestCase("fast", true)]
+        public void Sync_defaults_are_correct(string configWildcard, bool fastSyncEnabled)
         {
             Test<ISyncConfig, bool>(configWildcard, c => c.FastSync, fastSyncEnabled);
-            Test<ISyncConfig, bool>(configWildcard, c => c.FastBlocks, fastBlocksEnabled);
         }
 
         [TestCase("archive")]

src/Nethermind/Nethermind.Runner.Test/MemoryHintManTests.cs

@@ -79,14 +79,12 @@ public void Db_size_are_computed_correctly(
             [Values(256 * MB, 512 * MB, 1 * GB, 4 * GB, 6 * GB, 16 * GB, 32 * GB, 64 * GB, 128 * GB)]
             long memoryHint,
             [Values(1u, 2u, 3u, 4u, 8u, 32u)] uint cpuCount,
-            [Values(true, false)] bool fastSync,
-            [Values(true, false)] bool fastBlocks)
+            [Values(true, false)] bool fastSync)
         {
             // OK to throw here
             if (memoryHint == 256.MB())
             {
                 _txPoolConfig.Size = 128;
-                _syncConfig.FastBlocks = false;
                 _initConfig.DiagnosticMode = DiagnosticMode.MemDb;
             }
 
@@ -95,7 +93,6 @@ public void Db_size_are_computed_correctly(
 
             SyncConfig syncConfig = new SyncConfig();
             syncConfig.FastSync = fastSync;
-            syncConfig.FastBlocks = fastBlocks;
 
             IDbConfig dbConfig = _dbConfig;
 

src/Nethermind/Nethermind.Runner/configs/chiado.cfg

@@ -15,7 +15,6 @@
   },
   "Sync": {
     "FastSync": true,
-    "FastBlocks": true,
     "PivotNumber": 8260000,
     "PivotHash": "0x980fc3d226c606ca126e06a34c3cbb4ff01be055309a7d4e9f29396096d6ef76",
     "PivotTotalDifficulty": "231708131825107706987652208063906496124457284",
@@ -43,4 +42,4 @@
       16
     ]
   }
-}
+}

src/Nethermind/Nethermind.Runner/configs/joc-testnet.cfg

@@ -11,7 +11,6 @@
   "Sync": {
     "FastSync": true,
     "SnapSync": true,
-    "FastBlocks": true,
     "PivotNumber": 3300000,
     "PivotHash": "0x58fbbcd0d0e8e5856c205385c922dd9e2b0b711060b001a960f327cf7b6608dc",
     "PivotTotalDifficulty": "6599797"
@@ -28,4 +27,4 @@
   "Merge": {
     "Enabled": false
   }
-}
+}

src/Nethermind/Nethermind.Runner/configs/kovan.cfg

@@ -14,7 +14,6 @@
     "PivotNumber": 34000000,
     "PivotHash": "0xaace54dd10cada02c236bd8182489cc7f9520dedceb1795f9f716e66d86921cb",
     "PivotTotalDifficulty": "11519157357521914760869389464249041320958641825",
-    "FastBlocks": true,
     "UseGethLimitsInFastBlocks": false,
     "FastSyncCatchUpHeightDelta": 10000000000
   },
@@ -31,4 +30,4 @@
       16
     ]
   }
-}
+}

src/Nethermind/Nethermind.Runner/configs/poacore_validator.cfg

@@ -17,7 +17,6 @@
     "PivotNumber": 13200000,
     "PivotHash": "0xa7a12fb5ec74204dbeed8630a5c762fa5875ea1e492d8199a15807316d4a8347",
     "PivotTotalDifficulty": "4491727243356387717716544818000000000000000000",
-    "FastBlocks": true,
     "UseGethLimitsInFastBlocks": false,
     "FastSyncCatchUpHeightDelta": 10000000000
   },

src/Nethermind/Nethermind.Runner/configs/sepolia.cfg

@@ -15,7 +15,6 @@
   },
   "Sync": {
     "FastSync": true,
-    "FastBlocks": true,
     "SnapSync": true,
     "UseGethLimitsInFastBlocks": true,
     "PivotNumber": 5300000,
@@ -38,4 +37,4 @@
   "Merge": {
     "Enabled": true
   }
-}
+}

src/Nethermind/Nethermind.Runner/configs/volta.cfg

@@ -18,7 +18,6 @@
     "PivotNumber": 26680000,
     "PivotHash": "0x038403ed7351bf180066ea7b6396daec13e6bb13163334ac9fab8ee3de19d471",
     "PivotTotalDifficulty": "9078733549450638205202834526279575881277928465",
-    "FastBlocks": true,
     "UseGethLimitsInFastBlocks": false,
     "FastSyncCatchUpHeightDelta": 10000000000
   },
@@ -34,4 +33,4 @@
   "Merge": {
     "Enabled": false
   }
-}
+}

src/Nethermind/Nethermind.Synchronization.Test/FastBlocks/BodiesSyncFeedTests.cs

@@ -60,7 +60,6 @@ public void Setup()
             PivotHash = _pivotBlock.Hash!.ToString(),
             PivotNumber = _pivotBlock.Number.ToString(),
             AncientBodiesBarrier = 0,
-            FastBlocks = true,
             DownloadBodiesInFastSync = true,
         };