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

Fix wrongly marked revelations

Browse Source 
Revelations are sometimes marked as skipped or backtracked, but they are
actually still applied. This fix keeps the Applied tag for Reveal operations.
This commit is contained in:
Fabrice Le Fessant 2018-08-28 14:37:55 +02:00
parent b6b2ba2e70
commit 2804c932f0
No known key found for this signature in database
GPG Key ID: 49959FA3DC71AA72
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/proto_alpha/lib_protocol/src/apply.ml
View File

@ -595,27 +595,35 @@ let apply_manager_contents
Lwt.return
(`Failure, Failed (manager_kind operation, errors), [])
let skipped_operation_result
: type kind. kind manager_operation -> kind manager_operation_result
= function operation ->
match operation with
| Reveal _ ->
Applied ( Reveal_result : kind successful_manager_operation_result )
| _ -> Skipped (manager_kind operation)
let rec mark_skipped
: type kind.
baker : Signature.Public_key_hash.t -> Level.t -> kind Kind.manager contents_list ->
kind Kind.manager contents_result_list = fun ~baker level -> function
| Single (Manager_operation ({ source ; fee } as op)) ->
| Single (Manager_operation { source ; fee ; operation } ) ->
Single_result
(Manager_operation_result
{ balance_updates =
Delegate.cleanup_balance_updates
[ Contract source, Debited fee ;
Fees (baker, level.cycle), Credited fee ] ;
operation_result = Skipped (manager_kind op.operation) ;
operation_result = skipped_operation_result operation ;
internal_operation_results = [] })
| Cons (Manager_operation ({ source ; fee } as op), rest) ->
| Cons (Manager_operation { source ; fee ; operation } , rest) ->
Cons_result
(Manager_operation_result {
balance_updates =
Delegate.cleanup_balance_updates
[ Contract source, Debited fee ;
Fees (baker, level.cycle), Credited fee ] ;
operation_result = Skipped (manager_kind op.operation) ;
operation_result = skipped_operation_result operation ;
internal_operation_results = [] },
mark_skipped ~baker level rest)
@ -707,6 +715,7 @@ let mark_backtracked results =
: type kind. kind manager_operation_result -> kind manager_operation_result
= function
| Failed _ | Skipped _ | Backtracked _ as result -> result
| Applied Reveal_result as result -> result
| Applied result -> Backtracked (result, None) in
mark_contents_list results