@@ -66,7 +66,13 @@ func (h *Handler) GetMessageStatus(ctx context.Context, l1TxnHash *common.Hash)
6666 for i , msgHash := range msgHashes {
6767 hash , err := h .bcReader .L1HandlerTxnHash (msgHash )
6868 if err != nil {
69- return nil , jsonrpc .Err (jsonrpc .InternalError , fmt .Errorf ("failed to retrieve L1 handler txn %v" , err ))
69+ return nil , jsonrpc .Err (
70+ jsonrpc .InternalError ,
71+ fmt .Sprintf ("failed to retrieve L1 handler txn hash. msgHash %s, err: %v" ,
72+ msgHash .Hex (),
73+ err ,
74+ ),
75+ )
7076 }
7177 status , rpcErr := h .TransactionStatus (ctx , & hash )
7278 if rpcErr != nil {
@@ -100,14 +106,21 @@ func (h *Handler) messageToL2Logs(ctx context.Context, txHash *common.Hash) ([]*
100106 }
101107
102108 messageHashes := make ([]* common.Hash , 0 , len (receipt .Logs ))
103- for _ , vLog := range receipt .Logs {
109+ for i , vLog := range receipt .Logs {
104110 if common .HexToHash (vLog .Topics [0 ].Hex ()).Cmp (logMsgToL2SigHash ) != 0 {
105111 continue
106112 }
107113 var event logMessageToL2
108114 err = h .coreContractABI .UnpackIntoInterface (& event , "LogMessageToL2" , vLog .Data )
109115 if err != nil {
110- return nil , jsonrpc .Err (rpccore .ErrInternal .Code , fmt .Errorf ("failed to unpack log %v" , err ))
116+ return nil , jsonrpc .Err (
117+ jsonrpc .InternalError ,
118+ fmt .Sprintf ("failed to unpack log, l1 txn hash %s, logIndex %d err: %v" ,
119+ txHash .Hex (),
120+ i ,
121+ err ,
122+ ),
123+ )
111124 }
112125 // Extract indexed fields from topics
113126 fromAddress := common .HexToAddress (vLog .Topics [1 ].Hex ())
0 commit comments