Txpool state cache

src/Nethermind/Nethermind.Blockchain/BlockTree.cs

@@ -1253,7 +1253,7 @@ private ChainLevelInfo UpdateOrCreateLevel(long number, Hash256 hash, BlockInfo
         /// <returns></returns>
         private bool ShouldCache(long number)
         {
-            return number == 0L || Head is null || number >= Head.Number - HeaderStore.CacheSize;
+            return number == 0L || Head is null || number >= Head.Number - BlockStore.CacheSize;
         }
 
         public ChainLevelInfo? FindLevel(long number)

src/Nethermind/Nethermind.Blockchain/Blocks/BlockStore.cs

@@ -18,7 +18,7 @@ public class BlockStore : IBlockStore
 {
     private readonly IDb _blockDb;
     private readonly BlockDecoder _blockDecoder = new();
-    private const int CacheSize = 128 + 32;
+    public const int CacheSize = 128 + 32;
 
     private readonly LruCache<ValueHash256, Block>
         _blockCache = new(CacheSize, CacheSize, "blocks");

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

@@ -216,6 +216,9 @@ private void ValidateProcessedBlock(Block suggestedBlock, ProcessingOptions opti
             if (_logger.IsWarn) _logger.Warn($"Suggested block TD: {suggestedBlock.TotalDifficulty}, Suggested block IsPostMerge {suggestedBlock.IsPostMerge}, Block TD: {block.TotalDifficulty}, Block IsPostMerge {block.IsPostMerge}");
             throw new InvalidBlockException(suggestedBlock, error);
         }
+
+        // Block is valid, copy the account changes as we use the suggested block not the processed one
+        suggestedBlock.AccountChanges = block.AccountChanges;
     }
 
     private bool ShouldComputeStateRoot(BlockHeader header) =>
@@ -251,6 +254,8 @@ protected virtual TxReceipt[] ProcessBlock(
 
         _stateProvider.Commit(spec, commitStorageRoots: true);
 
+        // Get the accounts that have been changed
+        block.AccountChanges = _stateProvider.GetAccountChanges();
         if (ShouldComputeStateRoot(block.Header))
         {
             _stateProvider.RecalculateStateRoot();

src/Nethermind/Nethermind.Core/Block.cs

@@ -6,6 +6,8 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
+using Nethermind.Core.Collections;
 using Nethermind.Core.Crypto;
 using Nethermind.Int256;
 
@@ -109,6 +111,9 @@ public Transaction[] Transactions
     public Hash256? WithdrawalsRoot => Header.WithdrawalsRoot; // do not add setter here
     public Hash256? ParentBeaconBlockRoot => Header.ParentBeaconBlockRoot; // do not add setter here
 
+    [JsonIgnore]
+    public ArrayPoolList<AddressAsKey>? AccountChanges { get; set; }
+
     public override string ToString() => ToString(Format.Short);
 
     public string ToString(Format format) => format switch

src/Nethermind/Nethermind.Db/Metrics.cs

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System.ComponentModel;
+using System.Threading;
+
 using Nethermind.Core.Attributes;
 
 namespace Nethermind.Db
@@ -14,15 +16,19 @@ public static class Metrics
 
         [CounterMetric]
         [Description("Number of State Trie cache hits.")]
-        public static long StateTreeCache { get; set; }
+        public static long StateTreeCache => _stateTreeCacheHits;
+        private static long _stateTreeCacheHits;
+        public static void IncrementTreeCacheHits() => Interlocked.Increment(ref _stateTreeCacheHits);
 
         [CounterMetric]
         [Description("Number of State Trie reads.")]
         public static long StateTreeReads { get; set; }
 
         [CounterMetric]
         [Description("Number of State Reader reads.")]
-        public static long StateReaderReads { get; set; }
+        public static long StateReaderReads => _stateReaderReads;
+        private static long _stateReaderReads;
+        public static void IncrementStateReaderReads() => Interlocked.Increment(ref _stateReaderReads);
 
         [CounterMetric]
         [Description("Number of Blocks Trie writes.")]

src/Nethermind/Nethermind.State/IWorldState.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Nethermind.Core;
+using Nethermind.Core.Collections;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Int256;
@@ -104,4 +105,5 @@ public interface IWorldState : IJournal<Snapshot>, IReadOnlyStateProvider
     void Commit(IReleaseSpec releaseSpec, IWorldStateTracer? tracer, bool isGenesis = false, bool commitStorageRoots = true);
 
     void CommitTree(long blockNumber);
+    ArrayPoolList<AddressAsKey>? GetAccountChanges();
 }

src/Nethermind/Nethermind.State/PersistentStorageProvider.cs

@@ -3,8 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 using Nethermind.Core;
 using Nethermind.Core.Collections;
 using Nethermind.Core.Crypto;

src/Nethermind/Nethermind.State/StateProvider.cs

@@ -2,10 +2,13 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Nethermind.Core;
 using Nethermind.Core.Caching;
+using Nethermind.Core.Collections;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Resettables;
 using Nethermind.Core.Specs;
@@ -674,7 +677,7 @@ private void ReportChanges(IStateTracer stateTracer, Dictionary<AddressAsKey, Ch
             }
             else
             {
-                Metrics.StateTreeCache++;
+                Metrics.IncrementTreeCacheHits();
             }
             return account;
         }
@@ -798,6 +801,24 @@ public Change(ChangeType type, Address address, Account? account)
             public Account? Account { get; }
         }
 
+        public ArrayPoolList<AddressAsKey>? ChangedAddresses()
+        {
+            int count = _blockCache.Count;
+            if (count == 0)
+            {
+                return null;
+            }
+            else
+            {
+                ArrayPoolList<AddressAsKey> addresses = new(count);
+                foreach (AddressAsKey address in _blockCache.Keys)
+                {
+                    addresses.Add(address);
+                }
+                return addresses;
+            }
+        }
+
         public void Reset()
         {
             if (_logger.IsTrace) _logger.Trace("Clearing state provider caches");

src/Nethermind/Nethermind.State/StateReader.cs

@@ -68,7 +68,7 @@ private bool TryGetState(Hash256 stateRoot, Address address, out AccountStruct a
                 return false;
             }
 
-            Metrics.StateReaderReads++;
+            Metrics.IncrementStateReaderReads();
             return _state.TryGetStruct(address, out account, stateRoot);
         }
     }

src/Nethermind/Nethermind.State/WorldState.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using Nethermind.Core;
+using Nethermind.Core.Collections;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Int256;
@@ -236,5 +237,10 @@ public void CreateAccountIfNotExists(Address address, in UInt256 balance, in UIn
         {
             _stateProvider.CreateAccountIfNotExists(address, balance, nonce);
         }
+
+        ArrayPoolList<AddressAsKey>? IWorldState.GetAccountChanges()
+        {
+            return _stateProvider.ChangedAddresses();
+        }
     }
 }

src/Nethermind/Nethermind.TxPool.Test/TxPoolTests.cs

@@ -273,6 +273,7 @@ public void get_next_pending_nonce()
 
             // LatestPendingNonce=1, when the current nonce of the account=1 and no pending transactions
             _stateProvider.IncrementNonce(TestItem.AddressA);
+            _txPool.ResetAddress(TestItem.AddressA);
             latestNonce = _txPool.GetLatestPendingNonce(TestItem.AddressA);
             Assert.That((UInt256)1, Is.EqualTo(latestNonce));
 
@@ -564,6 +565,7 @@ public void should_not_count_txs_with_stale_nonces_when_calculating_cumulative_c
                 if (i < numberOfStaleTxsInBucket)
                 {
                     _stateProvider.IncrementNonce(TestItem.AddressA);
+                    _txPool.ResetAddress(TestItem.AddressA);
                 }
             }
 
@@ -1041,6 +1043,7 @@ public void should_retrieve_added_persistent_transaction_correctly_even_if_was_e
             retrievedTransaction.Should().BeEquivalentTo(transaction);
 
             EnsureSenderBalance(transactionWithHigherFee);
+            _txPool.ResetAddress(transactionWithHigherFee.SenderAddress);
             _txPool.SubmitTx(transactionWithHigherFee, TxHandlingOptions.None).Should().Be(AcceptTxResult.Accepted);
             _txPool.TryGetPendingTransaction(transactionWithHigherFee.Hash, out var retrievedTransactionWithHigherFee).Should().BeTrue();
             retrievedTransactionWithHigherFee.Should().BeEquivalentTo(transactionWithHigherFee);

src/Nethermind/Nethermind.TxPool/TxPool.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Channels;
@@ -44,6 +45,7 @@ public class TxPool : ITxPool, IDisposable
 
         private readonly IChainHeadSpecProvider _specProvider;
         private readonly IAccountStateProvider _accounts;
+        private readonly AccountCache _accountCache;
         private readonly IEthereumEcdsa _ecdsa;
         private readonly IBlobTxStorage _blobTxStorage;
         private readonly IChainHeadInfoProvider _headInfo;
@@ -65,6 +67,8 @@ public class TxPool : ITxPool, IDisposable
         private readonly ITimer? _timer;
         private Transaction[]? _transactionSnapshot;
         private Transaction[]? _blobTransactionSnapshot;
+        private long _lastBlockNumber = -1;
+        private Hash256? _lastBlockHash;
 
         /// <summary>
         /// This class stores all known pending transactions that can be used for block production
@@ -97,7 +101,7 @@ public TxPool(IEthereumEcdsa ecdsa,
             _headInfo = chainHeadInfoProvider ?? throw new ArgumentNullException(nameof(chainHeadInfoProvider));
             _txPoolConfig = txPoolConfig;
             _blobReorgsSupportEnabled = txPoolConfig.BlobsSupport.SupportsReorgs();
-            _accounts = _headInfo.AccountStateProvider;
+            _accounts = _accountCache = new AccountCache(_headInfo.AccountStateProvider);
             _specProvider = _headInfo.SpecProvider;
 
             MemoryAllowance.MemPoolSize = txPoolConfig.Size;
@@ -206,6 +210,23 @@ private void ProcessNewHeads()
                     {
                         try
                         {
+                            ArrayPoolList<AddressAsKey>? accountChanges = args.Block.AccountChanges;
+                            if (!CanUseCache(args.Block, accountChanges))
+                            {
+                                // Not sequential block, reset cache
+                                _accountCache.Reset();
+                            }
+                            else
+                            {
+                                // Sequential block, just remove changed accounts from cache
+                                _accountCache.RemoveAccounts(accountChanges);
+                            }
+                            args.Block.AccountChanges = null;
+                            accountChanges?.Dispose();
+
+                            _lastBlockNumber = args.Block.Number;
+                            _lastBlockHash = args.Block.Hash;
+
                             ReAddReorganisedTransactions(args.PreviousBlock);
                             RemoveProcessedTransactions(args.Block);
                             UpdateBuckets();
@@ -219,6 +240,11 @@ private void ProcessNewHeads()
                         }
                     }
                 }
+
+                bool CanUseCache(Block block, [NotNullWhen(true)] ArrayPoolList<AddressAsKey>? accountChanges)
+                {
+                    return accountChanges is not null && block.ParentHash == _lastBlockHash && _lastBlockNumber + 1 == block.Number;
+                }
             }, TaskCreationOptions.LongRunning).ContinueWith(t =>
             {
                 if (t.IsFaulted)
@@ -737,6 +763,74 @@ private void TimerOnElapsed(object? sender, EventArgs e)
             _timer!.Enabled = true;
         }
 
+        internal void ResetAddress(Address address)
+        {
+            ArrayPoolList<AddressAsKey> arrayPoolList = new(1);
+            arrayPoolList.Add(address);
+            _accountCache.RemoveAccounts(arrayPoolList);
+        }
+
+        private sealed class AccountCache : IAccountStateProvider
+        {
+            private readonly IAccountStateProvider _provider;
+            private readonly LruCache<AddressAsKey, AccountStruct>[] _caches;
+
+            public AccountCache(IAccountStateProvider provider)
+            {
+                _provider = provider;
+                _caches = new LruCache<AddressAsKey, AccountStruct>[16];
+                for (int i = 0; i < _caches.Length; i++)
+                {
+                    // Cache per nibble to reduce contention as TxPool is very parallel
+                    _caches[i] = new LruCache<AddressAsKey, AccountStruct>(1_024, "");
+                }
+            }
+
+            public bool TryGetAccount(Address address, out AccountStruct account)
+            {
+                var cache = _caches[GetCacheIndex(address)];
+                if (!cache.TryGet(new AddressAsKey(address), out account))
+                {
+                    if (!_provider.TryGetAccount(address, out account))
+                    {
+                        cache.Set(address, AccountStruct.TotallyEmpty);
+                        return false;
+                    }
+                    cache.Set(address, account);
+                }
+                else
+                {
+                    Db.Metrics.IncrementTreeCacheHits();
+                }
+
+                return true;
+            }
+
+            public void RemoveAccounts(ArrayPoolList<AddressAsKey> address)
+            {
+                Parallel.ForEach(address.GroupBy(a => GetCacheIndex(a.Value)),
+                    (n) =>
+                    {
+                        var cache = _caches[n.Key];
+                        foreach (Address a in n)
+                        {
+                            cache.Delete(a);
+                        }
+                    }
+                );
+            }
+
+            private static int GetCacheIndex(Address address) => address.Bytes[^1] & 0xf;
+
+            public void Reset()
+            {
+                for (int i = 0; i < _caches.Length; i++)
+                {
+                    _caches[i].Clear();
+                }
+            }
+        }
+
         private static void WriteTxPoolReport(in ILogger logger)
         {
             if (!logger.IsInfo)