Merge pull request #6000 from BitGo/COIN-3815-build-rpc-call-fix

Author: baltiyal

modules/sdk-coin-apt/src/lib/constants.ts

@@ -19,3 +19,6 @@ export const DIGITAL_ASSET_TRANSFER_FUNCTION = '0x1::object::transfer';
 export const APTOS_COIN = '0x1::aptos_coin::AptosCoin';
 export const FUNGIBLE_ASSET_TYPE_ARGUMENT = '0x1::fungible_asset::Metadata';
 export const DIGITAL_ASSET_TYPE_ARGUMENT = '0x4::token::Token';
+
+export const FUNBIGLE_ASSET_TYPE_TAG = '0x1::object::Object';
+export const BATCH_FUNGIBLE_ASSET_TYPE_TAG = '0x1::object::Object<0x1::fungible_asset::Metadata>';

modules/sdk-coin-apt/src/lib/transaction/digitalAssetTransfer.ts

@@ -47,16 +47,17 @@ export class DigitalAssetTransfer extends Transaction {
   protected getTransactionPayloadData(): InputGenerateTransactionPayloadData {
     const recipientAddress = AccountAddress.fromString(this.recipients[0].address);
     const digitalAssetAddress = AccountAddress.fromString(this._assetId);
-    const transferDigitalAssetAbi: EntryFunctionABI = {
-      typeParameters: [{ constraints: [MoveAbility.KEY] }],
-      parameters: [new TypeTagStruct(objectStructTag(new TypeTagGeneric(0))), new TypeTagAddress()],
-    };
 
     return {
       function: DIGITAL_ASSET_TRANSFER_FUNCTION,
       typeArguments: [DIGITAL_ASSET_TYPE_ARGUMENT],
       functionArguments: [digitalAssetAddress, recipientAddress],
-      abi: transferDigitalAssetAbi,
+      abi: this.transferDigitalAssetAbi,
     };
   }
+
+  private transferDigitalAssetAbi: EntryFunctionABI = {
+    typeParameters: [{ constraints: [MoveAbility.KEY] }],
+    parameters: [new TypeTagStruct(objectStructTag(new TypeTagGeneric(0))), new TypeTagAddress()],
+  };
 }

modules/sdk-coin-apt/src/lib/transaction/fungibleAssetTransfer.ts

@@ -8,13 +8,16 @@ import {
   TransactionPayloadEntryFunction,
   TypeTagAddress,
   TypeTagU64,
+  TypeTagVector,
 } from '@aptos-labs/ts-sdk';
 import { InvalidTransactionError, TransactionType } from '@bitgo/sdk-core';
 import { BaseCoin as CoinConfig } from '@bitgo/statics';
 import {
   FUNGIBLE_ASSET_TYPE_ARGUMENT,
   FUNGIBLE_ASSET_TRANSFER_FUNCTION,
   FUNGIBLE_ASSET_BATCH_TRANSFER_FUNCTION,
+  FUNBIGLE_ASSET_TYPE_TAG,
+  BATCH_FUNGIBLE_ASSET_TYPE_TAG,
 } from '../constants';
 import utils from '../utils';
 
@@ -37,10 +40,6 @@ export class FungibleAssetTransfer extends Transaction {
 
   protected getTransactionPayloadData(): InputGenerateTransactionPayloadData {
     const fungibleTokenAddress = this._assetId;
-    const faTransferAbi: EntryFunctionABI = {
-      typeParameters: [{ constraints: [] }],
-      parameters: [parseTypeTag('0x1::object::Object'), new TypeTagAddress(), new TypeTagU64()],
-    };
 
     if (this.recipients.length > 1) {
       return {
@@ -51,6 +50,7 @@ export class FungibleAssetTransfer extends Transaction {
           this.recipients.map((recipient) => AccountAddress.fromString(recipient.address)),
           this.recipients.map((recipient) => recipient.amount),
         ],
+        abi: this.batchFaTransferAbi,
       };
     }
     return {
@@ -61,7 +61,7 @@ export class FungibleAssetTransfer extends Transaction {
         AccountAddress.fromString(this.recipients[0].address),
         this.recipients[0].amount,
       ],
-      abi: faTransferAbi,
+      abi: this.faTransferAbi,
     };
   }
 
@@ -74,4 +74,17 @@ export class FungibleAssetTransfer extends Transaction {
           FUNGIBLE_ASSET_TYPE_ARGUMENT === payload.entryFunction.type_args[0].toString()))
     );
   }
+  private faTransferAbi: EntryFunctionABI = {
+    typeParameters: [{ constraints: [] }],
+    parameters: [parseTypeTag(FUNBIGLE_ASSET_TYPE_TAG), new TypeTagAddress(), new TypeTagU64()],
+  };
+
+  private batchFaTransferAbi: EntryFunctionABI = {
+    typeParameters: [],
+    parameters: [
+      parseTypeTag(BATCH_FUNGIBLE_ASSET_TYPE_TAG),
+      new TypeTagVector(new TypeTagAddress()),
+      new TypeTagVector(new TypeTagU64()),
+    ],
+  };
 }

modules/sdk-coin-apt/src/lib/transaction/transferTransaction.ts

@@ -2,9 +2,13 @@ import { Transaction } from './transaction';
 import { InvalidTransactionError, TransactionType } from '@bitgo/sdk-core';
 import {
   AccountAddress,
+  EntryFunctionABI,
   InputGenerateTransactionPayloadData,
   TransactionPayload,
   TransactionPayloadEntryFunction,
+  TypeTagAddress,
+  TypeTagU64,
+  TypeTagVector,
 } from '@aptos-labs/ts-sdk';
 
 import { BaseCoin as CoinConfig } from '@bitgo/statics';
@@ -38,12 +42,14 @@ export class TransferTransaction extends Transaction {
           this.recipients.map((recipient) => AccountAddress.fromString(recipient.address)),
           this.recipients.map((recipient) => recipient.amount),
         ],
+        abi: this.batchCoinTransferAbi,
       };
     }
     return {
       function: COIN_TRANSFER_FUNCTION,
       typeArguments: [this.assetId],
       functionArguments: [AccountAddress.fromString(this.recipients[0].address), this.recipients[0].amount],
+      abi: this.coinTransferAbi,
     };
   }
 
@@ -55,4 +61,14 @@ export class TransferTransaction extends Transaction {
       payload.entryFunction.type_args[0].toString().length > 0
     );
   }
+
+  private coinTransferAbi: EntryFunctionABI = {
+    typeParameters: [{ constraints: [] }],
+    parameters: [new TypeTagAddress(), new TypeTagU64()],
+  };
+
+  private batchCoinTransferAbi: EntryFunctionABI = {
+    typeParameters: [{ constraints: [] }],
+    parameters: [new TypeTagVector(new TypeTagAddress()), new TypeTagVector(new TypeTagU64())],
+  };
 }