fix fork application order

Author: Thegaram

miner/scroll_worker.go

@@ -633,12 +633,6 @@ func (w *worker) handleForks(parent *types.Block) (bool, error) {
 		return true, nil
 	}
 
-	// Stop/start miner at Euclid fork boundary on zktrie/mpt nodes
-	if w.chainConfig.IsEuclid(w.current.header.Time) {
-		parent := w.chain.GetBlockByHash(w.current.header.ParentHash)
-		return parent != nil && !w.chainConfig.IsEuclid(parent.Time()), nil
-	}
-
 	// Apply Feynman hard fork
 	if w.chainConfig.IsFeynmanTransitionBlock(w.current.header.Time, parent.Time()) {
 		misc.ApplyFeynmanHardFork(w.current.state)
@@ -651,6 +645,12 @@ func (w *worker) handleForks(parent *types.Block) (bool, error) {
 		core.ProcessParentBlockHash(w.current.header.ParentHash, vmenv, w.current.state)
 	}
 
+	// Stop/start miner at Euclid fork boundary on zktrie/mpt nodes
+	if w.chainConfig.IsEuclid(w.current.header.Time) {
+		parent := w.chain.GetBlockByHash(w.current.header.ParentHash)
+		return parent != nil && !w.chainConfig.IsEuclid(parent.Time()), nil
+	}
+
 	return false, nil
 }