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

Client/Endorser: do not send endorsement for old blocks

Browse Source
This commit is contained in:
Grégoire Henry 2017-02-15 20:39:38 +01:00
parent 0b33e5a6da
commit 2f6863da89
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/client/embedded/alpha/baker/client_mining_endorsement.ml
View File

@ -176,7 +176,7 @@ let forge_endorsement cctxt
type state = { type state = {
delegates: public_key_hash list ; delegates: public_key_hash list ;
mutable best_fitness: Fitness.t ; mutable best: Client_mining_blocks.block_info ;
mutable to_endorse: endorsement list ; mutable to_endorse: endorsement list ;
delay: int64; delay: int64;
} }
@ -187,9 +187,9 @@ and endorsement = {
slot: int; slot: int;
} }
let create_state delegates best_fitness delay = let create_state delegates best delay =
{ delegates ; { delegates ;
best_fitness ; best ;
to_endorse = [] ; to_endorse = [] ;
delay ; delay ;
} }
@ -200,6 +200,12 @@ let rec insert ({time} as e) = function
e :: l e :: l
| e' :: l -> e' :: insert e l | e' :: l -> e' :: insert e l
let drop_old_endorsement ~before state =
state.to_endorse <-
List.filter
(fun { block } -> Fitness.compare before block.fitness <= 0)
state.to_endorse
let schedule_endorsements cctxt state bis = let schedule_endorsements cctxt state bis =
let may_endorse (block: Client_mining_blocks.block_info) delegate time = let may_endorse (block: Client_mining_blocks.block_info) delegate time =
Client_keys.Public_key_hash.name cctxt delegate >>= fun name -> Client_keys.Public_key_hash.name cctxt delegate >>= fun name ->
@ -212,6 +218,10 @@ let schedule_endorsements cctxt state bis =
Block_hash.pp_short block.hash name (List.length slots) >>= fun () -> Block_hash.pp_short block.hash name (List.length slots) >>= fun () ->
iter_p iter_p
(fun slot -> (fun slot ->
if Fitness.compare state.best.fitness block.fitness < 0 then begin
state.best <- block ;
drop_old_endorsement ~before:block.fitness state ;
end ;
previously_endorsed_slot cctxt level slot >>=? function previously_endorsed_slot cctxt level slot >>=? function
| true -> | true ->
lwt_debug "slot %d: previously endorsed." slot >>= fun () -> lwt_debug "slot %d: previously endorsed." slot >>= fun () ->
@ -284,7 +294,7 @@ let pop_endorsements state =
let endorse cctxt state = let endorse cctxt state =
let to_endorse = pop_endorsements state in let to_endorse = pop_endorsements state in
iter_p iter_p
(fun {delegate;block;slot} -> (fun { delegate ; block ; slot } ->
let hash = block.hash in let hash = block.hash in
let b = `Hash hash in let b = `Hash hash in
let level = Raw_level.succ block.level.level in let level = Raw_level.succ block.level.level in
@ -322,7 +332,7 @@ let create cctxt ~delay contracts block_stream =
Lwt_stream.get block_stream >>= function Lwt_stream.get block_stream >>= function
| None | Some [] -> | None | Some [] ->
cctxt.Client_commands.error "Can't fetch the current block head." cctxt.Client_commands.error "Can't fetch the current block head."
| Some ({ Client_mining_blocks.fitness } :: _ as initial_heads) -> | Some (bi :: _ as initial_heads) ->
let last_get_block = ref None in let last_get_block = ref None in
let get_block () = let get_block () =
match !last_get_block with match !last_get_block with
@ -331,7 +341,7 @@ let create cctxt ~delay contracts block_stream =
last_get_block := Some t ; last_get_block := Some t ;
t t
| Some t -> t in | Some t -> t in
let state = create_state contracts fitness (Int64.of_int delay) in let state = create_state contracts bi (Int64.of_int delay) in
let rec worker_loop () = let rec worker_loop () =
let timeout = compute_timeout state in let timeout = compute_timeout state in
Lwt.choose [ (timeout >|= fun () -> `Timeout) ; Lwt.choose [ (timeout >|= fun () -> `Timeout) ;

10
src/client/embedded/alpha/baker/client_mining_forge.ml
View File

@ -282,7 +282,7 @@ let create_state genesis delegates best =
let drop_old_slots ~before state = let drop_old_slots ~before state =
state.future_slots <- state.future_slots <-
List.filter List.filter
(fun (t, _slot) -> Time.compare t before < 0) (fun (t, _slot) -> Time.compare before t <= 0)
state.future_slots state.future_slots
let compute_timeout { future_slots } = let compute_timeout { future_slots } =
@ -338,8 +338,11 @@ let insert_block
Client_mining_revelation.forge_seed_nonce_revelation Client_mining_revelation.forge_seed_nonce_revelation
cctxt ~force:true (`Hash bi.hash) (List.map snd nonces) cctxt ~force:true (`Hash bi.hash) (List.map snd nonces)
end >>= fun _ignore_error -> end >>= fun _ignore_error ->
if Fitness.compare state.best.fitness bi.fitness < 0 then if Fitness.compare state.best.fitness bi.fitness < 0 then begin
state.best <- bi ; state.best <- bi ;
drop_old_slots
~before:(Time.add state.best.timestamp (-1800L)) state ;
end ;
get_mining_slot cctxt ?max_priority bi state.delegates >>= function get_mining_slot cctxt ?max_priority bi state.delegates >>= function
| None -> | None ->
lwt_debug lwt_debug
@ -351,9 +354,6 @@ let insert_block
Time.pp_hum timestamp Time.pp_hum timestamp
name name
Block_hash.pp_short bi.hash >>= fun () -> Block_hash.pp_short bi.hash >>= fun () ->
if Time.compare bi.timestamp state.best.timestamp = 0 then
drop_old_slots
~before:(Time.add state.best.timestamp (-1800L)) state ;
state.future_slots <- insert_mining_slot slot state.future_slots ; state.future_slots <- insert_mining_slot slot state.future_slots ;
Lwt.return_unit Lwt.return_unit