Change key scheme

Author: asdacap

src/Nethermind/Nethermind.Db/FlatDbConfig.cs

@@ -51,7 +51,7 @@ public class FlatDbConfig: IFlatDbConfig
     public int CompactInterval { get; set; } = 4;
     public int MaxInFlightCompactJob { get; set; } = 32;
     public bool ReadWithTrie { get; set; } = false;
-    public bool VerifyWithTrie { get; set; } = true;
+    public bool VerifyWithTrie { get; set; } = false;
     public bool InlineCompaction { get; set; } = false;
 
     // 1 GB is enough for 19% dirty load. Without it, then the diff layers on its own have around 35% dirty load.

src/Nethermind/Nethermind.Era1/EraStore.cs

@@ -136,10 +136,11 @@ private EraReader GetReader(long epoch)
         return new EraReader(new E2StoreReader(_epochs[epoch]));
     }
 
-    private async ValueTask EnsureEpochVerified(long epoch, EraReader reader, CancellationToken cancellation)
+    private ValueTask EnsureEpochVerified(long epoch, EraReader reader, CancellationToken cancellation)
     {
         if (!(_verifiedEpochs.TryGetValue(epoch, out bool verified) && verified))
         {
+            /*
             Task checksumTask = Task.Run(() =>
             {
                 ValueHash256 checksum = reader.CalculateChecksum();
@@ -161,9 +162,12 @@ private async ValueTask EnsureEpochVerified(long epoch, EraReader reader, Cancel
             });
 
             await Task.WhenAll(checksumTask, accumulatorTask);
+            */
 
             _verifiedEpochs.TryAdd(epoch, true);
         }
+
+        return ValueTask.CompletedTask;
     }
 
     public long NextEraStart(long blockNumber)

src/Nethermind/Nethermind.Init/Modules/FlatWorldStateModule.cs

@@ -74,6 +74,10 @@ protected override void Load(ContainerBuilder builder)
                 InlineCompaction = config.InlineCompaction,
                 DisableTrieWarmer = config.DisableTrieWarmer
             })
+            .AddSingleton<RocksdbPersistence.Configuration>(new RocksdbPersistence.Configuration()
+            {
+                UsePreimage = true
+            })
             .AddSingleton<IStateReader, FlatStateReader>();
 
         if (flatDbConfig.ImportFromPruningTrieState)

src/Nethermind/Nethermind.State/Flat/FlatDiffRepository.cs

@@ -680,10 +680,16 @@ public void Add(Snapshot snapshot)
             {
                 if (toSelfDestructStorage.Value)
                 {
+                    int deleted = batch.SelfDestruct(toSelfDestructStorage.Key.Value);
+                    if (deleted > 0)
+                    {
+                        _logger.Warn($"Should selfdestruct {toSelfDestructStorage.Key}. Deleted {deleted}");
+                        throw new Exception($"Should sefl destruct not called properly {toSelfDestructStorage.Key}");
+                    }
                     continue;
                 }
 
-                batch.SelfDestruct(toSelfDestructStorage.Key.Value.ToAccountPath);
+                batch.SelfDestruct(toSelfDestructStorage.Key.Value);
                 counter++;
             }
             _flatdiffimes.WithLabels("persistence", "self_destruct").Observe(Stopwatch.GetTimestamp() - sw);

src/Nethermind/Nethermind.State/Flat/FlatVerifyTrieVisitor.cs

@@ -176,6 +176,20 @@ public void VisitLeaf(in Context nodeContext, TrieNode node)
         {
             Interlocked.Add(ref Stats._stateSize, node.FullRlp.Length);
             Interlocked.Increment(ref Stats._accountCount);
+
+            Hash256 addrHash = nodeContext.Path.Append(node.Key).Path.ToHash256();
+            byte[]? rawAccountBytes = _persistenceReader.GetAccountRaw(addrHash);
+            Rlp.ValueDecoderContext ctx = new Rlp.ValueDecoderContext(rawAccountBytes);
+            Account? flatAccount = AccountDecoder.Instance.Decode(ref ctx);
+
+            ctx = node.Value.Span.AsRlpValueContext();
+            Account? nodeAccount = AccountDecoder.Instance.Decode(ref ctx);
+
+            if (nodeAccount != flatAccount)
+            {
+                if (_logger.IsWarn) _logger.Warn($"Mismatched account. AddressHash: {addrHash}. Trie account: {nodeAccount}, Flat account; {flatAccount}");
+                Interlocked.Increment(ref Stats._mismatchedAccount);
+            }
         }
 
         IncrementLevel(nodeContext);
@@ -208,20 +222,6 @@ public void VisitAccount(in Context nodeContext, TrieNode node, in AccountStruct
             Interlocked.Increment(ref Stats._missingCode);
         }
 
-        Hash256 addrHash = nodeContext.Path.Path.ToHash256();
-        byte[]? rawAccountBytes = _persistenceReader.GetAccountRaw(addrHash);
-        Rlp.ValueDecoderContext ctx = new Rlp.ValueDecoderContext(rawAccountBytes);
-        Account? flatAccount = AccountDecoder.Instance.Decode(ref ctx);
-
-        ctx = node.Value.Span.AsRlpValueContext();
-        Account? nodeAccount = AccountDecoder.Instance.Decode(ref ctx);
-
-        if (nodeAccount != flatAccount)
-        {
-            if (_logger.IsWarn) _logger.Warn($"Mismatched account. AddressHash: {addrHash}. Trie account: {nodeAccount}, Flat account; {flatAccount}");
-            Interlocked.Increment(ref Stats._mismatchedAccount);
-        }
-
         IncrementLevel(nodeContext, Stats._codeLevels);
     }
 

src/Nethermind/Nethermind.State/Flat/Persistence/IPersistence.cs

@@ -27,7 +27,7 @@ public interface IPersistenceReader: IDisposable
 
     public interface IWriteBatch: IDisposable
     {
-        void SelfDestruct(in ValueHash256 toAccountPath);
+        int SelfDestruct(Address addr);
         void RemoveAccount(Address addr);
         void SetAccount(Address addr, Account account);
         void SetStorage(Address addr, UInt256 slot, ReadOnlySpan<byte> value);