Merge pull request #7200 from LiskHQ/7011-merge_development

Merge development into feature branch - Closes #7011
LiskHQ · Jun 3, 2022 · f2f10ea · f2f10ea
2 parents 18924d2 + b3cec2f
commit f2f10ea
Show file tree

Hide file tree

Showing 84 changed files with 13,806 additions and 745 deletions.
diff --git a/commander/test/bootstrapping/commands/transaction/sign.spec.ts b/commander/test/bootstrapping/commands/transaction/sign.spec.ts
diff --git a/elements/lisk-api-client/test/unit/__snapshots__/transaction.spec.ts.snap b/elements/lisk-api-client/test/unit/__snapshots__/transaction.spec.ts.snap
diff --git a/elements/lisk-client/test/lisk-cryptography/sign.spec.ts b/elements/lisk-client/test/lisk-cryptography/sign.spec.ts
@@ -60,7 +60,7 @@ ${defaultSignature}
 
 	const defaultData = Buffer.from('This is some data');
 	const defaultDataSignature =
-		'41f7d923c8957664923b49d7a893153476bc60e0392702cf111a26a92d74279a00c41f1999504c9faeee7b3d05393ca04d61a0768c3ae4d324f3097ab0b52201';
+		'554b14094052d3e3874ba0704f216fd7b366450295c44cdbf2bd2a210e27a318a752143121af6fbe5a1ec5961dbef362ba39aa0714c0b9a4e60208e665466002';
 
 	let defaultSignedMessage: any;
 

diff --git a/elements/lisk-cryptography/src/bls.ts b/elements/lisk-cryptography/src/bls.ts
@@ -25,6 +25,7 @@ import {
 } from './bls_lib';
 import { tagMessage } from './message_tag';
 import { readBit, writeBit } from './utils';
+import { hash } from './hash';
 
 export { BLS_SUPPORTED };
 export const generatePrivateKey = blsKeyGen;
@@ -36,15 +37,15 @@ export const signBLS = (
 	networkIdentifier: Buffer,
 	data: Buffer,
 	privateKey: Buffer,
-): Buffer => blsSign(privateKey, tagMessage(tag, networkIdentifier, data));
+): Buffer => blsSign(privateKey, hash(tagMessage(tag, networkIdentifier, data)));
 
 export const verifyBLS = (
 	tag: string,
 	networkIdentifier: Buffer,
 	data: Buffer,
 	signature: Buffer,
 	publicKey: Buffer,
-): boolean => blsVerify(publicKey, tagMessage(tag, networkIdentifier, data), signature);
+): boolean => blsVerify(publicKey, hash(tagMessage(tag, networkIdentifier, data)), signature);
 
 export const createAggSig = (
 	publicKeysList: Buffer[],
@@ -84,7 +85,7 @@ export const verifyAggSig = (
 		}
 	}
 
-	return blsFastAggregateVerify(keys, taggedMessage, signature);
+	return blsFastAggregateVerify(keys, hash(taggedMessage), signature);
 };
 
 export const verifyWeightedAggSig = (
@@ -112,5 +113,5 @@ export const verifyWeightedAggSig = (
 		return false;
 	}
 
-	return blsFastAggregateVerify(keys, taggedMessage, signature);
+	return blsFastAggregateVerify(keys, hash(taggedMessage), signature);
 };
diff --git a/elements/lisk-cryptography/src/sign.ts b/elements/lisk-cryptography/src/sign.ts
@@ -120,7 +120,7 @@ export const signDataWithPrivateKey = (
 	networkIdentifier: Buffer,
 	data: Buffer,
 	privateKey: Buffer,
-): Buffer => signDetached(tagMessage(tag, networkIdentifier, data), privateKey);
+): Buffer => signDetached(hash(tagMessage(tag, networkIdentifier, data)), privateKey);
 
 export const signDataWithPassphrase = (
 	tag: string,
@@ -141,4 +141,4 @@ export const verifyData = (
 	data: Buffer,
 	signature: Buffer,
 	publicKey: Buffer,
-): boolean => verifyDetached(tagMessage(tag, networkIdentifier, data), signature, publicKey);
+): boolean => verifyDetached(hash(tagMessage(tag, networkIdentifier, data)), signature, publicKey);
diff --git a/elements/lisk-cryptography/test/protocol_specs/bls_specs/sign_bls/case1.yml b/elements/lisk-cryptography/test/protocol_specs/bls_specs/sign_bls/case1.yml
@@ -3,4 +3,4 @@ input:
   tag: LSK_TX_
   netId: '0x9ee11e9df416b18bf69dbd1a920442e08c6ca319e69926bc843a561782ca17ee'
   message: '0xbeaf'
-output: '0xa6f889695b4ee393c6ede6af2215019cf9d7e004781b98ea12d6b227212126687ecde1c2a08e38e2d5c18eab2881879102e91ac5f0e9813126d6d68262af149ba6c25ffb88e6688fec49b5199cec863c0eb54110fdb6d92c6570f3ca9c1910b9'
+output: '0xb34d13b21f5064ed845ef674f5308748d34a640511b479bd5d3374548e69005e3e7f4fbdd2e7292a409fde45bcccf14c0de9ff0eba62e41bdbb329c7deb8a0ec6e1a732588f1db994a46e545e52a0d2558e6229663c07a7db9ea5589b861ae16'
diff --git a/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_agg_sig/case1.yml b/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_agg_sig/case1.yml
@@ -6,12 +6,12 @@ input:
     - '0xb301803f8b5ac4a1133581fc676dfedc60d891dd5fa99028805e5ea5b08d3491af75d0707adab3b70c6a6a580217bf81'
     - '0xb53d21a4cfd562c469cc81514d4ce5a6b577d8403d32a394dc265dd190b47fa9f829fdd7963afdf972e5e77854051f6f'
     - '0xa6b6a639f7fa0b64ad3a93be965e9cc34e1d9d0f0427c14c38fc80934a937c5fa745a3cb285f64d4d1c06d0825504488'
-    - '0xb0b2b9b812972e5e629810f0b841391933822d166995530770b5e875a73d945969986e3041a93db90160ea8510439c3e'
+    - '0x8abaa90eca571e8771d51e34922ed53d4f7c551c48db001c51508649640f3c28f4651154e5ae3ef1d4dc00a46e4321c8'
     - '0x95324a8c4a890e8c1e83c96c6c639254937c9c9cee789556606744b07e98292e292c8c150efd9506b0b5547fea3fdf9f'
-    - '0x884b52f84e801d2453edb023928c79125a5e4384c108dd8f17b7f2a20772c7dc4b9635602937df1b87d8b7284870c932'
+    - '0x9674867a5f54b704f1cffe9678112107ac06911c25cd1acf0858a13e02918f5a2e35b81737d2178641b82f32f274b87d'
   aggregation_bits: '0x4001'
-  signature: '0x89a3b2642b285b129ff9196fa310eea2fb77468b3919f6530ebef402a5c7d589b3d6cfa0bb884b38b365047a7a6a216614a72941479d2753438b3657a430318f43dbfd895632db1c23d988097115fe1d0c4aa5d2ef42da50b8027bd2e410d781'
+  signature: '0x85c33a7f77f70f6d16da200e6eb9038591e8484d11704bd41335cf93f4ba22d98124e2d95857d8fac8d7442fc5b01fb70a41397cae80e18fcff0768ea33c2d35d9d8989df83ea41bb1701a565c0878767050b614ea277312993fadc7fdb9d4a0'
   tag: 'LSK_CE_'
   netId: '0x9ee11e9df416b18bf69dbd1a920442e08c6ca319e69926bc843a561782ca17ee'
   message: '0xbeaf'
-output: true
+output: true
diff --git a/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_bls/case1.yml b/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_bls/case1.yml
@@ -3,5 +3,5 @@ input:
   tag: LSK_TX_
   netId: '0x9ee11e9df416b18bf69dbd1a920442e08c6ca319e69926bc843a561782ca17ee'
   message: '0xbeaf'
-  signature: '0xa6f889695b4ee393c6ede6af2215019cf9d7e004781b98ea12d6b227212126687ecde1c2a08e38e2d5c18eab2881879102e91ac5f0e9813126d6d68262af149ba6c25ffb88e6688fec49b5199cec863c0eb54110fdb6d92c6570f3ca9c1910b9'
+  signature: '0xb34d13b21f5064ed845ef674f5308748d34a640511b479bd5d3374548e69005e3e7f4fbdd2e7292a409fde45bcccf14c0de9ff0eba62e41bdbb329c7deb8a0ec6e1a732588f1db994a46e545e52a0d2558e6229663c07a7db9ea5589b861ae16'
 output: true
diff --git a/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_weighted_agg_sig/case1.yml b/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_weighted_agg_sig/case1.yml
@@ -6,11 +6,11 @@ input:
     - '0xb301803f8b5ac4a1133581fc676dfedc60d891dd5fa99028805e5ea5b08d3491af75d0707adab3b70c6a6a580217bf81'
     - '0xb53d21a4cfd562c469cc81514d4ce5a6b577d8403d32a394dc265dd190b47fa9f829fdd7963afdf972e5e77854051f6f'
     - '0xa6b6a639f7fa0b64ad3a93be965e9cc34e1d9d0f0427c14c38fc80934a937c5fa745a3cb285f64d4d1c06d0825504488'
-    - '0xb0b2b9b812972e5e629810f0b841391933822d166995530770b5e875a73d945969986e3041a93db90160ea8510439c3e'
+    - '0x8abaa90eca571e8771d51e34922ed53d4f7c551c48db001c51508649640f3c28f4651154e5ae3ef1d4dc00a46e4321c8'
     - '0x95324a8c4a890e8c1e83c96c6c639254937c9c9cee789556606744b07e98292e292c8c150efd9506b0b5547fea3fdf9f'
-    - '0x884b52f84e801d2453edb023928c79125a5e4384c108dd8f17b7f2a20772c7dc4b9635602937df1b87d8b7284870c932'
+    - '0x9674867a5f54b704f1cffe9678112107ac06911c25cd1acf0858a13e02918f5a2e35b81737d2178641b82f32f274b87d'
   aggregation_bits: '0x4001'
-  signature: '0x89a3b2642b285b129ff9196fa310eea2fb77468b3919f6530ebef402a5c7d589b3d6cfa0bb884b38b365047a7a6a216614a72941479d2753438b3657a430318f43dbfd895632db1c23d988097115fe1d0c4aa5d2ef42da50b8027bd2e410d781'
+  signature: '0x85c33a7f77f70f6d16da200e6eb9038591e8484d11704bd41335cf93f4ba22d98124e2d95857d8fac8d7442fc5b01fb70a41397cae80e18fcff0768ea33c2d35d9d8989df83ea41bb1701a565c0878767050b614ea277312993fadc7fdb9d4a0'
   tag: 'LSK_CE_'
   netId: '0x9ee11e9df416b18bf69dbd1a920442e08c6ca319e69926bc843a561782ca17ee'
   message: '0xbeaf'

diff --git a/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_weighted_agg_sig/case2.yml b/elements/lisk-cryptography/test/protocol_specs/bls_specs/verify_weighted_agg_sig/case2.yml
@@ -6,11 +6,11 @@ input:
     - '0xb301803f8b5ac4a1133581fc676dfedc60d891dd5fa99028805e5ea5b08d3491af75d0707adab3b70c6a6a580217bf81'
     - '0xb53d21a4cfd562c469cc81514d4ce5a6b577d8403d32a394dc265dd190b47fa9f829fdd7963afdf972e5e77854051f6f'
     - '0xa6b6a639f7fa0b64ad3a93be965e9cc34e1d9d0f0427c14c38fc80934a937c5fa745a3cb285f64d4d1c06d0825504488'
-    - '0xb0b2b9b812972e5e629810f0b841391933822d166995530770b5e875a73d945969986e3041a93db90160ea8510439c3e'
+    - '0x8abaa90eca571e8771d51e34922ed53d4f7c551c48db001c51508649640f3c28f4651154e5ae3ef1d4dc00a46e4321c8'
     - '0x95324a8c4a890e8c1e83c96c6c639254937c9c9cee789556606744b07e98292e292c8c150efd9506b0b5547fea3fdf9f'
-    - '0x884b52f84e801d2453edb023928c79125a5e4384c108dd8f17b7f2a20772c7dc4b9635602937df1b87d8b7284870c932'
+    - '0x9674867a5f54b704f1cffe9678112107ac06911c25cd1acf0858a13e02918f5a2e35b81737d2178641b82f32f274b87d'
   aggregation_bits: '0x4001'
-  signature: '0x89a3b2642b285b129ff9196fa310eea2fb77468b3919f6530ebef402a5c7d589b3d6cfa0bb884b38b365047a7a6a216614a72941479d2753438b3657a430318f43dbfd895632db1c23d988097115fe1d0c4aa5d2ef42da50b8027bd2e410d781'
+  signature: '0x85c33a7f77f70f6d16da200e6eb9038591e8484d11704bd41335cf93f4ba22d98124e2d95857d8fac8d7442fc5b01fb70a41397cae80e18fcff0768ea33c2d35d9d8989df83ea41bb1701a565c0878767050b614ea277312993fadc7fdb9d4a0'
   tag: 'LSK_CE_'
   netId: '0x9ee11e9df416b18bf69dbd1a920442e08c6ca319e69926bc843a561782ca17ee'
   message: '0xbeaf'

diff --git a/elements/lisk-cryptography/test/sign.spec.ts b/elements/lisk-cryptography/test/sign.spec.ts
@@ -58,7 +58,7 @@ ${defaultSignature}
 
 	const defaultData = Buffer.from('This is some data');
 	const defaultDataSignature =
-		'446f811d6d6b9d216310a3ad3b458b17704e9559db123ff465a83d5b3080da04a030513d5071bcd30d57ec59c351ce68784563d7528c7be642b0ed215ce91008';
+		'be3167eb1bd0b1e37727872a7eaee78a7ec13386d23dc50e7ef589ff0e50d680bc8e039072790b875820b25ea7129a8b6c98850951515fac5cfa56119ce43e00';
 
 	let defaultSignedMessage: SignedMessageWithOnePassphrase;