Merge pull request #5502 from BitGo/coin-3061-fix-txn-id

fix(sdk-coin-apt): generate txn hash

Author: bhavidhingra

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

@@ -353,11 +353,12 @@ export abstract class Transaction extends BaseTransaction {
       !this._senderSignature.signature ||
       !this._feePayerSignature ||
       !this._feePayerSignature.publicKey ||
-      !this._feePayerSignature.signature
+      !this._feePayerSignature.signature ||
+      !this._feePayerAddress
     ) {
       return;
     }
-    const transaction = new SimpleTransaction(this._rawTransaction);
+    const transaction = new SimpleTransaction(this._rawTransaction, AccountAddress.fromString(this._feePayerAddress));
     const senderPublicKey = new Ed25519PublicKey(utils.getBufferFromHexString(this._senderSignature.publicKey.pub));
     const senderSignature = new Ed25519Signature(this._senderSignature.signature);
     const senderAuthenticator = new AccountAuthenticatorEd25519(senderPublicKey, senderSignature);

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

@@ -152,7 +152,7 @@ describe('APT:', function () {
           'sender',
           'type',
         ],
-        id: '0x80a52dd5d4f712a80b77ad7b4a12a8e61b76243a546099b0ab9acfef4e9a4e31',
+        id: '0x249289a8178e4b9cdb89fad6e8e436ccc435753e4ea3c9d50e0c8b525582e90d',
         outputs: [
           {
             address: '0xf7405c28a02cf5bab4ea4498240bb3579db45951794eb1c843bef0534c093ad9',

modules/sdk-coin-apt/test/unit/transactionBuilder/digitalAssetTransferBuilder.ts

@@ -65,7 +65,7 @@ describe('Apt Digital Asset Transfer Builder', () => {
       value: testData.digitalTokenRecipients[0].amount,
       coin: 'tapt',
     });
-    should.equal(tx.id, '0xfb4f870c4ae1bc74f6ceff72d8ee92f109239be8e12ddb07ddf30d7e6bd30586');
+    should.equal(tx.id, '0x3a97bbf538a73f98625b65c770bbf69d032ac18cd028b871182a127f10ab5666');
     should.equal(tx.maxGasAmount, 200000);
     should.equal(tx.gasUnitPrice, 100);
     should.equal(tx.sequenceNumber, 171);
@@ -129,7 +129,7 @@ describe('Apt Digital Asset Transfer Builder', () => {
     const txBuilder = factory.from(testData.DIGITAL_ASSET_TRANSFER);
     const tx = (await txBuilder.build()) as DigitalAssetTransfer;
     const toJson = tx.toJson();
-    should.equal(toJson.id, '0xfb4f870c4ae1bc74f6ceff72d8ee92f109239be8e12ddb07ddf30d7e6bd30586');
+    should.equal(toJson.id, '0x3a97bbf538a73f98625b65c770bbf69d032ac18cd028b871182a127f10ab5666');
     should.equal(toJson.sender, testData.sender2.address);
     should.deepEqual(toJson.recipient, {
       address: testData.digitalTokenRecipients[0].address,

modules/sdk-coin-apt/test/unit/transactionBuilder/fungibleAssetTransferBuilder.ts

@@ -67,7 +67,7 @@ describe('Apt Token Transfer Builder', () => {
         value: testData.fungibleTokenRecipients[0].amount,
         coin: 'tapt:usdt',
       });
-      should.equal(tx.id, '0x2dae2ecd096a212d6f565bd161c92f506cebb700aaf16c88bd3456b88d4c392a');
+      should.equal(tx.id, '0x271da92f3dcd673a0bd28d26f8b49c1f0c6ead0f5be0fbab3e9412972e96d80b');
       should.equal(tx.maxGasAmount, 200000);
       should.equal(tx.gasUnitPrice, 100);
       should.equal(tx.sequenceNumber, 167);
@@ -131,7 +131,7 @@ describe('Apt Token Transfer Builder', () => {
       const txBuilder = factory.from(testData.FUNGIBLE_TOKEN_TRANSFER);
       const tx = (await txBuilder.build()) as FungibleAssetTransfer;
       const toJson = tx.toJson();
-      should.equal(toJson.id, '0x2dae2ecd096a212d6f565bd161c92f506cebb700aaf16c88bd3456b88d4c392a');
+      should.equal(toJson.id, '0x271da92f3dcd673a0bd28d26f8b49c1f0c6ead0f5be0fbab3e9412972e96d80b');
       should.equal(toJson.sender, testData.sender2.address);
       should.deepEqual(toJson.recipient, {
         address: testData.fungibleTokenRecipients[0].address,

modules/sdk-coin-apt/test/unit/transactionBuilder/transferBuilder.ts

@@ -65,7 +65,7 @@ describe('Apt Transfer Transaction', () => {
           value: testData.recipients[0].amount,
           coin: 'tapt',
         });
-        should.equal(tx.id, '0x80a52dd5d4f712a80b77ad7b4a12a8e61b76243a546099b0ab9acfef4e9a4e31');
+        should.equal(tx.id, '0x249289a8178e4b9cdb89fad6e8e436ccc435753e4ea3c9d50e0c8b525582e90d');
         should.equal(tx.maxGasAmount, 200000);
         should.equal(tx.gasUnitPrice, 100);
         should.equal(tx.sequenceNumber, 146);
@@ -126,7 +126,7 @@ describe('Apt Transfer Transaction', () => {
         const txBuilder = factory.from(testData.TRANSACTION_USING_TRANSFER_COINS);
         const tx = (await txBuilder.build()) as TransferTransaction;
         const toJson = tx.toJson();
-        should.equal(toJson.id, '0x80a52dd5d4f712a80b77ad7b4a12a8e61b76243a546099b0ab9acfef4e9a4e31');
+        should.equal(toJson.id, '0x249289a8178e4b9cdb89fad6e8e436ccc435753e4ea3c9d50e0c8b525582e90d');
         should.equal(toJson.sender, '0x1aed808916ab9b1b30b07abb53561afd46847285ce28651221d406173a372449');
         should.deepEqual(toJson.recipient, {
           address: '0xf7405c28a02cf5bab4ea4498240bb3579db45951794eb1c843bef0534c093ad9',