balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shell: less optimistic heuristic for head change

Browse Source
This commit is contained in:
Grégoire Henry 2018-11-01 01:44:18 +01:00 committed by Pierre Boutillier
parent 966c86def2
commit 3f04501c0d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib_shell/chain_validator.ml
View File

@ -269,9 +269,21 @@ let on_request (type a) w spawn_child (req : a Request.t) : a tzresult Lwt.t =
and head_hash = State.Block.hash head and head_hash = State.Block.hash head
and block_header = State.Block.header block and block_header = State.Block.header block
and block_hash = State.Block.hash block in and block_hash = State.Block.hash block in
if begin
Fitness.(block_header.shell.fitness <= head_header.shell.fitness) match nv.prevalidator with
then | None ->
Lwt.return head_header.shell.fitness
| Some pv ->
Prevalidator.fitness pv
end >>= fun context_fitness ->
let head_fitness = head_header.shell.fitness in
let new_fitness = block_header.shell.fitness in
let accepted_head =
if Fitness.(context_fitness = head_fitness) then
Fitness.(new_fitness > head_fitness)
else
Fitness.(new_fitness >= context_fitness) in
if not accepted_head then
return Event.Ignored_head return Event.Ignored_head
else begin else begin
Chain.set_head nv.parameters.chain_state block >>= fun previous -> Chain.set_head nv.parameters.chain_state block >>= fun previous ->