Skip to content

Commit e584437

Browse files
authored
fix: misuse of jsonrpc.Err(...) (#3365)
* fix: misuse of jsonrpc.Err(...) * update error messages * add ':' to error message
1 parent 646ef43 commit e584437

File tree

2 files changed

+32
-6
lines changed

2 files changed

+32
-6
lines changed

rpc/v8/l1.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@ func (h *Handler) GetMessageStatus(ctx context.Context, l1TxnHash *common.Hash)
6565
for i, msgHash := range msgHashes {
6666
hash, err := h.bcReader.L1HandlerTxnHash(msgHash)
6767
if err != nil {
68-
return nil, jsonrpc.Err(jsonrpc.InternalError, fmt.Errorf("failed to retrieve L1 handler txn %v", err))
68+
return nil, jsonrpc.Err(
69+
jsonrpc.InternalError,
70+
fmt.Sprintf("failed to retrieve L1 handler txn hash. msgHash %s, err: %v",
71+
msgHash.Hex(),
72+
err,
73+
),
74+
)
6975
}
7076
status, rpcErr := h.TransactionStatus(ctx, hash)
7177
if rpcErr != nil {
@@ -91,14 +97,21 @@ func (h *Handler) messageToL2Logs(ctx context.Context, txHash *common.Hash) ([]*
9197
}
9298

9399
messageHashes := make([]*common.Hash, 0, len(receipt.Logs))
94-
for _, vLog := range receipt.Logs {
100+
for i, vLog := range receipt.Logs {
95101
if common.HexToHash(vLog.Topics[0].Hex()).Cmp(logMsgToL2SigHash) != 0 {
96102
continue
97103
}
98104
var event logMessageToL2
99105
err = h.coreContractABI.UnpackIntoInterface(&event, "LogMessageToL2", vLog.Data)
100106
if err != nil {
101-
return nil, jsonrpc.Err(rpccore.ErrInternal.Code, fmt.Errorf("failed to unpack log %v", err))
107+
return nil, jsonrpc.Err(
108+
jsonrpc.InternalError,
109+
fmt.Sprintf("failed to unpack log, l1 txn hash %s, logIndex %d err: %v",
110+
txHash.Hex(),
111+
i,
112+
err,
113+
),
114+
)
102115
}
103116
// Extract indexed fields from topics
104117
fromAddress := common.HexToAddress(vLog.Topics[1].Hex())

rpc/v9/l1.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)