fix(xrpl): autofill transaction type handling

Author: GuillemGarciaDev

xrpl/rpc/client.go

@@ -249,20 +249,20 @@ func (c *Client) Autofill(tx *transaction.FlatTransaction) error {
 			return err
 		}
 	}
-	if txType, ok := (*tx)["TransactionType"].(transaction.TxType); ok {
-		if acc, ok := (*tx)["Account"].(types.Address); txType == transaction.AccountDeleteTx && ok {
+	if txType, ok := (*tx)["TransactionType"].(string); ok {
+		if acc, ok := (*tx)["Account"].(types.Address); txType == transaction.AccountDeleteTx.String() && ok {
 			err := c.checkAccountDeleteBlockers(acc)
 			if err != nil {
 				return err
 			}
 		}
-		if txType == transaction.PaymentTx {
+		if txType == transaction.PaymentTx.String() {
 			err := c.checkPaymentAmounts(tx)
 			if err != nil {
 				return err
 			}
 		}
-		if txType == transaction.BatchTx {
+		if txType == transaction.BatchTx.String() {
 			err := c.autofillRawTransactions(tx)
 			if err != nil {
 				return err

xrpl/transaction/integration/batch_test.go

@@ -3,6 +3,7 @@ package integration
 import (
 	"testing"
 
+	"github.com/Peersyst/xrpl-go/xrpl/rpc"
 	"github.com/Peersyst/xrpl-go/xrpl/testutil/integration"
 	"github.com/Peersyst/xrpl-go/xrpl/transaction"
 	"github.com/Peersyst/xrpl-go/xrpl/transaction/types"
@@ -137,3 +138,115 @@ func TestIntegrationBatchMultisign_Websocket(t *testing.T) {
 		})
 	}
 }
+
+func TestIntegrationBatch_RPC(t *testing.T) {
+	env := integration.GetRPCEnv(t)
+	clientCfg, err := rpc.NewClientConfig(env.Host, rpc.WithFaucetProvider(env.FaucetProvider))
+	require.NoError(t, err)
+	client := rpc.NewClient(clientCfg)
+
+	runner := integration.NewRunner(t, client, integration.NewRunnerConfig(
+		integration.WithWallets(3),
+	))
+
+	err = runner.Setup()
+	require.NoError(t, err)
+	defer runner.Teardown()
+
+	sender := runner.GetWallet(0)
+	receiver := runner.GetWallet(1)
+
+	tt := []BatchTest{
+		{
+			Name: "pass - valid batch transaction",
+			Batch: &transaction.Batch{
+				BaseTx: transaction.BaseTx{
+					Account:         runner.GetWallet(0).GetAddress(),
+					TransactionType: transaction.BatchTx,
+				},
+				RawTransactions: []types.RawTransaction{
+					{
+						RawTransaction: CreatePaymentTx(sender, receiver, types.XRPCurrencyAmount(1)).Flatten(),
+					},
+					{
+						RawTransaction: CreatePaymentTx(sender, receiver, types.XRPCurrencyAmount(1)).Flatten(),
+					},
+				},
+			},
+		},
+	}
+
+	for _, tc := range tt {
+		t.Run(tc.Name, func(t *testing.T) {
+			tc.Batch.SetAllOrNothingFlag()
+			flatTx := tc.Batch.Flatten()
+			err := client.Autofill(&flatTx)
+
+			require.NoError(t, err)
+
+			_, err = runner.TestTransaction(&flatTx, sender, "tesSUCCESS", &integration.TestTransactionOptions{
+				SkipAutofill: true,
+			})
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestIntegrationBatchMultisign_RPC(t *testing.T) {
+	env := integration.GetRPCEnv(t)
+	clientCfg, err := rpc.NewClientConfig(env.Host, rpc.WithFaucetProvider(env.FaucetProvider))
+	require.NoError(t, err)
+	client := rpc.NewClient(clientCfg)
+
+	runner := integration.NewRunner(t, client, integration.NewRunnerConfig(
+		integration.WithWallets(3),
+	))
+
+	err = runner.Setup()
+	require.NoError(t, err)
+	defer runner.Teardown()
+
+	sender := runner.GetWallet(0)
+	sender2 := runner.GetWallet(1)
+	receiver := runner.GetWallet(2)
+
+	tt := []BatchTest{
+		{
+			Name: "pass - valid batch transaction",
+			Batch: &transaction.Batch{
+				BaseTx: transaction.BaseTx{
+					Account:         sender.GetAddress(),
+					TransactionType: transaction.BatchTx,
+				},
+				RawTransactions: []types.RawTransaction{
+					{
+						RawTransaction: CreatePaymentTx(sender, receiver, types.XRPCurrencyAmount(1)).Flatten(),
+					},
+					{
+						RawTransaction: CreatePaymentTx(sender2, receiver, types.XRPCurrencyAmount(1)).Flatten(),
+					},
+				},
+			},
+		},
+	}
+
+	for _, tc := range tt {
+		t.Run(tc.Name, func(t *testing.T) {
+			tc.Batch.SetAllOrNothingFlag()
+			flatTx := tc.Batch.Flatten()
+			err := client.AutofillMultisigned(&flatTx, 1)
+			require.NoError(t, err)
+
+			err = wallet.SignMultiBatch(*sender2, &flatTx, nil)
+
+			require.NoError(t, err)
+
+			_, err = runner.TestTransaction(&flatTx, sender, "tesSUCCESS", &integration.TestTransactionOptions{
+				SkipAutofill: true,
+			})
+
+			require.NoError(t, err)
+		})
+	}
+}
+