fix(rpc): handle EncodingJSON response in GetBlockWithOpts

Author: tanmay4l

rpc/client_test.go

@@ -471,14 +471,16 @@ func TestClient_GetBlockWithOpts(t *testing.T) {
 }
 
 func TestClient_GetBlockWithOpts_EncodingJSON(t *testing.T) {
-	responseBody := `{}`
+	// Full EncodingJSON response: transactions are JSON objects, not base64 arrays.
+	// System program (11111111111111111111111111111111) used as second account.
+	responseBody := `{"blockHeight":100,"blockTime":1625227950,"blockhash":"5M77sHdwzH6rckuQwF8HL1w52n7hjrh4GVTFiF6T8QyB","parentSlot":99,"previousBlockhash":"Aq9jSXe1jRzfiaBcRFLe4wm7j499vWVEeFQrq5nnXfZN","rewards":[],"transactions":[{"meta":{"err":null,"fee":5000,"innerInstructions":[],"logMessages":[],"postBalances":[441866063495,1],"postTokenBalances":[],"preBalances":[441866068495,1],"preTokenBalances":[],"rewards":[],"status":{"Ok":null}},"transaction":{"message":{"accountKeys":["EVd8FFVB54svYdZdG6hH4F4hTbqre5mpQ7XyF5rKUmes","11111111111111111111111111111111"],"header":{"numRequiredSignatures":1,"numReadonlySignedAccounts":0,"numReadonlyUnsignedAccounts":1},"recentBlockhash":"Aq9jSXe1jRzfiaBcRFLe4wm7j499vWVEeFQrq5nnXfZN","instructions":[{"accounts":[0,1],"data":"3Bxs4ThLFRfx6J7z","programIdIndex":1}]},"signatures":["D8emaP3CaepSGigD3TCrev7j67yPLMi82qfzTb9iZYPxHcCmm6sQBKTU4bzAee4445zbnbWduVAZ87WfbWbXoAU"]},"version":"legacy"}]}`
 	server, closer := mockJSONRPC(t, stdjson.RawMessage(wrapIntoRPC(responseBody)))
 	defer closer()
 
 	client := New(server.URL)
 
 	block := 42
-	_, err := client.GetBlockWithOpts(
+	out, err := client.GetBlockWithOpts(
 		context.Background(),
 		uint64(block),
 		&GetBlockOpts{
@@ -506,6 +508,13 @@ func TestClient_GetBlockWithOpts_EncodingJSON(t *testing.T) {
 		},
 		reqBody,
 	)
+
+	require.Len(t, out.Transactions, 1)
+	tx, err := out.Transactions[0].GetTransaction()
+	require.NoError(t, err)
+	require.Len(t, tx.Signatures, 1)
+	require.Len(t, tx.Message.AccountKeys, 2)
+	assert.Equal(t, solana.MustPublicKeyFromBase58("EVd8FFVB54svYdZdG6hH4F4hTbqre5mpQ7XyF5rKUmes"), tx.Message.AccountKeys[0])
 }
 
 func TestClient_GetBlockWithOpts_AccountsMode(t *testing.T) {
@@ -603,7 +612,7 @@ func TestClient_GetBlockWithOpts_AccountsMode_GetTransactionFails(t *testing.T)
 
 	require.Len(t, out.Transactions, 1)
 
-	// GetTransaction should fail — no binary data
+	// GetTransaction should fail — accounts mode returns JSON without a message field.
 	_, err = out.Transactions[0].GetTransaction()
 	assert.Error(t, err)
 

rpc/types.go

@@ -116,9 +116,22 @@ func (twm TransactionWithMeta) MustGetTransaction() *solana.Transaction {
 }
 
 func (twm TransactionWithMeta) GetTransaction() (*solana.Transaction, error) {
+	if twm.Transaction == nil {
+		return nil, fmt.Errorf("transaction is nil")
+	}
+	// EncodingJSON: the RPC returned a JSON object — unmarshal directly.
+	if raw := twm.Transaction.GetRawJSON(); raw != nil {
+		var tx solana.Transaction
+		if err := json.Unmarshal(raw, &tx); err != nil {
+			return nil, err
+		}
+		if tx.Message.AccountKeys == nil {
+			return nil, fmt.Errorf("transaction has no message: block may have been fetched with transactionDetails=accounts; use GetAccountKeys instead")
+		}
+		return &tx, nil
+	}
 	tx := new(solana.Transaction)
-	err := tx.UnmarshalWithDecoder(bin.NewBinDecoder(twm.Transaction.GetBinary()))
-	if err != nil {
+	if err := tx.UnmarshalWithDecoder(bin.NewBinDecoder(twm.Transaction.GetBinary())); err != nil {
 		return nil, err
 	}
 	return tx, nil