Merge branch 'master' into dotnet9

NethermindEth · Dec 5, 2024 · 6ee07b1 · 6ee07b1
2 parents f7af689 + cfb53c2
commit 6ee07b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/src/Nethermind/Nethermind.Shutter.Test/ShutterBlockHandlerTests.cs b/src/Nethermind/Nethermind.Shutter.Test/ShutterBlockHandlerTests.cs
@@ -53,7 +53,7 @@ public void Wait_times_out_at_cutoff()
     [Test]
     public void Does_not_wait_after_cutoff()
     {
-        const ulong blockWaitCutoff = 1333;
+        ulong blockWaitCutoff = ShutterTestsCommon.Cfg.BlockUpToDateCutoff;
         Random rnd = new(ShutterTestsCommon.Seed);
         Timestamper timestamper = ShutterTestsCommon.InitTimestamper(ShutterTestsCommon.InitialSlotTimestamp, 2 * blockWaitCutoff);
         ShutterApiSimulator api = ShutterTestsCommon.InitApi(rnd, timestamper);

diff --git a/src/Nethermind/Nethermind.Shutter.Test/ShutterTestsCommon.cs b/src/Nethermind/Nethermind.Shutter.Test/ShutterTestsCommon.cs
@@ -31,7 +31,6 @@ class ShutterTestsCommon
     public const int ChainId = BlockchainIds.Chiado;
     public const ulong GenesisTimestamp = 1;
     public static readonly TimeSpan SlotLength = TimeSpan.FromSeconds(5);
-    public static readonly TimeSpan BlockUpToDateCutoff = TimeSpan.FromSeconds(5);
     public static readonly ISpecProvider SpecProvider = ChiadoSpecProvider.Instance;
     public static readonly IEthereumEcdsa Ecdsa = new EthereumEcdsa(ChainId);
     public static readonly ILogManager LogManager = LimboLogs.Instance;
@@ -47,6 +46,7 @@ class ShutterTestsCommon
         EncryptedGasLimit = 21000 * 20,
         Validator = true
     };
+    public static readonly TimeSpan BlockUpToDateCutoff = TimeSpan.FromMilliseconds(Cfg.BlockUpToDateCutoff);
 
     public static ShutterApiSimulator InitApi(Random rnd, ITimestamper? timestamper = null, ShutterEventSimulator? eventSimulator = null)
     {

diff --git a/src/Nethermind/Nethermind.Shutter/Config/IShutterConfig.cs b/src/Nethermind/Nethermind.Shutter/Config/IShutterConfig.cs
@@ -83,6 +83,10 @@ public interface IShutterConfig : IConfig
         DefaultValue = "60000", HiddenFromDocs = true)]
     uint DisconnectionLogInterval { get; set; }
 
+    [ConfigItem(Description = "How many milliseconds until a block is considered outdated.",
+        DefaultValue = "20000", HiddenFromDocs = true)]
+    uint BlockUpToDateCutoff { get; set; }
+
     [ConfigItem(Description = "Whether to output libp2p logs.",
         DefaultValue = "false", HiddenFromDocs = true)]
     bool P2PLogsEnabled { get; set; }

diff --git a/src/Nethermind/Nethermind.Shutter/Config/ShutterConfig.cs b/src/Nethermind/Nethermind.Shutter/Config/ShutterConfig.cs
@@ -23,6 +23,7 @@ public class ShutterConfig : IShutterConfig
         public ushort MaxKeyDelay { get; set; } = 1666;
         public uint DisconnectionLogTimeout { get; set; } = 1200000;
         public uint DisconnectionLogInterval { get; set; } = 60000;
+        public uint BlockUpToDateCutoff { get; set; } = 20000;
         public bool P2PLogsEnabled { get; set; } = false;
     }
 }
diff --git a/src/Nethermind/Nethermind.Shutter/ShutterApi.cs b/src/Nethermind/Nethermind.Shutter/ShutterApi.cs
@@ -76,7 +76,7 @@ IPAddress ip
         _slotLength = slotLength;
         _fileSystem = fileSystem;
         _keyStoreConfig = keyStoreConfig;
-        _blockUpToDateCutoff = slotLength;
+        _blockUpToDateCutoff = TimeSpan.FromMilliseconds(cfg.BlockUpToDateCutoff);
         _blockWaitCutoff = _slotLength / 3;
 
         _txProcessingEnvFactory = new(worldStateManager, blockTree, specProvider, logManager);