Merge pull request #6106 from BitGo/WIN-5434

fix: support memoid along with address for send transaction

Author: abhishekagrawal080

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

@@ -248,6 +248,7 @@ export class Hbar extends BaseCoin {
     const recipients = txParams.recipients.map((recipient) => ({
       ...recipient,
       amount: txParams.type === 'enabletoken' ? '0' : recipient.amount,
+      address: Utils.getAddressDetails(recipient.address).address,
     }));
     if (coinConfig.isToken) {
       recipients.forEach((recipient) => {

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

@@ -478,6 +478,26 @@ describe('Hedera Hashgraph:', function () {
         .verifyTransaction({ txParams, txPrebuild, memo, wallet: walletObj } as any)
         .should.be.rejectedWith('Incorrect token name specified in recipients');
     });
+
+    it('should success to verify transfer having address with memo id', async function () {
+      const txParams = newTxParams();
+      const txPrebuild = newTxPrebuild();
+      txPrebuild.txHex = TestData.UNSIGNED_TOKEN_ASSOCIATE;
+      txParams.recipients = [
+        {
+          address: '0.0.81320?memoId=1',
+          amount: '0',
+          tokenName: 'thbar:usdc',
+        },
+      ];
+      const validTransaction = await basecoin.verifyTransaction({
+        txParams,
+        txPrebuild,
+        memo,
+        wallet: walletObj,
+      } as any);
+      validTransaction.should.equal(true);
+    });
   });
 
   describe('Sign Message', () => {

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

@@ -98,7 +98,10 @@ export class Rune extends CosmosCoin {
     const explainedTx = transaction.explainTransaction();
 
     if (txParams.recipients && txParams.recipients.length > 0) {
-      const filteredRecipients = txParams.recipients?.map((recipient) => _.pick(recipient, ['address', 'amount']));
+      const filteredRecipients = txParams.recipients.map((recipient) => ({
+        address: this.getAddressDetails(recipient.address).address,
+        amount: recipient.amount,
+      }));
       let filteredOutputs = explainedTx.outputs.map((output) => _.pick(output, ['address', 'amount']));
 
       filteredOutputs = filteredOutputs.map((output) => {

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

@@ -154,6 +154,24 @@ describe('Rune', function () {
       isTransactionVerified.should.equal(true);
     });
 
+    it('should succeed to verify transaction having recipient address has memo', async function () {
+      const txPrebuild = {
+        txHex: TEST_SEND_TX.signedTxBase64,
+        txInfo: {},
+      };
+      const txParams = {
+        recipients: [
+          {
+            address: TEST_SEND_TX.recipient + '?memoId=2',
+            amount: TEST_SEND_TX.sendAmount,
+          },
+        ],
+      };
+      const verification = {};
+      const isTransactionVerified = await trune.verifyTransaction({ txParams, txPrebuild, verification });
+      isTransactionVerified.should.equal(true);
+    });
+
     it('should fail to verify transaction with invalid param', async function () {
       const txPrebuild = {};
       const txParams = { recipients: undefined };

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

@@ -95,6 +95,21 @@ export class Ton extends BaseCoin {
     return true;
   }
 
+  getAddressDetails(address: string): { address: string; memoId?: string } {
+    const addressComponents = address.split('?memoId=');
+
+    if (addressComponents.length > 1) {
+      return {
+        address: addressComponents[0],
+        memoId: addressComponents[1],
+      };
+    } else {
+      return {
+        address: addressComponents[0],
+      };
+    }
+  }
+
   async verifyTransaction(params: VerifyTransactionOptions): Promise<boolean> {
     const coinConfig = coins.get(this.getChain());
     const { txPrebuild: txPrebuild, txParams: txParams } = params;
@@ -108,8 +123,9 @@ export class Ton extends BaseCoin {
     const explainedTx = transaction.explainTransaction();
     if (txParams.recipients !== undefined) {
       const filteredRecipients = txParams.recipients?.map((recipient) => {
+        const destination = this.getAddressDetails(recipient.address);
         return {
-          address: new TonWeb.Address(recipient.address).toString(true, true, true),
+          address: new TonWeb.Address(destination.address).toString(true, true, true),
           amount: BigInt(recipient.amount),
         };
       });

modules/sdk-coin-ton/test/resources/ton.ts

@@ -52,6 +52,14 @@ export const signedSendTransaction = {
   },
 };
 
+export const signedSendTransactionForMemoId = {
+  tx: 'te6cckEBAgEAqQAB4YgBJAxo7vqHF++LJ4bC/kJ8A1uVRskrKlrKJZ8rIB0tF+gCadlSX+hPo2mmhZyi0p3zTVUYVRkcmrCm97cSUFSa2vzvCArM3APg+ww92r3IcklNjnzfKOgysJVQXiCvj9SAaU1NGLsotvRwAAAAMAAcAQBmQgAaRefBOjTi/hwqDjv+7I6nGj9WEAe3ls/rFuBEQvggr5zEtAAAAAAAAAAAAAAAAAAAdfZO7w==',
+  recipient: {
+    address: 'EQA0i8-CdGnF_DhUHHf92R1ONH6sIA9vLZ_WLcCIhfBBXwtG?memoId=1234',
+    amount: '10000000',
+  },
+};
+
 export const signedSingleNominatorWithdrawTransaction = {
   tx: 'te6cckECGAEAA8MAAuGIADZN0H0n1tz6xkYgWqJSRmkURKYajjEgXeawBo9cifPIGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACmpoxdJlgLSAAAAAAADgEXAgE0AhYBFP8A9KQT9LzyyAsDAgEgBBECAUgFCALm0AHQ0wMhcbCSXwTgItdJwSCSXwTgAtMfIYIQcGx1Z70ighBkc3RyvbCSXwXgA/pAMCD6RAHIygfL/8nQ7UTQgQFA1yH0BDBcgQEI9ApvoTGzkl8H4AXTP8glghBwbHVnupI4MOMNA4IQZHN0crqSXwbjDQYHAHgB+gD0BDD4J28iMFAKoSG+8uBQghBwbHVngx6xcIAYUATLBSbPFlj6Ahn0AMtpF8sfUmDLPyDJgED7AAYAilAEgQEI9Fkw7UTQgQFA1yDIAc8W9ADJ7VQBcrCOI4IQZHN0coMesXCAGFAFywVQA88WI/oCE8tqyx/LP8mAQPsAkl8D4gIBIAkQAgEgCg8CAVgLDAA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYAIBIA0OABmtznaiaEAga5Drhf/AABmvHfaiaEAQa5DrhY/AABG4yX7UTQ1wsfgAWb0kK29qJoQICga5D6AhhHDUCAhHpJN9KZEM5pA+n/mDeBKAG3gQFImHFZ8xhAT48oMI1xgg0x/TH9MfAvgju/Jk7UTQ0x/TH9P/9ATRUUO68qFRUbryogX5AVQQZPkQ8qP4ACSkyMsfUkDLH1Iwy/9SEPQAye1U+A8B0wchwACfbFGTINdKltMH1AL7AOgw4CHAAeMAIcAC4wABwAORMOMNA6TIyx8Syx/L/xITFBUAbtIH+gDU1CL5AAXIygcVy//J0Hd0gBjIywXLAiLPFlAF+gIUy2sSzMzJc/sAyEAUgQEI9FHypwIAcIEBCNcY+gDTP8hUIEeBAQj0UfKnghBub3RlcHSAGMjLBcsCUAbPFlAE+gIUy2oSyx/LP8lz+wACAGyBAQjXGPoA0z8wUiSBAQj0WfKnghBkc3RycHSAGMjLBcsCUAXPFlAD+gITy2rLHxLLP8lz+wAACvQAye1UAFEAAAAAKamjF8DDudwJkyEh7jUbJEjFCjriVxsSlRJFyF872V1eegb4QACPQgAaRefBOjTi/hwqDjv+7I6nGj9WEAe3ls/rFuBEQvggr6A613oAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAHA0/PoUC5EIEyWuPg==',
   txBounceable:

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

@@ -166,6 +166,23 @@ describe('TON:', function () {
           .should.rejectedWith('missing required tx prebuild property txHex');
       });
     });
+
+    it('should succeed to verify transaction with recipient having memo', async function () {
+      const txParams = {
+        recipients: [testData.signedSendTransactionForMemoId.recipient],
+      };
+      const txPrebuild = {
+        txHex: Buffer.from(testData.signedSendTransactionForMemoId.tx, 'base64').toString('hex'),
+        txInfo: {},
+      };
+      const verification = {};
+      const isTransactionVerified = await basecoin.verifyTransaction({
+        txParams,
+        txPrebuild,
+        verification,
+      } as any);
+      isTransactionVerified.should.equal(true);
+    });
   });
 
   describe('Explain Transaction: ', () => {

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

@@ -699,6 +699,29 @@ describe('XLM:', function () {
       validTransaction.should.equal(true);
     });
 
+    it('should verify a transaction has recipient having memo', async function () {
+      const txParams = {
+        recipients: [
+          {
+            address: 'GCNFRU774FPHLV3HAB6CR54XJYFYITOLU6KS2J5BNCLDPYN7I3DOMIPY?memoId=1234567890',
+            amount: '128000000',
+          },
+        ],
+      };
+      const txPrebuild = {
+        txBase64: halfSignedTransaction.halfSigned.txBase64,
+      };
+      const verification = {
+        disableNetworking: true,
+        keychains: {
+          user: { pub: userKeychain.pub },
+          backup: { pub: backupKeychain.pub },
+        },
+      };
+      const validTransaction = await basecoin.verifyTransaction({ txParams, txPrebuild, wallet, verification });
+      validTransaction.should.equal(true);
+    });
+
     it('should verify a transaction with root key', async function () {
       const txParams = {
         recipients: [

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

@@ -313,7 +313,7 @@ export class Xrp extends BaseCoin {
     const expectedOutput = txParams.recipients && txParams.recipients[0];
 
     const comparator = (recipient1, recipient2) => {
-      if (recipient1.address !== recipient2.address) {
+      if (utils.getAddressDetails(recipient1.address).address !== utils.getAddressDetails(recipient2.address).address) {
         return false;
       }
       const amount1 = new BigNumber(recipient1.amount);

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

@@ -489,6 +489,41 @@ describe('XRP:', function () {
       };
       await token.verifyTransaction({ txParams, txPrebuild }).should.be.rejectedWith('txrp:usd is not supported');
     });
+
+    it('should verify token transfers with recipoent has dt', async function () {
+      const txPrebuild = {
+        txHex:
+          '{"Account":"rsgg4mwHTGPRP7A4eGUmrpTxTeDZHQrHkQ","Fee":"45","Sequence":1760661,"Flags":2147483648,"TransactionType":"Payment","Destination":"raJ4NmhHr2j2SGkmVFeMqKR5MUSWXjNF9a","Amount":{"value":"0.01","currency":"524C555344000000000000000000000000000000","issuer":"rQhWct2fv4Vc4KRjRgMrxa8xPN9Zx9iLKV"},"DestinationTag":1}',
+        txInfo: {
+          Account: 'rsgg4mwHTGPRP7A4eGUmrpTxTeDZHQrHkQ',
+          TransactionType: 'Payment',
+          Destination: 'raJ4NmhHr2j2SGkmVFeMqKR5MUSWXjNF9a',
+          Amount: {
+            value: '0.01',
+            currency: '524C555344000000000000000000000000000000',
+            issuer: 'rQhWct2fv4Vc4KRjRgMrxa8xPN9Zx9iLKV',
+          },
+          DestinationTag: 1,
+        },
+        coin: 'txrp',
+        token: 'txrp:rlusd',
+      };
+      const txParams = {
+        coin: 'txrp:rlusd',
+        recipients: [
+          {
+            address: 'raJ4NmhHr2j2SGkmVFeMqKR5MUSWXjNF9a?dt=1',
+            amount: '10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+          },
+        ],
+      };
+
+      const validTransaction = await token.verifyTransaction({
+        txParams,
+        txPrebuild,
+      });
+      validTransaction.should.equal(true);
+    });
   });
 
   describe('Unit Tests for isWalletAddress function', function () {