merged lates master

Author: rg911

src/model/transaction/AggregateTransaction.ts

@@ -236,13 +236,16 @@ export class AggregateTransaction extends Transaction {
      * For off chain Aggregated Complete Transaction co-signing.
      * @param initiatorAccount - Initiator account
      * @param {CosignatureSignedTransaction[]} cosignatureSignedTransactions - Array of cosigned transaction
+     * @param generationHash - Network generation hash hex
      * @return {SignedTransaction}
      */
     public signTransactionGivenSignatures(initiatorAccount: Account,
-                                          cosignatureSignedTransactions: CosignatureSignedTransaction[]) {
+                                          cosignatureSignedTransactions: CosignatureSignedTransaction[],
+                                          generationHash: string) {
         const aggregateTransaction = this.buildTransaction();
         const signedTransactionRaw = aggregateTransaction.signTransactionGivenSignatures(initiatorAccount,
-                                                                                         cosignatureSignedTransactions);
+                                                                                         cosignatureSignedTransactions,
+                                                                                         generationHash);
         return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey,
                                      this.type, this.networkType);
     }

test/model/transaction/CosignatureTransaction.spec.ts

@@ -15,7 +15,6 @@
  */
 
 import {expect} from 'chai';
-import { VerifiableTransaction } from 'nem2-library';
 import {CreateTransactionFromDTO} from '../../../src/infrastructure/transaction/CreateTransactionFromDTO';
 import {Account} from '../../../src/model/account/Account';
 import { NetworkType } from '../../../src/model/blockchain/NetworkType';