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

Alpha: fixed small regression on nonce revelations

Browse Source
This commit is contained in:
Marco Stronati 2018-05-23 16:17:09 +02:00 committed by Grégoire Henry
parent 67566c271c
commit 125e5ce95f
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/proto_alpha/lib_protocol/src/nonce_storage.ml
View File

@ -52,27 +52,28 @@ let () =
`Branch `Branch
~id:"nonce.unexpected" ~id:"nonce.unexpected"
~title:"Unexpected nonce" ~title:"Unexpected nonce"
~description:"The provided nonce is inconsistent with the commit nonce hash." ~description:"The provided nonce is inconsistent with the committed nonce hash."
~pp: (fun ppf () -> ~pp: (fun ppf () ->
Format.fprintf ppf "This nonce revelation is invalid (inconsistent with the commited hash)") Format.fprintf ppf "This nonce revelation is invalid (inconsistent with the committed hash)")
Data_encoding.unit Data_encoding.unit
(function Unexpected_nonce -> Some () | _ -> None) (function Unexpected_nonce -> Some () | _ -> None)
(fun () -> Unexpected_nonce) (fun () -> Unexpected_nonce)
(* checks that the level of a revelation is not too early or too late wrt to the
current context and that a nonce has not been already revealed for that level *)
let get_unrevealed ctxt level = let get_unrevealed ctxt level =
let revealed_cycle = let cur_level = Level_storage.current ctxt in
let cur_level = Level_storage.current ctxt in match Cycle_repr.pred cur_level.cycle with
match Cycle_repr.pred cur_level.cycle with | None -> fail Too_early_revelation (* no revelations during cycle 0 *)
| None -> Cycle_repr.root | Some revealed_cycle ->
| Some min_cycle -> min_cycle in if Cycle_repr.(revealed_cycle < level.Level_repr.cycle) then
if Cycle_repr.(revealed_cycle < level.Level_repr.cycle) then fail Too_early_revelation
fail Too_early_revelation else if Cycle_repr.(level.Level_repr.cycle < revealed_cycle) then
else if Cycle_repr.(level.Level_repr.cycle < revealed_cycle) then fail Too_late_revelation
fail Too_late_revelation else
else Storage.Seed.Nonce.get ctxt level >>=? function
Storage.Seed.Nonce.get ctxt level >>=? function | Revealed _ -> fail Previously_revealed_nonce
| Revealed _ -> fail Previously_revealed_nonce | Unrevealed status -> return status
| Unrevealed status -> return status
let record_hash ctxt unrevealed = let record_hash ctxt unrevealed =
let level = Level_storage.current ctxt in let level = Level_storage.current ctxt in