internal/t8ntool: rework how isMerged is determined

ethereum · Apr 29, 2022 · 5485da1 · 5485da1
1 parent 6e7fe4b
commit 5485da1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
@@ -252,8 +252,9 @@ func Transition(ctx *cli.Context) error {
 			return NewError(ErrorConfig, errors.New("EIP-1559 config but missing 'currentBaseFee' in env section"))
 		}
 	}
-
-	if env := prestate.Env; chainConfig.IsMerged(big.NewInt(int64(env.Number))) {
+	isMerged := chainConfig.TerminalTotalDifficulty != nil && chainConfig.TerminalTotalDifficulty.BitLen() == 0
+	env := prestate.Env
+	if isMerged {
 		// post-merge:
 		// - random must be supplied
 		// - difficulty must be zero

diff --git a/params/config.go b/params/config.go
@@ -477,11 +477,6 @@ func (c *ChainConfig) IsArrowGlacier(num *big.Int) bool {
 	return isForked(c.ArrowGlacierBlock, num)
 }
 
-// IsMerged returns whether num is either equal to the TheMerge fork block or greater.
-func (c *ChainConfig) IsMerged(num *big.Int) bool {
-	return isForked(c.MergeForkBlock, num)
-}
-
 // IsTerminalPoWBlock returns whether the given block is the last block of PoW stage.
 func (c *ChainConfig) IsTerminalPoWBlock(parentTotalDiff *big.Int, totalDiff *big.Int) bool {
 	if c.TerminalTotalDifficulty == nil {