From 86a6e503a80a6681c150f5eb87ba00603c94babe Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Tue, 27 May 2025 22:18:09 +0800 Subject: [PATCH 1/2] fix(bridge-history): unclaimed withdrawals --- bridge-history-api/internal/orm/cross_message.go | 2 +- common/version/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge-history-api/internal/orm/cross_message.go b/bridge-history-api/internal/orm/cross_message.go index 936f79ef46..ad16beeafe 100644 --- a/bridge-history-api/internal/orm/cross_message.go +++ b/bridge-history-api/internal/orm/cross_message.go @@ -154,7 +154,7 @@ func (c *CrossMessage) GetL2UnclaimedWithdrawalsByAddress(ctx context.Context, s db := c.db.WithContext(ctx) db = db.Model(&CrossMessage{}) db = db.Where("message_type = ?", btypes.MessageTypeL2SentMessage) - db = db.Where("tx_status = ?", types.TxStatusTypeSent) + db = db.Where("tx_status != ?", types.TxStatusTypeRelayed) db = db.Where("sender = ?", sender) db = db.Order("block_timestamp desc") db = db.Limit(500) diff --git a/common/version/version.go b/common/version/version.go index 61f863e707..ce95304847 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.19" +var tag = "v4.5.20" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { From 7bf1092baa4995da45cf29b5c5011bd1f30c1376 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Tue, 27 May 2025 23:01:48 +0800 Subject: [PATCH 2/2] address comments --- bridge-history-api/internal/orm/cross_message.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge-history-api/internal/orm/cross_message.go b/bridge-history-api/internal/orm/cross_message.go index ad16beeafe..91d670d8e8 100644 --- a/bridge-history-api/internal/orm/cross_message.go +++ b/bridge-history-api/internal/orm/cross_message.go @@ -154,7 +154,7 @@ func (c *CrossMessage) GetL2UnclaimedWithdrawalsByAddress(ctx context.Context, s db := c.db.WithContext(ctx) db = db.Model(&CrossMessage{}) db = db.Where("message_type = ?", btypes.MessageTypeL2SentMessage) - db = db.Where("tx_status != ?", types.TxStatusTypeRelayed) + db = db.Where("tx_status in (?)", []types.TxStatusType{types.TxStatusTypeSent, types.TxStatusTypeFailedRelayed, types.TxStatusTypeRelayTxReverted}) db = db.Where("sender = ?", sender) db = db.Order("block_timestamp desc") db = db.Limit(500)