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

Alpha: do not decrease delegation rights expiration date when provisioning

Browse Source
This commit is contained in:
Benjamin Canou 2018-03-16 17:24:22 +01:00
parent 04bbbf9fe2
commit 0cf6f8fff2
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto_alpha/lib_protocol/src/delegate_storage.ml
View File

@ -151,7 +151,7 @@ let set c contract delegate =
begin begin
if self_delegation then if self_delegation then
Storage.Delegates.add c delegate >>= fun c -> Storage.Delegates.add c delegate >>= fun c ->
Roll_storage.Delegate.set_active c ~init:true delegate >>=? fun c -> Roll_storage.Delegate.set_active c delegate >>=? fun c ->
return c return c
else else
return c return c

21
src/proto_alpha/lib_protocol/src/roll_storage.ml
View File

@ -272,21 +272,30 @@ module Delegate = struct
Storage.Roll.Delegate_change.set ctxt delegate change >>=? fun ctxt -> Storage.Roll.Delegate_change.set ctxt delegate change >>=? fun ctxt ->
return ctxt return ctxt
let set_active ctxt ?(init = false) delegate = let set_active ctxt delegate =
Storage.Contract.Inactive_delegate.mem ctxt Storage.Contract.Inactive_delegate.mem ctxt
(Contract_repr.implicit_contract delegate) >>= fun inactive -> (Contract_repr.implicit_contract delegate) >>= fun inactive ->
let current_cycle = (Raw_context.current_level ctxt).cycle in let current_cycle = (Raw_context.current_level ctxt).cycle in
let preserved_cycles = Constants_storage.preserved_cycles ctxt in let preserved_cycles = Constants_storage.preserved_cycles ctxt in
(* When the delegate is new or inactive, she will become active in (* When the delegate is new or inactive, she will become active in
`1+preserved_cycles`, and we allows `preserved_cycles` for the `1+preserved_cycles`, and we allow `preserved_cycles` for the
delegate to start baking. When the delegate is active, we only delegate to start baking. When the delegate is active, we only
give me at least `preserved_cycles` after the current cycle give her at least `preserved_cycles` after the current cycle
before to be deactivated. *) before to be deactivated. *)
let delay = Storage.Contract.Delegate_desactivation.get_option ctxt
if init || inactive then (1+2*preserved_cycles) else 1+preserved_cycles in (Contract_repr.implicit_contract delegate) >>=? fun current_expiration ->
let expiration = match current_expiration with
| None ->
Cycle_repr.add current_cycle (1+2*preserved_cycles)
| Some current_expiration ->
let delay =
if inactive then (1+2*preserved_cycles) else 1+preserved_cycles in
let updated =
Cycle_repr.add current_cycle delay in
Cycle_repr.max current_expiration updated in
Storage.Contract.Delegate_desactivation.init_set ctxt Storage.Contract.Delegate_desactivation.init_set ctxt
(Contract_repr.implicit_contract delegate) (Contract_repr.implicit_contract delegate)
Cycle_repr.(add current_cycle delay) >>= fun ctxt -> expiration >>= fun ctxt ->
if not inactive then if not inactive then
return ctxt return ctxt
else begin else begin

2
src/proto_alpha/lib_protocol/src/roll_storage.mli
View File

@ -52,7 +52,7 @@ module Delegate : sig
val set_inactive : Raw_context.t -> Ed25519.Public_key_hash.t -> Raw_context.t tzresult Lwt.t val set_inactive : Raw_context.t -> Ed25519.Public_key_hash.t -> Raw_context.t tzresult Lwt.t
val set_active : Raw_context.t -> ?init:bool -> Ed25519.Public_key_hash.t -> Raw_context.t tzresult Lwt.t val set_active : Raw_context.t -> Ed25519.Public_key_hash.t -> Raw_context.t tzresult Lwt.t
end end