LumeWeb
/
chainsafe-bls
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use validateBytes instead of generic assert

This commit is contained in:
dapplion 2020-11-29 14:06:09 +00:00
parent 70574b45c1
commit 5db911d470
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/functional.ts
View File

@ -1,4 +1,4 @@
import {assert} from "./helpers"; import {validateBytes} from "./helpers";
import {IBls} from "./interface"; import {IBls} from "./interface";
// Returned type is enforced at each implementation's index // Returned type is enforced at each implementation's index
@ -14,8 +14,9 @@ export function functionalInterfaceFactory({
* @param message * @param message
*/ */
function sign(secretKey: Uint8Array, message: Uint8Array): Uint8Array { function sign(secretKey: Uint8Array, message: Uint8Array): Uint8Array {
assert(secretKey, "secretKey is null or undefined"); validateBytes(secretKey, "secretKey");
assert(message, "message is null or undefined"); validateBytes(message, "message");
const privateKey = PrivateKey.fromBytes(secretKey); const privateKey = PrivateKey.fromBytes(secretKey);
return privateKey.sign(message).toBytes(); return privateKey.sign(message).toBytes();
} }
@ -45,9 +46,10 @@ export function functionalInterfaceFactory({
* @param signature * @param signature
*/ */
function verify(publicKey: Uint8Array, message: Uint8Array, signature: Uint8Array): boolean { function verify(publicKey: Uint8Array, message: Uint8Array, signature: Uint8Array): boolean {
assert(publicKey, "publicKey is null or undefined"); validateBytes(publicKey, "publicKey");
assert(message, "message is null or undefined"); validateBytes(message, "message");
assert(signature, "signature is null or undefined"); validateBytes(signature, "signature");
try { try {
return Signature.fromBytes(signature).verify(PublicKey.fromBytes(publicKey), message); return Signature.fromBytes(signature).verify(PublicKey.fromBytes(publicKey), message);
} catch (e) { } catch (e) {
@ -62,9 +64,10 @@ export function functionalInterfaceFactory({
* @param signature * @param signature
*/ */
function verifyAggregate(publicKeys: Uint8Array[], message: Uint8Array, signature: Uint8Array): boolean { function verifyAggregate(publicKeys: Uint8Array[], message: Uint8Array, signature: Uint8Array): boolean {
assert(publicKeys, "publicKey is null or undefined"); validateBytes(publicKeys, "publicKey");
assert(message, "message is null or undefined"); validateBytes(message, "message");
assert(signature, "signature is null or undefined"); validateBytes(signature, "signature");
try { try {
return Signature.fromBytes(signature).verifyAggregate( return Signature.fromBytes(signature).verifyAggregate(
publicKeys.map((pubkey) => PublicKey.fromBytes(pubkey)), publicKeys.map((pubkey) => PublicKey.fromBytes(pubkey)),
@ -83,9 +86,9 @@ export function functionalInterfaceFactory({
* @param fast Check if all messages are different * @param fast Check if all messages are different
*/ */
function verifyMultiple(publicKeys: Uint8Array[], messages: Uint8Array[], signature: Uint8Array): boolean { function verifyMultiple(publicKeys: Uint8Array[], messages: Uint8Array[], signature: Uint8Array): boolean {
assert(publicKeys, "publicKey is null or undefined"); validateBytes(publicKeys, "publicKey");
assert(messages, "message is null or undefined"); validateBytes(messages, "message");
assert(signature, "signature is null or undefined"); validateBytes(signature, "signature");
if (publicKeys.length === 0 || publicKeys.length != messages.length) { if (publicKeys.length === 0 || publicKeys.length != messages.length) {
return false; return false;

20
src/helpers/utils.ts
View File

@ -3,12 +3,6 @@ import randomBytes from "randombytes";
// Single import to ease changing this lib if necessary // Single import to ease changing this lib if necessary
export {randomBytes}; export {randomBytes};
export function assert(condition: unknown, message = "Assertion failed"): asserts condition {
if (!condition) {
throw new Error(message);
}
}
export function isEqualBytes(a: Buffer | Uint8Array, b: Buffer | Uint8Array): boolean { export function isEqualBytes(a: Buffer | Uint8Array, b: Buffer | Uint8Array): boolean {
return toBuffer(a).equals(toBuffer(b)); return toBuffer(a).equals(toBuffer(b));
} }
@ -16,3 +10,17 @@ export function isEqualBytes(a: Buffer | Uint8Array, b: Buffer | Uint8Array): bo
export function toBuffer(input: Uint8Array): Buffer { export function toBuffer(input: Uint8Array): Buffer {
return Buffer.from(input.buffer, input.byteOffset, input.length); return Buffer.from(input.buffer, input.byteOffset, input.length);
} }
/**
* Validate bytes to prevent confusing WASM errors downstream if bytes is null
*/
export function validateBytes(
bytes: Uint8Array | Uint8Array[] | null,
argName?: string
): asserts bytes is NonNullable<typeof bytes> {
for (const item of Array.isArray(bytes) ? bytes : [bytes]) {
if (item == null) {
throw Error(`${argName || "bytes"} is null or undefined`);
}
}
}