Merge branch 'master' into 0.9.x

This commit is contained in:
Cayman 2020-01-10 14:07:22 -06:00
commit f8b1cb3cc7
1 changed files with 16 additions and 0 deletions

View File

@ -4,6 +4,7 @@ import {PublicKey} from "./publicKey";
import {Signature} from "./signature"; import {Signature} from "./signature";
import {BLSPubkey, BLSSecretKey, BLSSignature, Domain, bytes32} from "@chainsafe/eth2.0-types"; import {BLSPubkey, BLSSecretKey, BLSSignature, Domain, bytes32} from "@chainsafe/eth2.0-types";
import {PUBLIC_KEY_LENGTH} from "./constants"; import {PUBLIC_KEY_LENGTH} from "./constants";
import assert from "assert";
export {Keypair, PrivateKey, PublicKey, Signature}; export {Keypair, PrivateKey, PublicKey, Signature};
@ -21,6 +22,7 @@ export function generateKeyPair(): Keypair {
* @param {BLSSecretKey} secretKey * @param {BLSSecretKey} secretKey
*/ */
export function generatePublicKey(secretKey: BLSSecretKey): BLSPubkey { export function generatePublicKey(secretKey: BLSSecretKey): BLSPubkey {
assert(secretKey, "secretKey is null or undefined");
const keypair = new Keypair(PrivateKey.fromBytes(secretKey)); const keypair = new Keypair(PrivateKey.fromBytes(secretKey));
return keypair.publicKey.toBytesCompressed(); return keypair.publicKey.toBytesCompressed();
} }
@ -32,6 +34,9 @@ export function generatePublicKey(secretKey: BLSSecretKey): BLSPubkey {
* @param domain * @param domain
*/ */
export function sign(secretKey: BLSSecretKey, messageHash: bytes32, domain: Domain): BLSSignature { export function sign(secretKey: BLSSecretKey, messageHash: bytes32, domain: Domain): BLSSignature {
assert(secretKey, "secretKey is null or undefined");
assert(messageHash, "messageHash is null or undefined");
assert(domain, "domain is null or undefined");
const privateKey = PrivateKey.fromBytes(secretKey); const privateKey = PrivateKey.fromBytes(secretKey);
return privateKey.signMessage(messageHash, domain).toBytesCompressed(); return privateKey.signMessage(messageHash, domain).toBytesCompressed();
} }
@ -41,6 +46,7 @@ export function sign(secretKey: BLSSecretKey, messageHash: bytes32, domain: Doma
* @param signatures * @param signatures
*/ */
export function aggregateSignatures(signatures: BLSSignature[]): BLSSignature { export function aggregateSignatures(signatures: BLSSignature[]): BLSSignature {
assert(signatures, "signatures is null or undefined");
return signatures.map((signature): Signature => { return signatures.map((signature): Signature => {
return Signature.fromCompressedBytes(signature); return Signature.fromCompressedBytes(signature);
}).reduce((previousValue, currentValue): Signature => { }).reduce((previousValue, currentValue): Signature => {
@ -53,6 +59,7 @@ export function aggregateSignatures(signatures: BLSSignature[]): BLSSignature {
* @param publicKeys * @param publicKeys
*/ */
export function aggregatePubkeys(publicKeys: BLSPubkey[]): BLSPubkey { export function aggregatePubkeys(publicKeys: BLSPubkey[]): BLSPubkey {
assert(publicKeys, "publicKeys is null or undefined");
if(publicKeys.length === 0) { if(publicKeys.length === 0) {
return Buffer.alloc(PUBLIC_KEY_LENGTH); return Buffer.alloc(PUBLIC_KEY_LENGTH);
} }
@ -74,6 +81,10 @@ export function aggregatePubkeys(publicKeys: BLSPubkey[]): BLSPubkey {
* @param domain * @param domain
*/ */
export function verify(publicKey: BLSPubkey, messageHash: bytes32, signature: BLSSignature, domain: Domain): boolean { export function verify(publicKey: BLSPubkey, messageHash: bytes32, signature: BLSSignature, domain: Domain): boolean {
assert(publicKey, "publicKey is null or undefined");
assert(messageHash, "messageHash is null or undefined");
assert(signature, "signature is null or undefined");
assert(domain, "domain is null or undefined");
try { try {
return PublicKey return PublicKey
.fromBytes(publicKey) .fromBytes(publicKey)
@ -96,6 +107,11 @@ export function verifyMultiple(
signature: BLSSignature, signature: BLSSignature,
domain: Domain domain: Domain
): boolean { ): boolean {
assert(publicKeys, "publicKey is null or undefined");
assert(messageHashes, "messageHash is null or undefined");
assert(signature, "signature is null or undefined");
assert(domain, "domain is null or undefined");
if(publicKeys.length === 0 || publicKeys.length != messageHashes.length) { if(publicKeys.length === 0 || publicKeys.length != messageHashes.length) {
return false; return false;
} }