Adjust Optimism (Mainnet) TotalDifficulty calculation

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

@@ -51,7 +51,7 @@ public BeaconHeadersSyncFeed(
         IMergeConfig? mergeConfig,
         IInvalidChainTracker invalidChainTracker,
         ILogManager logManager)
-        : base(blockTree, syncPeerPool, syncConfig, syncReport, logManager, true) // alwaysStartHeaderSync = true => for the merge we're forcing header sync start. It doesn't matter if it is archive sync or fast sync
+        : base(blockTree, syncPeerPool, syncConfig, syncReport, logManager, alwaysStartHeaderSync: true) // alwaysStartHeaderSync = true => for the merge we're forcing header sync start. It doesn't matter if it is archive sync or fast sync
     {
         _poSSwitcher = poSSwitcher ?? throw new ArgumentNullException(nameof(poSSwitcher));
         _pivot = pivot ?? throw new ArgumentNullException(nameof(pivot));
@@ -79,7 +79,7 @@ protected override void ResetPivot()
         // First, we assume pivot
         _pivotNumber = ExpectedPivotNumber;
         _nextHeaderHash = ExpectedPivotHash;
-        _nextHeaderDiff = _poSSwitcher.FinalTotalDifficulty;
+        _nextHeaderTotalDifficulty = _poSSwitcher.FinalTotalDifficulty;
 
         long startNumber = _pivotNumber;
 
@@ -89,7 +89,7 @@ protected override void ResetPivot()
         {
             startNumber = lowestInserted.Number - 1;
             _nextHeaderHash = lowestInserted.ParentHash ?? Keccak.Zero;
-            _nextHeaderDiff = lowestInserted.TotalDifficulty - lowestInserted.Difficulty;
+            _nextHeaderTotalDifficulty = lowestInserted.TotalDifficulty - lowestInserted.Difficulty;
         }
 
         // the base class with starts with _lowestRequestedHeaderNumber - 1, so we offset it here.
@@ -168,7 +168,7 @@ protected override AddBlockResult InsertToBlockTree(BlockHeader header)
             _logger.Trace(
                 $"Adding new header in beacon headers sync {header.ToString(BlockHeader.Format.FullHashAndNumber)}");
         BlockTreeInsertHeaderOptions headerOptions = BlockTreeInsertHeaderOptions.BeaconHeaderInsert;
-        if (_nextHeaderDiff is null)
+        if (_nextHeaderTotalDifficulty is null)
         {
             headerOptions |= BlockTreeInsertHeaderOptions.TotalDifficultyNotNeeded;
         }
@@ -188,7 +188,7 @@ protected override AddBlockResult InsertToBlockTree(BlockHeader header)
         if (insertOutcome == AddBlockResult.Added || insertOutcome == AddBlockResult.AlreadyKnown)
         {
             _nextHeaderHash = header.ParentHash!;
-            _nextHeaderDiff = header.TotalDifficulty is not null && header.TotalDifficulty >= header.Difficulty
+            _nextHeaderTotalDifficulty = header.TotalDifficulty is not null && header.TotalDifficulty >= header.Difficulty
                 ? header.TotalDifficulty - header.Difficulty
                 : null;
         }

src/Nethermind/Nethermind.Optimism/OptimismPlugin.cs

@@ -160,7 +160,7 @@ public Task InitSynchronization()
             .AddSingleton(_mergeConfig)
             .AddSingleton<IInvalidChainTracker>(_invalidChainTracker);
 
-        builder.RegisterModule(new SynchronizerModule(_syncConfig));
+        builder.RegisterModule(new OptimismSynchronizerModule(parameters: _api.ChainSpec.Optimism, _api.SpecProvider, _syncConfig));
         builder.RegisterModule(new MergeSynchronizerModule());
 
         IContainer container = builder.Build();

src/Nethermind/Nethermind.Optimism/OptimismSynchronizerModule.cs

@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using Autofac;
+using Nethermind.Blockchain.Synchronization;
+using Nethermind.Core;
+using Nethermind.Core.Specs;
+using Nethermind.Specs.ChainSpecStyle;
+using Nethermind.Synchronization;
+
+namespace Nethermind.Optimism;
+
+/// <remarks>
+/// In Optimism Mainnet, the <see cref="BlockHeader.TotalDifficulty"/> gets resetted to <c>0</c> in the Bedrock block unlike other chains that went through The Merge fork.
+/// Calculation is still the same: the current block's <see cref="BlockHeader.TotalDifficulty"/> is the parent's <see cref="BlockHeader.TotalDifficulty"/> plus the current block's <see cref="BlockHeader.Difficulty"/>.
+/// <seealso href="https://github.com/NethermindEth/nethermind/issues/7626"/>
+/// </remarks>
+public class OptimismSynchronizerModule(
+    OptimismParameters parameters,
+    ISpecProvider provider,
+    ISyncConfig syncConfig
+) : SynchronizerModule(syncConfig)
+{
+    private const ulong OptimismMainnetChainId = 0xA;
+
+    protected override void Load(ContainerBuilder builder)
+    {
+        base.Load(builder);
+
+        if (provider.ChainId == OptimismMainnetChainId)
+        {
+            builder.AddSingleton<ITotalDifficultyStrategy>(
+                new FixedTotalDifficultyStrategy(
+                    new CumulativeTotalDifficultyStrategy(),
+                    fixesBlockNumber: parameters.BedrockBlockNumber - 1,
+                    toTotalDifficulty: provider.TerminalTotalDifficulty ?? throw new ArgumentNullException(nameof(provider.TerminalTotalDifficulty))
+                )
+            );
+        }
+        else
+        {
+            builder.AddSingleton<ITotalDifficultyStrategy>(new CumulativeTotalDifficultyStrategy());
+        }
+    }
+}

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

@@ -574,7 +574,7 @@ public ResettableHeaderSyncFeed(
             long? hangOnBlockNumberAfterInsert = null,
             ManualResetEventSlim? hangLatch = null,
             bool alwaysStartHeaderSync = false
-        ) : base(blockTree, syncPeerPool, syncConfig, syncReport, logManager, alwaysStartHeaderSync)
+        ) : base(blockTree, syncPeerPool, syncConfig, syncReport, logManager, alwaysStartHeaderSync: alwaysStartHeaderSync)
         {
             _hangOnBlockNumber = hangOnBlockNumber;
             _hangOnBlockNumberAfterInsert = hangOnBlockNumberAfterInsert;

src/Nethermind/Nethermind.Synchronization.Test/TotalDifficultyStrategyTests.cs

@@ -0,0 +1,76 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System.Collections.Generic;
+using FluentAssertions;
+using Nethermind.Core;
+using Nethermind.Core.Test.Builders;
+using Nethermind.Int256;
+using NUnit.Framework;
+
+namespace Nethermind.Synchronization.Test;
+
+public class TotalDifficultyStrategyTests
+{
+    [Test]
+    public void CumulativeTotalDifficultyStrategy_own_TotalDifficulty_is_Parent_TotalDifficulty_plus_own_difficulty()
+    {
+        ITotalDifficultyStrategy strategy = new CumulativeTotalDifficultyStrategy();
+
+        List<(BlockHeader Header, UInt256 ExpectedTotalDifficulty)> headers =
+        [
+            (Build.A.BlockHeader.WithDifficulty(10).WithTotalDifficulty(39).TestObject, 39),
+            (Build.A.BlockHeader.WithDifficulty(8).TestObject, 29),
+            (Build.A.BlockHeader.WithDifficulty(5).TestObject, 21),
+            (Build.A.BlockHeader.WithDifficulty(12).TestObject, 16),
+            (Build.A.BlockHeader.WithDifficulty(3).TestObject, 4),
+            (Build.A.BlockHeader.WithDifficulty(1).TestObject, 1),
+        ];
+
+        for (int i = 0; i < headers.Count - 1; i++)
+        {
+            var header = headers[i].Header;
+            var parent = headers[i + 1].Header;
+
+            parent.TotalDifficulty = strategy.ParentTotalDifficulty(header);
+        }
+
+        foreach (var (header, expectedTotalDifficulty) in headers)
+        {
+            header.TotalDifficulty.Should().Be(expectedTotalDifficulty);
+        }
+    }
+
+    [Test]
+    public void FixedTotalDifficultyStrategy_fixes_a_block_header_to_specific_total_difficulty()
+    {
+        ITotalDifficultyStrategy strategy = new FixedTotalDifficultyStrategy(
+            new CumulativeTotalDifficultyStrategy(),
+            fixesBlockNumber: 3,
+            toTotalDifficulty: 21
+        );
+
+        List<(BlockHeader Header, UInt256 ExpectedTotalDifficulty)> headers =
+        [
+            (Build.A.BlockHeader.WithNumber(5).WithDifficulty(0).WithTotalDifficulty(0).TestObject, 0),
+            (Build.A.BlockHeader.WithNumber(4).WithDifficulty(0).TestObject, 0),
+            (Build.A.BlockHeader.WithNumber(3).WithDifficulty(5).TestObject, 21),
+            (Build.A.BlockHeader.WithNumber(2).WithDifficulty(12).TestObject, 16),
+            (Build.A.BlockHeader.WithNumber(1).WithDifficulty(3).TestObject, 4),
+            (Build.A.BlockHeader.WithNumber(0).WithDifficulty(1).TestObject, 1),
+        ];
+
+        for (int i = 0; i < headers.Count - 1; i++)
+        {
+            var header = headers[i].Header;
+            var parent = headers[i + 1].Header;
+
+            parent.TotalDifficulty = strategy.ParentTotalDifficulty(header);
+        }
+
+        foreach (var (header, expectedTotalDifficulty) in headers)
+        {
+            header.TotalDifficulty.Should().Be(expectedTotalDifficulty);
+        }
+    }
+}

src/Nethermind/Nethermind.Synchronization/FastBlocks/FastHeadersSyncFeed.cs

@@ -32,14 +32,15 @@ public class HeadersSyncFeed : ActivatedSyncFeed<HeadersSyncBatch?>
         protected readonly ISyncReport _syncReport;
         protected readonly IBlockTree _blockTree;
         protected readonly ISyncConfig _syncConfig;
+        private readonly ITotalDifficultyStrategy _totalDifficultyStrategy;
 
         private readonly object _handlerLock = new();
 
         private readonly int _headersRequestSize = GethSyncLimits.MaxHeaderFetch;
         protected long _lowestRequestedHeaderNumber;
 
         protected Hash256 _nextHeaderHash;
-        protected UInt256? _nextHeaderDiff;
+        protected UInt256? _nextHeaderTotalDifficulty;
 
         protected long _pivotNumber;
 
@@ -154,13 +155,15 @@ public HeadersSyncFeed(
             ISyncConfig? syncConfig,
             ISyncReport? syncReport,
             ILogManager? logManager,
+            ITotalDifficultyStrategy? totalDifficultyStrategy = null,
             bool alwaysStartHeaderSync = false)
         {
             _syncPeerPool = syncPeerPool ?? throw new ArgumentNullException(nameof(syncPeerPool));
             _syncReport = syncReport ?? throw new ArgumentNullException(nameof(syncReport));
             _blockTree = blockTree ?? throw new ArgumentNullException(nameof(blockTree));
             _syncConfig = syncConfig ?? throw new ArgumentNullException(nameof(syncConfig));
             _logger = logManager?.GetClassLogger<HeadersSyncFeed>() ?? throw new ArgumentNullException(nameof(HeadersSyncFeed));
+            _totalDifficultyStrategy = totalDifficultyStrategy ?? new CumulativeTotalDifficultyStrategy();
 
             if (!_syncConfig.UseGethLimitsInFastBlocks)
             {
@@ -196,7 +199,7 @@ protected virtual void ResetPivot()
             _pivotNumber = _syncConfig.PivotNumberParsed;
             _lowestRequestedHeaderNumber = _pivotNumber + 1; // Because we want the pivot to be requested
             _nextHeaderHash = _syncConfig.PivotHashParsed;
-            _nextHeaderDiff = _syncConfig.PivotTotalDifficultyParsed;
+            _nextHeaderTotalDifficulty = _syncConfig.PivotTotalDifficultyParsed;
 
             // Resume logic
             BlockHeader? lowestInserted = _blockTree.LowestInsertedHeader;
@@ -610,7 +613,7 @@ protected virtual int InsertHeaders(HeadersSyncBatch batch)
                     }
                 }
 
-                header.TotalDifficulty = _nextHeaderDiff;
+                header.TotalDifficulty = _nextHeaderTotalDifficulty;
                 AddBlockResult addBlockResult = InsertHeader(header);
                 if (addBlockResult == AddBlockResult.InvalidBlock)
                 {
@@ -713,8 +716,9 @@ protected virtual AddBlockResult InsertToBlockTree(BlockHeader header)
         protected void SetExpectedNextHeaderToParent(BlockHeader header)
         {
             _nextHeaderHash = header.ParentHash!;
-            _nextHeaderDiff = (header.TotalDifficulty ?? 0) - header.Difficulty;
+            _nextHeaderTotalDifficulty = _totalDifficultyStrategy.ParentTotalDifficulty(header);
         }
+
         private bool _disposed = false;
         public override void Dispose()
         {

src/Nethermind/Nethermind.Synchronization/ITotalDifficultyStrategy.cs

@@ -0,0 +1,34 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Nethermind.Core;
+using Nethermind.Int256;
+
+namespace Nethermind.Synchronization;
+
+public interface ITotalDifficultyStrategy
+{
+    UInt256 ParentTotalDifficulty(BlockHeader header);
+}
+
+public sealed class CumulativeTotalDifficultyStrategy : ITotalDifficultyStrategy
+{
+    public UInt256 ParentTotalDifficulty(BlockHeader header)
+    {
+        return (header.TotalDifficulty ?? 0) - header.Difficulty;
+    }
+}
+
+public sealed class FixedTotalDifficultyStrategy(
+    ITotalDifficultyStrategy strategy,
+    long fixesBlockNumber,
+    UInt256 toTotalDifficulty
+) : ITotalDifficultyStrategy
+{
+    public UInt256 ParentTotalDifficulty(BlockHeader header)
+    {
+        return header.Number > 0 && header.Number - 1 == fixesBlockNumber
+            ? toTotalDifficulty
+            : strategy.ParentTotalDifficulty(header);
+    }
+}

src/Nethermind/Nethermind.Synchronization/Reporting/SyncReport.cs

@@ -259,7 +259,7 @@ private void WriteDbSyncReport()
 
         private void WriteNotStartedReport()
         {
-            _logger.Info($"Waiting for peers... {(DateTime.UtcNow - StartTime).Seconds}s");
+            _logger.Info($"Waiting for peers... {Math.Round((DateTime.UtcNow - StartTime).TotalSeconds)}s");
         }
 
         private void WriteFullSyncReport()