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

Alpha: add a few comments

Browse Source
This commit is contained in:
Benjamin Canou 2018-06-28 15:08:38 +02:00
parent f946443b3b
commit da7c71a7aa
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,7 +364,10 @@ let apply_manager_operation_content :
match parameters with match parameters with
| None -> return ctxt | None -> return ctxt
| Some arg -> | Some arg ->
Lwt.return (Script.force_decode arg) >>=? fun (arg, _cost_arg) -> Lwt.return (Script.force_decode arg) >>=? fun (arg, _cost_arg (* see [note] *)) ->
(* [note]: for toplevel ops, _cost_* is nil since the
lazy value has already been forced at precheck, so
we compute and consume the full cost again *)
let cost_arg = Script.deserialized_cost arg in let cost_arg = Script.deserialized_cost arg in
Lwt.return (Gas.consume ctxt cost_arg) >>=? fun ctxt -> Lwt.return (Gas.consume ctxt cost_arg) >>=? fun ctxt ->
match Micheline.root arg with match Micheline.root arg with
@ -393,7 +396,7 @@ let apply_manager_operation_content :
let unit = Micheline.strip_locations (Prim (0, Script.D_Unit, [], [])) in let unit = Micheline.strip_locations (Prim (0, Script.D_Unit, [], [])) in
return (ctxt, unit) return (ctxt, unit)
| Some parameters -> | Some parameters ->
Lwt.return (Script.force_decode parameters) >>=? fun (arg, _cost_arg) -> Lwt.return (Script.force_decode parameters) >>=? fun (arg, _cost_arg (* see [note] *)) ->
let cost_arg = Script.deserialized_cost arg in let cost_arg = Script.deserialized_cost arg in
Lwt.return (Gas.consume ctxt cost_arg) >>=? fun ctxt -> Lwt.return (Gas.consume ctxt cost_arg) >>=? fun ctxt ->
return (ctxt, arg) return (ctxt, arg)
@ -428,9 +431,9 @@ let apply_manager_operation_content :
begin match script with begin match script with
| None -> return (None, ctxt) | None -> return (None, ctxt)
| Some script -> | Some script ->
Lwt.return (Script.force_decode script.storage) >>=? fun (ustorage, _) -> Lwt.return (Script.force_decode script.storage) >>=? fun (ustorage, _cost (* see [note] *)) ->
Lwt.return (Gas.consume ctxt (Script.deserialized_cost ustorage)) >>=? fun ctxt -> Lwt.return (Gas.consume ctxt (Script.deserialized_cost ustorage)) >>=? fun ctxt ->
Lwt.return (Script.force_decode script.storage) >>=? fun (ucode, _) -> Lwt.return (Script.force_decode script.storage) >>=? fun (ucode, _cost (* see [note] *)) ->
Lwt.return (Gas.consume ctxt (Script.deserialized_cost ucode)) >>=? fun ctxt -> Lwt.return (Gas.consume ctxt (Script.deserialized_cost ucode)) >>=? fun ctxt ->
Script_ir_translator.parse_script ctxt script >>=? fun (_, ctxt) -> Script_ir_translator.parse_script ctxt script >>=? fun (_, ctxt) ->
Script_ir_translator.erase_big_map_initialization ctxt Optimized script >>=? fun (script, big_map_diff, ctxt) -> Script_ir_translator.erase_big_map_initialization ctxt Optimized script >>=? fun (script, big_map_diff, ctxt) ->
@ -513,18 +516,19 @@ let precheck_manager_contents
| Reveal pk -> | Reveal pk ->
Contract.reveal_manager_key ctxt source pk Contract.reveal_manager_key ctxt source pk
| Transaction { parameters = Some arg ; _ } -> | Transaction { parameters = Some arg ; _ } ->
(* Fail if not enough gas for minimal deserialization cost *) (* Fail quickly if not enough gas for minimal deserialization cost *)
Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@ Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@
Gas.consume ctxt (Script.minimal_deserialize_cost arg) >>=? fun _ -> Gas.consume ctxt (Script.minimal_deserialize_cost arg) >>=? fun _ ->
(* Fail if not enough gas for complete deserialization cost *)
Lwt.return @@ Script.force_decode arg >>=? fun (_arg, cost_arg) -> Lwt.return @@ Script.force_decode arg >>=? fun (_arg, cost_arg) ->
Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@ Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@
Gas.consume ctxt cost_arg Gas.consume ctxt cost_arg
| Origination { script = Some script ; _ } -> | Origination { script = Some script ; _ } ->
(* Fail if not enough gas for minimal deserialization cost *) (* Fail quickly if not enough gas for minimal deserialization cost *)
Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@ Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@
(Gas.consume ctxt (Script.minimal_deserialize_cost script.code) >>? fun ctxt -> (Gas.consume ctxt (Script.minimal_deserialize_cost script.code) >>? fun ctxt ->
Gas.consume ctxt (Script.minimal_deserialize_cost script.storage)) Gas.consume ctxt (Script.minimal_deserialize_cost script.storage)) >>=? fun _ ->
>>=? fun _ -> (* Fail if not enough gas for complete deserialization cost *)
Lwt.return @@ Script.force_decode script.code >>=? fun (_code, cost_code) -> Lwt.return @@ Script.force_decode script.code >>=? fun (_code, cost_code) ->
Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@ Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@
Gas.consume ctxt cost_code >>=? fun ctxt -> Gas.consume ctxt cost_code >>=? fun ctxt ->