Merge pull request #6837 from BitGo/coin-5449

fix: return raw data for vet nft transaction

Author: at31416

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

@@ -16,8 +16,10 @@ import {
   ParsedTransaction,
   SignedTransaction,
   SignTransactionOptions,
+  TokenTransferRecipientParams,
   VerifyAddressOptions,
   VerifyTransactionOptions,
+  TokenType,
 } from '@bitgo/sdk-core';
 import { BaseCoin as StaticsBaseCoin } from '@bitgo/statics';
 import utils from './lib/utils';
@@ -245,18 +247,26 @@ export class Vet extends BaseCoin {
     } as unknown as Hash;
   }
 
-  buildNftTransferData(params: BuildNftTransferDataOptions): string {
-    const { recipientAddress, fromAddress } = params;
+  buildNftTransferData(params: BuildNftTransferDataOptions): TokenTransferRecipientParams {
+    const { recipientAddress, fromAddress, tokenContractAddress } = params;
     if (!utils.isValidAddress(recipientAddress)) {
       throw new InvalidAddressError('Invalid recipient address');
     }
     if (!utils.isValidAddress(fromAddress)) {
       throw new InvalidAddressError('Invalid from address');
     }
+    if (!utils.isValidAddress(tokenContractAddress)) {
+      throw new InvalidAddressError('Invalid NFT contract address address');
+    }
     switch (params.type) {
       case 'ERC721': {
         const tokenId = params.tokenId;
-        return utils.getTransferNFTData(fromAddress, recipientAddress, tokenId);
+        return {
+          tokenType: TokenType.ERC721,
+          tokenQuantity: '1', // This NFT standard will always have quantity of 1
+          tokenContractAddress,
+          tokenId,
+        };
       }
       default:
         throw new NotImplementedError(`NFT type ${params.type} not supported on ${this.getChain()}`);

modules/sdk-coin-vet/test/unit/vet.ts

@@ -119,7 +119,12 @@ describe('Vechain', function () {
         tokenId: '1234',
         tokenContractAddress: testData.NFT_CONTRACT_ADDRESS,
       });
-      data.should.equal(testData.VALID_NFT_CONTRACT_DATA);
+      data.should.deepEqual({
+        tokenType: 'ERC721',
+        tokenQuantity: '1',
+        tokenContractAddress: '0x1ec1d168574603ec35b9d229843b7c2b44bcb770',
+        tokenId: '1234',
+      });
     });
 
     it('should build throw invalid address error', function () {

modules/sdk-core/src/bitgo/baseCoin/baseCoin.ts

@@ -49,7 +49,13 @@ import {
   AuditDecryptedKeyParams,
 } from './iBaseCoin';
 import { IInscriptionBuilder } from '../inscriptionBuilder';
-import { MPCSweepRecoveryOptions, MPCTxs, PopulatedIntent, PrebuildTransactionWithIntentOptions } from '../utils';
+import {
+  MPCSweepRecoveryOptions,
+  MPCTxs,
+  PopulatedIntent,
+  PrebuildTransactionWithIntentOptions,
+  TokenTransferRecipientParams,
+} from '../utils';
 
 export abstract class BaseCoin implements IBaseCoin {
   protected readonly bitgo: BitGoBase;
@@ -586,7 +592,7 @@ export abstract class BaseCoin implements IBaseCoin {
     throw new NotImplementedError('getHashFunction is not supported for this coin');
   }
 
-  buildNftTransferData(params: BuildNftTransferDataOptions): string {
+  buildNftTransferData(params: BuildNftTransferDataOptions): string | TokenTransferRecipientParams {
     throw new NotImplementedError('buildNftTransferData is not supported for this coin');
   }
 

modules/sdk-core/src/bitgo/baseCoin/iBaseCoin.ts

@@ -14,7 +14,7 @@ import { IWebhooks } from '../webhook/iWebhooks';
 import { TransactionType } from '../../account-lib';
 import { IInscriptionBuilder } from '../inscriptionBuilder';
 import { Hash } from 'crypto';
-import { MessageStandardType, MPCTx, PopulatedIntent, TokenType } from '../utils';
+import { MessageStandardType, MPCTx, PopulatedIntent, TokenTransferRecipientParams, TokenType } from '../utils';
 
 export const multisigTypes = {
   onchain: 'onchain',
@@ -574,7 +574,7 @@ export interface IBaseCoin {
    * @param params Options specifying the token contract, token recipient & the token(s) to be transferred
    * @return the hex string for the contract call.
    */
-  buildNftTransferData(params: BuildNftTransferDataOptions): string;
+  buildNftTransferData(params: BuildNftTransferDataOptions): string | TokenTransferRecipientParams;
   getHashFunction(): Hash;
   broadcastTransaction(params: BaseBroadcastTransactionOptions): Promise<BaseBroadcastTransactionResult>;
   setCoinSpecificFieldsInIntent(intent: PopulatedIntent, params: PrebuildTransactionWithIntentOptions): void;

modules/sdk-core/src/bitgo/wallet/iWallet.ts

@@ -671,7 +671,7 @@ export interface SendManyOptions extends PrebuildAndSignTransactionOptions {
     address: string;
     amount: string | number;
     feeLimit?: string;
-    data?: string;
+    data?: string | TokenTransferRecipientParams;
     tokenName?: string;
     tokenData?: TokenTransferRecipientParams;
   }[];

modules/sdk-core/src/bitgo/wallet/wallet.ts

@@ -2537,15 +2537,23 @@ export class Wallet implements IWallet {
         }
 
         const data = this.baseCoin.buildNftTransferData({ ...sendNftOptions, fromAddress: baseAddress });
+        let recipient;
+        if (this.baseCoin.getFamily() === 'vet') {
+          recipient = {
+            address: recipientAddress,
+            amount: '1',
+            tokenData: data,
+          };
+        } else {
+          recipient = {
+            address: sendNftOptions.tokenContractAddress,
+            amount: '0',
+            data,
+          };
+        }
         return this.sendMany({
           ...sendOptions,
-          recipients: [
-            {
-              address: sendNftOptions.tokenContractAddress,
-              amount: '0',
-              data: data,
-            },
-          ],
+          recipients: [recipient],
         });
       }
       case 'ERC1155': {