remove handling of "the bug" for fork 12 (#1296)

0xPolygonHermez · Oct 9, 2024 · e4a34d7 · e4a34d7
1 parent 9ded83e
commit e4a34d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/core/blockchain_zkevm.go b/core/blockchain_zkevm.go
@@ -115,7 +115,9 @@ func ExecuteBlockEphemerallyZk(
 		}
 
 		localReceipt := CreateReceiptForBlockInfoTree(receipt, chainConfig, blockNum, execResult)
-		ProcessReceiptForBlockExecution(receipt, roHermezDb, chainConfig, blockNum, header, tx)
+		if err = ProcessReceiptForBlockExecution(receipt, roHermezDb, chainConfig, blockNum, header, tx); err != nil {
+			return nil, err
+		}
 
 		if err != nil {
 			if !vmConfig.StatelessExec {

diff --git a/core/types/log_zkevm.go b/core/types/log_zkevm.go
@@ -38,10 +38,15 @@ func (_this *Log) Clone() *Log {
 }
 
 func (_this *Log) ApplyPaddingToLogsData(isForkId8, isForkId12 bool) {
+	if isForkId12 {
+		// we want to skip this behaviour completely for fork 12
+		return
+	}
+
 	d := _this.Data
 	mSize := len(d)
 
-	if isForkId8 && !isForkId12 {
+	if isForkId8 {
 		d = applyHexPadBug(d, mSize)
 	} else {
 		// [zkEvm] fill 0 at the end

diff --git a/zk/stages/stage_sequence_execute_blocks.go b/zk/stages/stage_sequence_execute_blocks.go
@@ -163,12 +163,6 @@ func finaliseBlock(
 		return nil, err
 	}
 
-	if batchState.isL1Recovery() {
-		for i, receipt := range builtBlockElements.receipts {
-			core.ProcessReceiptForBlockExecution(receipt, batchContext.sdb.hermezDb.HermezDbReader, batchContext.cfg.chainConfig, newHeader.Number.Uint64(), newHeader, builtBlockElements.transactions[i])
-		}
-	}
-
 	finalBlock, finalTransactions, finalReceipts, err := core.FinalizeBlockExecution(
 		batchContext.cfg.engine,
 		batchContext.sdb.stateReader,