split relayed failed to failed relayed and relayed tx reverted

scroll-tech · Dec 13, 2023 · 5c1de26 · 5c1de26
1 parent bb1a7f6
commit 5c1de26
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/bridge-history-api/internal/controller/fetcher/l2_fetcher.go b/bridge-history-api/internal/controller/fetcher/l2_fetcher.go
@@ -175,7 +175,7 @@ func (c *L2MessageFetcher) doFetchAndSaveEvents(ctx context.Context, from uint64
 					l2RevertedRelayedMessages = append(l2RevertedRelayedMessages, &orm.CrossMessage{
 						MessageHash:   "0x" + common.Bytes2Hex(crypto.Keccak256(tx.AsL1MessageTx().Data)),
 						L2TxHash:      tx.Hash().String(),
-						TxStatus:      int(orm.TxStatusTypeRelayedFailed),
+						TxStatus:      int(orm.TxStatusTypeRelayedTxReverted),
 						L2BlockNumber: receipt.BlockNumber.Uint64(),
 						MessageType:   int(orm.MessageTypeL1SentMessage),
 					})

diff --git a/bridge-history-api/internal/logic/watcher_event_parser.go b/bridge-history-api/internal/logic/watcher_event_parser.go
@@ -144,7 +144,7 @@ func ParseL1CrossChainEventLogs(ctx context.Context, logs []types.Log, blockTime
 				MessageHash:   event.MessageHash.String(),
 				L1BlockNumber: vlog.BlockNumber,
 				L1TxHash:      vlog.TxHash.String(),
-				TxStatus:      int(orm.TxStatusTypeRelayedFailed),
+				TxStatus:      int(orm.TxStatusTypeFailedRelayed),
 				MessageType:   int(orm.MessageTypeL2SentMessage),
 			})
 		}
@@ -397,7 +397,7 @@ func ParseL2EventLogs(logs []types.Log, blockTimestampsMap map[uint64]uint64) ([
 				MessageHash:   event.MessageHash.String(),
 				L2BlockNumber: vlog.BlockNumber,
 				L2TxHash:      vlog.TxHash.String(),
-				TxStatus:      int(orm.TxStatusTypeRelayedFailed),
+				TxStatus:      int(orm.TxStatusTypeFailedRelayed),
 				MessageType:   int(orm.MessageTypeL1SentMessage),
 			})
 		}

diff --git a/bridge-history-api/internal/orm/cross_message.go b/bridge-history-api/internal/orm/cross_message.go
@@ -42,7 +42,10 @@ const (
 	TxStatusTypeSent
 	TxStatusTypeSentFailed
 	TxStatusTypeRelayed
-	TxStatusTypeRelayedFailed
+	// FailedRelayedMessage event: encoded tx failed, cannot retry. e.g., https://sepolia.scrollscan.com/tx/0xfc7d3ea5ec8dc9b664a5a886c3b33d21e665355057601033481a439498efb79a
+	TxStatusTypeFailedRelayed
+	// In some cases, user can retry with a larger gas limit. e.g., https://sepolia.scrollscan.com/tx/0x7323a7ba29492cb47d92206411be99b27896f2823cee0633a596b646b73f1b5b
+	TxStatusTypeRelayedTxReverted
 	TxStatusTypeSkipped
 	TxStatusTypeDropped
 )