Fixed aggregate transaction creatFromPayload

- Catbuffer use separate builder class for Complete and Bonded
- Added unit tests

Author: rg911

src/model/transaction/AggregateTransaction.ts

@@ -131,9 +131,14 @@ export class AggregateTransaction extends Transaction {
      * @returns {AggregateTransaction}
      */
     public static createFromPayload(payload: string, signSchema: SignSchema = SignSchema.SHA3): AggregateTransaction {
-        const builder = AggregateCompleteTransactionBuilder
-            .loadFromBinary(Convert.hexToUint8(payload));
-        const type = builder.getType().valueOf();
+        /**
+         * Get transaction type from the payload hex
+         * As buffer uses separate builder class for Complete and bonded
+         */
+        const type = parseInt(Convert.uint8ToHex(Convert.hexToUint8(payload.substring(204, 208)).reverse()), 16);
+        const builder = type === TransactionType.AGGREGATE_COMPLETE ?
+            AggregateCompleteTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload)) :
+            AggregateBondedTransactionBuilder.loadFromBinary(Convert.hexToUint8(payload));
         const innerTransactionHex = Convert.uint8ToHex(builder.getTransactions());
         const networkType = Convert.hexToUint8(builder.getVersion().toString(16))[0];
         const consignaturesHex = Convert.uint8ToHex(builder.getCosignatures());

test/core/utils/TransactionMapping.spec.ts

@@ -439,6 +439,7 @@ describe('TransactionMapping - createFromPayload', () => {
 
         const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AggregateTransaction;
 
+        expect(transaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE);
         expect(transaction.innerTransactions[0].type).to.be.equal(TransactionType.TRANSFER);
     });
 
@@ -461,6 +462,7 @@ describe('TransactionMapping - createFromPayload', () => {
 
         const transaction = TransactionMapping.createFromPayload(signedTransaction.payload) as AggregateTransaction;
 
+        expect(transaction.type).to.be.equal(TransactionType.AGGREGATE_BONDED);
         expect(transaction.innerTransactions[0].type).to.be.equal(TransactionType.TRANSFER);
     });
 

test/model/transaction/AggregateTransaction.spec.ts

@@ -265,6 +265,33 @@ describe('AggregateTransaction', () => {
 
     });
 
+    it('should createBonded an AggregateTransaction object with TransferTransaction', () => {
+        const transferTransaction = TransferTransaction.create(
+            Deadline.create(),
+            Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'),
+            [],
+            PlainMessage.create('test-message'),
+            NetworkType.MIJIN_TEST,
+        );
+
+        const aggregateTransaction = AggregateTransaction.createBonded(
+            Deadline.create(2, ChronoUnit.MINUTES),
+            [transferTransaction.toAggregate(account.publicAccount)],
+            NetworkType.MIJIN_TEST,
+            [],
+        );
+
+        const signedTransaction = aggregateTransaction.signWith(account, generationHash);
+
+        expect(signedTransaction.payload.substring(0, 8)).to.be.equal('CD000000');
+        expect(signedTransaction.payload.substring(240, 256)).to.be.equal('5100000051000000');
+        expect(signedTransaction.payload.substring(204, 208)).to.be.equal('4142');
+        expect(signedTransaction.payload.substring(
+            320,
+            signedTransaction.payload.length,
+        )).to.be.equal('019054419050B9837EFAB4BBE8A4B9BB32D812F9885C00D8FC1650E1420D000000746573742D6D657373616765');
+    });
+
     it('should validate if accounts have signed an aggregate transaction', () => {
         const aggregateTransactionDTO = {
             meta: {