consensus: fail if running shanghai on clique or ethash

marioevz · Nov 6, 2022 · 23a4378 · 23a4378
1 parent 19e47b4
commit 23a4378
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
@@ -298,6 +298,9 @@ func (c *Clique) verifyHeader(chain consensus.ChainHeaderReader, header *types.H
 	if header.GasLimit > params.MaxGasLimit {
 		return fmt.Errorf("invalid gasLimit: have %v, max %v", header.GasLimit, params.MaxGasLimit)
 	}
+	if chain.Config().IsShanghai(new(big.Int).SetUint64(header.Time)) {
+		return fmt.Errorf("clique does not support shanghai fork")
+	}
 	// If all checks passed, validate any special fields for hard forks
 	if err := misc.VerifyForkHashes(chain.Config(), header, false); err != nil {
 		return err

diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
@@ -310,6 +310,9 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa
 	if diff := new(big.Int).Sub(header.Number, parent.Number); diff.Cmp(big.NewInt(1)) != 0 {
 		return consensus.ErrInvalidNumber
 	}
+	if chain.Config().IsShanghai(new(big.Int).SetUint64(header.Time)) {
+		return fmt.Errorf("ethash does not support shanghai fork")
+	}
 	// Verify the engine specific seal securing the block
 	if seal {
 		if err := ethash.verifySeal(chain, header, false); err != nil {