Skip to content

Commit

Permalink
feat: asyncAggregateWithRandomness (#7204) (#7435)
Browse files Browse the repository at this point in the history 
- repeat of #7204 because we reverted it
- See the review in #6483

Co-authored-by: Matthew Keil <[email protected]>
  • Loading branch information
@wemeetagain @matthewkeil
wemeetagain and matthewkeil authored Feb 7, 2025
1 parent 0a8e6e1 commit a7755ad
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 64 deletions.
2 changes: 1 addition & 1 deletion packages/beacon-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
},
"dependencies": {
"@chainsafe/as-sha256": "^1.0.0",
"@chainsafe/blst": "^2.1.0",
"@chainsafe/blst": "^2.2.0",
"@chainsafe/discv5": "^9.0.0",
"@chainsafe/enr": "^3.0.0",
"@chainsafe/libp2p-gossipsub": "^13.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/beacon-node/src/chain/bls/multithread/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ export class BlsMultiThreadWorkerPool implements IBlsVerifier {
try {
// Note: This can throw, must be handled per-job.
// Pubkey and signature aggregation is defered here
workReq = jobItemWorkReq(job, this.metrics);
workReq = await jobItemWorkReq(job, this.metrics);
} catch (e) {
this.metrics?.blsThreadPool.errorAggregateSignatureSetsCount.inc({type: job.type});

Expand Down
18 changes: 5 additions & 13 deletions packages/beacon-node/src/chain/bls/multithread/jobItem.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PublicKey, aggregateWithRandomness} from "@chainsafe/blst";
import {PublicKey, asyncAggregateWithRandomness} from "@chainsafe/blst";
import {ISignatureSet, SignatureSetType} from "@lodestar/state-transition";
import {Metrics} from "../../../metrics/metrics.js";
import {LinkedList} from "../../../util/array.js";
Expand Down Expand Up @@ -48,7 +48,7 @@ export function jobItemSigSets(job: JobQueueItem): number {
* Prepare BlsWorkReq from JobQueueItem
* WARNING: May throw with untrusted user input
*/
export function jobItemWorkReq(job: JobQueueItem, metrics: Metrics | null): BlsWorkReq {
export async function jobItemWorkReq(job: JobQueueItem, metrics: Metrics | null): Promise<BlsWorkReq> {
switch (job.type) {
case JobQueueItemType.default:
return {
Expand All @@ -61,17 +61,9 @@ export function jobItemWorkReq(job: JobQueueItem, metrics: Metrics | null): BlsW
})),
};
case JobQueueItemType.sameMessage: {
// This is slow code on main thread (mainly signature deserialization + group check).
// Ideally it can be taken off-thread, but in the mean time, keep track of total time spent here.
// As of July 2024, for a node subscribing to all subnets, with 1 signature per validator per epoch,
// it takes around 2.02 min to perform this operation for a single epoch.
// cpu profile on main thread has 250s idle so this only works until we reach 3M validators
// However, for normal node with only 2 to 7 subnet subscriptions per epoch this works until 27M validators
// and not a problem in the near future
// this is monitored on v1.21.0 https://github.com/ChainSafe/lodestar/pull/6894/files#r1687359225
const timer = metrics?.blsThreadPool.aggregateWithRandomnessMainThreadDuration.startTimer();
const {pk, sig} = aggregateWithRandomness(job.sets.map((set) => ({pk: set.publicKey, sig: set.signature})));
timer?.();
const {pk, sig} = await asyncAggregateWithRandomness(
job.sets.map((set) => ({pk: set.publicKey, sig: set.signature}))
);

return {
opts: job.opts,
Expand Down
5 changes: 0 additions & 5 deletions packages/beacon-node/src/metrics/metrics/lodestar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,6 @@ export function createLodestarMetrics(
name: "lodestar_bls_thread_pool_batchable_sig_sets_total",
help: "Count of total batchable signature sets",
}),
aggregateWithRandomnessMainThreadDuration: register.histogram({
name: "lodestar_bls_thread_pool_aggregate_with_randomness_main_thread_time_seconds",
help: "Total time performing aggregateWithRandomness on main thread",
buckets: [0.001, 0.005, 0.01, 0.1],
}),
pubkeysAggregationMainThreadDuration: register.histogram({
name: "lodestar_bls_thread_pool_pubkeys_aggregation_main_thread_time_seconds",
help: "Total time spent aggregating pubkeys on main thread",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"dependencies": {
"@chainsafe/bls-keygen": "^0.4.0",
"@chainsafe/bls-keystore": "^3.1.0",
"@chainsafe/blst": "^2.1.0",
"@chainsafe/blst": "^2.2.0",
"@chainsafe/discv5": "^9.0.0",
"@chainsafe/enr": "^3.0.0",
"@chainsafe/persistent-merkle-tree": "^1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/flare/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"dependencies": {
"@chainsafe/bls-keygen": "^0.4.0",
"@chainsafe/blst": "^2.1.0",
"@chainsafe/blst": "^2.2.0",
"@lodestar/api": "^1.26.0",
"@lodestar/config": "^1.26.0",
"@lodestar/params": "^1.26.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/state-transition/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"types": "lib/index.d.ts",
"dependencies": {
"@chainsafe/as-sha256": "^1.0.0",
"@chainsafe/blst": "^2.1.0",
"@chainsafe/blst": "^2.2.0",
"@chainsafe/persistent-merkle-tree": "^1.0.1",
"@chainsafe/persistent-ts": "^1.0.0",
"@chainsafe/pubkey-index-map": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
],
"dependencies": {
"@chainsafe/bls-keystore": "^3.1.0",
"@chainsafe/blst": "^2.1.0",
"@chainsafe/blst": "^2.2.0",
"@lodestar/params": "^1.26.0",
"@lodestar/utils": "^1.26.0",
"axios": "^1.3.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/validator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"blockchain"
],
"dependencies": {
"@chainsafe/blst": "^2.1.0",
"@chainsafe/blst": "^2.2.0",
"@chainsafe/ssz": "^1.0.2",
"@lodestar/api": "^1.26.0",
"@lodestar/config": "^1.26.0",
Expand Down
78 changes: 39 additions & 39 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,40 +491,40 @@
"@chainsafe/bls-keygen" "^0.4.0"
bls-eth-wasm "^0.4.8"

"@chainsafe/blst-darwin-arm64@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-darwin-arm64/-/blst-darwin-arm64-2.1.0.tgz#8871d62dc0402df30adbd6f52fbbd02d59f3c5ff"
integrity sha512-7iPRlSbQxEZ2AblmkFLuhnVPUipvA0UenEaUCaLC1MhGFpSwy5bSrF8Krs/E++GN3p2LVz7ZH3tlDfFL0z1EvQ==
"@chainsafe/blst-darwin-arm64@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-darwin-arm64/-/blst-darwin-arm64-2.2.0.tgz#0ab9083805c308106c2f2107df1e6376d9190b1b"
integrity sha512-BOOy2KHbV028cioPWaAMqHdLRKd6/3XyEmUEcQC2E/SpyYLdNcaKiBUYIU4pT9CrWBbJJxX68UI+3vZVg0M8/w==

"@chainsafe/blst-darwin-x64@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-darwin-x64/-/blst-darwin-x64-2.1.0.tgz#8fe58d92b72b1b872f8b687a0aad8beda3e09072"
integrity sha512-aeoidOpOYVmRFeHVm1p/Axd6CfqWpr6SIift216/HTDBTiuJCGSJqHzk9RHf7gzkr6WtxO7g/6AtkagZA2VPFg==
"@chainsafe/blst-darwin-x64@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-darwin-x64/-/blst-darwin-x64-2.2.0.tgz#231943a7736f3f89d35e03fec890b7809c98ff1a"
integrity sha512-jG64cwIdPT7u/haRrW26tWCpfMfHBQCfGY169mFQifCwO4VEwvaiVBPOh5olFis6LjpcmD+O0jpM8GqrnsmUHQ==

"@chainsafe/blst-linux-arm64-gnu@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-arm64-gnu/-/blst-linux-arm64-gnu-2.1.0.tgz#323789a10679cf81813b1e664ef4187a2e941cff"
integrity sha512-d2zgqoJOqkWg2sZbNR7pv8f+oYPOJmnMu46Uulm6NkW3iYNZIc2KkVjBXGYk7xJ+U8ZEzb7KZ7gRB9315sWBcg==
"@chainsafe/blst-linux-arm64-gnu@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-arm64-gnu/-/blst-linux-arm64-gnu-2.2.0.tgz#721aeec63e8e02aba3358a0084c095403a5438fa"
integrity sha512-L8xV2uuLn8we76vdzfryS9ePdheuZrmY6yArGUFaF1Uzcwml6V1/VvyPl9/uooo/YfVRIrvF/D+lQfI2GFAnhw==

"@chainsafe/blst-linux-arm64-musl@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-arm64-musl/-/blst-linux-arm64-musl-2.1.0.tgz#4a308d6b1f71a57a6ecc6cc0531746f5cd8ae3d0"
integrity sha512-w+KiL8ViLXigZVS++tdCwnMBnbc4HXb8claKOnlCppE1rAeF0Dt186AU2TRpqOop3QoOqckqvsguR9iQwZlTUw==
"@chainsafe/blst-linux-arm64-musl@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-arm64-musl/-/blst-linux-arm64-musl-2.2.0.tgz#dbbabaab93156548c86e2b2b3a1d27160b715000"
integrity sha512-0Vn0luxLYVgC3lvWT1MapFHSAoz99PldqjhilXTGv0AcAk/X5LXPH2RC9Dp2KJGqthyUkpbk1j47jUBfBI+BIg==

"@chainsafe/blst-linux-x64-gnu@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-x64-gnu/-/blst-linux-x64-gnu-2.1.0.tgz#c015f9f25aab10bba7720518ba9dc19bb850dcc3"
integrity sha512-2xdOIkkJTvi+/gUoiPQO+p+2o19pixLsH5BOrwxY+EABLL6wxZ82w5LatV3x27YJTk7PbAlyT36n7CjmzaZ/tw==
"@chainsafe/blst-linux-x64-gnu@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-x64-gnu/-/blst-linux-x64-gnu-2.2.0.tgz#9f8ab825621b75227c75bb75d369d3d42e91fa74"
integrity sha512-gEY/z2SDBA7kXtFEI9VNhWTJAIjx16jdeAyCaS2k4ACGurWZaWk+Ee4KniTsr4WieSqeuNTUr7Pdja0Sr4EKNQ==

"@chainsafe/blst-linux-x64-musl@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-x64-musl/-/blst-linux-x64-musl-2.1.0.tgz#da4ac690cc3b59bc21c4578d30502490c044f7fb"
integrity sha512-/ddO38KkTTgTmXBLAubU1fjUWcQy90sdUi0IoRm5RprdpXvTSGZ1m8XrcxwEYkUO+KpnacOuU0UDwerHMJl4DA==
"@chainsafe/blst-linux-x64-musl@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-linux-x64-musl/-/blst-linux-x64-musl-2.2.0.tgz#11e99ac12b0f83cad68da56f4e9cfc4aa403a2e6"
integrity sha512-58GKtiUmtVSuerRzPEcMNQZpICPboBKFnL7+1Wo+PSuajkvbae7tEFrFTtWeMoKIPgOEsPMnk96LF+0yNgavUg==

"@chainsafe/blst-win32-x64-msvc@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-win32-x64-msvc/-/blst-win32-x64-msvc-2.1.0.tgz#edaff899194caa4e40901af90779721673671631"
integrity sha512-wSRVGoLrluus38fmYYS0ft3VSG2EaeeWvb7yxvrAS8xUsaRFRClYo/3kaEHR3D9B9Nu5wiuWfob6DoM3w9deLw==
"@chainsafe/blst-win32-x64-msvc@2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst-win32-x64-msvc/-/blst-win32-x64-msvc-2.2.0.tgz#f32b164721ff5edc279f6d6cd0fffde0ad2fe16c"
integrity sha512-UFrZshl4dfX5Uh2zeKXAZtrkQ+otczHMON2tsrapQNICWmfHZrzE6pKuBL+9QeGAbgflwpbz7+D5nQRDpiuHxQ==

"@chainsafe/blst@^0.2.0":
version "0.2.11"
Expand All @@ -535,18 +535,18 @@
node-fetch "^2.6.1"
node-gyp "^8.4.0"

"@chainsafe/blst@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst/-/blst-2.1.0.tgz#1df4fa8e390db5c3cceed673b57468e23b4da36f"
integrity sha512-oY5k4whglgVOkisfujO0s1QgCOp3N/J3GogRbHhuNLrf6KN0zs1C3pKHg66EQhQqWVYnFY2Shx2s71/NFD7y+A==
"@chainsafe/blst@^2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@chainsafe/blst/-/blst-2.2.0.tgz#ced8b861b94934e3c1c53e173c3e1205d775d93b"
integrity sha512-VBaQoNE2a9d9+skAjQKv3Suk0yGKqp3mZM0YWYJNPj/Ae/f6lAyeVSgKqo2LrsNQBzD/LqrJLKUY8rJT3vDKLA==
optionalDependencies:
"@chainsafe/blst-darwin-arm64" "2.1.0"
"@chainsafe/blst-darwin-x64" "2.1.0"
"@chainsafe/blst-linux-arm64-gnu" "2.1.0"
"@chainsafe/blst-linux-arm64-musl" "2.1.0"
"@chainsafe/blst-linux-x64-gnu" "2.1.0"
"@chainsafe/blst-linux-x64-musl" "2.1.0"
"@chainsafe/blst-win32-x64-msvc" "2.1.0"
"@chainsafe/blst-darwin-arm64" "2.2.0"
"@chainsafe/blst-darwin-x64" "2.2.0"
"@chainsafe/blst-linux-arm64-gnu" "2.2.0"
"@chainsafe/blst-linux-arm64-musl" "2.2.0"
"@chainsafe/blst-linux-x64-gnu" "2.2.0"
"@chainsafe/blst-linux-x64-musl" "2.2.0"
"@chainsafe/blst-win32-x64-msvc" "2.2.0"

"@chainsafe/discv5@^9.0.0":
version "9.0.0"
Expand Down

0 comments on commit a7755ad

Please sign in to comment.