Cleanup/Remove fast sync with header only

src/Nethermind/Nethermind.Core/ContainerBuilderExtensions.cs

@@ -60,6 +60,16 @@ public static ContainerBuilder AddSingleton<T>(this ContainerBuilder builder, T
         return builder;
     }
 
+
+    public static ContainerBuilder AddSingleton<T>(this ContainerBuilder builder, Func<IComponentContext, T> factory) where T : class
+    {
+        builder.Register(factory)
+            .As<T>()
+            .SingleInstance();
+
+        return builder;
+    }
+
     public static ContainerBuilder AddSingleton<T, TImpl>(this ContainerBuilder builder) where TImpl : notnull where T : notnull
     {
         builder.RegisterType<TImpl>()

src/Nethermind/Nethermind.Merge.Plugin.Test/MergeSyncTestContainerBuilderExtensions.cs

@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Autofac;
+using Nethermind.Blockchain;
+using Nethermind.Core;
+using Nethermind.Db;
+
+namespace Nethermind.Merge.Plugin.Test;
+
+public static class MergeSyncTestContainerBuilderExtensions
+{
+    public static ContainerBuilder AddBlockTreeScenario(this ContainerBuilder builder, BlockTreeTests.BlockTreeTestScenario.ScenarioBuilder scenarioBuilder)
+    {
+        return builder
+            .AddSingleton<IBlockTree>(scenarioBuilder.NotSyncedTree)
+            .AddKeyedSingleton(DbNames.Metadata, scenarioBuilder.NotSyncedTreeBuilder.MetadataDb);
+    }
+}

src/Nethermind/Nethermind.Merge.Plugin/PoSSwitcher.cs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
+using Autofac.Features.AttributeFilters;
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Synchronization;
 using Nethermind.Core;
@@ -54,7 +55,7 @@ public class PoSSwitcher : IPoSSwitcher
         public PoSSwitcher(
             IMergeConfig mergeConfig,
             ISyncConfig syncConfig,
-            IDb metadataDb,
+            [KeyFilter(DbNames.Metadata)] IDb metadataDb,
             IBlockTree blockTree,
             ISpecProvider specProvider,
             ChainSpec chainSpec,

src/Nethermind/Nethermind.Merge.Plugin/Synchronization/BeaconPivot.cs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
+using Autofac.Features.AttributeFilters;
 using Nethermind.Blockchain;
 using Nethermind.Blockchain.Synchronization;
 using Nethermind.Consensus;
@@ -45,7 +46,7 @@ private BlockHeader? CurrentBeaconPivot
 
         public BeaconPivot(
             ISyncConfig syncConfig,
-            IDb metadataDb,
+            [KeyFilter(DbNames.Metadata)] IDb metadataDb,
             IBlockTree blockTree,
             IPoSSwitcher poSSwitcher,
             ILogManager logManager)

src/Nethermind/Nethermind.Synchronization.Test/TestSynchronizerModule.cs

@@ -8,6 +8,7 @@
 using Nethermind.Core.Timers;
 using Nethermind.Db;
 using Nethermind.Logging;
+using Nethermind.State;
 using Nethermind.Stats;
 using Nethermind.Trie;
 using NSubstitute;
@@ -28,6 +29,7 @@ protected override void Load(ContainerBuilder builder)
             .AddSingleton<IBlockTree>(Substitute.For<IBlockTree>())
             .AddSingleton<ITimerFactory>(Substitute.For<ITimerFactory>())
             .AddSingleton<ISyncConfig>(syncConfig)
+            .AddSingleton<IStateReader>(Substitute.For<IStateReader>())
             .AddSingleton<IBetterPeerStrategy>(new TotalDifficultyBetterPeerStrategy(LimboLogs.Instance))
             .AddSingleton<INodeStatsManager, NodeStatsManager>()
             .AddSingleton<CancelOnDisposeToken>()

src/Nethermind/Nethermind.Synchronization/Blocks/DownloaderOptions.cs

@@ -8,12 +8,7 @@ namespace Nethermind.Synchronization.Blocks
     [Flags]
     public enum DownloaderOptions
     {
-        None = 0,
-        Process = 1,
-        WithReceipts = 2,
-        MoveToMain = 4,
-        WithBodies = 8,
-        // ReSharper disable once UnusedMember.Global
-        All = 15
+        Fast,
+        Full,
     }
 }

src/Nethermind/Nethermind.Synchronization/Blocks/FastSyncFeed.cs

@@ -25,18 +25,7 @@ public FastSyncFeed(ISyncConfig syncConfig)
 
         private DownloaderOptions BuildOptions()
         {
-            DownloaderOptions options = DownloaderOptions.MoveToMain;
-            if (_syncConfig.DownloadReceiptsInFastSync)
-            {
-                options |= DownloaderOptions.WithReceipts;
-            }
-
-            if (_syncConfig.DownloadBodiesInFastSync)
-            {
-                options |= DownloaderOptions.WithBodies;
-            }
-
-            return options;
+            return DownloaderOptions.Fast;
         }
 
         public override Task<BlocksRequest> PrepareRequest(CancellationToken token = default) => Task.FromResult(_blocksRequest);

src/Nethermind/Nethermind.Synchronization/Blocks/FullSyncFeed.cs

@@ -14,7 +14,7 @@ public class FullSyncFeed : ActivatedSyncFeed<BlocksRequest?>
 
         protected override SyncMode ActivationSyncModes { get; } = SyncMode.Full;
 
-        private static DownloaderOptions BuildOptions() => DownloaderOptions.WithBodies | DownloaderOptions.Process;
+        private static DownloaderOptions BuildOptions() => DownloaderOptions.Full;
 
         // ReSharper disable once RedundantTypeArgumentsOfMethod
         public override Task<BlocksRequest?> PrepareRequest(CancellationToken token = default) => Task.FromResult<BlocksRequest?>(_blocksRequest);

src/Nethermind/Nethermind.Synchronization/Blocks/SyncBatchSize.cs

@@ -8,7 +8,7 @@
 namespace Nethermind.Synchronization.Blocks
 {
     [DebuggerDisplay("{Current}")]
-    public struct SyncBatchSize
+    public class SyncBatchSize
     {
         private readonly ILogger _logger;
 
@@ -22,9 +22,9 @@ public struct SyncBatchSize
 
         public int Current { get; private set; }
 
-        public readonly bool IsMin => Current == Min;
+        public bool IsMin => Current == Min;
 
-        public readonly bool IsMax => Current == Max;
+        public bool IsMax => Current == Max;
 
         public SyncBatchSize(ILogManager logManager)
         {