status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-28 15:27:22 +00:00
Code Issues Projects Releases Wiki Activity

Don't look for syncnets peers before the Altair transition

Browse Source
This commit is contained in:
Zahary Karadjov 2021-10-04 16:08:47 +03:00 committed by zah
parent f10a2b18bb
commit 22346f3e32
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_chain/networking/eth2_network.nim
View File

@ -1040,7 +1040,7 @@ proc trimConnections(node: Eth2Node, count: int) {.async.} =
inc(nbc_cycling_kicked_peers) inc(nbc_cycling_kicked_peers)
if toKick <= 0: return if toKick <= 0: return
proc getLowSubnets(node: Eth2Node): proc getLowSubnets(node: Eth2Node, epoch: Epoch):
(BitArray[ATTESTATION_SUBNET_COUNT], (BitArray[ATTESTATION_SUBNET_COUNT],
BitArray[SYNC_COMMITTEE_SUBNET_COUNT]) = BitArray[SYNC_COMMITTEE_SUBNET_COUNT]) =
# Returns the subnets required to have a healthy mesh # Returns the subnets required to have a healthy mesh
@ -1083,7 +1083,12 @@ proc getLowSubnets(node: Eth2Node):
return ( return (
findLowSubnets(getAttestationTopic, SubnetId, ATTESTATION_SUBNET_COUNT), findLowSubnets(getAttestationTopic, SubnetId, ATTESTATION_SUBNET_COUNT),
findLowSubnets(getSyncCommitteeTopic, SyncCommitteeIndex, SYNC_COMMITTEE_SUBNET_COUNT) # We start looking one epoch before the transition in order to allow
# some time for the gossip meshes to get healthy:
if epoch + 1 >= node.cfg.ALTAIR_FORK_EPOCH:
findLowSubnets(getSyncCommitteeTopic, SyncCommitteeIndex, SYNC_COMMITTEE_SUBNET_COUNT)
else:
default(BitArray[SYNC_COMMITTEE_SUBNET_COUNT])
) )
proc runDiscoveryLoop*(node: Eth2Node) {.async.} = proc runDiscoveryLoop*(node: Eth2Node) {.async.} =
@ -1091,7 +1096,8 @@ proc runDiscoveryLoop*(node: Eth2Node) {.async.} =
while true: while true:
let let
(wantedAttnets, wantedSyncnets) = node.getLowSubnets() currentEpoch = node.getBeaconTime().slotOrZero.epoch
(wantedAttnets, wantedSyncnets) = node.getLowSubnets(currentEpoch)
wantedAttnetsCount = wantedAttnets.countOnes() wantedAttnetsCount = wantedAttnets.countOnes()
wantedSyncnetsCount = wantedSyncnets.countOnes() wantedSyncnetsCount = wantedSyncnets.countOnes()