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

Comments on #117 addressed (#154)

Browse Source
This commit is contained in:
Yuriy Glukhov 2019-03-05 15:55:09 +02:00 committed by Jacek Sieka
parent 21e4debda0
commit 38f48753b2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_chain/sync_protocol.nim
View File

@ -29,13 +29,15 @@ func toHeader(b: BeaconBlock): BeaconBlockHeader =
body: hash_tree_root_final(b.body) body: hash_tree_root_final(b.body)
) )
proc fromHeader(b: var BeaconBlock, h: BeaconBlockHeader) = proc fromHeaderAndBody(b: var BeaconBlock, h: BeaconBlockHeader, body: BeaconBlockBody) =
assert(hash_tree_root_final(body) == h.body)
b.slot = h.slot b.slot = h.slot
b.parent_root = h.parent_root b.parent_root = h.parent_root
b.state_root = h.state_root b.state_root = h.state_root
b.randao_reveal = h.randao_reveal b.randao_reveal = h.randao_reveal
b.eth1_data = h.eth1_data b.eth1_data = h.eth1_data
b.signature = h.signature b.signature = h.signature
b.body = body
proc importBlocks(node: BeaconNode, roots: openarray[(Eth2Digest, uint64)], headers: openarray[BeaconBlockHeader], bodies: openarray[BeaconBlockBody]) = proc importBlocks(node: BeaconNode, roots: openarray[(Eth2Digest, uint64)], headers: openarray[BeaconBlockHeader], bodies: openarray[BeaconBlockBody]) =
var bodyMap = initTable[Eth2Digest, int]() var bodyMap = initTable[Eth2Digest, int]()
@ -48,8 +50,7 @@ proc importBlocks(node: BeaconNode, roots: openarray[(Eth2Digest, uint64)], head
let iBody = bodyMap.getOrDefault(h.body, -1) let iBody = bodyMap.getOrDefault(h.body, -1)
if iBody >= 0: if iBody >= 0:
var blk: BeaconBlock var blk: BeaconBlock
blk.fromHeader(h) blk.fromHeaderAndBody(h, bodies[iBody])
blk.body = bodies[iBody]
node.onBeaconBlock(blk) node.onBeaconBlock(blk)
inc goodBlocks inc goodBlocks
else: else:
@ -115,7 +116,7 @@ p2pProtocol BeaconSync(version = 1,
requestResponse: requestResponse:
proc getBeaconBlockHeaders(peer: Peer, blockRoot: Eth2Digest, slot: uint64, maxHeaders: int, skipSlots: int) = proc getBeaconBlockHeaders(peer: Peer, blockRoot: Eth2Digest, slot: uint64, maxHeaders: int, skipSlots: int) =
# TODO: validate maxHeaders # TODO: validate maxHeaders and implement slipSlots
var s = slot var s = slot
var headers = newSeqOfCap[BeaconBlockHeader](maxHeaders) var headers = newSeqOfCap[BeaconBlockHeader](maxHeaders)
let db = peer.networkState.db let db = peer.networkState.db