#356: removed networkType/signSchema coupling for transaction hash generation

Author: Greg S

src/model/transaction/AggregateTransaction.ts

@@ -15,7 +15,7 @@
  */
 
 import { sha3_256 } from 'js-sha3';
-import {KeyPair, MerkleHashBuilder, SHA3Hasher} from '../../core/crypto';
+import {KeyPair, MerkleHashBuilder, SHA3Hasher, SignSchema} from '../../core/crypto';
 import {Convert, RawArray} from '../../core/format';
 import {AggregateBondedTransactionBuilder} from '../../infrastructure/catbuffer/AggregateBondedTransactionBuilder';
 import {AggregateCompleteTransactionBuilder} from '../../infrastructure/catbuffer/AggregateCompleteTransactionBuilder';
@@ -373,9 +373,9 @@ export class AggregateTransaction extends Transaction {
      * @returns {Uint8Array}
      */
     private calculateInnerTransactionHash(networkType: NetworkType): Uint8Array {
-        const signSchema = SHA3Hasher.resolveSignSchema(networkType);
-        const hasher  = SHA3Hasher.createHasher(32, signSchema);
-        const builder = new MerkleHashBuilder(32, signSchema);
+        // Note: Transaction hashing *always* uses SHA3
+        const hasher  = SHA3Hasher.createHasher(32, SignSchema.SHA3);
+        const builder = new MerkleHashBuilder(32, SignSchema.SHA3);
         this.innerTransactions.forEach((transaction) => {
             const entityHash: Uint8Array = new Uint8Array(32);
 

src/model/transaction/Transaction.ts

@@ -169,9 +169,9 @@ export abstract class Transaction {
         entityHashBytes.set(generationHash, generationHashIdx);
         entityHashBytes.set(transactionBody, transactionBodyIdx);
 
-        // 6) create SHA3 or Keccak hash depending on `signSchema`
-        const signSchema: SignSchema = SHA3Hasher.resolveSignSchema(networkType);
-        SHA3Hasher.func(entityHash, entityHashBytes, 32, signSchema);
+        // 6) create SHA3 hash of transaction data
+        // Note: Transaction hashing *always* uses SHA3
+        SHA3Hasher.func(entityHash, entityHashBytes, 32, SignSchema.SHA3);
         return Convert.uint8ToHex(entityHash);
     }
 

test/model/transaction/Transaction.spec.ts

@@ -344,22 +344,6 @@ describe('Transaction', () => {
             expect(hash1).to.equal(hash2);
         });
 
-        it ('create different hash given different signature schemas', () => {
-            const hash1 = Transaction.createTransactionHash(
-                knownPayload,
-                generationHashBytes,
-                NetworkType.MIJIN_TEST, // SHA3
-            );
-
-            const hash2 = Transaction.createTransactionHash(
-                knownPayload,
-                generationHashBytes,
-                NetworkType.TEST_NET, // KECCAK
-            );
-
-            expect(hash1).to.not.equal(hash2);
-        });
-
         it('create correct SHA3 transaction hash given network type MIJIN or MIJIN_TEST', () => {
             const hash1 = Transaction.createTransactionHash(
                 knownPayload,
@@ -376,22 +360,6 @@ describe('Transaction', () => {
             expect(hash2).to.equal(knownHash_sha3);
         });
 
-        it('create correct KECCAK transaction hash given network type MAIN_NET or TEST_NET', () => {
-            const hash1 = Transaction.createTransactionHash(
-                knownPayload,
-                generationHashBytes,
-                NetworkType.TEST_NET,
-            );
-            const hash2 = Transaction.createTransactionHash(
-                knownPayload,
-                generationHashBytes,
-                NetworkType.MAIN_NET,
-            );
-
-            expect(hash1).to.equal(knownHash_keccak);
-            expect(hash2).to.equal(knownHash_keccak);
-        });
-
         it('hash only merkle transaction hash for aggregate transactions', () => {
             const hash1 = Transaction.createTransactionHash(
                 knownAggregatePayload,