From bd3625cf8fd188f22283b7f51ca7353c27e1ed23 Mon Sep 17 00:00:00 2001
From: colinlyguo <colinlyguo@scroll.io>
Date: Thu, 16 May 2024 11:40:02 +0800
Subject: [PATCH] address comments

---
 .../internal/logic/history_logic.go           | 20 +++++++++++--------
 bridge-history-api/internal/types/events.go   |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bridge-history-api/internal/logic/history_logic.go b/bridge-history-api/internal/logic/history_logic.go
index 4bbd3658b0..0d97b6f0a1 100644
--- a/bridge-history-api/internal/logic/history_logic.go
+++ b/bridge-history-api/internal/logic/history_logic.go
@@ -337,14 +337,13 @@ func getTxHistoryInfoFromCrossMessage(message *orm.CrossMessage) *types.TxHistor
 }
 
 func getTxHistoryInfoFromBridgeBatchDepositMessage(message *orm.BridgeBatchDepositEvent) *types.TxHistoryInfo {
-	return &types.TxHistoryInfo{
-		Hash:           message.L1TxHash,
-		TokenType:      btypes.TokenType(message.TokenType),
-		TokenAmounts:   utils.ConvertStringToStringArray(message.TokenAmount),
-		L1TokenAddress: message.L1TokenAddress,
-		L2TokenAddress: message.L2TokenAddress,
-		BlockNumber:    message.L1BlockNumber,
-		TxStatus:       btypes.TxStatusType(message.TxStatus),
+	txHistory := &types.TxHistoryInfo{
+		Hash:         message.L1TxHash,
+		TokenType:    btypes.TokenType(message.TokenType),
+		TokenAmounts: utils.ConvertStringToStringArray(message.TokenAmount),
+		BlockNumber:  message.L1BlockNumber,
+		MessageType:  btypes.MessageTypeL1BatchDeposit,
+		TxStatus:     btypes.TxStatusType(message.TxStatus),
 		CounterpartChainTx: &types.CounterpartChainTx{
 			Hash:        message.L2TxHash,
 			BlockNumber: message.L2BlockNumber,
@@ -352,6 +351,11 @@ func getTxHistoryInfoFromBridgeBatchDepositMessage(message *orm.BridgeBatchDepos
 		BlockTimestamp:  message.BlockTimestamp,
 		BatchDepositFee: message.Fee,
 	}
+	if txHistory.TokenType != btypes.TokenTypeETH {
+		txHistory.L1TokenAddress = message.L1TokenAddress
+		txHistory.L2TokenAddress = message.L2TokenAddress
+	}
+	return txHistory
 }
 
 func (h *HistoryLogic) getCachedTxsInfo(ctx context.Context, cacheKey string, pageNum, pageSize uint64) ([]*types.TxHistoryInfo, uint64, bool, error) {
diff --git a/bridge-history-api/internal/types/events.go b/bridge-history-api/internal/types/events.go
index 611a09bc97..40c84044f1 100644
--- a/bridge-history-api/internal/types/events.go
+++ b/bridge-history-api/internal/types/events.go
@@ -49,6 +49,7 @@ const (
 	MessageTypeUnknown MessageType = iota
 	MessageTypeL1SentMessage
 	MessageTypeL2SentMessage
+	MessageTypeL1BatchDeposit
 )
 
 // RollupStatusType represents the status of a rollup.