Merge branch 'master' into task/g218_block_outgoing_account_restriction

Author: rg911

src/core/format/Utilities.ts

@@ -168,8 +168,8 @@ export const decodeChar = (c) => {
 };
 
 export const decodeBlock = (input, inputOffset, output, outputOffset) => {
-    const bytes = new Uint8Array(this.Encoded_Block_Size);
-    for (let i = 0; i < this.Encoded_Block_Size; ++i) {
+    const bytes = new Uint8Array(Encoded_Block_Size);
+    for (let i = 0; i < Encoded_Block_Size; ++i) {
         bytes[i] = decodeChar(input[inputOffset + i]);
     }
 

src/model/transaction/AggregateTransaction.ts

@@ -115,6 +115,17 @@ export class AggregateTransaction extends Transaction {
         );
     }
 
+    /**
+     * @description add inner transactions to current list
+     * @param {InnerTransaction[]} transaction
+     * @returns {AggregateTransaction}
+     * @memberof AggregateTransaction
+     */
+    public addTransactions(transactions: InnerTransaction[]): AggregateTransaction {
+        const innerTransactions = this.innerTransactions.concat(transactions);
+        return Object.assign({__proto__: Object.getPrototypeOf(this)}, this, {innerTransactions});
+    }
+
     /**
      * @internal
      * @returns {AggregateTransaction}

test/model/transaction/AggregateTransaction.spec.ts

@@ -454,6 +454,33 @@ describe('AggregateTransaction', () => {
         expect(standardCosignedTransaction.hash).to.be.equal(signedTransaction.hash);
     });
 
+    it('Should be able to add innertransactions to current aggregate tx', () => {
+        const transferTx1 = TransferTransaction.create(Deadline.create(),
+                                                  account.address,
+                                                  [],
+                                                  PlainMessage.create('a to b'),
+                                                  NetworkType.MIJIN_TEST);
+        const transferTx2 = TransferTransaction.create(Deadline.create(),
+                                                  account.address,
+                                                  [],
+                                                  PlainMessage.create('b to a'),
+                                                  NetworkType.MIJIN_TEST);
+        let aggregateTransaction = AggregateTransaction.createComplete(
+            Deadline.create(),
+            [transferTx1.toAggregate(account.publicAccount)],
+            NetworkType.MIJIN_TEST,
+            [],
+        );
+
+        expect(aggregateTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE);
+        expect(aggregateTransaction.innerTransactions.length).to.be.equal(1);
+
+        aggregateTransaction = aggregateTransaction.addTransactions([transferTx2.toAggregate(account.publicAccount)]);
+
+        expect(aggregateTransaction.type).to.be.equal(TransactionType.AGGREGATE_COMPLETE);
+        expect(aggregateTransaction.innerTransactions.length).to.be.equal(2);
+    });
+
     describe('size', () => {
         it('should return 282 for AggregateTransaction byte size with TransferTransaction with 1 mosaic and message NEM', () => {
             const transaction = TransferTransaction.create(