Merge pull request #5774 from BitGo/COIN-3289-fix

fix(sdk-coin-stx): function arguments order fix

Author: ravibitgo

modules/sdk-coin-stx/src/lib/transaction.ts

@@ -247,15 +247,15 @@ export class Transaction extends BaseTransaction {
       } else if (txJson.payload.functionName === FUNCTION_NAME_TRANSFER && txJson.payload.functionArgs.length >= 3) {
         this._outputs = [
           {
-            address: cvToString(txJson.payload.functionArgs[1]),
-            value: cvToValue(txJson.payload.functionArgs[2]).toString(),
+            address: cvToString(txJson.payload.functionArgs[2]),
+            value: cvToValue(txJson.payload.functionArgs[0]).toString(),
             coin: this._coinConfig.name,
           },
         ];
         this._inputs = [
           {
-            address: cvToString(txJson.payload.functionArgs[0]),
-            value: cvToValue(txJson.payload.functionArgs[2]).toString(),
+            address: cvToString(txJson.payload.functionArgs[1]),
+            value: cvToValue(txJson.payload.functionArgs[0]).toString(),
             coin: this._coinConfig.name,
           },
         ];

modules/sdk-coin-stx/src/lib/utils.ts

@@ -473,16 +473,16 @@ export function functionArgsToTokenTransferParams(args: ClarityValue[]): TokenTr
     throw new InvalidTransactionError("function args don't match token transfer declaration");
   }
   if (
-    args[0].type !== ClarityType.PrincipalStandard ||
+    args[0].type !== ClarityType.UInt ||
     args[1].type !== ClarityType.PrincipalStandard ||
-    args[2].type !== ClarityType.UInt
+    args[2].type !== ClarityType.PrincipalStandard
   ) {
     throw new InvalidTransactionError("function args don't match token transfer declaration");
   }
   const tokenTransferParams = {
-    sender: cvToString(args[0]),
-    recipient: cvToString(args[1]),
-    amount: cvToValue(args[2], true),
+    amount: cvToValue(args[0], true),
+    sender: cvToString(args[1]),
+    recipient: cvToString(args[2]),
   };
   if (args.length === 4 && args[3].type === ClarityType.Buffer) {
     tokenTransferParams['memo'] = args[3].buffer.toString('ascii');

modules/sdk-coin-stx/src/stx.ts

@@ -196,9 +196,9 @@ export class Stx extends BaseCoin {
       let outputAmount: string;
       let memo: string | undefined;
       if (txJson.payload.contractAddress && txJson.payload.functionArgs.length >= 3) {
-        outputAmount = cvToValue(txJson.payload.functionArgs[2]).toString();
+        outputAmount = cvToValue(txJson.payload.functionArgs[0]).toString();
         transactionRecipient = {
-          address: cvToString(txJson.payload.functionArgs[1]),
+          address: cvToString(txJson.payload.functionArgs[2]),
           amount: outputAmount,
           tokenName: findTokenNameByContract(txJson.payload.contractAddress, txJson.payload.contractName),
         };

modules/sdk-coin-stx/test/fixtures.ts

@@ -34,10 +34,10 @@ export const unsignedTxExplainedTransfer = {
 };
 
 export const txForExplainFungibleTokenTransfer =
-  '808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b4000000030200ffa41419c088011baffa87d0113257dbf2033e19ffd5098e9c3e1d8bc606f5e97519688630d57154fcad34967ea04246fe5127203c9971e0b1426cdbd6c132d502004fed6b5699e3211629ad182bf53392374a72e692eb4afe770ffa1fd715661c5706ec16854d14028c49d54806b34b89f108f76d39f2a7675589a94a179bba0ed100038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d0002030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e7366657200000004051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece0100000000000000000000000000002710020000000131';
+  '808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b400000003020000f2872c232e1747af46070c191947fa2503ac364d111c30c17a7d0307c7c6792140250743d22d37f0df813d48493bf58bdc455d9d71fce8a57245d8cd17335102018627c757a1216e33c6cd06a33a48ae072b8b28f50df772aaaa57cc067fc2220f646a068ea54847638e03c0782063bd4931674cf80be805bc458e27a0d042a24700038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d0002030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece020000000131';
 
 export const fungibleTokenTransferTx = {
-  id: 'f2ea2261c3d66b87ffe67dedbf36e8ab00762bd6fa8d8fafdf6299c56deb1ebf',
+  id: '992f26de0f8ebb56bcd2a3d41eefe3552c98d524b4f4ff1fea1a908891ec1e54',
   fee: '180',
   contractAddress: 'STAG18E45W613FZ3H4ZMF6QHH426EXM5QTSAVWYH',
   contractName: 'tsip6dp-token',

modules/sdk-coin-stx/test/unit/resources.ts

@@ -184,9 +184,9 @@ export const FUNGIBLE_TOKEN_TRANSFER_CONSTANTS = {
   RECEIVER_ADDRESS: 'SN2NN1JP9AEP5BVE19RNJ6T2MP7NDGRZYST1VDF3M',
   TOKEN_NAME: 'tsip6dp-token',
   UNSIGNED_SINGLE_SIG_TX:
-    '80800000000400164247d6f2b425ac5771423ae6c80c754f7172b0000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e7366657200000004051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece0100000000000000000000000000002710020000000131',
+    '80800000000400164247d6f2b425ac5771423ae6c80c754f7172b0000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece020000000131',
   UNSIGNED_SINGLE_SIG_TX_WITHOUT_MEMO:
-    '80800000000400164247d6f2b425ac5771423ae6c80c754f7172b0000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e7366657200000003051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece0100000000000000000000000000002710',
+    '80800000000400164247d6f2b425ac5771423ae6c80c754f7172b0000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000030100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece',
   SIGNED_MULTI_SIG_TX:
-    '808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b4000000030200ffa41419c088011baffa87d0113257dbf2033e19ffd5098e9c3e1d8bc606f5e97519688630d57154fcad34967ea04246fe5127203c9971e0b1426cdbd6c132d502004fed6b5699e3211629ad182bf53392374a72e692eb4afe770ffa1fd715661c5706ec16854d14028c49d54806b34b89f108f76d39f2a7675589a94a179bba0ed100038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d0002030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e7366657200000004051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece0100000000000000000000000000002710020000000131',
+    '808000000004012fe507c09dbb23c3b7e5d166c81fc4b87692510b000000000000000000000000000000b400000003020000f2872c232e1747af46070c191947fa2503ac364d111c30c17a7d0307c7c6792140250743d22d37f0df813d48493bf58bdc455d9d71fce8a57245d8cd17335102018627c757a1216e33c6cd06a33a48ae072b8b28f50df772aaaa57cc067fc2220f646a068ea54847638e03c0782063bd4931674cf80be805bc458e27a0d042a24700038e3c4529395611be9abf6fa3b6987e81d402385e3d605a073f42f407565a4a3d0002030200000000021a1500a1c42f0c11bfe3893f479af18904677685be0d747369703664702d746f6b656e087472616e73666572000000040100000000000000000000000000002710051a1500a1c42f0c11bfe3893f479af18904677685be0515ab50cac953ac55edc14e2b236854b1ead863fece020000000131',
 };

modules/sdk-coin-stx/test/unit/transactionBuilder/fungibleTokenTransferBuilder.ts

@@ -55,9 +55,9 @@ describe('Stacks: Fungible Token Transfer Builder', () => {
       it('an unsigned fungible token transfer transaction', async () => {
         const builder = initTxBuilder();
         builder.functionArgs([
+          uintCV('10000'),
           standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.SENDER_ADDRESS),
           standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.RECEIVER_ADDRESS),
-          uintCV('10000'),
           bufferCVFromString('1'),
         ]);
         builder.fromPubKey(testData.TX_SENDER.pub);
@@ -84,9 +84,9 @@ describe('Stacks: Fungible Token Transfer Builder', () => {
       it('an unsigned fungible token transfer transaction without memo', async () => {
         const builder = initTxBuilder();
         builder.functionArgs([
+          uintCV('10000'),
           standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.SENDER_ADDRESS),
           standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.RECEIVER_ADDRESS),
-          uintCV('10000'),
         ]);
         builder.fromPubKey(testData.TX_SENDER.pub);
         builder.numberSignatures(1);
@@ -115,9 +115,9 @@ describe('Stacks: Fungible Token Transfer Builder', () => {
       it('a multisig fungible token transfer transaction', async () => {
         const builder = initTxBuilder();
         builder.functionArgs([
+          uintCV('10000'),
           standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.SENDER_ADDRESS),
           standardPrincipalCV(testData.FUNGIBLE_TOKEN_TRANSFER_CONSTANTS.RECEIVER_ADDRESS),
-          uintCV('10000'),
           bufferCVFromString('1'),
         ]);