Cherry-pick PR #1374

0xPolygonHermez · Nov 6, 2024 · 075906d · 075906d
1 parent b42e3e2
commit 075906d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
@@ -663,6 +663,10 @@ func AccumulateRewards(config *chain.Config, header *types.Header, uncles []*typ
 
 // accumulateRewards retrieves rewards for a block and applies them to the coinbase accounts for miner and uncle miners
 func accumulateRewards(config *chain.Config, state *state.IntraBlockState, header *types.Header, uncles []*types.Header) {
+	if config.IsNormalcy(header.Number.Uint64()) {
+		return
+	}
+
 	minerReward, uncleRewards := AccumulateRewards(config, header, uncles)
 	for i, uncle := range uncles {
 		if i < len(uncleRewards) {

diff --git a/core/blockchain_zkevm.go b/core/blockchain_zkevm.go
@@ -134,7 +134,8 @@ func ExecuteBlockEphemerallyZk(
 				receipts = append(receipts, receipt)
 			}
 		}
-		if !chainConfig.IsForkID7Etrog(block.NumberU64()) {
+		if !chainConfig.IsForkID7Etrog(block.NumberU64()) &&
+			!chainConfig.IsNormalcy(block.NumberU64()) {
 			if err := ibs.ScalableSetSmtRootHash(roHermezDb); err != nil {
 				return nil, err
 			}

diff --git a/core/state/intra_block_state_zkevm.go b/core/state/intra_block_state_zkevm.go
@@ -59,7 +59,7 @@ func (sdb *IntraBlockState) GetTxCount() (uint64, error) {
 
 func (sdb *IntraBlockState) PostExecuteStateSet(chainConfig *chain.Config, blockNum uint64, blockInfoRoot *libcommon.Hash) {
 	//ETROG
-	if chainConfig.IsForkID7Etrog(blockNum) {
+	if chainConfig.IsForkID7Etrog(blockNum) && !chainConfig.IsNormalcy(blockNum) {
 		sdb.scalableSetBlockInfoRoot(blockInfoRoot)
 	}
 }
@@ -70,18 +70,20 @@ func (sdb *IntraBlockState) PreExecuteStateSet(chainConfig *chain.Config, blockN
 		sdb.CreateAccount(ADDRESS_SCALABLE_L2, true)
 	}
 
-	//save block number
-	sdb.scalableSetBlockNum(blockNumber)
+	if !chainConfig.IsNormalcy(blockNumber) {
+		//save block number
+		sdb.scalableSetBlockNum(blockNumber)
 
-	//ETROG
-	if chainConfig.IsForkID7Etrog(blockNumber) {
-		currentTimestamp := sdb.ScalableGetTimestamp()
-		if blockTimestamp > currentTimestamp {
-			sdb.ScalableSetTimestamp(blockTimestamp)
-		}
+		//ETROG
+		if chainConfig.IsForkID7Etrog(blockNumber) {
+			currentTimestamp := sdb.ScalableGetTimestamp()
+			if blockTimestamp > currentTimestamp {
+				sdb.ScalableSetTimestamp(blockTimestamp)
+			}
 
-		//save prev block hash
-		sdb.scalableSetBlockHash(blockNumber-1, stateRoot)
+			//save prev block hash
+			sdb.scalableSetBlockHash(blockNumber-1, stateRoot)
+		}
 	}
 }
 
@@ -98,19 +100,24 @@ func (sdb *IntraBlockState) SyncerPreExecuteStateSet(
 		sdb.CreateAccount(ADDRESS_SCALABLE_L2, true)
 	}
 
-	//save block number
-	sdb.scalableSetBlockNum(blockNumber)
+	if !chainConfig.IsNormalcy(blockNumber) {
+		//save block number
+		sdb.scalableSetBlockNum(blockNumber)
+	}
+
 	emptyHash := libcommon.Hash{}
 
 	//ETROG
 	if chainConfig.IsForkID7Etrog(blockNumber) {
-		currentTimestamp := sdb.ScalableGetTimestamp()
-		if blockTimestamp > currentTimestamp {
-			sdb.ScalableSetTimestamp(blockTimestamp)
-		}
+		if !chainConfig.IsNormalcy(blockNumber) {
+			currentTimestamp := sdb.ScalableGetTimestamp()
+			if blockTimestamp > currentTimestamp {
+				sdb.ScalableSetTimestamp(blockTimestamp)
+			}
 
-		//save prev block hash
-		sdb.scalableSetBlockHash(blockNumber-1, prevBlockHash)
+			//save prev block hash
+			sdb.scalableSetBlockHash(blockNumber-1, prevBlockHash)
+		}
 
 		//save ger with l1blockhash - but only in the case that the l1 info tree index hasn't been
 		// re-used.  If it has been re-used we never write this to the contract storage