Keep empty fields in the response of zkevm_getBatchByNumber

cmd/rpcdaemon/commands/zkevm_api.go

@@ -857,30 +857,19 @@ func populateBatchDetails(batch *types.Batch) (json.RawMessage, error) {
 	jBatch["timestamp"] = batch.Timestamp
 	jBatch["blocks"] = batch.Blocks
 	jBatch["transactions"] = batch.Transactions
-	if batch.GlobalExitRoot != (common.Hash{}) {
-		jBatch["globalExitRoot"] = batch.GlobalExitRoot
-	}
+	jBatch["globalExitRoot"] = batch.GlobalExitRoot
+	jBatch["mainnetExitRoot"] = batch.MainnetExitRoot
+	jBatch["rollupExitRoot"] = batch.RollupExitRoot
+	jBatch["localExitRoot"] = batch.LocalExitRoot
+	jBatch["sendSequencesTxHash"] = batch.SendSequencesTxHash
+	jBatch["verifyBatchTxHash"] = batch.VerifyBatchTxHash
+
 	if batch.ForcedBatchNumber != nil {
 		jBatch["forcedBatchNumber"] = batch.ForcedBatchNumber
 	}
-	if batch.MainnetExitRoot != (common.Hash{}) {
-		jBatch["mainnetExitRoot"] = batch.MainnetExitRoot
-	}
-	if batch.RollupExitRoot != (common.Hash{}) {
-		jBatch["rollupExitRoot"] = batch.RollupExitRoot
-	}
-	if batch.LocalExitRoot != (common.Hash{}) {
-		jBatch["localExitRoot"] = batch.LocalExitRoot
-	}
 	if batch.AccInputHash != (common.Hash{}) {
 		jBatch["accInputHash"] = batch.AccInputHash
 	}
-	if batch.SendSequencesTxHash != nil {
-		jBatch["sendSequencesTxHash"] = batch.SendSequencesTxHash
-	}
-	if batch.VerifyBatchTxHash != nil {
-		jBatch["verifyBatchTxHash"] = batch.VerifyBatchTxHash
-	}
 	jBatch["closed"] = batch.Closed
 	if len(batch.BatchL2Data) > 0 {
 		jBatch["batchL2Data"] = batch.BatchL2Data