Skip to content

Only access "warmup" hashtable once per warmup #8983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benaadams merged 2 commits into from
Jul 14, 2025
Merged

Only access "warmup" hashtable once per warmup #8983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2af061
Only access "warm" up hashtable once per warmup
benaadams Jul 13, 2025
e617fa4
Update src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.cs
benaadams Jul 14, 2025
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
6 changes: 2 additions & 4 deletions src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,9 @@ private static bool ChargeAccountAccessGas(ref long gasAvailable, VirtualMachine
}

// If the account is cold (and not a precompile), charge the cold access cost.
if (vmState.AccessTracker.IsCold(address) && !address.IsPrecompile(spec))
if (!address.IsPrecompile(spec) && vmState.AccessTracker.WarmUp(address))
{
result = UpdateGas(GasCostOf.ColdAccountAccess, ref gasAvailable);
vmState.AccessTracker.WarmUp(address);
}
else if (chargeForWarm)
{
Expand Down Expand Up @@ -415,10 +414,9 @@ private static bool ChargeStorageAccessGas(
}

// If the storage cell is still cold, apply the higher cold access cost and mark it as warm.
if (accessTracker.IsCold(in storageCell))
if (accessTracker.WarmUp(in storageCell))
{
result = UpdateGas(GasCostOf.ColdSLoad, ref gasAvailable);
accessTracker.WarmUp(in storageCell);
}
// For SLOAD operations on already warmed-up storage, apply a lower warm-read cost.
else if (storageAccessType == StorageAccessType.SLOAD)
Expand Down
12 changes: 4 additions & 8 deletions src/Nethermind/Nethermind.Evm/StackAccessTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,11 @@ public StackAccessTracker()

public readonly bool IsCold(in StorageCell storageCell) => !_trackingState.AccessedStorageCells.Contains(storageCell);

public readonly void WarmUp(Address address)
{
_trackingState.AccessedAddresses.Add(address);
}
public readonly bool WarmUp(Address address)
=> _trackingState.AccessedAddresses.Add(address);

public readonly void WarmUp(in StorageCell storageCell)
{
_trackingState.AccessedStorageCells.Add(storageCell);
}
public readonly bool WarmUp(in StorageCell storageCell)
=> _trackingState.AccessedStorageCells.Add(storageCell);

public readonly bool WarmUpLargeContract(Address address)
=> _trackingState.LargeContractList.Add(address);
Expand Down