core, eth, internal, miner: remove unnecessary parameters #30776
+61
−65
Conversation
This file contains 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
rjl493456442
requested review from
lightclient,
s1na,
karalabe,
holiman and
MariusVanDerWijden
as code owners
holiman
requested changes
Nov 21, 2024
internal/ethapi/simulate.go
Outdated
| @@ -200,7 +200,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header, | |||
| if err := ctx.Err(); err != nil { | |||
| return nil, nil, err | |||
| } | |||
| if err := sim.sanitizeCall(&call, sim.state, header, blockContext, &gasUsed); err != nil { | |||
| if err := sim.sanitizeCall(&call, tracingStateDB, header, blockContext, &gasUsed); err != nil { | |||
There was a problem hiding this comment.
This is a change in semantics. I think this is wrong, the sanitizeCall is only used for setting nonce if unset:
nonce := state.GetNonce(call.from())
call.Nonce = (*hexutil.Uint64)(&nonce)
I don't think we should use the hooked state for that.
Suggested change
| if err := sim.sanitizeCall(&call, tracingStateDB, header, blockContext, &gasUsed); err != nil { | |
| if err := sim.sanitizeCall(&call, sim.state, header, blockContext, &gasUsed); err != nil { |
There was a problem hiding this comment.
Hm, actually, sanitizeCall is only called from one location (here), you could just do the nonce-check outside, and skip passing the state along
There was a problem hiding this comment.
I reverted the change
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.
It's a subsequent pull request after the #30745 , removing some unnecessary parameters.