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

Baker: correct handling of protocol upgrades

Browse Source
This commit is contained in:
Pierre Chambart 2018-07-17 18:27:35 +02:00 committed by Grégoire Henry
parent 86091e98c6
commit ae1f325b76
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/proto_alpha/lib_delegate/client_baking_forge.ml
View File

@ -783,10 +783,15 @@ let bake_slot
None in None in
tzforce state.constants >>=? fun Constants.{ parametric = { hard_gas_limit_per_block } } -> tzforce state.constants >>=? fun Constants.{ parametric = { hard_gas_limit_per_block } } ->
classify_operations cctxt ?threshold ~hard_gas_limit_per_block ~block operations >>=? fun operations -> classify_operations cctxt ?threshold ~hard_gas_limit_per_block ~block operations >>=? fun operations ->
(* Don't load an alpha context if the chain is still in genesis *) let next_version =
if Protocol_hash.(Proto_alpha.hash <> bi.next_protocol) then match Tezos_base.Block_header.get_forced_protocol_upgrade ~level:(Raw_level.to_int32 next_level.Level.level) with
| None -> bi.next_protocol
| Some hash -> hash
in
if Protocol_hash.(Proto_alpha.hash <> next_version) then
(* Delegate validation to shell *) (* Delegate validation to shell *)
shell_prevalidation cctxt ~chain ~block seed_nonce_hash operations slot shell_prevalidation cctxt ~chain ~block seed_nonce_hash
(List.sub operations 4) slot
else else
let protocol_data = forge_faked_protocol_data ~priority ~seed_nonce_hash in let protocol_data = forge_faked_protocol_data ~priority ~seed_nonce_hash in
filter_and_apply_operations ~timestamp ~protocol_data state bi operations >>= function filter_and_apply_operations ~timestamp ~protocol_data state bi operations >>= function