Fix getBatchByNumber when prevBatch ger doesn't exist

cffls · Jul 9, 2024 · d515a87 · d515a87
1 parent 529cb58
commit d515a87
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/cmd/rpcdaemon/commands/zkevm_api.go b/cmd/rpcdaemon/commands/zkevm_api.go
@@ -645,15 +645,17 @@ func (api *ZkEvmAPIImpl) GetBatchByNumber(ctx context.Context, batchNumber rpc.B
 			return nil, err
 		}
 
-		itu, err := hermezDb.GetL1InfoTreeUpdateByGer(prevBatchGer.GlobalExitRoot)
-		if err != nil {
-			return nil, err
-		}
+		if prevBatchGer != nil {
+			itu, err := hermezDb.GetL1InfoTreeUpdateByGer(prevBatchGer.GlobalExitRoot)
+			if err != nil {
+				return nil, err
+			}
 
-		if itu == nil || batch.MainnetExitRoot == itu.MainnetExitRoot {
-			batch.MainnetExitRoot = common.Hash{}
-			batch.RollupExitRoot = common.Hash{}
-			batch.GlobalExitRoot = common.Hash{}
+			if itu == nil || batch.MainnetExitRoot == itu.MainnetExitRoot {
+				batch.MainnetExitRoot = common.Hash{}
+				batch.RollupExitRoot = common.Hash{}
+				batch.GlobalExitRoot = common.Hash{}
+			}
 		}
 	}