From 7de19f9cc05e30bd341444d090849acd0ee51634 Mon Sep 17 00:00:00 2001 From: Benjamin Canou Date: Fri, 22 Jun 2018 23:29:04 +0200 Subject: [PATCH] Alpha,RPCs: run_code makes a dummy origination instead of taking a random contract from the wallet --- .../lib_client/client_proto_programs.ml | 15 +----- .../lib_client/client_proto_programs.mli | 2 - .../lib_protocol/src/helpers_services.ml | 51 ++++++++++++------- .../lib_protocol/src/helpers_services.mli | 4 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/proto_alpha/lib_client/client_proto_programs.ml b/src/proto_alpha/lib_client/client_proto_programs.ml index 034626e5c..54e1e6d3e 100644 --- a/src/proto_alpha/lib_client/client_proto_programs.ml +++ b/src/proto_alpha/lib_client/client_proto_programs.ml @@ -78,42 +78,31 @@ let print_trace_result (cctxt : #Client_context.printer) ~show_source ~parsed = | Error errs -> print_errors cctxt errs ~show_source ~parsed -let get_contract cctxt ?(chain = `Main) block contract = - match contract with - | Some contract -> return contract - | None -> - (* TODO use local contract by default *) - Alpha_services.Contract.list cctxt (chain, block) >>|? List.hd - let run (cctxt : #Proto_alpha.rpc_context) ?(chain = `Main) block - ?contract ?(amount = Tez.fifty_cents) ~(program : Michelson_v1_parser.parsed) ~(storage : Michelson_v1_parser.parsed) ~(input : Michelson_v1_parser.parsed) () = - get_contract cctxt ~chain block contract >>=? fun contract -> Alpha_services.Helpers.Scripts.run_code cctxt (chain, block) - program.expanded (storage.expanded, input.expanded, amount, contract) + program.expanded (storage.expanded, input.expanded, amount) let trace (cctxt : #Proto_alpha.rpc_context) ?(chain = `Main) block - ?contract ?(amount = Tez.fifty_cents) ~(program : Michelson_v1_parser.parsed) ~(storage : Michelson_v1_parser.parsed) ~(input : Michelson_v1_parser.parsed) () = - get_contract cctxt ~chain block contract >>=? fun contract -> Alpha_services.Helpers.Scripts.trace_code cctxt (chain, block) - program.expanded (storage.expanded, input.expanded, amount, contract) + program.expanded (storage.expanded, input.expanded, amount) let typecheck_data cctxt diff --git a/src/proto_alpha/lib_client/client_proto_programs.mli b/src/proto_alpha/lib_client/client_proto_programs.mli index 725d5f72b..7acf865b9 100644 --- a/src/proto_alpha/lib_client/client_proto_programs.mli +++ b/src/proto_alpha/lib_client/client_proto_programs.mli @@ -18,7 +18,6 @@ val run : #Proto_alpha.rpc_context -> ?chain:Shell_services.chain -> Shell_services.block -> - ?contract:Contract.t -> ?amount:Tez.t -> program:Michelson_v1_parser.parsed -> storage:Michelson_v1_parser.parsed -> @@ -32,7 +31,6 @@ val trace : #Proto_alpha.rpc_context -> ?chain:Shell_services.chain -> Shell_services.block -> - ?contract:Contract.t -> ?amount:Tez.t -> program:Michelson_v1_parser.parsed -> storage:Michelson_v1_parser.parsed -> diff --git a/src/proto_alpha/lib_protocol/src/helpers_services.ml b/src/proto_alpha/lib_protocol/src/helpers_services.ml index 94fb54b3f..971eb1461 100644 --- a/src/proto_alpha/lib_protocol/src/helpers_services.ml +++ b/src/proto_alpha/lib_protocol/src/helpers_services.ml @@ -45,12 +45,11 @@ module Scripts = struct let path = RPC_path.(path / "scripts") let run_code_input_encoding = - (obj5 + (obj4 (req "script" Script.expr_encoding) (req "storage" Script.expr_encoding) (req "input" Script.expr_encoding) - (req "amount" Tez.encoding) - (req "contract" Contract.encoding)) + (req "amount" Tez.encoding)) let run_code = RPC_service.post_service @@ -140,32 +139,46 @@ module Scripts = struct let register () = let open Services_registration in - register0 S.run_code begin fun ctxt () - (code, storage, parameter, amount, contract) -> - Lwt.return (Gas.set_limit ctxt (Constants.hard_gas_limit_per_operation ctxt)) >>=? fun ctxt -> + let originate_dummy_contract ctxt script = let ctxt = Contract.init_origination_nonce ctxt Operation_hash.zero in + Contract.fresh_contract_from_current_nonce ctxt >>=? fun (ctxt, dummy_contract) -> + let balance = match Tez.of_mutez 4_000_000_000_000L with + | Some balance -> balance + | None -> assert false in + Contract.originate ctxt dummy_contract + ~balance + ~manager: Signature.Public_key_hash.zero + ~delegate: None + ~spendable: false + ~delegatable: false + ~script: (script, None) >>=? fun ctxt -> + return (ctxt, dummy_contract) in + register0 S.run_code begin fun ctxt () + (code, storage, parameter, amount) -> let storage = Script.lazy_expr storage in let code = Script.lazy_expr code in + originate_dummy_contract ctxt { storage ; code } >>=? fun (ctxt, dummy_contract) -> + Lwt.return (Gas.set_limit ctxt (Constants.hard_gas_limit_per_operation ctxt)) >>=? fun ctxt -> Script_interpreter.execute ctxt Readable - ~source:contract (* transaction initiator *) - ~payer:contract (* storage fees payer *) - ~self:(contract, { storage ; code }) (* script owner *) + ~source:dummy_contract + ~payer:dummy_contract + ~self:(dummy_contract, { storage ; code }) ~amount ~parameter >>=? fun { Script_interpreter.storage ; operations ; big_map_diff ; _ } -> return (storage, operations, big_map_diff) end ; register0 S.trace_code begin fun ctxt () - (code, storage, parameter, amount, contract) -> - Lwt.return (Gas.set_limit ctxt (Constants.hard_gas_limit_per_operation ctxt)) >>=? fun ctxt -> - let ctxt = Contract.init_origination_nonce ctxt Operation_hash.zero in + (code, storage, parameter, amount) -> let storage = Script.lazy_expr storage in let code = Script.lazy_expr code in + originate_dummy_contract ctxt { storage ; code } >>=? fun (ctxt, dummy_contract) -> + Lwt.return (Gas.set_limit ctxt (Constants.hard_gas_limit_per_operation ctxt)) >>=? fun ctxt -> Script_interpreter.trace ctxt Readable - ~source:contract (* transaction initiator *) - ~payer:contract (* storage fees payer *) - ~self:(contract, { storage ; code }) (* script owner *) + ~source:dummy_contract + ~payer:dummy_contract + ~self:(dummy_contract, { storage ; code }) ~amount ~parameter >>=? fun ({ Script_interpreter.storage ; operations ; big_map_diff ; _ }, trace) -> return (storage, operations, trace, big_map_diff) @@ -249,13 +262,13 @@ module Scripts = struct end - let run_code ctxt block code (storage, input, amount, contract) = + let run_code ctxt block code (storage, input, amount) = RPC_context.make_call0 S.run_code ctxt - block () (code, storage, input, amount, contract) + block () (code, storage, input, amount) - let trace_code ctxt block code (storage, input, amount, contract) = + let trace_code ctxt block code (storage, input, amount) = RPC_context.make_call0 S.trace_code ctxt - block () (code, storage, input, amount, contract) + block () (code, storage, input, amount) let typecheck_code ctxt block = RPC_context.make_call0 S.typecheck_code ctxt block () diff --git a/src/proto_alpha/lib_protocol/src/helpers_services.mli b/src/proto_alpha/lib_protocol/src/helpers_services.mli index d1048bf80..e46e11c1d 100644 --- a/src/proto_alpha/lib_protocol/src/helpers_services.mli +++ b/src/proto_alpha/lib_protocol/src/helpers_services.mli @@ -25,7 +25,7 @@ module Scripts : sig val run_code: 'a #RPC_context.simple -> - 'a -> Script.expr -> (Script.expr * Script.expr * Tez.t * Contract.t) -> + 'a -> Script.expr -> (Script.expr * Script.expr * Tez.t) -> (Script.expr * packed_internal_operation list * Contract.big_map_diff option) shell_tzresult Lwt.t @@ -33,7 +33,7 @@ module Scripts : sig val trace_code: 'a #RPC_context.simple -> 'a -> Script.expr -> - (Script.expr * Script.expr * Tez.t * Contract.t) -> + (Script.expr * Script.expr * Tez.t) -> (Script.expr * packed_internal_operation list * Script_interpreter.execution_trace *