core/vm: evm fixes + add london to allprotocolchanges #22901
Closed
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
holiman
requested review from
karalabe,
rjl493456442,
gballet and
MariusVanDerWijden
as code owners
fedekunze
reviewed
May 20, 2021
| @@ -43,6 +43,7 @@ type Config struct { | |||
| Value *big.Int | |||
| Debug bool | |||
| EVMConfig vm.Config | |||
| Basefee *big.Int | |||
There was a problem hiding this comment.
Suggested change
| Basefee *big.Int | |
| BaseFee *big.Int |
There was a problem hiding this comment.
I don't understand where is this being used?
Comment on lines
+97
to
+98
| if cfg.Basefee == nil { | ||
| cfg.Basefee = new(big.Int) |
There was a problem hiding this comment.
Suggested change
| if cfg.Basefee == nil { | |
| cfg.Basefee = new(big.Int) | |
| if cfg.BaseFee == nil { | |
| cfg.BaseFee = new(big.Int) |
| @@ -35,6 +35,7 @@ func NewEnv(cfg *Config) *vm.EVM { | |||
| Time: cfg.Time, | |||
| Difficulty: cfg.Difficulty, | |||
| GasLimit: cfg.GasLimit, | |||
| BaseFee: cfg.Basefee, | |||
There was a problem hiding this comment.
Suggested change
| BaseFee: cfg.Basefee, | |
| BaseFee: cfg.BaseFee, |
Merged
holiman
commented
Jun 1, 2021
| @@ -426,9 +426,9 @@ func (b *SimulatedBackend) PendingNonceAt(ctx context.Context, account common.Ad | |||
| } | |||
|
|
|||
| // SuggestGasPrice implements ContractTransactor.SuggestGasPrice. Since the simulated | |||
| // chain doesn't have miners, we just return a gas price of 1 for any call. | |||
| // chain doesn't have miners, we just return a gas price of 875000000 (initial basefee) for any call. | |||
There was a problem hiding this comment.
initial basefee is 1000000000
| // We want to simulate an empty middle block, having the same state as the | ||
| // first one. The last is needs a state change again to force a reorg. | ||
| if i != 1 { | ||
| tx, err := types.SignTx(types.NewTransaction(block.TxNonce(addr), common.Address{0x00}, new(big.Int), params.TxGas, nil, nil), signer, key) | ||
| tx, err := types.SignTx(types.NewTransaction(block.TxNonce(addr), common.Address{0x00}, new(big.Int), params.TxGas, big.NewInt(875000000), nil), signer, key) |
There was a problem hiding this comment.
Not sure where 875 came from, use initial basefee instead
rjl493456442
reviewed
Jun 6, 2021
| @@ -20,7 +20,9 @@ import ( | |||
| "bytes" | |||
| "context" | |||
| "errors" | |||
| "github.com/ethereum/go-ethereum/log" | |||
| if g.Config == nil { | ||
| g.Config = params.AllEthashProtocolChanges | ||
| } | ||
| config := g.Config | ||
| block := g.ToBlock(db) |
There was a problem hiding this comment.
Why to move these codes up?
There was a problem hiding this comment.
Yes, for setting the basefee. nvm
|
Closing, fixed by 7a7abe3 instead |
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.
This PR fixes some minor evm nits, like making it possible to execute
/evm --json --code 0x48 runand see theBASEFEEopcode in all it's glory