Gnosis Shutter

.github/workflows/nethermind-tests.yml

@@ -64,6 +64,7 @@ jobs:
           - Nethermind.Overseer.Test
           - Nethermind.Runner.Test
           - Nethermind.Serialization.Ssz.Test
+          - Nethermind.Shutter.Test
           - Nethermind.Sockets.Test
           - Nethermind.Specs.Test
           - Nethermind.State.Test

src/Nethermind/Chains/chiado.json

@@ -64,6 +64,7 @@
     "eip3529Transition": "0x0",
     "eip3541Transition": "0x0",
     "eip1559Transition": "0x0",
+    "beaconChainGenesisTimestamp": "0x6343ee4c",
     "eip3651TransitionTimestamp": "0x646e0e4c",
     "eip3855TransitionTimestamp": "0x646e0e4c",
     "eip3860TransitionTimestamp": "0x646e0e4c",

src/Nethermind/Chains/foundation.json

@@ -181,6 +181,7 @@
     "eip3198Transition": "0xC5D488",
     "eip3529Transition": "0xC5D488",
     "eip3541Transition": "0xC5D488",
+    "beaconChainGenesisTimestamp": "0x5fc63057",
     "eip3651TransitionTimestamp": "0x64373057",
     "eip3855TransitionTimestamp": "0x64373057",
     "eip3860TransitionTimestamp": "0x64373057",

src/Nethermind/Chains/gnosis.json

@@ -70,6 +70,7 @@
     "eip3529Transition": 19040000,
     "eip3541Transition": 19040000,
     "eip1559Transition": 19040000,
+    "beaconChainGenesisTimestamp": "0x61b10dbc",
     "eip3651TransitionTimestamp": "0x64c8edbc",
     "eip3855TransitionTimestamp": "0x64c8edbc",
     "eip3860TransitionTimestamp": "0x64c8edbc",

src/Nethermind/Chains/holesky.json

@@ -35,6 +35,7 @@
     "eip3198Transition": "0x0",
     "eip3529Transition": "0x0",
     "eip3541Transition": "0x0",
+    "beaconChainGenesisTimestamp": "0x65156994",
     "eip3651TransitionTimestamp": "0x6516eac0",
     "eip3855TransitionTimestamp": "0x6516eac0",
     "eip3860TransitionTimestamp": "0x6516eac0",

src/Nethermind/Chains/sepolia.json

@@ -57,6 +57,7 @@
     "eip3541Transition": "0x0",
     "terminalTotalDifficulty": "3C6568F12E8000",
     "mergeForkIdTransition": "0x1A7ACB",
+    "beaconChainGenesisTimestamp": "0x62b07d60",
     "eip4895TransitionTimestamp": "0x63FD7D60",
     "eip3855TransitionTimestamp": "0x63FD7D60",
     "eip3651TransitionTimestamp": "0x63FD7D60",

src/Nethermind/Directory.Packages.props

@@ -19,8 +19,8 @@
     <PackageVersion Include="FastEnum" Version="1.8.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
-    <PackageVersion Include="Google.Protobuf" Version="3.27.2" />
-    <PackageVersion Include="Google.Protobuf.Tools" Version="3.27.2" />
+    <PackageVersion Include="Google.Protobuf" Version="3.28.0" />
+    <PackageVersion Include="Google.Protobuf.Tools" Version="3.28.0" />
     <PackageVersion Include="Grpc" Version="2.46.6" />
     <PackageVersion Include="Grpc.Tools" Version="2.65.0" />
     <PackageVersion Include="HexMate" Version="0.0.3" />
@@ -44,13 +44,14 @@
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageVersion Include="Nethermind.Crypto.Bls" Version="1.0.2" />
+    <PackageVersion Include="Nethermind.Crypto.Bls" Version="1.0.3" />
     <PackageVersion Include="Nethermind.Crypto.Pairings" Version="1.1.1" />
     <PackageVersion Include="Nethermind.Crypto.SecP256k1" Version="1.2.2" />
     <PackageVersion Include="Nethermind.DotNetty.Buffers" Version="1.0.1" />
     <PackageVersion Include="Nethermind.DotNetty.Handlers" Version="1.0.1" />
     <PackageVersion Include="Nethermind.DotNetty.Transport" Version="1.0.1" />
     <PackageVersion Include="Nethermind.Gmp" Version="1.0.1" />
+    <PackageVersion Include="Nethermind.Libp2p" Version="1.0.0-preview.33" />
     <PackageVersion Include="Nethermind.Numerics.Int256" Version="1.2.0" />
     <PackageVersion Include="Nito.Collections.Deque" Version="1.2.1" />
     <PackageVersion Include="NLog" Version="5.3.2" />

src/Nethermind/Nethermind.Api/Extensions/IConsensusWrapperPlugin.cs

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using System.Threading.Tasks;
 using Nethermind.Consensus;
 using Nethermind.Consensus.Transactions;
 

src/Nethermind/Nethermind.Api/Extensions/IPluginConfig.cs

@@ -8,6 +8,6 @@ namespace Nethermind.Api.Extensions;
 [ConfigCategory(DisabledForCli = false, HiddenFromDocs = true)]
 public interface IPluginConfig : IConfig
 {
-    [ConfigItem(Description = "Order of plugin initialization", DefaultValue = "[Clique, Aura, Ethash, Optimism, AuRaMerge, Merge, MEV, HealthChecks, Hive]")]
+    [ConfigItem(Description = "Order of plugin initialization", DefaultValue = "[Clique, Aura, Ethash, Optimism, Shutter, AuRaMerge, Merge, MEV, HealthChecks, Hive]")]
     string[] PluginOrder { get; set; }
 }

src/Nethermind/Nethermind.Api/Extensions/PluginConfig.cs

@@ -5,5 +5,5 @@ namespace Nethermind.Api.Extensions;
 
 public class PluginConfig : IPluginConfig
 {
-    public string[] PluginOrder { get; set; } = { "Clique", "Aura", "Ethash", "Optimism", "AuRaMerge", "Merge", "MEV", "HealthChecks", "Hive" };
+    public string[] PluginOrder { get; set; } = { "Clique", "Aura", "Ethash", "Optimism", "Shutter", "AuRaMerge", "Merge", "MEV", "HealthChecks", "Hive" };
 }

src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs

@@ -88,6 +88,7 @@ public interface IApiWithBlockchain : IApiWithStores, IBlockchainBridgeFactory
         IGasLimitCalculator? GasLimitCalculator { get; set; }
 
         IBlockProducerEnvFactory? BlockProducerEnvFactory { get; set; }
+        IBlockImprovementContextFactory? BlockImprovementContextFactory { get; set; }
 
         IGasPriceOracle? GasPriceOracle { get; set; }
 

src/Nethermind/Nethermind.Api/IApiWithStores.cs

@@ -8,6 +8,7 @@
 using Nethermind.Consensus;
 using Nethermind.Crypto;
 using Nethermind.Db.Blooms;
+using Nethermind.Facade.Find;
 using Nethermind.State.Repositories;
 using Nethermind.TxPool;
 using Nethermind.Wallet;

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -57,6 +57,7 @@
 using Nethermind.Sockets;
 using Nethermind.Trie;
 using Nethermind.Consensus.Processing.CensorshipDetector;
+using Nethermind.Facade.Find;
 
 namespace Nethermind.Api
 {
@@ -214,6 +215,7 @@ public ISealEngine SealEngine
         public IGasLimitCalculator? GasLimitCalculator { get; set; }
 
         public IBlockProducerEnvFactory? BlockProducerEnvFactory { get; set; }
+        public IBlockImprovementContextFactory? BlockImprovementContextFactory { get; set; }
         public IGasPriceOracle? GasPriceOracle { get; set; }
 
         public IEthSyncingInfo? EthSyncingInfo { get; set; }

src/Nethermind/Nethermind.Api/PluginPriorities.cs

@@ -6,4 +6,5 @@ namespace Nethermind.Api;
 public class PluginPriorities
 {
     public const int Merge = 1000;
+    public const int Shutter = 2000;
 }

src/Nethermind/Nethermind.Blockchain.Test/Find/LogFinderTests.cs

@@ -20,6 +20,7 @@
 using Nethermind.Logging;
 using Nethermind.Db.Blooms;
 using Nethermind.Facade.Filters;
+using Nethermind.Facade.Find;
 using NSubstitute;
 using NUnit.Framework;
 

src/Nethermind/Nethermind.Blockchain/Contracts/LogEntryAddressAndTopicsMatchTemplateEqualityComparer.cs

@@ -26,15 +26,15 @@ public bool Equals(LogEntry logEntry, LogEntry searchedEntryTemplate)
             Hash256[] matchEntryTopics = searchedEntryTemplate?.Topics ?? Array.Empty<Hash256>();
             return ReferenceEquals(logEntry, searchedEntryTemplate) || (
                 logEntry is not null
-                && logEntry.LoggersAddress == searchedEntryTemplate?.LoggersAddress
+                && logEntry.Address == searchedEntryTemplate?.Address
                 && logEntry.Topics.Length >= matchEntryTopics.Length
                 && logEntry.Topics.Take(matchEntryTopics.Length).SequenceEqual(matchEntryTopics)
                 );
         }
 
         public int GetHashCode(LogEntry obj)
         {
-            return obj.Topics.Aggregate(obj.LoggersAddress.GetHashCode(), (i, keccak) => i ^ keccak.GetHashCode());
+            return obj.Topics.Aggregate(obj.Address.GetHashCode(), (i, keccak) => i ^ keccak.GetHashCode());
         }
     }
 }

src/Nethermind/Nethermind.Blockchain/Spec/ChainHeadSpecProvider.cs

@@ -34,6 +34,8 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
 
         public long? DaoBlockNumber => _specProvider.DaoBlockNumber;
 
+        public ulong? BeaconChainGenesisTimestamp => _specProvider.BeaconChainGenesisTimestamp;
+
         public ulong NetworkId => _specProvider.NetworkId;
 
         public ulong ChainId => _specProvider.ChainId;

src/Nethermind/Nethermind.Consensus.AuRa/Config/IAuraConfig.cs

@@ -18,7 +18,6 @@ public interface IAuraConfig : IConfig
 
     [ConfigItem(Description = "The address of the transaction priority contract to use when selecting transactions from the transaction pool.",
         DefaultValue = "null")]
-
     string TxPriorityContractAddress { get; set; }
 
     [ConfigItem(Description = "The path to the transaction priority rules file to use when selecting transactions from the transaction pool.",

src/Nethermind/Nethermind.Merge.Plugin/BlockProduction/IBlockImprovementContext.cs → src/Nethermind/Nethermind.Consensus/Producers/IBlockImprovementContext.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Nethermind.Core;
 
-namespace Nethermind.Merge.Plugin.BlockProduction;
+namespace Nethermind.Consensus.Producers;
 
 public interface IBlockImprovementContext : IBlockProductionContext, IDisposable
 {

src/Nethermind/Nethermind.Merge.Plugin/BlockProduction/IBlockImprovementContextFactory.cs → src/Nethermind/Nethermind.Consensus/Producers/IBlockImprovementContextFactory.cs

@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
-using Nethermind.Consensus.Producers;
 using Nethermind.Core;
 
-namespace Nethermind.Merge.Plugin.BlockProduction;
+namespace Nethermind.Consensus.Producers;
 
 public interface IBlockImprovementContextFactory
 {

src/Nethermind/Nethermind.Merge.Plugin/BlockProduction/IBlockProductionContext.cs → src/Nethermind/Nethermind.Consensus/Producers/IBlockProductionContext.cs

@@ -4,7 +4,7 @@
 using Nethermind.Core;
 using Nethermind.Int256;
 
-namespace Nethermind.Merge.Plugin.BlockProduction;
+namespace Nethermind.Consensus.Producers;
 
 public interface IBlockProductionContext
 {

src/Nethermind/Nethermind.Consensus/Requests/DepositsProcessor.cs

@@ -30,7 +30,7 @@ public IEnumerable<Deposit> ProcessDeposits(Block block, TxReceipt[] receipts, I
                 for (var j = 0; j < logEntries.Length; j++)
                 {
                     LogEntry log = logEntries[j];
-                    if (log.LoggersAddress == spec.DepositContractAddress)
+                    if (log.Address == spec.DepositContractAddress)
                     {
                         yield return DecodeDeposit(log);
                     }

src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs

@@ -30,6 +30,7 @@
 using Nethermind.Db.Blooms;
 using Nethermind.Evm;
 using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Facade.Find;
 using Nethermind.Int256;
 using Nethermind.Logging;
 using Nethermind.Serialization.Json;

src/Nethermind/Nethermind.Core.Test/Crypto/BlsSignerTests.cs

@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using FluentAssertions;
+using Nethermind.Crypto;
+using NUnit.Framework;
+
+namespace Nethermind.Core.Test.Crypto;
+
+[TestFixture]
+public class BlsTests
+{
+    private static readonly byte[] SkBytes = [0x2c, 0xd4, 0xba, 0x40, 0x6b, 0x52, 0x24, 0x59, 0xd5, 0x7a, 0x0b, 0xed, 0x51, 0xa3, 0x97, 0x43, 0x5c, 0x0b, 0xb1, 0x1d, 0xd5, 0xf3, 0xca, 0x11, 0x52, 0xb3, 0x69, 0x4b, 0xb9, 0x1d, 0x7c, 0x22];
+    private static readonly byte[] MsgBytes = [0x3e, 0x00, 0xef, 0x2f, 0x89, 0x5f, 0x40, 0xd6, 0x7f, 0x5b, 0xb8, 0xe8, 0x1f, 0x09, 0xa5, 0xa1, 0x2c, 0x84, 0x0e, 0xc3, 0xce, 0x9a, 0x7f, 0x3b, 0x18, 0x1b, 0xe1, 0x88, 0xef, 0x71, 0x1a, 0x1e];
+
+    [Test]
+    public void Calculate_signature()
+    {
+        byte[] expected = [0xa5, 0xa0, 0x0d, 0xe9, 0x9d, 0x8f, 0xee, 0x7e, 0x28, 0x81, 0x1b, 0x2c, 0x08, 0xe0, 0xa7, 0xfc, 0x00, 0xa1, 0x10, 0x0c, 0x3d, 0x0f, 0x80, 0x51, 0x9d, 0x43, 0x24, 0x67, 0x1c, 0x29, 0x36, 0xb1, 0xe5, 0xa5, 0x87, 0x7d, 0x46, 0x7a, 0x6d, 0xc6, 0xf5, 0x92, 0xb2, 0x40, 0x7b, 0xcb, 0x12, 0x61, 0x0c, 0x18, 0x8a, 0x6c, 0xdf, 0x57, 0xd1, 0x77, 0x92, 0x00, 0x0f, 0xf7, 0x56, 0xf8, 0x0e, 0xbe, 0xd8, 0x00, 0x88, 0xab, 0x22, 0x9a, 0xa7, 0xe2, 0xc3, 0x24, 0x09, 0xec, 0xfe, 0x5a, 0x8d, 0x44, 0x73, 0xe9, 0x12, 0xfa, 0x19, 0x9e, 0xee, 0xa1, 0x8f, 0x3c, 0x79, 0x8d, 0xc5, 0x28, 0x64, 0x7d];
+        BlsSigner.Signature s = BlsSigner.Sign(new(SkBytes, Bls.ByteOrder.LittleEndian), MsgBytes);
+        s.Bytes.ToArray().Should().Equal(expected);
+    }
+
+    [Test]
+    public void Verify_signature()
+    {
+        Bls.SecretKey sk = new(SkBytes, Bls.ByteOrder.LittleEndian);
+        BlsSigner.Signature s = BlsSigner.Sign(sk, MsgBytes);
+        Assert.That(BlsSigner.Verify(BlsSigner.GetPublicKey(sk).ToAffine(), s, MsgBytes));
+    }
+
+    [Test]
+    public void Rejects_bad_signature()
+    {
+        Bls.SecretKey sk = new(SkBytes, Bls.ByteOrder.LittleEndian);
+        BlsSigner.Signature s = BlsSigner.Sign(sk, MsgBytes);
+        Span<byte> bytes = stackalloc byte[96];
+        s.Bytes.CopyTo(bytes);
+        bytes[34] += 1;
+        BlsSigner.Signature bad = new(bytes);
+
+        Assert.That(BlsSigner.Verify(BlsSigner.GetPublicKey(sk).ToAffine(), bad, MsgBytes), Is.False);
+    }
+
+    [Test]
+    public void Public_key_from_private_key()
+    {
+        byte[] expected = [0x95, 0x39, 0x27, 0x35, 0x0c, 0x35, 0x31, 0xb0, 0xbc, 0x58, 0x64, 0xcd, 0x9c, 0x5f, 0xe1, 0x34, 0x74, 0xca, 0x0c, 0x9b, 0x59, 0x99, 0x51, 0xa7, 0x76, 0xc4, 0xb9, 0x8d, 0xf6, 0x6a, 0x0e, 0x62, 0x07, 0xa8, 0x5c, 0x7f, 0x7a, 0x85, 0x1a, 0x0c, 0x02, 0x2a, 0x87, 0xc0, 0x29, 0xc3, 0x65, 0x61];
+        Assert.That(BlsSigner.GetPublicKey(new(SkBytes, Bls.ByteOrder.LittleEndian)).Compress(), Is.EqualTo(expected));
+    }
+}

src/Nethermind/Nethermind.Core.Test/Encoding/LogEntryDecoderTests.cs

@@ -22,7 +22,7 @@ public void Can_do_roundtrip(bool valueDecode)
         LogEntry decoded = valueDecode ? Rlp.Decode<LogEntry>(rlp.Bytes.AsSpan()) : Rlp.Decode<LogEntry>(rlp);
 
         Assert.That(decoded.Data, Is.EqualTo(logEntry.Data), "data");
-        Assert.That(decoded.LoggersAddress, Is.EqualTo(logEntry.LoggersAddress), "address");
+        Assert.That(decoded.Address, Is.EqualTo(logEntry.Address), "address");
         Assert.That(decoded.Topics, Is.EqualTo(logEntry.Topics), "topics");
     }
 
@@ -35,7 +35,7 @@ public void Can_do_roundtrip_ref_struct()
         LogEntryDecoder.DecodeStructRef(ref valueDecoderContext, RlpBehaviors.None, out LogEntryStructRef decoded);
 
         Assert.That(Bytes.AreEqual(logEntry.Data, decoded.Data), "data");
-        Assert.That(logEntry.LoggersAddress == decoded.LoggersAddress, "address");
+        Assert.That(logEntry.Address == decoded.Address, "address");
 
         Span<byte> buffer = stackalloc byte[32];
         KeccaksIterator iterator = new(decoded.TopicsRlp, buffer);
@@ -64,7 +64,7 @@ public void Can_do_roundtrip_rlp_stream()
         LogEntry deserialized = decoder.Decode(new RlpStream(encoded.Bytes))!;
 
         Assert.That(deserialized.Data, Is.EqualTo(logEntry.Data), "data");
-        Assert.That(deserialized.LoggersAddress, Is.EqualTo(logEntry.LoggersAddress), "address");
+        Assert.That(deserialized.Address, Is.EqualTo(logEntry.Address), "address");
         Assert.That(deserialized.Topics, Is.EqualTo(logEntry.Topics), "topics");
     }
 

src/Nethermind/Nethermind.Core.Test/FixedBlockChainHeadSpecProvider.cs

@@ -27,6 +27,8 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
 
         public long? DaoBlockNumber => specProvider.DaoBlockNumber;
 
+        public ulong? BeaconChainGenesisTimestamp => specProvider.BeaconChainGenesisTimestamp;
+
         public ulong NetworkId => specProvider.NetworkId;
         public ulong ChainId => specProvider.ChainId;
 

src/Nethermind/Nethermind.Core/Bloom.cs

@@ -121,7 +121,7 @@ public void Add(LogEntry[] logEntries, Bloom? blockBloom = null)
             for (int entryIndex = 0; entryIndex < logEntries.Length; entryIndex++)
             {
                 LogEntry logEntry = logEntries[entryIndex];
-                byte[] addressBytes = logEntry.LoggersAddress.Bytes;
+                byte[] addressBytes = logEntry.Address.Bytes;
                 Set(addressBytes, blockBloom);
                 Hash256[] topics = logEntry.Topics;
                 for (int topicIndex = 0; topicIndex < topics.Length; topicIndex++)
@@ -144,7 +144,7 @@ public void Accumulate(Bloom? bloom)
 
         public bool Matches(LogEntry logEntry)
         {
-            if (Matches(logEntry.LoggersAddress))
+            if (Matches(logEntry.Address))
             {
                 Hash256[] topics = logEntry.Topics;
                 for (int topicIndex = 0; topicIndex < topics.Length; topicIndex++)
@@ -279,7 +279,7 @@ public override readonly bool Equals(object? obj)
 
         public readonly bool Matches(LogEntry logEntry)
         {
-            if (Matches(logEntry.LoggersAddress))
+            if (Matches(logEntry.Address))
             {
                 Hash256[] topics = logEntry.Topics;
                 for (int topicIndex = 0; topicIndex < topics.Length; topicIndex++)

src/Nethermind/Nethermind.Core/Collections/EnumerableExtensions.cs

@@ -11,9 +11,26 @@ public static class EnumerableExtensions
 {
     public static void ForEach<T>(this IEnumerable<T> list, Action<T> action)
     {
-        list.ToList().ForEach(action);
+        foreach (T element in list)
+        {
+            action(element);
+        }
     }
 
     public static bool NullableSequenceEqual<T>(this IEnumerable<T>? first, IEnumerable<T>? second) =>
         first is not null ? second is not null && first.SequenceEqual(second) : second is null;
+
+    public static bool ContainsDuplicates<T>(this IEnumerable<T> list, int? count = null, IEqualityComparer<T>? comparer = null)
+    {
+        HashSet<T> hashSet = count is null ? new HashSet<T>(comparer) : new HashSet<T>(count.Value, comparer);
+        foreach (T element in list)
+        {
+            if (!hashSet.Add(element))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

src/Nethermind/Nethermind.Core/Collections/EnumerableWithCount.cs

@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Nethermind.Core.Collections;
+
+public readonly record struct EnumerableWithCount<T>(IEnumerable<T> Enumerable, int Count) : IEnumerable<T>
+{
+    // ReSharper disable once NotDisposedResourceIsReturned
+    public IEnumerator<T> GetEnumerator() => Enumerable.GetEnumerator();
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}
+