status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed build

This commit is contained in:
Viktor Kirilov 2020-06-10 11:30:21 +03:00
parent 3bae40ae91
commit 06873abde3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beacon_chain/attestation_pool.nim
View File

@ -11,8 +11,7 @@ import
deques, sequtils, tables, options, deques, sequtils, tables, options,
chronicles, stew/[byteutils], json_serialization/std/sets, chronicles, stew/[byteutils], json_serialization/std/sets,
./spec/[beaconstate, datatypes, crypto, digest, helpers, validator], ./spec/[beaconstate, datatypes, crypto, digest, helpers, validator],
./extras, ./block_pool, ./block_pools/candidate_chains, ./beacon_node_types, ./extras, ./block_pool, ./block_pools/candidate_chains, ./beacon_node_types
./fork_choice/[fork_choice_types, fork_choice]
logScope: topics = "attpool" logScope: topics = "attpool"

4
beacon_chain/beacon_node.nim
View File

@ -721,7 +721,7 @@ proc installAttestationHandlers(node: BeaconNode) =
let (afterGenesis, slot) = node.beaconClock.now().toSlot() let (afterGenesis, slot) = node.beaconClock.now().toSlot()
if not afterGenesis: if not afterGenesis:
return false return false
node.attestationPool.isValidAttestation(attestation, slot, committeeIndex, {}) node.attestationPool.isValidAttestation(attestation, slot, committeeIndex)
var attestationSubscriptions: seq[Future[void]] = @[] var attestationSubscriptions: seq[Future[void]] = @[]
@ -734,6 +734,7 @@ proc installAttestationHandlers(node: BeaconNode) =
# This proc needs to be within closureScope; don't lift out of loop. # This proc needs to be within closureScope; don't lift out of loop.
proc(attestation: Attestation): bool = proc(attestation: Attestation): bool =
attestationValidator(attestation, ci) attestationValidator(attestation, ci)
))
when ETH2_SPEC == "v0.11.3": when ETH2_SPEC == "v0.11.3":
# https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/p2p-interface.md#interop-3 # https://github.com/ethereum/eth2.0-specs/blob/v0.11.1/specs/phase0/p2p-interface.md#interop-3
@ -743,6 +744,7 @@ proc installAttestationHandlers(node: BeaconNode) =
# isValidAttestation checks attestation.data.index == topicCommitteeIndex # isValidAttestation checks attestation.data.index == topicCommitteeIndex
# which doesn't make sense here, so rig that check to vacuously pass. # which doesn't make sense here, so rig that check to vacuously pass.
attestationValidator(attestation, attestation.data.index) attestationValidator(attestation, attestation.data.index)
))
waitFor allFutures(attestationSubscriptions) waitFor allFutures(attestationSubscriptions)

3
beacon_chain/beacon_node_types.nim
View File

@ -5,8 +5,7 @@ import
stew/endians2, stew/endians2,
spec/[datatypes, crypto, digest], spec/[datatypes, crypto, digest],
block_pools/block_pools_types, block_pools/block_pools_types,
block_pool, # TODO: refactoring compat shim block_pool # TODO: refactoring compat shim
fork_choice/fork_choice_types
export block_pools_types export block_pools_types