remove block_id from starknet_subscribeTransactionStatus

Author: rianhughes

rpc/handlers.go

@@ -366,7 +366,7 @@ func (h *Handler) Methods() ([]jsonrpc.Method, string) { //nolint: funlen
 		},
 		{
 			Name:    "starknet_subscribeTransactionStatus",
-			Params:  []jsonrpc.Parameter{{Name: "transaction_hash"}, {Name: "block_id", Optional: true}},
+			Params:  []jsonrpc.Parameter{{Name: "transaction_hash"}},
 			Handler: h.SubscribeTransactionStatus,
 		},
 		{

rpc/subscriptions.go

@@ -108,22 +108,14 @@ func (h *Handler) SubscribeEvents(ctx context.Context, fromAddr *felt.Felt, keys
 // The optional block_id parameter is ignored, as status changes are not stored and historical data cannot be sent.
 //
 //nolint:gocyclo,funlen
-func (h *Handler) SubscribeTransactionStatus(ctx context.Context, txHash felt.Felt, blockID *BlockID) (*SubscriptionID,
+func (h *Handler) SubscribeTransactionStatus(ctx context.Context, txHash felt.Felt) (*SubscriptionID,
 	*jsonrpc.Error,
 ) {
 	w, ok := jsonrpc.ConnFromContext(ctx)
 	if !ok {
 		return nil, jsonrpc.Err(jsonrpc.MethodNotFound, nil)
 	}
 
-	// resolveBlockRange is only used to make sure that the requested block id is not older than 1024 block and check
-	// if the requested block is found. The range is inconsequential since we assume the provided transaction hash
-	// of a transaction is included in the block range: latest/pending - 1024.
-	_, _, rpcErr := h.resolveBlockRange(blockID)
-	if rpcErr != nil {
-		return nil, rpcErr
-	}
-
 	// If the error is transaction not found that means the transaction has not been submitted to the feeder gateway,
 	// therefore, we need to wait for a specified time and at regular interval check if the transaction has been found.
 	// If the transaction is found during the timout expiry, then we continue to keep track of its status otherwise the

rpc/subscriptions_test.go

@@ -352,7 +352,7 @@ func TestSubscribeTxnStatus(t *testing.T) {
 
 		subCtx := context.WithValue(context.Background(), jsonrpc.ConnKey{}, &fakeConn{w: serverConn})
 
-		id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash, nil)
+		id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash)
 		assert.Nil(t, id)
 		assert.Equal(t, ErrTxnHashNotFound, rpcErr)
 	})
@@ -381,7 +381,7 @@ func TestSubscribeTxnStatus(t *testing.T) {
 			mockChain.EXPECT().HeadsHeader().Return(&core.Header{Number: 1024}, nil)
 			mockChain.EXPECT().BlockHeaderByNumber(blockID.Number).Return(&core.Header{Number: 0}, nil)
 
-			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash, blockID)
+			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash)
 			assert.Zero(t, id)
 			assert.Equal(t, ErrTooManyBlocksBack, rpcErr)
 		})
@@ -390,7 +390,7 @@ func TestSubscribeTxnStatus(t *testing.T) {
 			mockChain.EXPECT().HeadsHeader().Return(&core.Header{Number: 2024}, nil)
 			mockChain.EXPECT().BlockHeaderByNumber(blockID.Number).Return(&core.Header{Number: 0}, nil)
 
-			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash, blockID)
+			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash)
 			assert.Zero(t, id)
 			assert.Equal(t, ErrTooManyBlocksBack, rpcErr)
 		})
@@ -422,7 +422,7 @@ func TestSubscribeTxnStatus(t *testing.T) {
 
 			ctx, cancel := context.WithCancel(context.Background())
 			subCtx := context.WithValue(ctx, jsonrpc.ConnKey{}, &fakeConn{w: serverConn})
-			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash, nil)
+			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash)
 			require.Nil(t, rpcErr)
 
 			b, err := TxnStatusRejected.MarshalText()
@@ -453,7 +453,7 @@ func TestSubscribeTxnStatus(t *testing.T) {
 
 			ctx, cancel := context.WithCancel(context.Background())
 			subCtx := context.WithValue(ctx, jsonrpc.ConnKey{}, &fakeConn{w: serverConn})
-			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash, nil)
+			id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash)
 			require.Nil(t, rpcErr)
 
 			b, err := TxnStatusAcceptedOnL1.MarshalText()
@@ -502,7 +502,7 @@ func TestSubscribeTxnStatus(t *testing.T) {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		subCtx := context.WithValue(ctx, jsonrpc.ConnKey{}, &fakeConn{w: serverConn})
-		id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash, nil)
+		id, rpcErr := handler.SubscribeTransactionStatus(subCtx, *txHash)
 		require.Nil(t, rpcErr)
 
 		b, err := TxnStatusReceived.MarshalText()