Fix getTransactionStatus rpc response (#2367)

NethermindEth · Jan 13, 2025 · 2a4add5 · 2a4add5
1 parent 0fb6380
commit 2a4add5
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/rpc/handlers.go b/rpc/handlers.go
@@ -501,7 +501,7 @@ func (h *Handler) MethodsV0_7() ([]jsonrpc.Method, string) { //nolint: funlen
 		{
 			Name:    "starknet_getTransactionStatus",
 			Params:  []jsonrpc.Parameter{{Name: "transaction_hash"}},
-			Handler: h.TransactionStatus,
+			Handler: h.TransactionStatusV0_7,
 		},
 		{
 			Name:    "starknet_call",

diff --git a/rpc/transaction.go b/rpc/transaction.go
@@ -646,6 +646,24 @@ func (h *Handler) TransactionStatus(ctx context.Context, hash felt.Felt) (*Trans
 	return nil, txErr
 }
 
+// In 0.7.0, the failure reason is not returned in the TransactionStatus response.
+type TransactionStatusV0_7 struct {
+	Finality  TxnStatus          `json:"finality_status"`
+	Execution TxnExecutionStatus `json:"execution_status,omitempty"`
+}
+
+func (h *Handler) TransactionStatusV0_7(ctx context.Context, hash felt.Felt) (*TransactionStatusV0_7, *jsonrpc.Error) {
+	res, err := h.TransactionStatus(ctx, hash)
+	if err != nil {
+		return nil, err
+	}
+
+	return &TransactionStatusV0_7{
+		Finality:  res.Finality,
+		Execution: res.Execution,
+	}, nil
+}
+
 func makeJSONErrorFromGatewayError(err error) *jsonrpc.Error {
 	gatewayErr, ok := err.(*gateway.Error)
 	if !ok {

diff --git a/rpc/transaction_test.go b/rpc/transaction_test.go
@@ -1225,7 +1225,7 @@ func TestTransactionStatus(t *testing.T) {
 					require.Nil(t, rpcErr)
 					require.Equal(t, want, status)
 				})
-				t.Run("verified", func(t *testing.T) {
+				t.Run("verified", func(t *testing.T) { //nolint:dupl
 					mockReader := mocks.NewMockReader(mockCtrl)
 					mockReader.EXPECT().TransactionByHash(tx.Hash()).Return(tx, nil)
 					mockReader.EXPECT().Receipt(tx.Hash()).Return(block.Receipts[0], block.Hash, block.Number, nil)
@@ -1243,6 +1243,24 @@ func TestTransactionStatus(t *testing.T) {
 					require.Nil(t, rpcErr)
 					require.Equal(t, want, status)
 				})
+				t.Run("verified v0.7.0", func(t *testing.T) { //nolint:dupl
+					mockReader := mocks.NewMockReader(mockCtrl)
+					mockReader.EXPECT().TransactionByHash(tx.Hash()).Return(tx, nil)
+					mockReader.EXPECT().Receipt(tx.Hash()).Return(block.Receipts[0], block.Hash, block.Number, nil)
+					mockReader.EXPECT().L1Head().Return(&core.L1Head{
+						BlockNumber: block.Number + 1,
+					}, nil)
+
+					handler := rpc.New(mockReader, nil, nil, "", log)
+
+					want := &rpc.TransactionStatusV0_7{
+						Finality:  rpc.TxnStatusAcceptedOnL1,
+						Execution: rpc.TxnSuccess,
+					}
+					status, rpcErr := handler.TransactionStatusV0_7(ctx, *tx.Hash())
+					require.Nil(t, rpcErr)
+					require.Equal(t, want, status)
+				})
 			})
 			t.Run("transaction not found in db", func(t *testing.T) {
 				notFoundTests := map[string]struct {