Instrument the SLOADopcode #507
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexandrosfilios
force-pushed
the
nit-3478-instrument-the-sloadopcode
branch
from
568a6b2 to
a327833
Compare
alexandrosfilios
force-pushed
the
nit-3478-instrument-the-sloadopcode
branch
from
a327833 to
042c464
Compare
core/state/access_events.go
Outdated
| @@ -151,6 +153,36 @@ func (ae *AccessEvents) AddTxDestination(addr common.Address, sendsValue bool) { | |||
| ae.touchAddressAndChargeGas(addr, zeroTreeIndex, utils.CodeHashLeafKey, false) | |||
| } | |||
|
|
|||
| // SlotMultigas returns the amount of gas to be charged for a cold storage access. | |||
| func (ae *AccessEvents) SlotMultigas(addr common.Address, slot common.Hash, isWrite bool) (*multigas.MultiGas, error) { | |||
There was a problem hiding this comment.
I would suggest fixing the existing functions in access_events.go instead of adding a new so that it will be easier to track changes in the next update from the go-ethereum upstream
There was a problem hiding this comment.
Thanks I wasnt sure what the usual approach is
| func (ae *AccessEvents) touchAddressAndChargeMultigas(addr common.Address, treeIndex uint256.Int, subIndex byte, isWrite bool) (*multigas.MultiGas, error) { | ||
| stemRead, selectorRead, stemWrite, selectorWrite, selectorFill := ae.touchAddress(addr, treeIndex, subIndex, isWrite) | ||
|
|
||
| gas := multigas.ZeroGas() |
There was a problem hiding this comment.
It is worth adding a short comment explaining the choice of resource type
| @@ -122,11 +122,9 @@ func gasSLoadEIP2929(evm *EVM, contract *Contract, stack *Stack, mem *Memory, me | |||
| // If the caller cannot afford the cost, this change will be rolled back | |||
| // If he does afford it, we can skip checking the same thing later on, during execution | |||
| evm.StateDB.AddSlotToAccessList(contract.Address(), slot) | |||
| // TODO(NIT-3484): Update multi dimensional gas here | |||
| return multigas.UnknownGas(params.ColdSloadCostEIP2929), nil | |||
| return multigas.StorageAccessGas(params.ColdSloadCostEIP2929), nil | |||
There was a problem hiding this comment.
And here a comment is needed too, based on how it's done in other places
alexandrosfilios
assigned
alexandrosfilios and
MishkaRogachev and unassigned
alexandrosfilios
MishkaRogachev
approved these changes
Aug 15, 2025
| // access cost to be charged, if need be. | ||
| func (ae *AccessEvents) touchAddressAndChargeGas(addr common.Address, treeIndex uint256.Int, subIndex byte, isWrite bool) uint64 { | ||
| multiGas, err := ae.touchAddressAndChargeMultigas(addr, treeIndex, subIndex, isWrite) | ||
| if err != nil { |
There was a problem hiding this comment.
nit: log an error just in case
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.