Added signSchema to transaction signning

Author: rg911

src/infrastructure/builders/AggregateTransaction.ts

@@ -17,6 +17,7 @@
 /**
  * @module transactions/AggregateTransaction
  */
+import { SignSchema } from '../../core/crypto';
 import AggregateTransactionBufferPackage from '../buffers/AggregateTransactionBuffer';
 import AggregateTransactionSchema from '../schemas/AggregateTransactionSchema';
 import { CosignatureTransaction} from './CosignatureTransaction';
@@ -35,11 +36,11 @@ export class AggregateTransaction extends VerifiableTransaction {
         super(bytes, AggregateTransactionSchema);
     }
 
-    signTransactionWithCosigners(initializer, cosigners, generationHash) {
-        const signedTransaction = this.signTransaction(initializer, generationHash);
+    signTransactionWithCosigners(initializer, cosigners, generationHash, signSchema: SignSchema = SignSchema.Catapult) {
+        const signedTransaction = this.signTransaction(initializer, generationHash, signSchema);
         cosigners.forEach((cosigner) => {
             const signatureTransaction = new CosignatureTransaction(signedTransaction.hash);
-            const signatureCosignTransaction = signatureTransaction.signCosignatoriesTransaction(cosigner);
+            const signatureCosignTransaction = signatureTransaction.signCosignatoriesTransaction(cosigner, signSchema);
             signedTransaction.payload = signedTransaction.payload +
                 signatureCosignTransaction.signer + signatureCosignTransaction.signature;
         });
@@ -56,8 +57,8 @@ export class AggregateTransaction extends VerifiableTransaction {
         return signedTransaction;
     }
 
-    signTransactionGivenSignatures(initializer, cosignedSignedTransactions, generationHash) {
-        const signedTransaction = this.signTransaction(initializer, generationHash);
+    signTransactionGivenSignatures(initializer, cosignedSignedTransactions, generationHash, signSchema) {
+        const signedTransaction = this.signTransaction(initializer, generationHash, signSchema);
         cosignedSignedTransactions.forEach((cosignedTransaction) => {
             signedTransaction.payload = signedTransaction.payload + cosignedTransaction.signer + cosignedTransaction.signature;
         });

src/model/account/Account.ts

@@ -149,32 +149,37 @@ export class Account {
      * Sign a transaction
      * @param transaction - The transaction to be signed.
      * @param generationHash - Network generation hash hex
+     * @param {SignSchema} signSchema The Sign Schema (NIS / Catapult)
      * @return {SignedTransaction}
      */
-    public sign(transaction: Transaction, generationHash): SignedTransaction {
-        return transaction.signWith(this, generationHash);
+    public sign(transaction: Transaction, generationHash, signSchema: SignSchema = SignSchema.Catapult): SignedTransaction {
+        return transaction.signWith(this, generationHash, signSchema);
     }
 
     /**
      * Sign transaction with cosignatories creating a new SignedTransaction
      * @param transaction - The aggregate transaction to be signed.
      * @param cosignatories - The array of accounts that will cosign the transaction
      * @param generationHash - Network generation hash hex
+     * @param {SignSchema} signSchema The Sign Schema (NIS / Catapult)
      * @return {SignedTransaction}
      */
     public signTransactionWithCosignatories(transaction: AggregateTransaction,
                                             cosignatories: Account[],
-                                            generationHash: string): SignedTransaction {
-    return transaction.signTransactionWithCosignatories(this, cosignatories, generationHash);
+                                            generationHash: string,
+                                            signSchema: SignSchema = SignSchema.Catapult): SignedTransaction {
+    return transaction.signTransactionWithCosignatories(this, cosignatories, generationHash, signSchema);
     }
 
     /**
      * Sign aggregate signature transaction
      * @param cosignatureTransaction - The aggregate signature transaction.
+     * @param {SignSchema} signSchema The Sign Schema (NIS / Catapult)
      * @return {CosignatureSignedTransaction}
      */
-    public signCosignatureTransaction(cosignatureTransaction: CosignatureTransaction): CosignatureSignedTransaction {
-        return cosignatureTransaction.signWith(this);
+    public signCosignatureTransaction(cosignatureTransaction: CosignatureTransaction,
+                                      signSchema: SignSchema = SignSchema.Catapult): CosignatureSignedTransaction {
+        return cosignatureTransaction.signWith(this, signSchema);
     }
 
     /**

src/model/transaction/AggregateTransaction.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { SignSchema } from '../../core/crypto';
 import { Builder } from '../../infrastructure/builders/AggregateTransaction';
 import { AggregateTransaction as AggregatedTransactionCore} from '../../infrastructure/builders/AggregateTransaction';
 import { Account } from '../account/Account';
@@ -134,11 +135,16 @@ export class AggregateTransaction extends Transaction {
      * @param initiatorAccount - Initiator account
      * @param cosignatories - The array of accounts that will cosign the transaction
      * @param generationHash - Network generation hash hex
+     * @param {SignSchema} signSchema The Sign Schema (NIS / Catapult)
      * @returns {SignedTransaction}
      */
-    public signTransactionWithCosignatories(initiatorAccount: Account, cosignatories: Account[], generationHash: string) {
+    public signTransactionWithCosignatories(initiatorAccount: Account,
+                                            cosignatories: Account[],
+                                            generationHash: string,
+                                            signSchema: SignSchema = SignSchema.Catapult) {
         const aggregateTransaction = this.buildTransaction();
-        const signedTransactionRaw = aggregateTransaction.signTransactionWithCosigners(initiatorAccount, cosignatories, generationHash);
+        const signedTransactionRaw = aggregateTransaction
+                .signTransactionWithCosigners(initiatorAccount, cosignatories, generationHash, signSchema);
         return new SignedTransaction(signedTransactionRaw.payload, signedTransactionRaw.hash, initiatorAccount.publicKey,
                                      this.type, this.networkType);
     }

src/model/transaction/CosignatureTransaction.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { SignSchema } from '../../core/crypto';
 import {CosignatureTransaction as CosignaturetransactionLibrary} from '../../infrastructure/builders/CosignatureTransaction';
 import {Account} from '../account/Account';
 import {AggregateTransaction} from './AggregateTransaction';
@@ -49,11 +50,12 @@ export class CosignatureTransaction {
      * @internal
      * Serialize and sign transaction creating a new SignedTransaction
      * @param account
+     * @param {SignSchema} signSchema The Sign Schema (NIS / Catapult)
      * @returns {CosignatureSignedTransaction}
      */
-    public signWith(account: Account): CosignatureSignedTransaction {
+    public signWith(account: Account, signSchema: SignSchema = SignSchema.Catapult): CosignatureSignedTransaction {
         const aggregateSignatureTransaction = new CosignaturetransactionLibrary(this.transactionToCosign.transactionInfo!.hash);
-        const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account);
+        const signedTransactionRaw = aggregateSignatureTransaction.signCosignatoriesTransaction(account, signSchema);
         return new CosignatureSignedTransaction(signedTransactionRaw.parentHash,
             signedTransactionRaw.signature,
             signedTransactionRaw.signer);

src/model/transaction/Transaction.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { SignSchema } from '../../core/crypto';
 import { VerifiableTransaction } from '../../infrastructure/builders/VerifiableTransaction';
 import { SerializeTransactionToJSON } from '../../infrastructure/transaction/SerializeTransactionToJSON';
 import { Account } from '../account/Account';
@@ -83,11 +84,12 @@ export abstract class Transaction {
      * Serialize and sign transaction creating a new SignedTransaction
      * @param account - The account to sign the transaction
      * @param generationHash - Network generation hash hex
+     * @param {SignSchema} signSchema The Sign Schema (NIS / Catapult)
      * @returns {SignedTransaction}
      */
-    public signWith(account: Account, generationHash: string): SignedTransaction {
+    public signWith(account: Account, generationHash: string, signSchema: SignSchema = SignSchema.Catapult): SignedTransaction {
         const transaction = this.buildTransaction();
-        const signedTransactionRaw = transaction.signTransaction(account, generationHash);
+        const signedTransactionRaw = transaction.signTransaction(account, generationHash, signSchema);
         return new SignedTransaction(
             signedTransactionRaw.payload,
             signedTransactionRaw.hash,