Skip to content
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

Fix ChargeAccountAccessGas logic #7997

Merged
merged 1 commit into from
Jan 6, 2025
+4 −5
Merged

Fix ChargeAccountAccessGas logic #7997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions src/Nethermind/Nethermind.Evm/VirtualMachine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,9 @@ private bool ChargeAccountAccessGas(ref long gasAvailable, EvmState vmState, Add
}
bool notOutOfGas = ChargeAccountGas(ref gasAvailable, vmState, address, spec);
return notOutOfGas
&& chargeForDelegation
&& vmState.Env.TxExecutionContext.CodeInfoRepository.TryGetDelegation(_state, address, out Address delegated)
? ChargeAccountGas(ref gasAvailable, vmState, delegated, spec)
: notOutOfGas;
&& (!chargeForDelegation
|| !vmState.Env.TxExecutionContext.CodeInfoRepository.TryGetDelegation(_state, address, out Address delegated)
|| ChargeAccountGas(ref gasAvailable, vmState, delegated, spec));

bool ChargeAccountGas(ref long gasAvailable, EvmState vmState, Address address, IReleaseSpec spec)
{
Expand Down Expand Up @@ -2075,7 +2074,7 @@ private void InstructionExtCodeSize<TTracingInstructions>(Address address, ref E
UInt256 result = (UInt256)accountCode.Span.Length;
if (delegation is not null)
{
//If the account has been delegated only the first two bytes of the delegation header counts as size
//If the account has been delegated only the first two bytes of the delegation header counts as size
result = (UInt256)Eip7702Constants.FirstTwoBytesOfHeader.Length;
}
stack.PushUInt256(in result);
Expand Down
Loading