Remove witness protocol support

src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs

@@ -166,7 +166,6 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
                     stateProvider),
                 stateProvider,
                 receiptStorage,
-                NullWitnessCollector.Instance,
                 new BlockhashStore(blockTree, specProvider, stateProvider),
                 _logManager);
 

src/Nethermind/Nethermind.AccountAbstraction.Test/AccountAbstractionRpcModuleTests.TestAccountAbstractionRpcBlockchain.cs

@@ -190,7 +190,6 @@ protected override BlockProcessor CreateBlockProcessor()
                     new BlockProcessor.BlockValidationTransactionsExecutor(TxProcessor, State),
                     State,
                     ReceiptStorage,
-                    NullWitnessCollector.Instance,
                     new BlockhashStore(BlockTree, SpecProvider, State),
                     LogManager);
 

src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs

@@ -70,8 +70,6 @@ public interface IApiWithBlockchain : IApiWithStores, IBlockchainBridgeFactory
         ITxPool? TxPool { get; set; }
         ITxPoolInfoProvider? TxPoolInfoProvider { get; set; }
         CompositeTxGossipPolicy TxGossipPolicy { get; }
-        IWitnessCollector? WitnessCollector { get; set; }
-        IWitnessRepository? WitnessRepository { get; set; }
         IHealthHintService? HealthHintService { get; set; }
         IRpcCapabilitiesProvider? RpcCapabilitiesProvider { get; set; }
         ITransactionComparerProvider? TransactionComparerProvider { get; set; }

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -146,8 +146,6 @@ public IBlockchainBridge CreateBlockchainBridge()
         public IProtocolsManager? ProtocolsManager { get; set; }
         public IProtocolValidator? ProtocolValidator { get; set; }
         public IReceiptStorage? ReceiptStorage { get; set; }
-        public IWitnessCollector? WitnessCollector { get; set; }
-        public IWitnessRepository? WitnessRepository { get; set; }
         public IReceiptFinder? ReceiptFinder { get; set; }
         public IReceiptMonitor? ReceiptMonitor { get; set; }
         public IRewardCalculatorSource? RewardCalculatorSource { get; set; } = NoBlockRewards.Instance;

src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs

@@ -49,7 +49,6 @@ public void Prepared_block_contains_author_field()
                 new BlockProcessor.BlockValidationTransactionsExecutor(transactionProcessor, stateProvider),
                 stateProvider,
                 NullReceiptStorage.Instance,
-                NullWitnessCollector.Instance,
                 Substitute.For<IBlockhashStore>(),
                 LimboLogs.Instance);
 
@@ -64,38 +63,6 @@ public void Prepared_block_contains_author_field()
             Assert.That(processedBlocks[0].Author, Is.EqualTo(block.Author), "author");
         }
 
-        [Test, Timeout(Timeout.MaxTestTime)]
-        public void Can_store_a_witness()
-        {
-            IDb stateDb = new MemDb();
-            IDb codeDb = new MemDb();
-            TrieStore trieStore = new TrieStore(stateDb, LimboLogs.Instance);
-
-            IWorldState stateProvider = new WorldState(trieStore, codeDb, LimboLogs.Instance);
-            ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();
-            IWitnessCollector witnessCollector = Substitute.For<IWitnessCollector>();
-            BlockProcessor processor = new(
-                HoleskySpecProvider.Instance,
-                TestBlockValidator.AlwaysValid,
-                NoBlockRewards.Instance,
-                new BlockProcessor.BlockValidationTransactionsExecutor(transactionProcessor, stateProvider),
-                stateProvider,
-                NullReceiptStorage.Instance,
-                witnessCollector,
-                Substitute.For<IBlockhashStore>(),
-                LimboLogs.Instance);
-
-            BlockHeader header = Build.A.BlockHeader.WithAuthor(TestItem.AddressD).TestObject;
-            Block block = Build.A.Block.WithHeader(header).TestObject;
-            _ = processor.Process(
-                Keccak.EmptyTreeHash,
-                new List<Block> { block },
-                ProcessingOptions.None,
-                NullBlockTracer.Instance);
-
-            witnessCollector.Received(1).Persist(block.Hash!);
-        }
-
         [Test, Timeout(Timeout.MaxTestTime)]
         public void Recovers_state_on_cancel()
         {
@@ -111,7 +78,6 @@ public void Recovers_state_on_cancel()
                 new BlockProcessor.BlockValidationTransactionsExecutor(transactionProcessor, stateProvider),
                 stateProvider,
                 NullReceiptStorage.Instance,
-                NullWitnessCollector.Instance,
                 Substitute.For<IBlockhashStore>(),
                 LimboLogs.Instance);
 

src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs

@@ -73,7 +73,6 @@ public void Test()
                 new BlockProcessor.BlockValidationTransactionsExecutor(txProcessor, stateProvider),
                 stateProvider,
                 NullReceiptStorage.Instance,
-                NullWitnessCollector.Instance,
                 new BlockhashStore(blockTree, specProvider, stateProvider),
                 LimboLogs.Instance);
             BlockchainProcessor blockchainProcessor = new(

src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs

@@ -19,7 +19,6 @@
 using Nethermind.Logging;
 using Nethermind.Specs;
 using Nethermind.State;
-using Nethermind.State.Witnesses;
 using Nethermind.Trie.Pruning;
 using Nethermind.TxPool;
 using NUnit.Framework;
@@ -75,7 +74,6 @@ public void Setup()
             new BlockProcessor.BlockValidationTransactionsExecutor(transactionProcessor, stateProvider),
             stateProvider,
             NullReceiptStorage.Instance,
-            new WitnessCollector(memDbProvider.StateDb, LimboLogs.Instance),
             new BlockhashStore(_blockTree, MainnetSpecProvider.Instance, stateProvider),
             LimboLogs.Instance);
         _blockchainProcessor = new BlockchainProcessor(

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

@@ -93,9 +93,6 @@ public interface ISyncConfig : IConfig
     [ConfigItem(DisabledForCli = true, HiddenFromDocs = true, DefaultValue = "1")]
     public long AncientReceiptsBarrierCalc => Math.Max(1, Math.Min(PivotNumberParsed, Math.Max(AncientBodiesBarrier, AncientReceiptsBarrier)));
 
-    [ConfigItem(Description = "Whether to enable the Witness protocol.", DefaultValue = "false")]
-    public bool WitnessProtocolEnabled { get; set; }
-
     [ConfigItem(Description = "Whether to use the Snap sync mode.", DefaultValue = "false")]
     public bool SnapSync { get; set; }
 

src/Nethermind/Nethermind.Blockchain/Synchronization/ISyncPeer.cs

@@ -13,11 +13,6 @@
 
 namespace Nethermind.Blockchain.Synchronization
 {
-    public interface IWitnessPeer
-    {
-        Task<Hash256[]> GetBlockWitnessHashes(Hash256 blockHash, CancellationToken token);
-    }
-
     public interface ISyncPeer : ITxPoolPeer, IPeerWithSatelliteProtocol
     {
         Node Node { get; }

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

@@ -48,7 +48,6 @@ public string? PivotHash
             set => _pivotHash = value;
         }
         public int MaxAttemptsToUpdatePivot { get; set; } = int.MaxValue;
-        public bool WitnessProtocolEnabled { get; set; } = false;
         public bool SnapSync { get; set; } = false;
         public int SnapSyncAccountRangePartitionCount { get; set; } = 8;
         public bool FixReceipts { get; set; } = false;

src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs

@@ -137,7 +137,6 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                     new BlockProcessor.BlockValidationTransactionsExecutor(transactionProcessor, stateProvider),
                     stateProvider,
                     NullReceiptStorage.Instance,
-                    NullWitnessCollector.Instance,
                     new BlockhashStore(blockTree, goerliSpecProvider, stateProvider),
                     nodeLogManager);
 
@@ -157,7 +156,6 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                     new BlockProcessor.BlockProductionTransactionsExecutor(minerTransactionProcessor, minerStateProvider, goerliSpecProvider, _logManager),
                     minerStateProvider,
                     NullReceiptStorage.Instance,
-                    NullWitnessCollector.Instance,
                     new BlockhashStore(blockTree, goerliSpecProvider, minerStateProvider),
                     nodeLogManager);
 

src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs

@@ -53,7 +53,6 @@ public AuRaBlockProcessor(
                 blockTransactionsExecutor,
                 stateProvider,
                 receiptStorage,
-                NullWitnessCollector.Instance,
                 new BlockhashStore(blockTree, specProvider, stateProvider),
                 logManager,
                 withdrawalProcessor)

src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs

@@ -107,7 +107,6 @@ public Task<IBlockProducer> InitBlockProducer(IBlockProductionTrigger? blockProd
                 getFromApi.BlockProducerEnvFactory.TransactionsExecutorFactory.Create(producerEnv),
                 producerEnv.StateProvider,
                 NullReceiptStorage.Instance,
-                NullWitnessCollector.Instance,
                 new BlockhashStore(getFromApi.BlockTree, getFromApi.SpecProvider, producerEnv.StateProvider),
                 getFromApi.LogManager,
                 new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(producerEnv.StateProvider, getFromApi.LogManager)));

src/Nethermind/Nethermind.Consensus.Ethash/NethDevPlugin.cs

@@ -77,7 +77,6 @@ public Task<IBlockProducer> InitBlockProducer(IBlockProductionTrigger? blockProd
                 new BlockProcessor.BlockProductionTransactionsExecutor(producerEnv, getFromApi!.SpecProvider, getFromApi.LogManager),
                 producerEnv.StateProvider,
                 NullReceiptStorage.Instance,
-                NullWitnessCollector.Instance,
                 new BlockhashStore(getFromApi.BlockTree, getFromApi.SpecProvider, producerEnv.StateProvider),
                 getFromApi.LogManager);
 

src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs

@@ -35,7 +35,6 @@ public partial class BlockProcessor : IBlockProcessor
     protected readonly IWorldState _stateProvider;
     private readonly IReceiptStorage _receiptStorage;
     private readonly IReceiptsRootCalculator _receiptsRootCalculator;
-    private readonly IWitnessCollector _witnessCollector;
     private readonly IWithdrawalProcessor _withdrawalProcessor;
     private readonly IBeaconBlockRootHandler _beaconBlockRootHandler;
     private readonly IBlockValidator _blockValidator;
@@ -57,7 +56,6 @@ public BlockProcessor(
         IBlockProcessor.IBlockTransactionsExecutor? blockTransactionsExecutor,
         IWorldState? stateProvider,
         IReceiptStorage? receiptStorage,
-        IWitnessCollector? witnessCollector,
         IBlockhashStore? blockHashStore,
         ILogManager? logManager,
         IWithdrawalProcessor? withdrawalProcessor = null,
@@ -68,7 +66,6 @@ public BlockProcessor(
         _blockValidator = blockValidator ?? throw new ArgumentNullException(nameof(blockValidator));
         _stateProvider = stateProvider ?? throw new ArgumentNullException(nameof(stateProvider));
         _receiptStorage = receiptStorage ?? throw new ArgumentNullException(nameof(receiptStorage));
-        _witnessCollector = witnessCollector ?? throw new ArgumentNullException(nameof(witnessCollector));
         _withdrawalProcessor = withdrawalProcessor ?? new WithdrawalProcessor(stateProvider, logManager);
         _rewardCalculator = rewardCalculator ?? throw new ArgumentNullException(nameof(rewardCalculator));
         _blockTransactionsExecutor = blockTransactionsExecutor ?? throw new ArgumentNullException(nameof(blockTransactionsExecutor));
@@ -78,7 +75,7 @@ public BlockProcessor(
         ReceiptsTracer = new BlockReceiptsTracer();
     }
 
-    public event EventHandler<BlockProcessedEventArgs> BlockProcessed;
+    public event EventHandler<BlockProcessedEventArgs>? BlockProcessed;
 
     public event EventHandler<TxProcessedEventArgs> TransactionProcessed
     {
@@ -103,7 +100,6 @@ the previous head state.*/
         bool notReadOnly = !options.ContainsFlag(ProcessingOptions.ReadOnlyChain);
         int blocksCount = suggestedBlocks.Count;
         Block[] processedBlocks = new Block[blocksCount];
-        using IDisposable tracker = _witnessCollector.TrackOnThisThread();
         try
         {
             for (int i = 0; i < blocksCount; i++)
@@ -113,15 +109,13 @@ the previous head state.*/
                     if (_logger.IsInfo) _logger.Info($"Processing part of a long blocks branch {i}/{blocksCount}. Block: {suggestedBlocks[i]}");
                 }
 
-                _witnessCollector.Reset();
                 (Block processedBlock, TxReceipt[] receipts) = ProcessOne(suggestedBlocks[i], options, blockTracer);
                 processedBlocks[i] = processedBlock;
 
                 // be cautious here as AuRa depends on processing
                 PreCommitBlock(newBranchStateRoot, suggestedBlocks[i].Number);
                 if (notReadOnly)
                 {
-                    _witnessCollector.Persist(processedBlock.Hash!);
                     BlockProcessed?.Invoke(this, new BlockProcessedEventArgs(processedBlock, receipts));
                 }
 

src/Nethermind/Nethermind.Consensus/Processing/ReadOnlyChainProcessingEnv.cs

@@ -48,7 +48,6 @@ public ReadOnlyChainProcessingEnv(
                 transactionsExecutor,
                 StateProvider,
                 receiptStorage,
-                NullWitnessCollector.Instance,
                 new BlockhashStore(txEnv.BlockTree, specProvider, StateProvider),
                 logManager);
 

src/Nethermind/Nethermind.Consensus/Producers/BlockProducerEnvFactory.cs

@@ -142,7 +142,6 @@ protected virtual BlockProcessor CreateBlockProcessor(ReadOnlyTxProcessingEnv re
                 TransactionsExecutorFactory.Create(readOnlyTxProcessingEnv),
                 readOnlyTxProcessingEnv.StateProvider,
                 receiptStorage,
-                NullWitnessCollector.Instance,
                 new BlockhashStore(_blockTree, _specProvider, readOnlyTxProcessingEnv.StateProvider),
                 logManager,
                 new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(readOnlyTxProcessingEnv.StateProvider, logManager)));

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

@@ -356,7 +356,6 @@ protected virtual IBlockProcessor CreateBlockProcessor() =>
             new BlockProcessor.BlockValidationTransactionsExecutor(TxProcessor, State),
             State,
             ReceiptStorage,
-            NullWitnessCollector.Instance,
             new BlockhashStore(BlockTree, SpecProvider, State),
             LogManager);
 

src/Nethermind/Nethermind.Db.Rocks/Config/DbConfig.cs

@@ -153,18 +153,6 @@ public class DbConfig : IDbConfig
     public long? BloomDbMaxBytesPerSec { get; set; }
     public IDictionary<string, string>? BloomDbAdditionalRocksDbOptions { get; set; }
 
-    public ulong WitnessDbWriteBufferSize { get; set; } = (ulong)1.KiB();
-    public uint WitnessDbWriteBufferNumber { get; set; } = 4;
-    public ulong WitnessDbBlockCacheSize { get; set; } = 0;
-    public bool WitnessDbCacheIndexAndFilterBlocks { get; set; } = false;
-    public int? WitnessDbMaxOpenFiles { get; set; }
-    public long? WitnessDbMaxBytesPerSec { get; set; }
-    public int? WitnessDbBlockSize { get; set; }
-    public bool? WitnessUseDirectReads { get; set; }
-    public bool? WitnessUseDirectIoForFlushAndCompactions { get; set; }
-    public ulong? WitnessCompactionReadAhead { get; set; }
-    public IDictionary<string, string>? WitnessDbAdditionalRocksDbOptions { get; set; }
-
     // TODO - profile and customize
     public ulong CanonicalHashTrieDbWriteBufferSize { get; set; } = (ulong)2.MB();
     public uint CanonicalHashTrieDbWriteBufferNumber { get; set; } = 4;

src/Nethermind/Nethermind.Db.Rocks/Config/IDbConfig.cs

@@ -154,18 +154,6 @@ public interface IDbConfig : IConfig
     long? BloomDbMaxBytesPerSec { get; set; }
     IDictionary<string, string>? BloomDbAdditionalRocksDbOptions { get; set; }
 
-    ulong WitnessDbWriteBufferSize { get; set; }
-    uint WitnessDbWriteBufferNumber { get; set; }
-    ulong WitnessDbBlockCacheSize { get; set; }
-    bool WitnessDbCacheIndexAndFilterBlocks { get; set; }
-    int? WitnessDbMaxOpenFiles { get; set; }
-    long? WitnessDbMaxBytesPerSec { get; set; }
-    int? WitnessDbBlockSize { get; set; }
-    bool? WitnessUseDirectReads { get; set; }
-    bool? WitnessUseDirectIoForFlushAndCompactions { get; set; }
-    ulong? WitnessCompactionReadAhead { get; set; }
-    IDictionary<string, string>? WitnessDbAdditionalRocksDbOptions { get; set; }
-
     ulong CanonicalHashTrieDbWriteBufferSize { get; set; }
     uint CanonicalHashTrieDbWriteBufferNumber { get; set; }
     ulong CanonicalHashTrieDbBlockCacheSize { get; set; }

src/Nethermind/Nethermind.Db.Test/Config/PerTableDbConfigTests.cs

@@ -23,7 +23,6 @@ public void CanReadAllConfigForAllTable()
             DbNames.Receipts,
             DbNames.BlockInfos,
             DbNames.Bloom,
-            DbNames.Witness,
             DbNames.CHT,
             DbNames.Metadata,
         };

src/Nethermind/Nethermind.Db/DbNames.cs

@@ -15,7 +15,6 @@ public static class DbNames
         public const string BlockInfos = "blockInfos";
         public const string BadBlocks = "badBlocks";
         public const string Bloom = "bloom";
-        public const string Witness = "witness";
         public const string CHT = "canonicalHashTrie";
         public const string Metadata = "metadata";
         public const string BlobTransactions = "blobTransactions";

src/Nethermind/Nethermind.Db/IDbProvider.cs

@@ -23,8 +23,6 @@ public interface IDbProvider : IDisposable
         // LES (ignore)
         public IDb ChtDb => GetDb<IDb>(DbNames.CHT);
 
-        public IDb WitnessDb => GetDb<IDb>(DbNames.Witness);
-
         public IDb MetadataDb => GetDb<IDb>(DbNames.Metadata);
 
         public IColumnsDb<BlobTxsColumns> BlobTransactionsDb => GetColumnDb<BlobTxsColumns>(DbNames.BlobTransactions);