From 509d8ae28a45ef634086b3a1c7689d24a88b3f92 Mon Sep 17 00:00:00 2001
From: Max Revitt <max.revitt@gmail.com>
Date: Tue, 6 Aug 2024 20:18:59 +0100
Subject: [PATCH] fix(zkevm_api): pre forkid12 ger (#929)

---
 cmd/rpcdaemon/commands/zkevm_api.go      | 9 ++-------
 zk/debug_tools/rpc-batch-compare/main.go | 8 +++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/cmd/rpcdaemon/commands/zkevm_api.go b/cmd/rpcdaemon/commands/zkevm_api.go
index 13df6aae7a8..9c9bd2bcde4 100644
--- a/cmd/rpcdaemon/commands/zkevm_api.go
+++ b/cmd/rpcdaemon/commands/zkevm_api.go
@@ -668,15 +668,10 @@ func (api *ZkEvmAPIImpl) GetBatchByNumber(ctx context.Context, batchNumber rpc.B
 			return nil, err
 		}
 
-		itu, err := hermezDb.GetL1InfoTreeUpdateByGer(prevBatchGer)
-		if err != nil {
-			return nil, err
-		}
-
-		if itu == nil || batch.MainnetExitRoot == itu.MainnetExitRoot {
+		if batchGer == prevBatchGer {
+			batch.GlobalExitRoot = common.Hash{}
 			batch.MainnetExitRoot = common.Hash{}
 			batch.RollupExitRoot = common.Hash{}
-			batch.GlobalExitRoot = common.Hash{}
 		}
 	}
 
diff --git a/zk/debug_tools/rpc-batch-compare/main.go b/zk/debug_tools/rpc-batch-compare/main.go
index 1db9c1b6bb5..e0d5ffa66e8 100644
--- a/zk/debug_tools/rpc-batch-compare/main.go
+++ b/zk/debug_tools/rpc-batch-compare/main.go
@@ -59,7 +59,7 @@ func getBatchByNumber(url string, number *big.Int) (map[string]interface{}, erro
 	requestBody, _ := json.Marshal(map[string]interface{}{
 		"jsonrpc": "2.0",
 		"method":  "zkevm_getBatchByNumber",
-		"params":  []interface{}{number.String(), true},
+		"params":  []interface{}{number.String(), false},
 		"id":      1,
 	})
 
@@ -105,12 +105,10 @@ func compareBatches(erigonURL, legacyURL string, batchNumber *big.Int) (string,
 	// ignore list
 	il := []string{
 		"timestamp",
-		"verifyBatchTxHash",
-		"sendSequencesTxHash",
 		"accInputHash",
-		"globalExitRoot",
-		"mainnetExitRoot",
+		"transactions",
 		"rollupExitRoot",
+		"mainnetExitRoot",
 	}
 	for _, i := range il {
 		delete(batch1, i)