mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-18 18:02:24 +00:00
core/vm/runtime: remove another instance of ttdpassed. Isolating this into its own commit as a reminder to double-check that this doesn't break anything
This commit is contained in:
parent
73edf5f0ce
commit
69f61a006a
1 changed files with 21 additions and 25 deletions
|
|
@ -78,7 +78,6 @@ func setDefaults(cfg *Config) {
|
||||||
ArrowGlacierBlock: nil,
|
ArrowGlacierBlock: nil,
|
||||||
GrayGlacierBlock: nil,
|
GrayGlacierBlock: nil,
|
||||||
TerminalTotalDifficulty: big.NewInt(0),
|
TerminalTotalDifficulty: big.NewInt(0),
|
||||||
TerminalTotalDifficultyPassed: true,
|
|
||||||
MergeNetsplitBlock: nil,
|
MergeNetsplitBlock: nil,
|
||||||
ShanghaiTime: &shanghaiTime,
|
ShanghaiTime: &shanghaiTime,
|
||||||
CancunTime: &cancunTime}
|
CancunTime: &cancunTime}
|
||||||
|
|
@ -109,10 +108,7 @@ func setDefaults(cfg *Config) {
|
||||||
if cfg.BlobBaseFee == nil {
|
if cfg.BlobBaseFee == nil {
|
||||||
cfg.BlobBaseFee = big.NewInt(params.BlobTxMinBlobGasprice)
|
cfg.BlobBaseFee = big.NewInt(params.BlobTxMinBlobGasprice)
|
||||||
}
|
}
|
||||||
// Merge indicators
|
|
||||||
if t := cfg.ChainConfig.ShanghaiTime; cfg.ChainConfig.TerminalTotalDifficultyPassed || (t != nil && *t == 0) {
|
|
||||||
cfg.Random = &(common.Hash{})
|
cfg.Random = &(common.Hash{})
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Execute executes the code using the input as call data during the execution.
|
// Execute executes the code using the input as call data during the execution.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue