@lodestar/beacon-node 1.32.0-dev.a2ccd2896c → 1.32.0-dev.adff67b617
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/impl/beacon/state/index.js +13 -1
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/validator/index.js +52 -29
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/chain.d.ts +4 -4
- package/lib/chain/chain.js +4 -7
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/interface.d.ts +2 -2
- package/lib/chain/opPools/syncContributionAndProofPool.js +1 -1
- package/lib/chain/opPools/syncContributionAndProofPool.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts +2 -2
- package/lib/chain/produceBlock/produceBlockBody.js +141 -108
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/metrics/metrics/beacon.d.ts +1 -0
- package/lib/metrics/metrics/beacon.js +6 -0
- package/lib/metrics/metrics/beacon.js.map +1 -1
- package/lib/network/core/networkCore.d.ts +4 -4
- package/lib/network/core/networkCore.js +45 -43
- package/lib/network/core/networkCore.js.map +1 -1
- package/lib/network/core/types.d.ts +4 -0
- package/lib/network/discv5/index.d.ts +1 -0
- package/lib/network/discv5/index.js +1 -0
- package/lib/network/discv5/index.js.map +1 -1
- package/lib/network/discv5/types.d.ts +1 -0
- package/lib/network/discv5/utils.d.ts +3 -1
- package/lib/network/discv5/utils.js +12 -2
- package/lib/network/discv5/utils.js.map +1 -1
- package/lib/network/discv5/worker.js +5 -1
- package/lib/network/discv5/worker.js.map +1 -1
- package/lib/network/forks.d.ts +2 -0
- package/lib/network/forks.js +4 -0
- package/lib/network/forks.js.map +1 -1
- package/lib/network/gossip/scoringParameters.js +4 -3
- package/lib/network/gossip/scoringParameters.js.map +1 -1
- package/lib/network/network.js +5 -4
- package/lib/network/network.js.map +1 -1
- package/lib/network/peers/discover.d.ts +2 -0
- package/lib/network/peers/discover.js +1 -0
- package/lib/network/peers/discover.js.map +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.d.ts +3 -3
- package/lib/network/reqresp/ReqRespBeaconNode.js +5 -4
- package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
- package/lib/network/subnets/attnetsService.d.ts +3 -3
- package/lib/network/subnets/attnetsService.js +15 -15
- package/lib/network/subnets/attnetsService.js.map +1 -1
- package/lib/network/subnets/interface.d.ts +3 -3
- package/lib/network/subnets/syncnetsService.d.ts +3 -3
- package/lib/network/subnets/syncnetsService.js +13 -13
- package/lib/network/subnets/syncnetsService.js.map +1 -1
- package/package.json +14 -14
|
@@ -2,7 +2,7 @@ import { SYNC_COMMITTEE_SUBNET_COUNT } from "@lodestar/params";
|
|
|
2
2
|
import { computeStartSlotAtEpoch } from "@lodestar/state-transition";
|
|
3
3
|
import { ssz } from "@lodestar/types";
|
|
4
4
|
import { ClockEvent } from "../../util/clock.js";
|
|
5
|
-
import {
|
|
5
|
+
import { getActiveSubscribeBoundaries } from "../forks.js";
|
|
6
6
|
import { GossipType } from "../gossip/index.js";
|
|
7
7
|
import { SubnetMap } from "../peers/utils/index.js";
|
|
8
8
|
const gossipType = GossipType.sync_committee;
|
|
@@ -70,18 +70,18 @@ export class SyncnetsService {
|
|
|
70
70
|
this.updateMetadata();
|
|
71
71
|
}
|
|
72
72
|
/** Call ONLY ONCE: Two epoch before the fork, re-subscribe all existing random subscriptions to the new fork */
|
|
73
|
-
|
|
74
|
-
this.logger.info("Subscribing to random attnets
|
|
73
|
+
subscribeSubnetsAfterBoundary(boundary) {
|
|
74
|
+
this.logger.info("Subscribing to random attnets after boundary", boundary);
|
|
75
75
|
for (const subnet of this.subscriptionsCommittee.getAll()) {
|
|
76
|
-
this.gossip.subscribeTopic({ type: gossipType, fork:
|
|
76
|
+
this.gossip.subscribeTopic({ type: gossipType, fork: boundary.fork, subnet });
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
/** Call ONLY ONCE: Two epochs after the fork, un-subscribe all subnets from the old fork */
|
|
80
|
-
|
|
81
|
-
this.logger.info("Unsubscribing to random attnets
|
|
80
|
+
unsubscribeSubnetsBeforeBoundary(boundary) {
|
|
81
|
+
this.logger.info("Unsubscribing to random attnets before boundary", boundary);
|
|
82
82
|
for (let subnet = 0; subnet < SYNC_COMMITTEE_SUBNET_COUNT; subnet++) {
|
|
83
83
|
if (!this.opts?.subscribeAllSubnets) {
|
|
84
|
-
this.gossip.unsubscribeTopic({ type: gossipType, fork:
|
|
84
|
+
this.gossip.unsubscribeTopic({ type: gossipType, fork: boundary.fork, subnet });
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -98,11 +98,11 @@ export class SyncnetsService {
|
|
|
98
98
|
}
|
|
99
99
|
/** Tigger a gossip subcription only if not already subscribed */
|
|
100
100
|
subscribeToSubnets(subnets) {
|
|
101
|
-
const
|
|
101
|
+
const boundaries = getActiveSubscribeBoundaries(this.config, this.clock.currentEpoch);
|
|
102
102
|
for (const subnet of subnets) {
|
|
103
103
|
if (!this.subscriptionsCommittee.has(subnet)) {
|
|
104
|
-
for (const
|
|
105
|
-
this.gossip.subscribeTopic({ type: gossipType, fork, subnet });
|
|
104
|
+
for (const boundary of boundaries) {
|
|
105
|
+
this.gossip.subscribeTopic({ type: gossipType, fork: boundary.fork, subnet });
|
|
106
106
|
}
|
|
107
107
|
this.metrics?.syncnetsService.subscribeSubnets.inc({ subnet });
|
|
108
108
|
}
|
|
@@ -110,12 +110,12 @@ export class SyncnetsService {
|
|
|
110
110
|
}
|
|
111
111
|
/** Trigger a gossip un-subscrition only if no-one is still subscribed */
|
|
112
112
|
unsubscribeSubnets(subnets) {
|
|
113
|
-
const
|
|
113
|
+
const boundaries = getActiveSubscribeBoundaries(this.config, this.clock.currentEpoch);
|
|
114
114
|
for (const subnet of subnets) {
|
|
115
115
|
// No need to check if active in subscriptionsCommittee since we only have a single SubnetMap
|
|
116
116
|
if (!this.opts?.subscribeAllSubnets) {
|
|
117
|
-
for (const
|
|
118
|
-
this.gossip.unsubscribeTopic({ type: gossipType, fork, subnet });
|
|
117
|
+
for (const boundary of boundaries) {
|
|
118
|
+
this.gossip.unsubscribeTopic({ type: gossipType, fork: boundary.fork, subnet });
|
|
119
119
|
}
|
|
120
120
|
this.metrics?.syncnetsService.unsubscribeSubnets.inc({ subnet });
|
|
121
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncnetsService.js","sourceRoot":"","sources":["../../../src/network/subnets/syncnetsService.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"syncnetsService.js","sourceRoot":"","sources":["../../../src/network/subnets/syncnetsService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.32.0-dev.
|
|
14
|
+
"version": "1.32.0-dev.adff67b617",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -117,18 +117,18 @@
|
|
|
117
117
|
"@libp2p/peer-id": "^5.1.0",
|
|
118
118
|
"@libp2p/prometheus-metrics": "^4.3.15",
|
|
119
119
|
"@libp2p/tcp": "^10.1.8",
|
|
120
|
-
"@lodestar/api": "1.32.0-dev.
|
|
121
|
-
"@lodestar/config": "1.32.0-dev.
|
|
122
|
-
"@lodestar/db": "1.32.0-dev.
|
|
123
|
-
"@lodestar/fork-choice": "1.32.0-dev.
|
|
124
|
-
"@lodestar/light-client": "1.32.0-dev.
|
|
125
|
-
"@lodestar/logger": "1.32.0-dev.
|
|
126
|
-
"@lodestar/params": "1.32.0-dev.
|
|
127
|
-
"@lodestar/reqresp": "1.32.0-dev.
|
|
128
|
-
"@lodestar/state-transition": "1.32.0-dev.
|
|
129
|
-
"@lodestar/types": "1.32.0-dev.
|
|
130
|
-
"@lodestar/utils": "1.32.0-dev.
|
|
131
|
-
"@lodestar/validator": "1.32.0-dev.
|
|
120
|
+
"@lodestar/api": "1.32.0-dev.adff67b617",
|
|
121
|
+
"@lodestar/config": "1.32.0-dev.adff67b617",
|
|
122
|
+
"@lodestar/db": "1.32.0-dev.adff67b617",
|
|
123
|
+
"@lodestar/fork-choice": "1.32.0-dev.adff67b617",
|
|
124
|
+
"@lodestar/light-client": "1.32.0-dev.adff67b617",
|
|
125
|
+
"@lodestar/logger": "1.32.0-dev.adff67b617",
|
|
126
|
+
"@lodestar/params": "1.32.0-dev.adff67b617",
|
|
127
|
+
"@lodestar/reqresp": "1.32.0-dev.adff67b617",
|
|
128
|
+
"@lodestar/state-transition": "1.32.0-dev.adff67b617",
|
|
129
|
+
"@lodestar/types": "1.32.0-dev.adff67b617",
|
|
130
|
+
"@lodestar/utils": "1.32.0-dev.adff67b617",
|
|
131
|
+
"@lodestar/validator": "1.32.0-dev.adff67b617",
|
|
132
132
|
"@multiformats/multiaddr": "^12.1.3",
|
|
133
133
|
"c-kzg": "^2.1.2",
|
|
134
134
|
"datastore-core": "^10.0.2",
|
|
@@ -165,5 +165,5 @@
|
|
|
165
165
|
"beacon",
|
|
166
166
|
"blockchain"
|
|
167
167
|
],
|
|
168
|
-
"gitHead": "
|
|
168
|
+
"gitHead": "250272e17cebe8f5336090f102dbe6f1978ec9d9"
|
|
169
169
|
}
|