Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Nethermind/Nethermind.State/PartialStorageProviderBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,12 @@ public ChangeTrace(byte[]? after)
{
After = after ?? StorageTree.ZeroBytes;
Before = StorageTree.ZeroBytes;
IsInitialValue = true;
}

public byte[] Before;
public byte[] After;
public bool IsInitialValue;
}

/// <summary>
Expand Down
9 changes: 3 additions & 6 deletions src/Nethermind/Nethermind.State/PersistentStorageProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -557,11 +557,7 @@ public void SaveChange(StorageCell storageCell, byte[] value)
ref ChangeTrace valueChanges = ref BlockChange.GetValueRefOrAddDefault(storageCell.Index, out bool exists);
if (!exists)
{
byte[] treeValue = !_provider._populatePreBlockCache ?
LoadFromTreeReadPreWarmCache(in storageCell) :
LoadFromTreePopulatePrewarmCache(in storageCell);

valueChanges = new ChangeTrace(treeValue, value);
valueChanges = new ChangeTrace(value);
}
else
{
Expand Down Expand Up @@ -635,7 +631,8 @@ private byte[] LoadFromTreeStorage(StorageCell storageCell)
foreach (var kvp in BlockChange)
{
byte[] after = kvp.Value.After;
if (!Bytes.AreEqual(kvp.Value.Before, after))
if (!Bytes.AreEqual(kvp.Value.Before, after)
|| kvp.Value.IsInitialValue) // IsInitialValue is so that it does not skip change if it does not know existing value.
{
BlockChange[kvp.Key] = new(after, after);
StorageTree.Set(kvp.Key, after);
Expand Down
Loading