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

Merge remote-tracking branch 'origin/master' into mpetrunic/eth2-utils-package 

# Conflicts:
#	packages/eth2.0-spec-test-util/src/single.ts
#	packages/eth2.0-types/package.json
#	packages/lodestar/package.json
#	packages/lodestar/src/chain/chain.ts
#	packages/lodestar/src/chain/interface.ts
#	packages/lodestar/src/cli/commands/beacon.ts
#	packages/lodestar/src/db/api/beacon/repositories/merkleTree.ts
#	packages/lodestar/src/interop/cli.ts
#	packages/lodestar/src/interop/deposits.ts
#	packages/lodestar/test/unit/chain/factory/block/blockAssembly.test.ts
#	packages/lodestar/test/utils/mocks/chain/chain.ts
#	packages/ssz/package.json
#	packages/ssz/test/spec/util.ts
#	yarn.lock
This commit is contained in:
Marin Petrunić 2019-09-24 22:38:03 +02:00
parent 9efe9d33fd b515bea50f
commit 2725e3a518
10 changed files with 180 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -28,7 +28,7 @@
"pretest": "yarn check-types",
"prepublishOnly": "yarn build",
"test:unit": "nyc --cache-dir .nyc_output/.cache -r lcov -e .ts mocha --colors -r ./.babel-register 'test/unit/**/*.test.ts' && nyc report",
"test:spec": "mocha --colors -r ./.babel-register 'test/spec/**/*.test.ts'",
"test:spec": "mocha --colors -r ts-node/register 'test/spec/**/*.test.ts'",
"test:spec-min": "yarn run test:spec",
"test": "yarn test:unit && yarn test:spec",
"coverage": "codecov -F bls",
@ -52,7 +52,7 @@
"@babel/register": "^7.0.0",
"@babel/runtime": "^7.4.4",
"@chainsafe/benchmark-utils": "^0.1.0",
"@chainsafe/eth2.0-spec-test-util": "^0.2.3",
"@chainsafe/eth2.0-spec-test-util": "0.4.1",
"@types/assert": "^1.4.2",
"@types/chai": "^4.1.7",
"@types/mocha": "^5.2.5",
@ -64,7 +64,7 @@
"codecov": "^3.1.0",
"eslint": "^5.14.1",
"js-yaml": "^3.13.1",
"mocha": "^5.2.0",
"mocha": "^6.2.0",
"nyc": "^13.3.0",
"sinon": "^7.2.7",
"supertest": "^4.0.2",

42
test/spec/aggregate_pubkeys.test.ts
View File

@ -1,21 +1,27 @@
import {join} from "path";
import {describeSpecTest} from "@chainsafe/eth2.0-spec-test-util";
import bls from "../../src";
import {BLSSignature} from "@chainsafe/eth2.0-types";
import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
import path from "path";
describeSpecTest(
join(__dirname, "../../../spec-test-cases/tests/bls/aggregate_pubkeys/aggregate_pubkeys.yaml"),
bls.aggregatePubkeys,
({input}) => {
const sigs: BLSSignature[] = [];
input.forEach((sig: string) => {
sigs.push(Buffer.from(sig.replace('0x', ''), 'hex'));
});
return [
sigs
];
},
({output}) => output,
(result) => `0x${result.toString('hex')}`,
() => false,
interface AggregatePubKeysTestCase {
data: {
input: string[];
output: string;
};
}
describeDirectorySpecTest<AggregatePubKeysTestCase, string>(
"aggregate pubkeys",
path.join(__dirname, "../../../spec-test-cases/tests/general/phase0/bls/aggregate_pubkeys/small"),
(testCase => {
const result = bls.aggregatePubkeys(testCase.data.input.map(pubKey => {
return Buffer.from(pubKey.replace("0x", ""), "hex");
}));
return `0x${result.toString('hex')}`;
}),
{
inputTypes: {
data: InputType.YAML,
},
getExpected: (testCase => testCase.data.output)
}
);

42
test/spec/aggregate_sigs.test.ts
View File

@ -1,21 +1,27 @@
import {join} from "path";
import {describeSpecTest} from "@chainsafe/eth2.0-spec-test-util";
import path from "path";
import bls from "../../src";
import {BLSPubkey} from "../../src/types";
import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
describeSpecTest(
join(__dirname, "../../../spec-test-cases/tests/bls/aggregate_sigs/aggregate_sigs.yaml"),
bls.aggregateSignatures,
({input}) => {
const pubKeys: BLSPubkey[] = [];
input.forEach((pubKey: string) => {
pubKeys.push(Buffer.from(pubKey.replace('0x', ''), 'hex'));
});
return [
pubKeys
];
},
({output}) => output,
(result) => `0x${result.toString('hex')}`,
() => false,
interface AggregateSigsTestCase {
data: {
input: string[];
output: string;
};
}
describeDirectorySpecTest<AggregateSigsTestCase, string>(
"aggregate sigs",
path.join(__dirname, "../../../spec-test-cases/tests/general/phase0/bls/aggregate_sigs/small"),
(testCase => {
const result = bls.aggregateSignatures(testCase.data.input.map(pubKey => {
return Buffer.from(pubKey.replace("0x", ""), "hex");
}));
return `0x${result.toString('hex')}`;
}),
{
inputTypes: {
data: InputType.YAML,
},
getExpected: (testCase => testCase.data.output)
}
);

23
test/spec/g2_compressed.test.ts
View File

@ -1,23 +0,0 @@
import {join} from "path";
import {describeSpecTest} from "@chainsafe/eth2.0-spec-test-util";
import {padLeft} from "../../src/helpers/utils";
import {G2point} from "../../src/helpers/g2point";
describeSpecTest(
join(__dirname, "../../../spec-test-cases/tests/bls/msg_hash_g2_compressed/g2_compressed.yaml"),
G2point.hashToG2,
({input}) => {
const domain = padLeft(Buffer.from(input.domain.replace('0x', ''), 'hex'), 8);
return [
Buffer.from(input.message.replace('0x', ''), 'hex'),
domain
];
},
({output}) => {
const xReExpected = padLeft(Buffer.from(output[0].replace('0x', ''), 'hex'), 48);
const xImExpected = padLeft(Buffer.from(output[1].replace('0x', ''), 'hex'), 48);
return '0x' + Buffer.concat([xReExpected, xImExpected]).toString('hex');
},
(result: G2point) => `0x${result.toBytesCompressed().toString('hex')}`,
() => false,
);

28
test/spec/g2_uncompressed.test.ts
View File

@ -1,28 +0,0 @@
import {join} from "path";
import {describeSpecTest} from "@chainsafe/eth2.0-spec-test-util";
import {padLeft} from "../../src/helpers/utils";
import {G2point} from "../../src/helpers/g2point";
describeSpecTest(
join(__dirname, "../../../spec-test-cases/tests/bls/msg_hash_g2_uncompressed/g2_uncompressed.yaml"),
G2point.hashToG2,
({input}) => {
const domain = padLeft(Buffer.from(input.domain.replace('0x', ''), 'hex'), 8);
return [
Buffer.from(input.message.replace('0x', ''), 'hex'),
domain
];
},
({output}) => {
return '0x' + G2point.fromUncompressedInput(
Buffer.from(output[0][0].replace('0x', ''), 'hex'),
Buffer.from(output[0][1].replace('0x', ''), 'hex'),
Buffer.from(output[1][0].replace('0x', ''), 'hex'),
Buffer.from(output[1][1].replace('0x', ''), 'hex'),
Buffer.from(output[2][0].replace('0x', ''), 'hex'),
Buffer.from(output[2][1].replace('0x', ''), 'hex'),
).toBytesCompressed().toString('hex');
},
(result: G2point) => `0x${result.toBytesCompressed().toString('hex')}`,
() => false,
);

35
test/spec/msg_hash_compressed.test.ts Normal file
View File

@ -0,0 +1,35 @@
import path from "path";
import {padLeft} from "../../src/helpers/utils";
import {G2point} from "../../src/helpers/g2point";
import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
interface MsgHHashCOmpressed {
data: {
input: {
message: string;
domain: string;
};
output: string[];
};
}
describeDirectorySpecTest<MsgHHashCOmpressed, string>(
"msg_hash_compressed",
path.join(__dirname, "../../../spec-test-cases/tests/general/phase0/bls/msg_hash_compressed/small"),
(testCase => {
const domain = padLeft(Buffer.from(testCase.data.input.domain.replace('0x', ''), 'hex'), 8);
const input = Buffer.from(testCase.data.input.message.replace('0x', ''), "hex");
const result = G2point.hashToG2(input, domain);
return `0x${result.toBytesCompressed().toString('hex')}`;
}),
{
inputTypes: {
data: InputType.YAML,
},
getExpected: (testCase => {
const xReExpected = padLeft(Buffer.from(testCase.data.output[0].replace('0x', ''), 'hex'), 48);
const xImExpected = padLeft(Buffer.from(testCase.data.output[1].replace('0x', ''), 'hex'), 48);
return '0x' + Buffer.concat([xReExpected, xImExpected]).toString('hex');
})
}
);

40
test/spec/msg_hash_uncompressed.test.ts Normal file
View File

@ -0,0 +1,40 @@
import path from "path";
import {padLeft} from "../../src/helpers/utils";
import {G2point} from "../../src/helpers/g2point";
import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
interface MsgHHashUnCompressed {
data: {
input: {
message: string;
domain: string;
};
output: string[][];
};
}
describeDirectorySpecTest<MsgHHashUnCompressed, string>(
"msg_hash_uncompressed",
path.join(__dirname, "../../../spec-test-cases/tests/general/phase0/bls/msg_hash_uncompressed/small"),
(testCase => {
const domain = padLeft(Buffer.from(testCase.data.input.domain.replace('0x', ''), 'hex'), 8);
const input = Buffer.from(testCase.data.input.message.replace("0x", ""), "hex");
const result = G2point.hashToG2(input, domain);
return `0x${result.toBytesCompressed().toString('hex')}`;
}),
{
inputTypes: {
data: InputType.YAML,
},
getExpected: (testCase => {
return '0x' + G2point.fromUncompressedInput(
Buffer.from(testCase.data.output[0][0].replace('0x', ''), 'hex'),
Buffer.from(testCase.data.output[0][1].replace('0x', ''), 'hex'),
Buffer.from(testCase.data.output[1][0].replace('0x', ''), 'hex'),
Buffer.from(testCase.data.output[1][1].replace('0x', ''), 'hex'),
Buffer.from(testCase.data.output[2][0].replace('0x', ''), 'hex'),
Buffer.from(testCase.data.output[2][1].replace('0x', ''), 'hex'),
).toBytesCompressed().toString('hex');
})
}
);

33
test/spec/priv_to_public.test.ts
View File

@ -1,14 +1,25 @@
import {join} from "path";
import {describeSpecTest} from "@chainsafe/eth2.0-spec-test-util";
import bls from "../../src";
import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
import path from "path";
describeSpecTest(
join(__dirname, "../../../spec-test-cases/tests/bls/priv_to_pub/priv_to_pub.yaml"),
bls.generatePublicKey,
({input}) => {
return [Buffer.from(input.replace('0x', ''), 'hex')];
},
({output}) => output,
(result) => `0x${result.toString('hex')}`,
() => false,
interface PrivToPubTestCase {
data: {
input: string;
output: string;
};
}
describeDirectorySpecTest<PrivToPubTestCase, string>(
"priv_to_pub",
path.join(__dirname, "../../../spec-test-cases/tests/general/phase0/bls/priv_to_pub/small"),
(testCase => {
const result = bls.generatePublicKey(Buffer.from(testCase.data.input.replace('0x', ''), 'hex'));
return `0x${result.toString('hex')}`;
}),
{
inputTypes: {
data: InputType.YAML,
},
getExpected: (testCase => testCase.data.output)
}
);

48
test/spec/sign_message.test.ts
View File

@ -1,20 +1,34 @@
import {join} from "path";
import {describeSpecTest} from "@chainsafe/eth2.0-spec-test-util";
import path from "path";
import bls from "../../src";
import {padLeft} from "../../src/helpers/utils";
import {describeDirectorySpecTest, InputType} from "@chainsafe/eth2.0-spec-test-util/lib/single";
describeSpecTest(
join(__dirname, "../../../spec-test-cases/tests/bls/sign_msg/sign_msg.yaml"),
bls.sign,
({input}) => {
const domain = padLeft(Buffer.from(input.domain.replace('0x', ''), 'hex'), 8);
return [
Buffer.from(input.privkey.replace('0x', ''), 'hex'),
Buffer.from(input.message.replace('0x', ''), 'hex'),
domain
];
},
({output}) => output,
(result) => `0x${result.toString('hex')}`,
() => false,
);
interface SignMessageTestCase {
data: {
input: {
privkey: string;
message: string;
domain: string;
};
output: string;
};
}
describeDirectorySpecTest<SignMessageTestCase, string>(
"priv_to_pub",
path.join(__dirname, "../../../spec-test-cases/tests/general/phase0/bls/sign_msg/small"),
(testCase => {
const signature = bls.sign(
Buffer.from(testCase.data.input.privkey.replace("0x", ""), "hex"),
Buffer.from(testCase.data.input.message.replace("0x", ""), "hex"),
padLeft(Buffer.from(testCase.data.input.domain.replace('0x', ''), 'hex'), 8)
);
return `0x${signature.toString("hex")}`;
}),
{
inputTypes: {
data: InputType.YAML,
},
getExpected: (testCase => testCase.data.output)
}
);

1
tsconfig.json
View File

@ -3,6 +3,7 @@
"include": ["src"],
"compilerOptions": {
"typeRoots": [
"src/@types",
"../../node_modules/@types"
]
}