From 5aa9e76b03d3500fa8c9abbb20d1bc7eaeff328b Mon Sep 17 00:00:00 2001 From: Vaivaswatha Nagaraj Date: Tue, 15 Dec 2020 09:31:30 +0530 Subject: [PATCH 1/3] Add an implicit transition parameter _origin --- src/base/Cashflow.ml | 5 +++-- src/base/ContractUtil.ml | 16 +++++++++++++++- src/base/GasUseAnalysis.ml | 2 ++ src/base/JSON.ml | 7 ++++++- src/base/SanityChecker.ml | 4 +++- src/eval/Eval.ml | 6 +++++- 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/base/Cashflow.ml b/src/base/Cashflow.ml index 114bded4b..ee51b3773 100644 --- a/src/base/Cashflow.ml +++ b/src/base/Cashflow.ml @@ -1938,8 +1938,9 @@ struct let empty_local_env = AssocDictionary.make_dict () in let implicit_local_env = AssocDictionary.insert MessagePayload.amount_label Money - (AssocDictionary.insert MessagePayload.sender_label NotMoney - empty_local_env) + (AssocDictionary.insert MessagePayload.origin_label NotMoney + (AssocDictionary.insert MessagePayload.sender_label NotMoney + empty_local_env)) in let init_local_env = List.fold_left comp_params ~init:implicit_local_env diff --git a/src/base/ContractUtil.ml b/src/base/ContractUtil.ml index cc28f9b4d..e5b4f16ae 100644 --- a/src/base/ContractUtil.ml +++ b/src/base/ContractUtil.ml @@ -39,6 +39,8 @@ module MessagePayload = struct let sender_label = "_sender" + let origin_label = "_origin" + let recipient_label = "_recipient" let eventname_label = "_eventname" @@ -69,6 +71,12 @@ module MessagePayload = struct Some (pure a) | _ -> None) + let get_origin = + get_value_for_entry origin_label (function + | ByStrX bs as a when CULiteral.Bystrx.width bs = address_length -> + Some (pure a) + | _ -> None) + let get_amount = get_value_for_entry amount_label (function | UintLit (Uint128L i) -> ( @@ -142,13 +150,19 @@ module ScillaContractUtil (SR : Rep) (ER : Rep) = struct ER.address_rep, bystrx_typ address_length ) in + let origin = + ( CUIdentifier.mk_id + (label_name_of_string MessagePayload.origin_label) + ER.address_rep, + bystrx_typ address_length ) + in let amount = ( CUIdentifier.mk_id (label_name_of_string MessagePayload.amount_label) ER.uint128_rep, uint128_typ ) in - amount :: sender :: cparams + amount :: origin :: sender :: cparams let msg_mandatory_field_types = [ diff --git a/src/base/GasUseAnalysis.ml b/src/base/GasUseAnalysis.ml index 163db0caf..68a281a1f 100644 --- a/src/base/GasUseAnalysis.ml +++ b/src/base/GasUseAnalysis.ml @@ -1242,6 +1242,8 @@ struct let si a t = mk_typed_id a t in let all_params = [ + ( si ContractUtil.MessagePayload.origin_label (bystrx_typ 20), + bystrx_typ 20 ); ( si ContractUtil.MessagePayload.sender_label (bystrx_typ 20), bystrx_typ 20 ); (si ContractUtil.MessagePayload.amount_label uint128_typ, uint128_typ); diff --git a/src/base/JSON.ml b/src/base/JSON.ml index 2a3c4c426..4750086ac 100644 --- a/src/base/JSON.ml +++ b/src/base/JSON.ml @@ -384,6 +384,7 @@ module Message = struct let tags = member_exn tag_label json |> to_string_exn in let amounts = member_exn amount_label json |> to_string_exn in let senders = member_exn sender_label json |> to_string_exn in + let origins = member_exn origin_label json |> to_string_exn in (* Make tag, amount and sender into a literal *) let tag = (tag_label, build_prim_lit_exn JSONType.string_typ tags) in let amount = @@ -393,9 +394,13 @@ module Message = struct ( sender_label, build_prim_lit_exn (JSONType.bystrx_typ address_length) senders ) in + let origin = + ( origin_label, + build_prim_lit_exn (JSONType.bystrx_typ address_length) origins ) + in let pjlist = member_exn "params" json |> to_list_exn in let params = List.map pjlist ~f:jobj_to_statevar in - tag :: amount :: sender :: params + tag :: amount :: origin :: sender :: params (* Same as message_to_jstring, but instead gives out raw json, not it's string *) let message_to_json message = diff --git a/src/base/SanityChecker.ml b/src/base/SanityChecker.ml index 785c61afd..53e76496a 100644 --- a/src/base/SanityChecker.ml +++ b/src/base/SanityChecker.ml @@ -146,7 +146,9 @@ struct match List.find c.comp_params ~f:(fun (s, _) -> String.( - as_string s = amount_label || as_string s = sender_label)) + as_string s = amount_label + || as_string s = sender_label + || as_string s = origin_label)) with | Some (s, _) -> e diff --git a/src/eval/Eval.ml b/src/eval/Eval.ml index 6a6167a99..81f122d24 100644 --- a/src/eval/Eval.ml +++ b/src/eval/Eval.ml @@ -445,10 +445,14 @@ let rec stmt_eval conf stmts = and try_apply_as_procedure conf proc proc_rest actuals = (* Create configuration for procedure call *) let sender = GlobalName.parse_simple_name MessagePayload.sender_label in + let origin = GlobalName.parse_simple_name MessagePayload.origin_label in let amount = GlobalName.parse_simple_name MessagePayload.amount_label in let%bind sender_value = fromR @@ Configuration.lookup conf (mk_loc_id sender) in + let%bind origin_value = + fromR @@ Configuration.lookup conf (mk_loc_id origin) + in let%bind amount_value = fromR @@ Configuration.lookup conf (mk_loc_id amount) in @@ -457,7 +461,7 @@ and try_apply_as_procedure conf proc proc_rest actuals = { conf with env = conf.init_env; procedures = proc_rest } ( sender :: amount :: List.map proc.comp_params ~f:(fun id_typ -> get_id (fst id_typ)) ) - (sender_value :: amount_value :: actuals) + (origin_value :: sender_value :: amount_value :: actuals) in let%bind conf' = stmt_eval proc_conf proc.comp_body in (* Reset configuration *) From 6004a949cdfe17ee0b7642f6833d6fdd1a954da9 Mon Sep 17 00:00:00 2001 From: Vaivaswatha Nagaraj Date: Tue, 15 Dec 2020 11:38:12 +0530 Subject: [PATCH 2/3] Fix bug and update tests --- src/eval/Eval.ml | 2 +- tests/runner/UintParam/message_1.json | 11 +++-- tests/runner/UintParam/message_2.json | 11 +++-- tests/runner/UintParam/message_3.json | 11 +++-- tests/runner/UintParam/output_1.json | 2 +- tests/runner/UintParam/output_2.json | 2 +- tests/runner/UintParam/output_3.json | 2 +- tests/runner/auction/message_1.json | 5 +- tests/runner/auction/message_2.json | 5 +- tests/runner/auction/message_3.json | 5 +- tests/runner/auction/message_4.json | 5 +- tests/runner/auction/message_5.json | 5 +- tests/runner/auction/message_6.json | 5 +- tests/runner/auction/message_7.json | 5 +- tests/runner/auction/message_8.json | 5 +- tests/runner/auction/output_1.json | 2 +- tests/runner/auction/output_2.json | 2 +- tests/runner/auction/output_3.json | 2 +- tests/runner/auction/output_4.json | 2 +- tests/runner/auction/output_5.json | 2 +- tests/runner/auction/output_6.json | 2 +- tests/runner/auction/output_7.json | 2 +- tests/runner/auction/output_8.json | 2 +- tests/runner/bookstore/message_1.json | 5 +- tests/runner/bookstore/message_10.json | 5 +- tests/runner/bookstore/message_11.json | 15 ++++-- tests/runner/bookstore/message_12.json | 5 +- tests/runner/bookstore/message_2.json | 5 +- tests/runner/bookstore/message_3.json | 5 +- tests/runner/bookstore/message_4.json | 5 +- tests/runner/bookstore/message_5.json | 5 +- tests/runner/bookstore/message_6.json | 5 +- tests/runner/bookstore/message_7.json | 5 +- tests/runner/bookstore/message_8.json | 5 +- tests/runner/bookstore/message_9.json | 5 +- tests/runner/bookstore/output_1.json | 2 +- tests/runner/bookstore/output_10.json | 2 +- tests/runner/bookstore/output_11.json | 2 +- tests/runner/bookstore/output_12.json | 2 +- tests/runner/bookstore/output_2.json | 2 +- tests/runner/bookstore/output_3.json | 2 +- tests/runner/bookstore/output_4.json | 2 +- tests/runner/bookstore/output_5.json | 2 +- tests/runner/bookstore/output_6.json | 2 +- tests/runner/bookstore/output_7.json | 2 +- tests/runner/bookstore/output_8.json | 2 +- tests/runner/bookstore/output_9.json | 2 +- tests/runner/cfinvoke/message_1.json | 13 ++--- tests/runner/cfinvoke/message_2.json | 13 ++--- tests/runner/cfinvoke/message_3.json | 13 ++--- tests/runner/cfinvoke/message_4.json | 3 +- tests/runner/cfinvoke/output_1.json | 2 +- tests/runner/cfinvoke/output_2.json | 2 +- tests/runner/cfinvoke/output_3.json | 2 +- tests/runner/cfinvoke/output_4.json | 2 +- .../chain-call-balance-1/message_1.json | 17 +++++-- .../chain-call-balance-2/message_1.json | 11 +++-- .../chain-call-balance-3/message_1.json | 5 +- tests/runner/crowdfunding/message_1.json | 5 +- tests/runner/crowdfunding/message_2.json | 3 +- tests/runner/crowdfunding/message_3.json | 3 +- tests/runner/crowdfunding/message_4.json | 3 +- tests/runner/crowdfunding/message_5.json | 3 +- tests/runner/crowdfunding/message_6.json | 3 +- tests/runner/crowdfunding/output_1.json | 2 +- tests/runner/crowdfunding/output_2.json | 2 +- tests/runner/crowdfunding/output_3.json | 2 +- tests/runner/crowdfunding/output_4.json | 2 +- tests/runner/crowdfunding/output_5.json | 2 +- tests/runner/crowdfunding/output_6.json | 2 +- tests/runner/crowdfunding_proc/message_1.json | 5 +- tests/runner/crowdfunding_proc/message_2.json | 3 +- tests/runner/crowdfunding_proc/message_3.json | 3 +- tests/runner/crowdfunding_proc/message_4.json | 3 +- tests/runner/crowdfunding_proc/message_5.json | 3 +- tests/runner/crowdfunding_proc/message_6.json | 3 +- tests/runner/crowdfunding_proc/output_1.json | 2 +- tests/runner/crowdfunding_proc/output_2.json | 2 +- tests/runner/crowdfunding_proc/output_3.json | 2 +- tests/runner/crowdfunding_proc/output_4.json | 2 +- tests/runner/crowdfunding_proc/output_5.json | 2 +- tests/runner/crowdfunding_proc/output_6.json | 2 +- tests/runner/earmarked-coin/message_1.json | 11 ++++- tests/runner/earmarked-coin/message_2.json | 11 ++++- tests/runner/earmarked-coin/message_3.json | 11 ++++- tests/runner/earmarked-coin/message_4.json | 11 ++++- tests/runner/earmarked-coin/message_5.json | 5 +- tests/runner/earmarked-coin/message_6.json | 5 +- tests/runner/earmarked-coin/output_1.json | 2 +- tests/runner/earmarked-coin/output_2.json | 2 +- tests/runner/earmarked-coin/output_3.json | 2 +- tests/runner/earmarked-coin/output_4.json | 2 +- tests/runner/earmarked-coin/output_5.json | 2 +- tests/runner/earmarked-coin/output_6.json | 2 +- tests/runner/ecdsa/message_1.json | 17 ++++--- tests/runner/ecdsa/message_2.json | 17 ++++--- tests/runner/ecdsa/message_3.json | 17 ++++--- tests/runner/ecdsa/message_4.json | 17 ++++--- tests/runner/ecdsa/output_1.json | 2 +- tests/runner/ecdsa/output_2.json | 2 +- tests/runner/ecdsa/output_3.json | 2 +- tests/runner/ecdsa/output_4.json | 2 +- tests/runner/empty/message_1.json | 5 +- tests/runner/empty/output_1.json | 2 +- tests/runner/exception-example/message_1.json | 12 ++--- tests/runner/exception-example/message_2.json | 12 ++--- tests/runner/exception-example/output_1.json | 2 +- tests/runner/exception-example/output_2.json | 2 +- tests/runner/fungible-token/message_0.json | 15 +++--- tests/runner/fungible-token/message_1.json | 9 ++-- tests/runner/fungible-token/message_2.json | 12 ++--- tests/runner/fungible-token/message_3.json | 12 ++--- tests/runner/fungible-token/message_4.json | 11 +++-- tests/runner/fungible-token/message_5.json | 11 +++-- tests/runner/fungible-token/message_6.json | 11 +++-- tests/runner/fungible-token/message_7.json | 11 +++-- tests/runner/fungible-token/message_8.json | 11 +++-- tests/runner/fungible-token/output_0.json | 2 +- tests/runner/fungible-token/output_1.json | 2 +- tests/runner/fungible-token/output_2.json | 2 +- tests/runner/fungible-token/output_3.json | 2 +- tests/runner/fungible-token/output_4.json | 2 +- tests/runner/fungible-token/output_5.json | 2 +- tests/runner/fungible-token/output_6.json | 2 +- tests/runner/fungible-token/output_7.json | 2 +- tests/runner/fungible-token/output_8.json | 2 +- tests/runner/helloWorld/message_1.json | 12 ++--- tests/runner/helloWorld/message_10.json | 5 +- tests/runner/helloWorld/message_11.json | 5 +- tests/runner/helloWorld/message_2.json | 13 ++--- tests/runner/helloWorld/message_3.json | 5 +- tests/runner/helloWorld/message_4.json | 5 +- tests/runner/helloWorld/message_5.json | 5 +- tests/runner/helloWorld/message_6.json | 11 +++-- tests/runner/helloWorld/message_7.json | 12 ++--- tests/runner/helloWorld/message_8.json | 5 +- tests/runner/helloWorld/output_1.json | 2 +- tests/runner/helloWorld/output_10.json | 2 +- tests/runner/helloWorld/output_11.json | 2 +- tests/runner/helloWorld/output_2.json | 2 +- tests/runner/helloWorld/output_3.json | 2 +- tests/runner/helloWorld/output_4.json | 2 +- tests/runner/helloWorld/output_5.json | 2 +- tests/runner/helloWorld/output_6.json | 4 +- tests/runner/helloWorld/output_7.json | 2 +- tests/runner/helloWorld/output_8.json | 2 +- tests/runner/helloWorld/output_9.json | 2 +- tests/runner/import-test-lib/message_1.json | 5 +- tests/runner/import-test-lib/output_1.json | 2 +- tests/runner/inplace-map/message_1.json | 5 +- tests/runner/inplace-map/message_10.json | 5 +- tests/runner/inplace-map/message_11.json | 5 +- tests/runner/inplace-map/message_12.json | 5 +- tests/runner/inplace-map/message_13.json | 5 +- tests/runner/inplace-map/message_14.json | 5 +- tests/runner/inplace-map/message_2.json | 5 +- tests/runner/inplace-map/message_3.json | 5 +- tests/runner/inplace-map/message_4.json | 5 +- tests/runner/inplace-map/message_5.json | 5 +- tests/runner/inplace-map/message_6.json | 5 +- tests/runner/inplace-map/message_7.json | 5 +- tests/runner/inplace-map/message_8.json | 5 +- tests/runner/inplace-map/message_9.json | 5 +- tests/runner/inplace-map/output_1.json | 2 +- tests/runner/inplace-map/output_10.json | 2 +- tests/runner/inplace-map/output_11.json | 2 +- tests/runner/inplace-map/output_12.json | 2 +- tests/runner/inplace-map/output_13.json | 2 +- tests/runner/inplace-map/output_14.json | 2 +- tests/runner/inplace-map/output_2.json | 2 +- tests/runner/inplace-map/output_3.json | 2 +- tests/runner/inplace-map/output_4.json | 2 +- tests/runner/inplace-map/output_5.json | 2 +- tests/runner/inplace-map/output_6.json | 2 +- tests/runner/inplace-map/output_7.json | 2 +- tests/runner/inplace-map/output_8.json | 2 +- tests/runner/inplace-map/output_9.json | 2 +- tests/runner/listiter/message_1.json | 26 +++++----- tests/runner/listiter/output_1.json | 2 +- tests/runner/loopy-tree-call/message_1.json | 17 ++++--- tests/runner/loopy-tree-call/output_1.json | 2 +- tests/runner/map_corners_test/message_1.json | 8 ++- tests/runner/map_corners_test/message_10.json | 8 ++- tests/runner/map_corners_test/message_11.json | 8 ++- tests/runner/map_corners_test/message_12.json | 8 ++- tests/runner/map_corners_test/message_13.json | 8 ++- tests/runner/map_corners_test/message_14.json | 8 ++- tests/runner/map_corners_test/message_15.json | 8 ++- tests/runner/map_corners_test/message_16.json | 8 ++- tests/runner/map_corners_test/message_17.json | 8 ++- tests/runner/map_corners_test/message_18.json | 8 ++- tests/runner/map_corners_test/message_2.json | 8 ++- tests/runner/map_corners_test/message_3.json | 8 ++- tests/runner/map_corners_test/message_4.json | 8 ++- tests/runner/map_corners_test/message_5.json | 8 ++- tests/runner/map_corners_test/message_6.json | 8 ++- tests/runner/map_corners_test/message_7.json | 8 ++- tests/runner/map_corners_test/message_8.json | 8 ++- tests/runner/map_corners_test/message_9.json | 8 ++- tests/runner/map_corners_test/output_1.json | 2 +- tests/runner/map_corners_test/output_10.json | 2 +- tests/runner/map_corners_test/output_11.json | 2 +- tests/runner/map_corners_test/output_12.json | 2 +- tests/runner/map_corners_test/output_13.json | 2 +- tests/runner/map_corners_test/output_14.json | 2 +- tests/runner/map_corners_test/output_15.json | 2 +- tests/runner/map_corners_test/output_16.json | 2 +- tests/runner/map_corners_test/output_17.json | 2 +- tests/runner/map_corners_test/output_18.json | 2 +- tests/runner/map_corners_test/output_2.json | 2 +- tests/runner/map_corners_test/output_3.json | 2 +- tests/runner/map_corners_test/output_4.json | 2 +- tests/runner/map_corners_test/output_5.json | 2 +- tests/runner/map_corners_test/output_6.json | 2 +- tests/runner/map_corners_test/output_7.json | 2 +- tests/runner/map_corners_test/output_8.json | 2 +- tests/runner/map_corners_test/output_9.json | 2 +- tests/runner/map_key_test/message_1.json | 9 ++-- tests/runner/map_key_test/output_1.json | 2 +- tests/runner/mappair/message_1.json | 5 +- tests/runner/mappair/message_12.json | 11 +++-- tests/runner/mappair/message_13.json | 5 +- tests/runner/mappair/message_14.json | 5 +- tests/runner/mappair/message_2.json | 11 +++-- tests/runner/mappair/message_3.json | 11 +++-- tests/runner/mappair/message_4.json | 5 +- tests/runner/mappair/message_5.json | 5 +- tests/runner/mappair/message_6.json | 5 +- tests/runner/mappair/message_7.json | 5 +- tests/runner/mappair/message_8.json | 5 +- tests/runner/mappair/output_1.json | 2 +- tests/runner/mappair/output_12.json | 2 +- tests/runner/mappair/output_13.json | 2 +- tests/runner/mappair/output_14.json | 2 +- tests/runner/mappair/output_2.json | 2 +- tests/runner/mappair/output_3.json | 2 +- tests/runner/mappair/output_4.json | 2 +- tests/runner/mappair/output_5.json | 2 +- tests/runner/mappair/output_6.json | 2 +- tests/runner/mappair/output_7.json | 2 +- tests/runner/mappair/output_8.json | 2 +- tests/runner/multiple-msgs/message_1.json | 5 +- tests/runner/multiple-msgs/output_1.json | 2 +- tests/runner/nonfungible-token/message_1.json | 11 +++-- .../runner/nonfungible-token/message_10.json | 11 +++-- .../runner/nonfungible-token/message_11.json | 11 +++-- .../runner/nonfungible-token/message_12.json | 7 +-- tests/runner/nonfungible-token/message_2.json | 9 ++-- .../runner/nonfungible-token/message_21.json | 9 ++-- .../runner/nonfungible-token/message_22.json | 9 ++-- .../runner/nonfungible-token/message_23.json | 9 ++-- .../runner/nonfungible-token/message_24.json | 9 ++-- .../runner/nonfungible-token/message_25.json | 9 ++-- .../runner/nonfungible-token/message_26.json | 5 +- .../runner/nonfungible-token/message_27.json | 13 ++--- tests/runner/nonfungible-token/message_3.json | 11 +++-- tests/runner/nonfungible-token/message_4.json | 7 +-- tests/runner/nonfungible-token/message_5.json | 7 +-- tests/runner/nonfungible-token/message_6.json | 7 +-- tests/runner/nonfungible-token/message_7.json | 7 +-- tests/runner/nonfungible-token/message_8.json | 15 +++--- tests/runner/nonfungible-token/message_9.json | 15 +++--- tests/runner/nonfungible-token/output_1.json | 2 +- tests/runner/nonfungible-token/output_10.json | 2 +- tests/runner/nonfungible-token/output_11.json | 2 +- tests/runner/nonfungible-token/output_12.json | 2 +- tests/runner/nonfungible-token/output_2.json | 2 +- tests/runner/nonfungible-token/output_21.json | 2 +- tests/runner/nonfungible-token/output_22.json | 2 +- tests/runner/nonfungible-token/output_23.json | 2 +- tests/runner/nonfungible-token/output_24.json | 2 +- tests/runner/nonfungible-token/output_25.json | 2 +- tests/runner/nonfungible-token/output_26.json | 2 +- tests/runner/nonfungible-token/output_27.json | 2 +- tests/runner/nonfungible-token/output_3.json | 2 +- tests/runner/nonfungible-token/output_4.json | 2 +- tests/runner/nonfungible-token/output_5.json | 2 +- tests/runner/nonfungible-token/output_6.json | 2 +- tests/runner/nonfungible-token/output_7.json | 2 +- tests/runner/nonfungible-token/output_8.json | 2 +- tests/runner/nonfungible-token/output_9.json | 2 +- tests/runner/one-msg/message_1.json | 5 +- tests/runner/one-msg/output_1.json | 2 +- tests/runner/one-msg1/message_1.json | 5 +- tests/runner/one-msg1/output_1.json | 2 +- tests/runner/ping/message_0.json | 14 +++--- tests/runner/ping/message_1.json | 3 +- tests/runner/ping/message_2.json | 3 +- tests/runner/ping/message_3.json | 3 +- tests/runner/ping/output_0.json | 2 +- tests/runner/ping/output_1.json | 2 +- tests/runner/ping/output_2.json | 2 +- tests/runner/ping/output_3.json | 2 +- tests/runner/pong/message_0.json | 13 ++--- tests/runner/pong/message_1.json | 3 +- tests/runner/pong/message_2.json | 3 +- tests/runner/pong/message_3.json | 3 +- tests/runner/pong/output_0.json | 2 +- tests/runner/pong/output_1.json | 2 +- tests/runner/pong/output_2.json | 2 +- tests/runner/pong/output_3.json | 2 +- tests/runner/salarybot/message_0.json | 5 +- tests/runner/salarybot/message_1.json | 17 ++++--- tests/runner/salarybot/message_2.json | 17 ++++--- tests/runner/salarybot/message_3.json | 17 ++++--- tests/runner/salarybot/message_4.json | 11 +++-- tests/runner/salarybot/message_5.json | 5 +- tests/runner/salarybot/output_0.json | 2 +- tests/runner/salarybot/output_1.json | 2 +- tests/runner/salarybot/output_2.json | 2 +- tests/runner/salarybot/output_3.json | 2 +- tests/runner/salarybot/output_4.json | 2 +- tests/runner/salarybot/output_5.json | 2 +- tests/runner/schnorr/message_1.json | 17 ++++--- tests/runner/schnorr/message_2.json | 17 ++++--- tests/runner/schnorr/message_3.json | 17 ++++--- tests/runner/schnorr/output_1.json | 2 +- tests/runner/schnorr/output_2.json | 2 +- tests/runner/schnorr/output_3.json | 2 +- tests/runner/shogi/message_1.json | 35 ++++++------- tests/runner/shogi/message_2.json | 35 ++++++------- tests/runner/shogi/message_3.json | 35 ++++++------- tests/runner/shogi/message_4.json | 49 +++++++++---------- tests/runner/shogi/output_1.json | 2 +- tests/runner/shogi/output_2.json | 2 +- tests/runner/shogi/output_3.json | 2 +- tests/runner/shogi_proc/message_1.json | 35 ++++++------- tests/runner/shogi_proc/message_2.json | 35 ++++++------- tests/runner/shogi_proc/message_3.json | 35 ++++++------- tests/runner/shogi_proc/message_4.json | 49 +++++++++---------- tests/runner/shogi_proc/output_1.json | 2 +- tests/runner/shogi_proc/output_2.json | 2 +- tests/runner/shogi_proc/output_3.json | 2 +- tests/runner/simple-dex/message_1.json | 15 +++--- tests/runner/simple-dex/message_2.json | 7 +-- tests/runner/simple-dex/message_3.json | 7 +-- tests/runner/simple-dex/message_4.json | 7 +-- tests/runner/simple-dex/message_5.json | 7 +-- tests/runner/simple-dex/message_6.json | 7 +-- tests/runner/simple-dex/message_7.json | 7 +-- tests/runner/simple-dex/message_8.json | 7 +-- tests/runner/simple-dex/output_1.json | 2 +- tests/runner/simple-dex/output_2.json | 2 +- tests/runner/simple-dex/output_3.json | 2 +- tests/runner/simple-dex/output_4.json | 2 +- tests/runner/simple-dex/output_5.json | 2 +- tests/runner/simple-dex/output_6.json | 2 +- tests/runner/simple-dex/output_7.json | 2 +- tests/runner/simple-dex/output_8.json | 2 +- tests/runner/wallet/message_1.json | 5 +- tests/runner/wallet/message_10.json | 5 +- tests/runner/wallet/message_11.json | 5 +- tests/runner/wallet/message_2.json | 5 +- tests/runner/wallet/message_3.json | 5 +- tests/runner/wallet/message_4.json | 5 +- tests/runner/wallet/message_5.json | 5 +- tests/runner/wallet/message_6.json | 5 +- tests/runner/wallet/message_7.json | 5 +- tests/runner/wallet/message_8.json | 5 +- tests/runner/wallet/message_9.json | 5 +- tests/runner/wallet/output_1.json | 2 +- tests/runner/wallet/output_10.json | 2 +- tests/runner/wallet/output_11.json | 2 +- tests/runner/wallet/output_2.json | 2 +- tests/runner/wallet/output_3.json | 2 +- tests/runner/wallet/output_4.json | 2 +- tests/runner/wallet/output_5.json | 2 +- tests/runner/wallet/output_6.json | 2 +- tests/runner/wallet/output_7.json | 2 +- tests/runner/wallet/output_8.json | 2 +- tests/runner/wallet/output_9.json | 2 +- tests/runner/wallet_2/message_1.json | 5 +- tests/runner/wallet_2/message_11.json | 5 +- tests/runner/wallet_2/message_12.json | 5 +- tests/runner/wallet_2/message_14.json | 5 +- tests/runner/wallet_2/message_15.json | 5 +- tests/runner/wallet_2/message_16.json | 5 +- tests/runner/wallet_2/message_17.json | 5 +- tests/runner/wallet_2/message_18.json | 5 +- tests/runner/wallet_2/message_19.json | 5 +- tests/runner/wallet_2/message_2.json | 5 +- tests/runner/wallet_2/message_20.json | 5 +- tests/runner/wallet_2/message_21.json | 5 +- tests/runner/wallet_2/message_22.json | 5 +- tests/runner/wallet_2/message_23.json | 5 +- tests/runner/wallet_2/message_24.json | 5 +- tests/runner/wallet_2/message_25.json | 5 +- tests/runner/wallet_2/message_26.json | 5 +- tests/runner/wallet_2/message_27.json | 5 +- tests/runner/wallet_2/message_28.json | 5 +- tests/runner/wallet_2/message_29.json | 5 +- tests/runner/wallet_2/message_3.json | 5 +- tests/runner/wallet_2/message_30.json | 5 +- tests/runner/wallet_2/message_31.json | 5 +- tests/runner/wallet_2/message_32.json | 5 +- tests/runner/wallet_2/message_33.json | 5 +- tests/runner/wallet_2/message_34.json | 5 +- tests/runner/wallet_2/message_35.json | 5 +- tests/runner/wallet_2/message_36.json | 5 +- tests/runner/wallet_2/message_37.json | 5 +- tests/runner/wallet_2/message_38.json | 5 +- tests/runner/wallet_2/message_39.json | 5 +- tests/runner/wallet_2/message_4.json | 5 +- tests/runner/wallet_2/message_40.json | 5 +- tests/runner/wallet_2/message_42.json | 5 +- tests/runner/wallet_2/message_5.json | 5 +- tests/runner/wallet_2/message_6.json | 5 +- tests/runner/wallet_2/message_7.json | 5 +- tests/runner/wallet_2/message_8.json | 5 +- tests/runner/wallet_2/output_1.json | 2 +- tests/runner/wallet_2/output_11.json | 2 +- tests/runner/wallet_2/output_12.json | 2 +- tests/runner/wallet_2/output_14.json | 2 +- tests/runner/wallet_2/output_15.json | 2 +- tests/runner/wallet_2/output_16.json | 2 +- tests/runner/wallet_2/output_17.json | 2 +- tests/runner/wallet_2/output_18.json | 2 +- tests/runner/wallet_2/output_19.json | 2 +- tests/runner/wallet_2/output_2.json | 2 +- tests/runner/wallet_2/output_20.json | 2 +- tests/runner/wallet_2/output_21.json | 2 +- tests/runner/wallet_2/output_22.json | 2 +- tests/runner/wallet_2/output_23.json | 2 +- tests/runner/wallet_2/output_24.json | 2 +- tests/runner/wallet_2/output_25.json | 2 +- tests/runner/wallet_2/output_26.json | 2 +- tests/runner/wallet_2/output_27.json | 2 +- tests/runner/wallet_2/output_28.json | 2 +- tests/runner/wallet_2/output_29.json | 2 +- tests/runner/wallet_2/output_3.json | 2 +- tests/runner/wallet_2/output_30.json | 2 +- tests/runner/wallet_2/output_31.json | 2 +- tests/runner/wallet_2/output_32.json | 2 +- tests/runner/wallet_2/output_33.json | 2 +- tests/runner/wallet_2/output_34.json | 2 +- tests/runner/wallet_2/output_35.json | 2 +- tests/runner/wallet_2/output_36.json | 2 +- tests/runner/wallet_2/output_37.json | 2 +- tests/runner/wallet_2/output_38.json | 2 +- tests/runner/wallet_2/output_39.json | 2 +- tests/runner/wallet_2/output_4.json | 2 +- tests/runner/wallet_2/output_40.json | 2 +- tests/runner/wallet_2/output_42.json | 2 +- tests/runner/wallet_2/output_5.json | 2 +- tests/runner/wallet_2/output_6.json | 2 +- tests/runner/wallet_2/output_7.json | 2 +- tests/runner/wallet_2/output_8.json | 2 +- tests/runner/zil-game/message_1.json | 22 ++++----- tests/runner/zil-game/message_2.json | 17 ++++--- tests/runner/zil-game/message_3.json | 22 ++++----- tests/runner/zil-game/message_4.json | 17 ++++--- tests/runner/zil-game/message_5.json | 17 ++++--- tests/runner/zil-game/message_6.json | 17 ++++--- tests/runner/zil-game/message_7.json | 7 +-- tests/runner/zil-game/message_8.json | 9 ++-- tests/runner/zil-game/message_9.json | 5 +- tests/runner/zil-game/output_1.json | 2 +- tests/runner/zil-game/output_2.json | 2 +- tests/runner/zil-game/output_3.json | 2 +- tests/runner/zil-game/output_4.json | 2 +- tests/runner/zil-game/output_5.json | 2 +- tests/runner/zil-game/output_6.json | 2 +- tests/runner/zil-game/output_7.json | 2 +- tests/runner/zil-game/output_8.json | 2 +- tests/runner/zil-game/output_9.json | 2 +- 465 files changed, 1438 insertions(+), 1074 deletions(-) diff --git a/src/eval/Eval.ml b/src/eval/Eval.ml index 81f122d24..6376526bc 100644 --- a/src/eval/Eval.ml +++ b/src/eval/Eval.ml @@ -459,7 +459,7 @@ and try_apply_as_procedure conf proc proc_rest actuals = let%bind proc_conf = Configuration.bind_all { conf with env = conf.init_env; procedures = proc_rest } - ( sender :: amount + ( origin :: sender :: amount :: List.map proc.comp_params ~f:(fun id_typ -> get_id (fst id_typ)) ) (origin_value :: sender_value :: amount_value :: actuals) in diff --git a/tests/runner/UintParam/message_1.json b/tests/runner/UintParam/message_1.json index 154770b8b..a9d769976 100644 --- a/tests/runner/UintParam/message_1.json +++ b/tests/runner/UintParam/message_1.json @@ -1,12 +1,13 @@ { "_tag": "Uint128Test", "_amount": "-1", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "x", - "type" : "Uint128", - "value" : "0" + "vname": "x", + "type": "Uint128", + "value": "0" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/UintParam/message_2.json b/tests/runner/UintParam/message_2.json index 0be966023..81e5ee078 100644 --- a/tests/runner/UintParam/message_2.json +++ b/tests/runner/UintParam/message_2.json @@ -1,12 +1,13 @@ { "_tag": "Uint128Test", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "x", - "type" : "Uint128", - "value" : "-1" + "vname": "x", + "type": "Uint128", + "value": "-1" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/UintParam/message_3.json b/tests/runner/UintParam/message_3.json index 43c982b59..c0299934c 100644 --- a/tests/runner/UintParam/message_3.json +++ b/tests/runner/UintParam/message_3.json @@ -1,12 +1,13 @@ { "_tag": "Uint256Test", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "x", - "type" : "Uint256", - "value" : "-1" + "vname": "x", + "type": "Uint256", + "value": "-1" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/UintParam/output_1.json b/tests/runner/UintParam/output_1.json index b32907d4c..170980c7e 100644 --- a/tests/runner/UintParam/output_1.json +++ b/tests/runner/UintParam/output_1.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7969", + "gas_remaining": "7962", "errors": [ { "error_message": "Invalid Uint128 value -1 in JSON", diff --git a/tests/runner/UintParam/output_2.json b/tests/runner/UintParam/output_2.json index e32ebe329..029e72da2 100644 --- a/tests/runner/UintParam/output_2.json +++ b/tests/runner/UintParam/output_2.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7969", + "gas_remaining": "7962", "errors": [ { "error_message": "Invalid Uint128 value -1 in JSON", diff --git a/tests/runner/UintParam/output_3.json b/tests/runner/UintParam/output_3.json index bba7ab4f6..d723693c1 100644 --- a/tests/runner/UintParam/output_3.json +++ b/tests/runner/UintParam/output_3.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7969", + "gas_remaining": "7962", "errors": [ { "error_message": "Invalid Uint256 value -1 in JSON", diff --git a/tests/runner/auction/message_1.json b/tests/runner/auction/message_1.json index d3d39b4ac..386c38706 100644 --- a/tests/runner/auction/message_1.json +++ b/tests/runner/auction/message_1.json @@ -1,6 +1,7 @@ { "_tag": "Bid", "_amount": "100", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/auction/message_2.json b/tests/runner/auction/message_2.json index ecd2df05f..ad4c93dba 100644 --- a/tests/runner/auction/message_2.json +++ b/tests/runner/auction/message_2.json @@ -1,6 +1,7 @@ { "_tag": "Bid", "_amount": "200", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/auction/message_3.json b/tests/runner/auction/message_3.json index 78f1bf797..30640657d 100644 --- a/tests/runner/auction/message_3.json +++ b/tests/runner/auction/message_3.json @@ -1,6 +1,7 @@ { "_tag": "Bid", "_amount": "50", - "_sender" : "0x12345678901234567890123456789012345678cd", - "params": [] + "_sender": "0x12345678901234567890123456789012345678cd", + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/auction/message_4.json b/tests/runner/auction/message_4.json index 2d55aa75f..7f45412f4 100644 --- a/tests/runner/auction/message_4.json +++ b/tests/runner/auction/message_4.json @@ -1,6 +1,7 @@ { "_tag": "Bid", "_amount": "500", - "_sender" : "0x12345678901234567890123456789012345678cd", - "params": [] + "_sender": "0x12345678901234567890123456789012345678cd", + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/auction/message_5.json b/tests/runner/auction/message_5.json index 2d55aa75f..7f45412f4 100644 --- a/tests/runner/auction/message_5.json +++ b/tests/runner/auction/message_5.json @@ -1,6 +1,7 @@ { "_tag": "Bid", "_amount": "500", - "_sender" : "0x12345678901234567890123456789012345678cd", - "params": [] + "_sender": "0x12345678901234567890123456789012345678cd", + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/auction/message_6.json b/tests/runner/auction/message_6.json index df8c0fac8..8f129a227 100644 --- a/tests/runner/auction/message_6.json +++ b/tests/runner/auction/message_6.json @@ -1,6 +1,7 @@ { "_tag": "Withdraw", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/auction/message_7.json b/tests/runner/auction/message_7.json index ffda4d289..f01e7f657 100644 --- a/tests/runner/auction/message_7.json +++ b/tests/runner/auction/message_7.json @@ -1,6 +1,7 @@ { "_tag": "AuctionEnd", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/auction/message_8.json b/tests/runner/auction/message_8.json index ffda4d289..f01e7f657 100644 --- a/tests/runner/auction/message_8.json +++ b/tests/runner/auction/message_8.json @@ -1,6 +1,7 @@ { "_tag": "AuctionEnd", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/auction/output_1.json b/tests/runner/auction/output_1.json index e74f2c0fc..b1adea0bb 100644 --- a/tests/runner/auction/output_1.json +++ b/tests/runner/auction/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7923", + "gas_remaining": "7915", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/auction/output_2.json b/tests/runner/auction/output_2.json index 824119eed..2027154b2 100644 --- a/tests/runner/auction/output_2.json +++ b/tests/runner/auction/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7917", + "gas_remaining": "7910", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/auction/output_3.json b/tests/runner/auction/output_3.json index 07e00c8c1..16b17eea9 100644 --- a/tests/runner/auction/output_3.json +++ b/tests/runner/auction/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7927", + "gas_remaining": "7920", "_accepted": "false", "messages": [ { diff --git a/tests/runner/auction/output_4.json b/tests/runner/auction/output_4.json index dd0c6309f..7f26ef9b7 100644 --- a/tests/runner/auction/output_4.json +++ b/tests/runner/auction/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7930", + "gas_remaining": "7923", "_accepted": "false", "messages": [ { diff --git a/tests/runner/auction/output_5.json b/tests/runner/auction/output_5.json index c58a5b880..dae5430ec 100644 --- a/tests/runner/auction/output_5.json +++ b/tests/runner/auction/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7931", + "gas_remaining": "7923", "_accepted": "false", "messages": [ { diff --git a/tests/runner/auction/output_6.json b/tests/runner/auction/output_6.json index 136386983..34b1c2222 100644 --- a/tests/runner/auction/output_6.json +++ b/tests/runner/auction/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7943", + "gas_remaining": "7936", "_accepted": "false", "messages": [ { diff --git a/tests/runner/auction/output_7.json b/tests/runner/auction/output_7.json index a65479491..3e08fa81b 100644 --- a/tests/runner/auction/output_7.json +++ b/tests/runner/auction/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7943", + "gas_remaining": "7936", "_accepted": "false", "messages": [ { diff --git a/tests/runner/auction/output_8.json b/tests/runner/auction/output_8.json index a4e205e5f..6ec3a16a7 100644 --- a/tests/runner/auction/output_8.json +++ b/tests/runner/auction/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7926", + "gas_remaining": "7919", "_accepted": "false", "messages": [ { diff --git a/tests/runner/bookstore/message_1.json b/tests/runner/bookstore/message_1.json index 12d7d5b0a..36690996f 100644 --- a/tests/runner/bookstore/message_1.json +++ b/tests/runner/bookstore/message_1.json @@ -1,7 +1,7 @@ { "_tag": "AddMember", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "member_address", @@ -18,5 +18,6 @@ "type": "Uint32", "value": "2" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_10.json b/tests/runner/bookstore/message_10.json index a9bd42d60..1ecc347be 100644 --- a/tests/runner/bookstore/message_10.json +++ b/tests/runner/bookstore/message_10.json @@ -1,7 +1,7 @@ { "_tag": "AddBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_title", @@ -18,5 +18,6 @@ "type": "Uint32", "value": "2" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_11.json b/tests/runner/bookstore/message_11.json index 9a7d9fa71..3ed3859a0 100644 --- a/tests/runner/bookstore/message_11.json +++ b/tests/runner/bookstore/message_11.json @@ -1,12 +1,17 @@ { "_tag": "OpenStore", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname": "is_open", - "type": "Bool", - "value": { "constructor": "False", "argtypes": [], "arguments": [] } + "vname": "is_open", + "type": "Bool", + "value": { + "constructor": "False", + "argtypes": [], + "arguments": [] + } } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_12.json b/tests/runner/bookstore/message_12.json index b2aa3a997..b363e1731 100644 --- a/tests/runner/bookstore/message_12.json +++ b/tests/runner/bookstore/message_12.json @@ -1,7 +1,7 @@ { "_tag": "AddBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_title", @@ -18,5 +18,6 @@ "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_2.json b/tests/runner/bookstore/message_2.json index d0b8bdfbe..4319e2582 100644 --- a/tests/runner/bookstore/message_2.json +++ b/tests/runner/bookstore/message_2.json @@ -1,7 +1,7 @@ { "_tag": "AddMember", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "member_address", @@ -18,5 +18,6 @@ "type": "Uint32", "value": "2" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/bookstore/message_3.json b/tests/runner/bookstore/message_3.json index dea7dcaa0..aaae778ff 100644 --- a/tests/runner/bookstore/message_3.json +++ b/tests/runner/bookstore/message_3.json @@ -1,7 +1,7 @@ { "_tag": "AddMember", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "member_address", @@ -18,5 +18,6 @@ "type": "Uint32", "value": "3" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_4.json b/tests/runner/bookstore/message_4.json index b2aa3a997..b363e1731 100644 --- a/tests/runner/bookstore/message_4.json +++ b/tests/runner/bookstore/message_4.json @@ -1,7 +1,7 @@ { "_tag": "AddBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_title", @@ -18,5 +18,6 @@ "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_5.json b/tests/runner/bookstore/message_5.json index 3a0c82eac..7f37b3c4a 100644 --- a/tests/runner/bookstore/message_5.json +++ b/tests/runner/bookstore/message_5.json @@ -1,12 +1,13 @@ { "_tag": "RemoveBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_id", "type": "Uint32", "value": "101" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_6.json b/tests/runner/bookstore/message_6.json index 463bcb7b7..134f3abb8 100644 --- a/tests/runner/bookstore/message_6.json +++ b/tests/runner/bookstore/message_6.json @@ -1,7 +1,7 @@ { "_tag": "UpdateBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_id", @@ -18,5 +18,6 @@ "type": "String", "value": "George Orwell" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_7.json b/tests/runner/bookstore/message_7.json index 5635e6285..6e38daee8 100644 --- a/tests/runner/bookstore/message_7.json +++ b/tests/runner/bookstore/message_7.json @@ -1,12 +1,13 @@ { "_tag": "RemoveBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_id", "type": "Uint32", "value": "999" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_8.json b/tests/runner/bookstore/message_8.json index bd53c2095..a7c8598e4 100644 --- a/tests/runner/bookstore/message_8.json +++ b/tests/runner/bookstore/message_8.json @@ -1,7 +1,7 @@ { "_tag": "UpdateBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_id", @@ -18,5 +18,6 @@ "type": "String", "value": "Bar" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/message_9.json b/tests/runner/bookstore/message_9.json index b2aa3a997..b363e1731 100644 --- a/tests/runner/bookstore/message_9.json +++ b/tests/runner/bookstore/message_9.json @@ -1,7 +1,7 @@ { "_tag": "AddBook", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "book_title", @@ -18,5 +18,6 @@ "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/bookstore/output_1.json b/tests/runner/bookstore/output_1.json index e641d3e1f..5f1ab8102 100644 --- a/tests/runner/bookstore/output_1.json +++ b/tests/runner/bookstore/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7911", + "gas_remaining": "7904", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_10.json b/tests/runner/bookstore/output_10.json index acd59f492..35094a052 100644 --- a/tests/runner/bookstore/output_10.json +++ b/tests/runner/bookstore/output_10.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7914", + "gas_remaining": "7906", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_11.json b/tests/runner/bookstore/output_11.json index c71ce5ffe..f44e9d9b1 100644 --- a/tests/runner/bookstore/output_11.json +++ b/tests/runner/bookstore/output_11.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7949", + "gas_remaining": "7933", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_12.json b/tests/runner/bookstore/output_12.json index 060ba949e..1441baae7 100644 --- a/tests/runner/bookstore/output_12.json +++ b/tests/runner/bookstore/output_12.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7920", + "gas_remaining": "7912", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_2.json b/tests/runner/bookstore/output_2.json index 4252614eb..f8100551a 100644 --- a/tests/runner/bookstore/output_2.json +++ b/tests/runner/bookstore/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7915", + "gas_remaining": "7908", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_3.json b/tests/runner/bookstore/output_3.json index d0caa4293..fb911aec4 100644 --- a/tests/runner/bookstore/output_3.json +++ b/tests/runner/bookstore/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7914", + "gas_remaining": "7907", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_4.json b/tests/runner/bookstore/output_4.json index 1c9566922..ac58601e9 100644 --- a/tests/runner/bookstore/output_4.json +++ b/tests/runner/bookstore/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7914", + "gas_remaining": "7906", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_5.json b/tests/runner/bookstore/output_5.json index 3f406c651..dc7857992 100644 --- a/tests/runner/bookstore/output_5.json +++ b/tests/runner/bookstore/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7948", + "gas_remaining": "7940", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_6.json b/tests/runner/bookstore/output_6.json index d890829b4..82243117b 100644 --- a/tests/runner/bookstore/output_6.json +++ b/tests/runner/bookstore/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7918", + "gas_remaining": "7911", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_7.json b/tests/runner/bookstore/output_7.json index f490cde39..fbb3acbc5 100644 --- a/tests/runner/bookstore/output_7.json +++ b/tests/runner/bookstore/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7948", + "gas_remaining": "7940", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_8.json b/tests/runner/bookstore/output_8.json index c4bb80fd9..103662824 100644 --- a/tests/runner/bookstore/output_8.json +++ b/tests/runner/bookstore/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7920", + "gas_remaining": "7913", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/bookstore/output_9.json b/tests/runner/bookstore/output_9.json index ef467b5ea..7215c5c17 100644 --- a/tests/runner/bookstore/output_9.json +++ b/tests/runner/bookstore/output_9.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7919", + "gas_remaining": "7912", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/cfinvoke/message_1.json b/tests/runner/cfinvoke/message_1.json index 6ab21daca..9a6a744a1 100644 --- a/tests/runner/cfinvoke/message_1.json +++ b/tests/runner/cfinvoke/message_1.json @@ -3,10 +3,11 @@ "_amount": "122", "_sender": "0x12345678901234567890123456789012345678ab", "params": [ - { - "vname": "trans", - "type": "String", - "value": "Donate" - } - ] + { + "vname": "trans", + "type": "String", + "value": "Donate" + } + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/cfinvoke/message_2.json b/tests/runner/cfinvoke/message_2.json index e2e740828..651079c5d 100644 --- a/tests/runner/cfinvoke/message_2.json +++ b/tests/runner/cfinvoke/message_2.json @@ -3,10 +3,11 @@ "_amount": "0", "_sender": "0x12345678901234567890123456789012345678ab", "params": [ - { - "vname": "trans", - "type": "String", - "value": "ClaimBack" - } - ] + { + "vname": "trans", + "type": "String", + "value": "ClaimBack" + } + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/cfinvoke/message_3.json b/tests/runner/cfinvoke/message_3.json index fe0beef82..5b39c13d3 100644 --- a/tests/runner/cfinvoke/message_3.json +++ b/tests/runner/cfinvoke/message_3.json @@ -3,10 +3,11 @@ "_amount": "0", "_sender": "0x12345678901234567890123456789012345678ab", "params": [ - { - "vname": "trans", - "type": "String", - "value": "GetFunds" - } - ] + { + "vname": "trans", + "type": "String", + "value": "GetFunds" + } + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/cfinvoke/message_4.json b/tests/runner/cfinvoke/message_4.json index 4270abccd..2a161a5ca 100644 --- a/tests/runner/cfinvoke/message_4.json +++ b/tests/runner/cfinvoke/message_4.json @@ -2,5 +2,6 @@ "_tag": "Main", "_amount": "122", "_sender": "0x8992d4dfafd282e8a8b3c776eb9fc907d321e21a", - "params": [] + "params": [], + "_origin": "0x8992d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/cfinvoke/output_1.json b/tests/runner/cfinvoke/output_1.json index 42176e4ba..7db30cfed 100644 --- a/tests/runner/cfinvoke/output_1.json +++ b/tests/runner/cfinvoke/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7949", + "gas_remaining": "7939", "_accepted": "true", "messages": [ { diff --git a/tests/runner/cfinvoke/output_2.json b/tests/runner/cfinvoke/output_2.json index 3abc88bd6..af57409a3 100644 --- a/tests/runner/cfinvoke/output_2.json +++ b/tests/runner/cfinvoke/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7946", + "gas_remaining": "7936", "_accepted": "false", "messages": [ { diff --git a/tests/runner/cfinvoke/output_3.json b/tests/runner/cfinvoke/output_3.json index 4f9dab87c..896934473 100644 --- a/tests/runner/cfinvoke/output_3.json +++ b/tests/runner/cfinvoke/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7943", + "gas_remaining": "7933", "_accepted": "false", "messages": [ { diff --git a/tests/runner/cfinvoke/output_4.json b/tests/runner/cfinvoke/output_4.json index 5e1cdc6bc..5b67f9798 100644 --- a/tests/runner/cfinvoke/output_4.json +++ b/tests/runner/cfinvoke/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7967", + "gas_remaining": "7959", "_accepted": "true", "messages": [ { diff --git a/tests/runner/chain-call-balance-1/message_1.json b/tests/runner/chain-call-balance-1/message_1.json index f064cc3e6..8f3acdfb9 100644 --- a/tests/runner/chain-call-balance-1/message_1.json +++ b/tests/runner/chain-call-balance-1/message_1.json @@ -1,9 +1,18 @@ { "_tag": "a_accept_callBcallC", "_amount": "50", - "_sender" : "0x02345678901234567890123456789012345678ab", + "_sender": "0x02345678901234567890123456789012345678ab", "params": [ - {"vname" : "addrB", "type" : "ByStr20", "value" : "0x22345678901234567890123456789012345678ab" }, - {"vname" : "addrC", "type" : "ByStr20", "value" : "0x32345678901234567890123456789012345678ab" } - ] + { + "vname": "addrB", + "type": "ByStr20", + "value": "0x22345678901234567890123456789012345678ab" + }, + { + "vname": "addrC", + "type": "ByStr20", + "value": "0x32345678901234567890123456789012345678ab" + } + ], + "_origin": "0x02345678901234567890123456789012345678ab" } diff --git a/tests/runner/chain-call-balance-2/message_1.json b/tests/runner/chain-call-balance-2/message_1.json index b150595c2..2fcab0b35 100644 --- a/tests/runner/chain-call-balance-2/message_1.json +++ b/tests/runner/chain-call-balance-2/message_1.json @@ -1,8 +1,13 @@ { "_tag": "b_accept_callC", "_amount": "50", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ - {"vname" : "addrC", "type" : "ByStr20", "value" : "0x32345678901234567890123456789012345678ab" } - ] + { + "vname": "addrC", + "type": "ByStr20", + "value": "0x32345678901234567890123456789012345678ab" + } + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/chain-call-balance-3/message_1.json b/tests/runner/chain-call-balance-3/message_1.json index 77be63831..4a199873c 100644 --- a/tests/runner/chain-call-balance-3/message_1.json +++ b/tests/runner/chain-call-balance-3/message_1.json @@ -1,6 +1,7 @@ { "_tag": "c_noaccept", "_amount": "50", - "_sender" : "0x22345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x22345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x22345678901234567890123456789012345678ab" } diff --git a/tests/runner/crowdfunding/message_1.json b/tests/runner/crowdfunding/message_1.json index 3c4668b00..c6a5a1f9c 100644 --- a/tests/runner/crowdfunding/message_1.json +++ b/tests/runner/crowdfunding/message_1.json @@ -1,6 +1,7 @@ { "_tag": "Donate", "_amount": "100", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/crowdfunding/message_2.json b/tests/runner/crowdfunding/message_2.json index c6546bc8a..619ff0cf4 100644 --- a/tests/runner/crowdfunding/message_2.json +++ b/tests/runner/crowdfunding/message_2.json @@ -2,5 +2,6 @@ "_tag": "Donate", "_amount": "200", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding/message_3.json b/tests/runner/crowdfunding/message_3.json index c6546bc8a..619ff0cf4 100644 --- a/tests/runner/crowdfunding/message_3.json +++ b/tests/runner/crowdfunding/message_3.json @@ -2,5 +2,6 @@ "_tag": "Donate", "_amount": "200", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding/message_4.json b/tests/runner/crowdfunding/message_4.json index 791455546..0a743bb6c 100644 --- a/tests/runner/crowdfunding/message_4.json +++ b/tests/runner/crowdfunding/message_4.json @@ -2,5 +2,6 @@ "_tag": "GetFunds", "_amount": "0", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding/message_5.json b/tests/runner/crowdfunding/message_5.json index e6c3a0673..3a1967811 100644 --- a/tests/runner/crowdfunding/message_5.json +++ b/tests/runner/crowdfunding/message_5.json @@ -2,5 +2,6 @@ "_tag": "ClaimBack", "_amount": "0", "_sender": "0x12345678901234567890123456789012345678ab", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/crowdfunding/message_6.json b/tests/runner/crowdfunding/message_6.json index 22ee776fa..a75006439 100644 --- a/tests/runner/crowdfunding/message_6.json +++ b/tests/runner/crowdfunding/message_6.json @@ -2,5 +2,6 @@ "_tag": "Donate", "_amount": "0", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding/output_1.json b/tests/runner/crowdfunding/output_1.json index 65dc4b575..138cf4e11 100644 --- a/tests/runner/crowdfunding/output_1.json +++ b/tests/runner/crowdfunding/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7943", + "gas_remaining": "7936", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding/output_2.json b/tests/runner/crowdfunding/output_2.json index c3a71e14b..f1b435bc1 100644 --- a/tests/runner/crowdfunding/output_2.json +++ b/tests/runner/crowdfunding/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7934", + "gas_remaining": "7927", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding/output_3.json b/tests/runner/crowdfunding/output_3.json index ee71ebea6..57d49fb33 100644 --- a/tests/runner/crowdfunding/output_3.json +++ b/tests/runner/crowdfunding/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7939", + "gas_remaining": "7932", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding/output_4.json b/tests/runner/crowdfunding/output_4.json index 9fadb13f2..9ef4ce1dc 100644 --- a/tests/runner/crowdfunding/output_4.json +++ b/tests/runner/crowdfunding/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7957", + "gas_remaining": "7949", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding/output_5.json b/tests/runner/crowdfunding/output_5.json index 90f2f260a..d3e683af6 100644 --- a/tests/runner/crowdfunding/output_5.json +++ b/tests/runner/crowdfunding/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7919", + "gas_remaining": "7911", "_accepted": "false", "messages": [ { diff --git a/tests/runner/crowdfunding/output_6.json b/tests/runner/crowdfunding/output_6.json index adaee2b3c..7a9ba7457 100644 --- a/tests/runner/crowdfunding/output_6.json +++ b/tests/runner/crowdfunding/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7935", + "gas_remaining": "7927", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding_proc/message_1.json b/tests/runner/crowdfunding_proc/message_1.json index 3c4668b00..c6a5a1f9c 100644 --- a/tests/runner/crowdfunding_proc/message_1.json +++ b/tests/runner/crowdfunding_proc/message_1.json @@ -1,6 +1,7 @@ { "_tag": "Donate", "_amount": "100", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/crowdfunding_proc/message_2.json b/tests/runner/crowdfunding_proc/message_2.json index c6546bc8a..619ff0cf4 100644 --- a/tests/runner/crowdfunding_proc/message_2.json +++ b/tests/runner/crowdfunding_proc/message_2.json @@ -2,5 +2,6 @@ "_tag": "Donate", "_amount": "200", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding_proc/message_3.json b/tests/runner/crowdfunding_proc/message_3.json index c6546bc8a..619ff0cf4 100644 --- a/tests/runner/crowdfunding_proc/message_3.json +++ b/tests/runner/crowdfunding_proc/message_3.json @@ -2,5 +2,6 @@ "_tag": "Donate", "_amount": "200", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding_proc/message_4.json b/tests/runner/crowdfunding_proc/message_4.json index 791455546..0a743bb6c 100644 --- a/tests/runner/crowdfunding_proc/message_4.json +++ b/tests/runner/crowdfunding_proc/message_4.json @@ -2,5 +2,6 @@ "_tag": "GetFunds", "_amount": "0", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding_proc/message_5.json b/tests/runner/crowdfunding_proc/message_5.json index e6c3a0673..3a1967811 100644 --- a/tests/runner/crowdfunding_proc/message_5.json +++ b/tests/runner/crowdfunding_proc/message_5.json @@ -2,5 +2,6 @@ "_tag": "ClaimBack", "_amount": "0", "_sender": "0x12345678901234567890123456789012345678ab", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/crowdfunding_proc/message_6.json b/tests/runner/crowdfunding_proc/message_6.json index 22ee776fa..a75006439 100644 --- a/tests/runner/crowdfunding_proc/message_6.json +++ b/tests/runner/crowdfunding_proc/message_6.json @@ -2,5 +2,6 @@ "_tag": "Donate", "_amount": "0", "_sender": "0x12345678901234567890123456789012345678cd", - "params": [] + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/crowdfunding_proc/output_1.json b/tests/runner/crowdfunding_proc/output_1.json index 156c34eee..2afd88ab2 100644 --- a/tests/runner/crowdfunding_proc/output_1.json +++ b/tests/runner/crowdfunding_proc/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7945", + "gas_remaining": "7938", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding_proc/output_2.json b/tests/runner/crowdfunding_proc/output_2.json index c9f3f8a81..02945e645 100644 --- a/tests/runner/crowdfunding_proc/output_2.json +++ b/tests/runner/crowdfunding_proc/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7945", + "gas_remaining": "7938", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding_proc/output_3.json b/tests/runner/crowdfunding_proc/output_3.json index 66757bc3f..08872a443 100644 --- a/tests/runner/crowdfunding_proc/output_3.json +++ b/tests/runner/crowdfunding_proc/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7947", + "gas_remaining": "7940", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding_proc/output_4.json b/tests/runner/crowdfunding_proc/output_4.json index 2aa03672a..e84271688 100644 --- a/tests/runner/crowdfunding_proc/output_4.json +++ b/tests/runner/crowdfunding_proc/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7955", + "gas_remaining": "7947", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/crowdfunding_proc/output_5.json b/tests/runner/crowdfunding_proc/output_5.json index 836223e75..188fdcf69 100644 --- a/tests/runner/crowdfunding_proc/output_5.json +++ b/tests/runner/crowdfunding_proc/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7927", + "gas_remaining": "7919", "_accepted": "false", "messages": [ { diff --git a/tests/runner/crowdfunding_proc/output_6.json b/tests/runner/crowdfunding_proc/output_6.json index d0de3a3c6..cca1c9f89 100644 --- a/tests/runner/crowdfunding_proc/output_6.json +++ b/tests/runner/crowdfunding_proc/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7945", + "gas_remaining": "7938", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/earmarked-coin/message_1.json b/tests/runner/earmarked-coin/message_1.json index 5e04f74d2..02ed7c1ef 100644 --- a/tests/runner/earmarked-coin/message_1.json +++ b/tests/runner/earmarked-coin/message_1.json @@ -1,6 +1,13 @@ { "_tag": "Earmark", "_amount": "100", - "_sender" : "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - "params": [ { "vname": "recip", "type": "ByStr20", "value": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" } ] + "_sender": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "params": [ + { + "vname": "recip", + "type": "ByStr20", + "value": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" + } + ], + "_origin": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" } diff --git a/tests/runner/earmarked-coin/message_2.json b/tests/runner/earmarked-coin/message_2.json index 131c893ad..fd9aae234 100644 --- a/tests/runner/earmarked-coin/message_2.json +++ b/tests/runner/earmarked-coin/message_2.json @@ -1,6 +1,13 @@ { "_tag": "ClaimForRecipient", "_amount": "0", - "_sender" : "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", - "params": [ { "vname": "earmarked_coin_address", "type": "ByStr20", "value": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" } ] + "_sender": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", + "params": [ + { + "vname": "earmarked_coin_address", + "type": "ByStr20", + "value": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + } + ], + "_origin": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" } diff --git a/tests/runner/earmarked-coin/message_3.json b/tests/runner/earmarked-coin/message_3.json index b12d49ace..d8e374c0b 100644 --- a/tests/runner/earmarked-coin/message_3.json +++ b/tests/runner/earmarked-coin/message_3.json @@ -1,6 +1,13 @@ { "_tag": "ClaimForRecipient", "_amount": "0", - "_sender" : "0xffffffffffffffffffffffffffffffffffffffff", - "params": [ { "vname": "earmarked_coin_address", "type": "ByStr20", "value": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" } ] + "_sender": "0xffffffffffffffffffffffffffffffffffffffff", + "params": [ + { + "vname": "earmarked_coin_address", + "type": "ByStr20", + "value": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + } + ], + "_origin": "0xffffffffffffffffffffffffffffffffffffffff" } diff --git a/tests/runner/earmarked-coin/message_4.json b/tests/runner/earmarked-coin/message_4.json index d004b5cf2..9d161ac7a 100644 --- a/tests/runner/earmarked-coin/message_4.json +++ b/tests/runner/earmarked-coin/message_4.json @@ -1,6 +1,13 @@ { "_tag": "ClaimForRecipient", "_amount": "0", - "_sender" : "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", - "params": [ { "vname": "earmarked_coin_address", "type": "ByStr20", "value": "0xffffffffffffffffffffffffffffffffffffffff" } ] + "_sender": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", + "params": [ + { + "vname": "earmarked_coin_address", + "type": "ByStr20", + "value": "0xffffffffffffffffffffffffffffffffffffffff" + } + ], + "_origin": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" } diff --git a/tests/runner/earmarked-coin/message_5.json b/tests/runner/earmarked-coin/message_5.json index 7f9383fa5..c6c2a426d 100644 --- a/tests/runner/earmarked-coin/message_5.json +++ b/tests/runner/earmarked-coin/message_5.json @@ -1,6 +1,7 @@ { "_tag": "ClaimForCreator", "_amount": "0", - "_sender" : "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - "params": [] + "_sender": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "params": [], + "_origin": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" } diff --git a/tests/runner/earmarked-coin/message_6.json b/tests/runner/earmarked-coin/message_6.json index 38e50a6bd..dbfe001d6 100644 --- a/tests/runner/earmarked-coin/message_6.json +++ b/tests/runner/earmarked-coin/message_6.json @@ -1,6 +1,7 @@ { "_tag": "ClaimForCreator", "_amount": "0", - "_sender" : "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", - "params": [] + "_sender": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", + "params": [], + "_origin": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" } diff --git a/tests/runner/earmarked-coin/output_1.json b/tests/runner/earmarked-coin/output_1.json index a67282e46..82a00ccc2 100644 --- a/tests/runner/earmarked-coin/output_1.json +++ b/tests/runner/earmarked-coin/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7942", + "gas_remaining": "7928", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/earmarked-coin/output_2.json b/tests/runner/earmarked-coin/output_2.json index eb9194e9f..cf51d996a 100644 --- a/tests/runner/earmarked-coin/output_2.json +++ b/tests/runner/earmarked-coin/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7921", + "gas_remaining": "7907", "_accepted": "false", "messages": [ { diff --git a/tests/runner/earmarked-coin/output_3.json b/tests/runner/earmarked-coin/output_3.json index c25dc510c..c430528bd 100644 --- a/tests/runner/earmarked-coin/output_3.json +++ b/tests/runner/earmarked-coin/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7937", + "gas_remaining": "7923", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/earmarked-coin/output_4.json b/tests/runner/earmarked-coin/output_4.json index 63447b13a..31d545420 100644 --- a/tests/runner/earmarked-coin/output_4.json +++ b/tests/runner/earmarked-coin/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7945", + "gas_remaining": "7930", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/earmarked-coin/output_5.json b/tests/runner/earmarked-coin/output_5.json index d945afd27..d840711f9 100644 --- a/tests/runner/earmarked-coin/output_5.json +++ b/tests/runner/earmarked-coin/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7938", + "gas_remaining": "7931", "_accepted": "false", "messages": [ { diff --git a/tests/runner/earmarked-coin/output_6.json b/tests/runner/earmarked-coin/output_6.json index 6f81b4867..5883f31d4 100644 --- a/tests/runner/earmarked-coin/output_6.json +++ b/tests/runner/earmarked-coin/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7959", + "gas_remaining": "7952", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/ecdsa/message_1.json b/tests/runner/ecdsa/message_1.json index 1a1c2eec7..52818c5fd 100644 --- a/tests/runner/ecdsa/message_1.json +++ b/tests/runner/ecdsa/message_1.json @@ -1,17 +1,18 @@ { "_tag": "verify", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "msg", - "type" : "ByStr", - "value" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" + "vname": "msg", + "type": "ByStr", + "value": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" }, { - "vname" : "sig", - "type" : "ByStr64", - "value" : "0x7133eff400b84935915c08ecd32e30b206d9e7b88d857a382fd14e10530f3056314970428c402f78ab96140318805bdbc94d87b0744cfba886c580bfcddb985f" + "vname": "sig", + "type": "ByStr64", + "value": "0x7133eff400b84935915c08ecd32e30b206d9e7b88d857a382fd14e10530f3056314970428c402f78ab96140318805bdbc94d87b0744cfba886c580bfcddb985f" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/ecdsa/message_2.json b/tests/runner/ecdsa/message_2.json index d4b32087c..8f900d42d 100644 --- a/tests/runner/ecdsa/message_2.json +++ b/tests/runner/ecdsa/message_2.json @@ -1,17 +1,18 @@ { "_tag": "verify", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "msg", - "type" : "ByStr", - "value" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" + "vname": "msg", + "type": "ByStr", + "value": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" }, { - "vname" : "sig", - "type" : "ByStr64", - "value" : "0x7133eff400b84935915c08ecd32e30b206d9e7b88d857a382fd14e10530f3056314970428c402f78ab96140318805bdbc94d87b0744cfba886c580bfcddb985e" + "vname": "sig", + "type": "ByStr64", + "value": "0x7133eff400b84935915c08ecd32e30b206d9e7b88d857a382fd14e10530f3056314970428c402f78ab96140318805bdbc94d87b0744cfba886c580bfcddb985e" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/ecdsa/message_3.json b/tests/runner/ecdsa/message_3.json index dff004269..34765522a 100644 --- a/tests/runner/ecdsa/message_3.json +++ b/tests/runner/ecdsa/message_3.json @@ -1,17 +1,18 @@ { "_tag": "verify", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "msg", - "type" : "ByStr", - "value" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf4" + "vname": "msg", + "type": "ByStr", + "value": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf4" }, { - "vname" : "sig", - "type" : "ByStr64", - "value" : "0x7133eff400b84935915c08ecd32e30b206d9e7b88d857a382fd14e10530f3056314970428c402f78ab96140318805bdbc94d87b0744cfba886c580bfcddb985e" + "vname": "sig", + "type": "ByStr64", + "value": "0x7133eff400b84935915c08ecd32e30b206d9e7b88d857a382fd14e10530f3056314970428c402f78ab96140318805bdbc94d87b0744cfba886c580bfcddb985e" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/ecdsa/message_4.json b/tests/runner/ecdsa/message_4.json index cd3d0c945..adf6ddfab 100644 --- a/tests/runner/ecdsa/message_4.json +++ b/tests/runner/ecdsa/message_4.json @@ -1,17 +1,18 @@ { "_tag": "verify", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "msg", - "type" : "ByStr", - "value" : "0x416d72697420526f636b73" + "vname": "msg", + "type": "ByStr", + "value": "0x416d72697420526f636b73" }, { - "vname" : "sig", - "type" : "ByStr64", - "value" : "0x90aae9db0329b180b4a269918564831ff669cb052fa5ddc46d544fd0f1dad124300e8b7d0384735ebe75c90e2c8cdc169ebe33430be4773d683f10a997e11b5e" + "vname": "sig", + "type": "ByStr64", + "value": "0x90aae9db0329b180b4a269918564831ff669cb052fa5ddc46d544fd0f1dad124300e8b7d0384735ebe75c90e2c8cdc169ebe33430be4773d683f10a997e11b5e" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/ecdsa/output_1.json b/tests/runner/ecdsa/output_1.json index 0ced50458..f5d484808 100644 --- a/tests/runner/ecdsa/output_1.json +++ b/tests/runner/ecdsa/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7868", + "gas_remaining": "7862", "_accepted": "false", "messages": [ { diff --git a/tests/runner/ecdsa/output_2.json b/tests/runner/ecdsa/output_2.json index 2c0fda272..2b0b5fd02 100644 --- a/tests/runner/ecdsa/output_2.json +++ b/tests/runner/ecdsa/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7868", + "gas_remaining": "7861", "_accepted": "false", "messages": [ { diff --git a/tests/runner/ecdsa/output_3.json b/tests/runner/ecdsa/output_3.json index 0ced50458..f5d484808 100644 --- a/tests/runner/ecdsa/output_3.json +++ b/tests/runner/ecdsa/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7868", + "gas_remaining": "7862", "_accepted": "false", "messages": [ { diff --git a/tests/runner/ecdsa/output_4.json b/tests/runner/ecdsa/output_4.json index 30253f481..3cc1124f0 100644 --- a/tests/runner/ecdsa/output_4.json +++ b/tests/runner/ecdsa/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7873", + "gas_remaining": "7867", "_accepted": "false", "messages": [ { diff --git a/tests/runner/empty/message_1.json b/tests/runner/empty/message_1.json index 7e2123fb6..176298815 100644 --- a/tests/runner/empty/message_1.json +++ b/tests/runner/empty/message_1.json @@ -1,6 +1,7 @@ { "_tag": "dummy", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params": [] + "_sender": "0x1234567890123456789012345678901234567890", + "params": [], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/empty/output_1.json b/tests/runner/empty/output_1.json index 9fca7e975..565d77e28 100644 --- a/tests/runner/empty/output_1.json +++ b/tests/runner/empty/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7923", + "gas_remaining": "7916", "_accepted": "false", "messages": [], "states": [ { "vname": "_balance", "type": "Uint128", "value": "0" } ], diff --git a/tests/runner/exception-example/message_1.json b/tests/runner/exception-example/message_1.json index 42062c32a..06af43309 100644 --- a/tests/runner/exception-example/message_1.json +++ b/tests/runner/exception-example/message_1.json @@ -1,13 +1,13 @@ { "_tag": "setHello", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname": "msg", - "type": "String", - "value": "Hello World" + "vname": "msg", + "type": "String", + "value": "Hello World" } - - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/exception-example/message_2.json b/tests/runner/exception-example/message_2.json index 963fae4f6..f92c71161 100644 --- a/tests/runner/exception-example/message_2.json +++ b/tests/runner/exception-example/message_2.json @@ -1,13 +1,13 @@ { "_tag": "emptyThrow", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname": "msg", - "type": "String", - "value": "Hello World" + "vname": "msg", + "type": "String", + "value": "Hello World" } - - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/exception-example/output_1.json b/tests/runner/exception-example/output_1.json index 53b5b9c2d..d3da0ad34 100644 --- a/tests/runner/exception-example/output_1.json +++ b/tests/runner/exception-example/output_1.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7957", + "gas_remaining": "7950", "errors": [ { "error_message": diff --git a/tests/runner/exception-example/output_2.json b/tests/runner/exception-example/output_2.json index 0cfcd0461..e538da621 100644 --- a/tests/runner/exception-example/output_2.json +++ b/tests/runner/exception-example/output_2.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7967", + "gas_remaining": "7960", "errors": [ { "error_message": "Exception thrown", diff --git a/tests/runner/fungible-token/message_0.json b/tests/runner/fungible-token/message_0.json index 099aefb61..fedac2529 100644 --- a/tests/runner/fungible-token/message_0.json +++ b/tests/runner/fungible-token/message_0.json @@ -1,12 +1,13 @@ { - "_tag" : "BalanceOf", - "_amount" : "0", - "_sender" : "0x12345678901234567890123456789012345678cd", - "params" : [ + "_tag": "BalanceOf", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678cd", + "params": [ { "vname": "tokenOwner", - "type" : "ByStr20", - "value" : "0x1234567890123456789012345678901234567890" + "type": "ByStr20", + "value": "0x1234567890123456789012345678901234567890" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/fungible-token/message_1.json b/tests/runner/fungible-token/message_1.json index 10cf15e0b..e790fb70c 100644 --- a/tests/runner/fungible-token/message_1.json +++ b/tests/runner/fungible-token/message_1.json @@ -1,6 +1,7 @@ { - "_tag" : "TotalSupply", - "_amount" : "0", - "_sender" : "0x12345678901234567890123456789012345678cd", - "params" : [] + "_tag": "TotalSupply", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678cd", + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/fungible-token/message_2.json b/tests/runner/fungible-token/message_2.json index 6f9cb2f01..08f753af6 100644 --- a/tests/runner/fungible-token/message_2.json +++ b/tests/runner/fungible-token/message_2.json @@ -1,8 +1,8 @@ { - "_tag" : "Transfer", - "_amount" : "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params" : [ + "_tag": "Transfer", + "_amount": "0", + "_sender": "0x1234567890123456789012345678901234567890", + "params": [ { "vname": "to", "type": "ByStr20", @@ -13,6 +13,6 @@ "type": "Uint128", "value": "20" } - - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/fungible-token/message_3.json b/tests/runner/fungible-token/message_3.json index 812d11f34..1744a3bfd 100644 --- a/tests/runner/fungible-token/message_3.json +++ b/tests/runner/fungible-token/message_3.json @@ -1,8 +1,8 @@ { - "_tag" : "Transfer", - "_amount" : "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params" : [ + "_tag": "Transfer", + "_amount": "0", + "_sender": "0x1234567890123456789012345678901234567890", + "params": [ { "vname": "to", "type": "ByStr20", @@ -13,6 +13,6 @@ "type": "Uint128", "value": "10001" } - - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/fungible-token/message_4.json b/tests/runner/fungible-token/message_4.json index a11849349..c90b7a291 100644 --- a/tests/runner/fungible-token/message_4.json +++ b/tests/runner/fungible-token/message_4.json @@ -1,8 +1,8 @@ { - "_tag" : "Approve", - "_amount" : "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params" : [ + "_tag": "Approve", + "_amount": "0", + "_sender": "0x1234567890123456789012345678901234567890", + "params": [ { "vname": "spender", "type": "ByStr20", @@ -13,5 +13,6 @@ "type": "Uint128", "value": "500" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/fungible-token/message_5.json b/tests/runner/fungible-token/message_5.json index d055a8124..8f69d6b49 100644 --- a/tests/runner/fungible-token/message_5.json +++ b/tests/runner/fungible-token/message_5.json @@ -1,8 +1,8 @@ { - "_tag" : "Approve", - "_amount" : "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params" : [ + "_tag": "Approve", + "_amount": "0", + "_sender": "0x1234567890123456789012345678901234567890", + "params": [ { "vname": "spender", "type": "ByStr20", @@ -13,5 +13,6 @@ "type": "Uint128", "value": "600" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/fungible-token/message_6.json b/tests/runner/fungible-token/message_6.json index b3f268f35..407c73587 100644 --- a/tests/runner/fungible-token/message_6.json +++ b/tests/runner/fungible-token/message_6.json @@ -1,8 +1,8 @@ { - "_tag" : "TransferFrom", - "_amount" : "0", - "_sender" : "0x64345678901234567890123456789012345678cd", - "params" : [ + "_tag": "TransferFrom", + "_amount": "0", + "_sender": "0x64345678901234567890123456789012345678cd", + "params": [ { "vname": "from", "type": "ByStr20", @@ -18,5 +18,6 @@ "type": "Uint128", "value": "580" } - ] + ], + "_origin": "0x64345678901234567890123456789012345678cd" } diff --git a/tests/runner/fungible-token/message_7.json b/tests/runner/fungible-token/message_7.json index 90187f072..aba9e77a0 100644 --- a/tests/runner/fungible-token/message_7.json +++ b/tests/runner/fungible-token/message_7.json @@ -1,8 +1,8 @@ { - "_tag" : "TransferFrom", - "_amount" : "0", - "_sender" : "0x64345678901234567890123456789012345678cd", - "params" : [ + "_tag": "TransferFrom", + "_amount": "0", + "_sender": "0x64345678901234567890123456789012345678cd", + "params": [ { "vname": "from", "type": "ByStr20", @@ -18,5 +18,6 @@ "type": "Uint128", "value": "21" } - ] + ], + "_origin": "0x64345678901234567890123456789012345678cd" } diff --git a/tests/runner/fungible-token/message_8.json b/tests/runner/fungible-token/message_8.json index 15a0120ff..e182a6ceb 100644 --- a/tests/runner/fungible-token/message_8.json +++ b/tests/runner/fungible-token/message_8.json @@ -1,8 +1,8 @@ { - "_tag" : "Allowance", - "_amount" : "0", - "_sender" : "0x64345678901234567890123456789012345678cd", - "params" : [ + "_tag": "Allowance", + "_amount": "0", + "_sender": "0x64345678901234567890123456789012345678cd", + "params": [ { "vname": "tokenOwner", "type": "ByStr20", @@ -13,5 +13,6 @@ "type": "ByStr20", "value": "0x54345678901234567890123456789012345678cd" } - ] + ], + "_origin": "0x64345678901234567890123456789012345678cd" } diff --git a/tests/runner/fungible-token/output_0.json b/tests/runner/fungible-token/output_0.json index 03ad1833d..86239f096 100644 --- a/tests/runner/fungible-token/output_0.json +++ b/tests/runner/fungible-token/output_0.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7933", + "gas_remaining": "7926", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_1.json b/tests/runner/fungible-token/output_1.json index 417a9f890..4cd9d2f44 100644 --- a/tests/runner/fungible-token/output_1.json +++ b/tests/runner/fungible-token/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7955", + "gas_remaining": "7948", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_2.json b/tests/runner/fungible-token/output_2.json index fd9ca6025..ffc4944c0 100644 --- a/tests/runner/fungible-token/output_2.json +++ b/tests/runner/fungible-token/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7907", + "gas_remaining": "7900", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_3.json b/tests/runner/fungible-token/output_3.json index 2503b3c9c..386962d61 100644 --- a/tests/runner/fungible-token/output_3.json +++ b/tests/runner/fungible-token/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7912", + "gas_remaining": "7905", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_4.json b/tests/runner/fungible-token/output_4.json index a123e4417..3f2d71066 100644 --- a/tests/runner/fungible-token/output_4.json +++ b/tests/runner/fungible-token/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7915", + "gas_remaining": "7908", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_5.json b/tests/runner/fungible-token/output_5.json index f1c68eece..43f3744b1 100644 --- a/tests/runner/fungible-token/output_5.json +++ b/tests/runner/fungible-token/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7915", + "gas_remaining": "7908", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_6.json b/tests/runner/fungible-token/output_6.json index 2631808c7..7115fd0bb 100644 --- a/tests/runner/fungible-token/output_6.json +++ b/tests/runner/fungible-token/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7881", + "gas_remaining": "7874", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_7.json b/tests/runner/fungible-token/output_7.json index 9c6d7d3d7..33ffbfb72 100644 --- a/tests/runner/fungible-token/output_7.json +++ b/tests/runner/fungible-token/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7889", + "gas_remaining": "7882", "_accepted": "false", "messages": [ { diff --git a/tests/runner/fungible-token/output_8.json b/tests/runner/fungible-token/output_8.json index 3e3d0725e..7f52aa996 100644 --- a/tests/runner/fungible-token/output_8.json +++ b/tests/runner/fungible-token/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7909", + "gas_remaining": "7902", "_accepted": "false", "messages": [ { diff --git a/tests/runner/helloWorld/message_1.json b/tests/runner/helloWorld/message_1.json index 42062c32a..06af43309 100644 --- a/tests/runner/helloWorld/message_1.json +++ b/tests/runner/helloWorld/message_1.json @@ -1,13 +1,13 @@ { "_tag": "setHello", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname": "msg", - "type": "String", - "value": "Hello World" + "vname": "msg", + "type": "String", + "value": "Hello World" } - - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/helloWorld/message_10.json b/tests/runner/helloWorld/message_10.json index aacbf68d0..143056952 100644 --- a/tests/runner/helloWorld/message_10.json +++ b/tests/runner/helloWorld/message_10.json @@ -1,6 +1,7 @@ { "_tag": "contrAddr", "_amount": "0", - "_sender" : "0xa2345678901234567890123456789012345678ab", - "params": [] + "_sender": "0xa2345678901234567890123456789012345678ab", + "params": [], + "_origin": "0xa2345678901234567890123456789012345678ab" } diff --git a/tests/runner/helloWorld/message_11.json b/tests/runner/helloWorld/message_11.json index 9446c21f1..e9a50e64c 100644 --- a/tests/runner/helloWorld/message_11.json +++ b/tests/runner/helloWorld/message_11.json @@ -1,6 +1,7 @@ { "_tag": "getHello", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params": [] + "_sender": "0x1234567890123456789012345678901234567890", + "params": [], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/helloWorld/message_2.json b/tests/runner/helloWorld/message_2.json index 74db7aa98..d7e4edd6a 100644 --- a/tests/runner/helloWorld/message_2.json +++ b/tests/runner/helloWorld/message_2.json @@ -1,12 +1,13 @@ { "_tag": "setHello", "_amount": "0", - "_sender" : "0xa2345678901234567890123456789012345678ab", - "params": [ + "_sender": "0xa2345678901234567890123456789012345678ab", + "params": [ { - "vname": "msg", - "type": "String", - "value": "Hello World" + "vname": "msg", + "type": "String", + "value": "Hello World" } - ] + ], + "_origin": "0xa2345678901234567890123456789012345678ab" } diff --git a/tests/runner/helloWorld/message_3.json b/tests/runner/helloWorld/message_3.json index 2dadc51a8..cebaa3bd6 100644 --- a/tests/runner/helloWorld/message_3.json +++ b/tests/runner/helloWorld/message_3.json @@ -1,6 +1,7 @@ { "_tag": "getHello", "_amount": "0", - "_sender" : "0xa2345678901234567890123456789012345678ab", - "params": [] + "_sender": "0xa2345678901234567890123456789012345678ab", + "params": [], + "_origin": "0xa2345678901234567890123456789012345678ab" } diff --git a/tests/runner/helloWorld/message_4.json b/tests/runner/helloWorld/message_4.json index aacbf68d0..143056952 100644 --- a/tests/runner/helloWorld/message_4.json +++ b/tests/runner/helloWorld/message_4.json @@ -1,6 +1,7 @@ { "_tag": "contrAddr", "_amount": "0", - "_sender" : "0xa2345678901234567890123456789012345678ab", - "params": [] + "_sender": "0xa2345678901234567890123456789012345678ab", + "params": [], + "_origin": "0xa2345678901234567890123456789012345678ab" } diff --git a/tests/runner/helloWorld/message_5.json b/tests/runner/helloWorld/message_5.json index 9446c21f1..e9a50e64c 100644 --- a/tests/runner/helloWorld/message_5.json +++ b/tests/runner/helloWorld/message_5.json @@ -1,6 +1,7 @@ { "_tag": "getHello", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params": [] + "_sender": "0x1234567890123456789012345678901234567890", + "params": [], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/helloWorld/message_6.json b/tests/runner/helloWorld/message_6.json index 62a17e4bc..6fd8b82ce 100644 --- a/tests/runner/helloWorld/message_6.json +++ b/tests/runner/helloWorld/message_6.json @@ -1,12 +1,13 @@ { "_tag": "getHello", "_amount": "0", - "_sender" : "0xa2345678901234567890123456789012345678ab", + "_sender": "0xa2345678901234567890123456789012345678ab", "params": [ { - "vname" : "Unknown", - "type" : "Int32", - "value" : "0" + "vname": "Unknown", + "type": "Int32", + "value": "0" } - ] + ], + "_origin": "0xa2345678901234567890123456789012345678ab" } diff --git a/tests/runner/helloWorld/message_7.json b/tests/runner/helloWorld/message_7.json index 42062c32a..06af43309 100644 --- a/tests/runner/helloWorld/message_7.json +++ b/tests/runner/helloWorld/message_7.json @@ -1,13 +1,13 @@ { "_tag": "setHello", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname": "msg", - "type": "String", - "value": "Hello World" + "vname": "msg", + "type": "String", + "value": "Hello World" } - - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/helloWorld/message_8.json b/tests/runner/helloWorld/message_8.json index 2dadc51a8..cebaa3bd6 100644 --- a/tests/runner/helloWorld/message_8.json +++ b/tests/runner/helloWorld/message_8.json @@ -1,6 +1,7 @@ { "_tag": "getHello", "_amount": "0", - "_sender" : "0xa2345678901234567890123456789012345678ab", - "params": [] + "_sender": "0xa2345678901234567890123456789012345678ab", + "params": [], + "_origin": "0xa2345678901234567890123456789012345678ab" } diff --git a/tests/runner/helloWorld/output_1.json b/tests/runner/helloWorld/output_1.json index 4bc3531eb..ee29c3e3e 100644 --- a/tests/runner/helloWorld/output_1.json +++ b/tests/runner/helloWorld/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7948", + "gas_remaining": "7941", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/helloWorld/output_10.json b/tests/runner/helloWorld/output_10.json index 30caf8be0..1be8c4363 100644 --- a/tests/runner/helloWorld/output_10.json +++ b/tests/runner/helloWorld/output_10.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7980", + "gas_remaining": "7973", "errors": [ { "error_message": "Expected string, got int", diff --git a/tests/runner/helloWorld/output_11.json b/tests/runner/helloWorld/output_11.json index 21a59460d..a44c7a629 100644 --- a/tests/runner/helloWorld/output_11.json +++ b/tests/runner/helloWorld/output_11.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7980", + "gas_remaining": "7973", "errors": [ { "error_message": "_balance field missing", diff --git a/tests/runner/helloWorld/output_2.json b/tests/runner/helloWorld/output_2.json index 872c9f90b..b3ecd95dd 100644 --- a/tests/runner/helloWorld/output_2.json +++ b/tests/runner/helloWorld/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7951", + "gas_remaining": "7943", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/helloWorld/output_3.json b/tests/runner/helloWorld/output_3.json index 8a21e0d2b..8a3b241e1 100644 --- a/tests/runner/helloWorld/output_3.json +++ b/tests/runner/helloWorld/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7964", + "gas_remaining": "7956", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/helloWorld/output_4.json b/tests/runner/helloWorld/output_4.json index 1df493e91..f0ad08078 100644 --- a/tests/runner/helloWorld/output_4.json +++ b/tests/runner/helloWorld/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7966", + "gas_remaining": "7959", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/helloWorld/output_5.json b/tests/runner/helloWorld/output_5.json index a3f5f8ab7..06a256b37 100644 --- a/tests/runner/helloWorld/output_5.json +++ b/tests/runner/helloWorld/output_5.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7976", + "gas_remaining": "7969", "errors": [ { "error_message": "Field Unknown : Int32 not defined in the contract\n", diff --git a/tests/runner/helloWorld/output_6.json b/tests/runner/helloWorld/output_6.json index f65adefe0..9279e6ae3 100644 --- a/tests/runner/helloWorld/output_6.json +++ b/tests/runner/helloWorld/output_6.json @@ -1,9 +1,9 @@ { - "gas_remaining": "7962", + "gas_remaining": "7955", "errors": [ { "error_message": - "Duplicate entries or mismatch b/w message entries:\n{ [_amount -> (Uint128 0)],\n [_sender -> (ByStr20 0xa2345678901234567890123456789012345678ab)],\n [Unknown -> (Int32 0)] }\nand expected transition parameters[_amount : (PrimType Uint128), _sender : (PrimType ByStr20)]\n", + "Duplicate entries or mismatch b/w message entries:\n{ [_amount -> (Uint128 0)],\n [_origin -> (ByStr20 0xa2345678901234567890123456789012345678ab)],\n [_sender -> (ByStr20 0xa2345678901234567890123456789012345678ab)],\n [Unknown -> (Int32 0)] }\nand expected transition parameters[_amount : (PrimType Uint128), _origin : (PrimType ByStr20), _sender : (PrimType ByStr20)]\n", "start_location": { "file": "", "line": 0, "column": 0 }, "end_location": { "file": "", "line": 0, "column": 0 } } diff --git a/tests/runner/helloWorld/output_7.json b/tests/runner/helloWorld/output_7.json index 49dcc1cd9..21b47a119 100644 --- a/tests/runner/helloWorld/output_7.json +++ b/tests/runner/helloWorld/output_7.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7961", + "gas_remaining": "7954", "errors": [ { "error_message": "Field welcome_msg occurs more than once in input.\n", diff --git a/tests/runner/helloWorld/output_8.json b/tests/runner/helloWorld/output_8.json index b3ffd30d2..c513190a2 100644 --- a/tests/runner/helloWorld/output_8.json +++ b/tests/runner/helloWorld/output_8.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7976", + "gas_remaining": "7969", "errors": [ { "error_message": diff --git a/tests/runner/helloWorld/output_9.json b/tests/runner/helloWorld/output_9.json index 67911e1d0..d7fa4e333 100644 --- a/tests/runner/helloWorld/output_9.json +++ b/tests/runner/helloWorld/output_9.json @@ -2,7 +2,7 @@ "gas_remaining": "7965", "errors": [ { - "error_message": "Invalid String value Hello\u0016World in JSON", + "error_message": "Member '_origin' not found in json", "start_location": { "file": "", "line": 0, "column": 0 }, "end_location": { "file": "", "line": 0, "column": 0 } }, diff --git a/tests/runner/import-test-lib/message_1.json b/tests/runner/import-test-lib/message_1.json index f4f272476..2ed6eb648 100644 --- a/tests/runner/import-test-lib/message_1.json +++ b/tests/runner/import-test-lib/message_1.json @@ -1,6 +1,7 @@ { "_tag": "Hi", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/import-test-lib/output_1.json b/tests/runner/import-test-lib/output_1.json index e99bed820..497b0128c 100644 --- a/tests/runner/import-test-lib/output_1.json +++ b/tests/runner/import-test-lib/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7897", + "gas_remaining": "7890", "_accepted": "false", "messages": [], "states": [ { "vname": "_balance", "type": "Uint128", "value": "0" } ], diff --git a/tests/runner/inplace-map/message_1.json b/tests/runner/inplace-map/message_1.json index a36b98311..41c329a61 100644 --- a/tests/runner/inplace-map/message_1.json +++ b/tests/runner/inplace-map/message_1.json @@ -1,6 +1,7 @@ { "_tag": "test1", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_10.json b/tests/runner/inplace-map/message_10.json index 77838193d..7bad3734f 100644 --- a/tests/runner/inplace-map/message_10.json +++ b/tests/runner/inplace-map/message_10.json @@ -1,6 +1,7 @@ { "_tag": "test6", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_11.json b/tests/runner/inplace-map/message_11.json index dfea12b08..6e3220400 100644 --- a/tests/runner/inplace-map/message_11.json +++ b/tests/runner/inplace-map/message_11.json @@ -1,6 +1,7 @@ { "_tag": "test7", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_12.json b/tests/runner/inplace-map/message_12.json index 4509ef7b8..6d9e6b048 100644 --- a/tests/runner/inplace-map/message_12.json +++ b/tests/runner/inplace-map/message_12.json @@ -1,6 +1,7 @@ { "_tag": "test8", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_13.json b/tests/runner/inplace-map/message_13.json index eb23a95e7..507bd608f 100644 --- a/tests/runner/inplace-map/message_13.json +++ b/tests/runner/inplace-map/message_13.json @@ -1,6 +1,7 @@ { "_tag": "test9", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_14.json b/tests/runner/inplace-map/message_14.json index 4509ef7b8..6d9e6b048 100644 --- a/tests/runner/inplace-map/message_14.json +++ b/tests/runner/inplace-map/message_14.json @@ -1,6 +1,7 @@ { "_tag": "test8", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_2.json b/tests/runner/inplace-map/message_2.json index 2d419b759..e923b7337 100644 --- a/tests/runner/inplace-map/message_2.json +++ b/tests/runner/inplace-map/message_2.json @@ -1,6 +1,7 @@ { "_tag": "test1", "_amount": "0", - "_sender" : "0xab345678901234567890123456789012345678ab", - "params": [] + "_sender": "0xab345678901234567890123456789012345678ab", + "params": [], + "_origin": "0xab345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_3.json b/tests/runner/inplace-map/message_3.json index 2d419b759..e923b7337 100644 --- a/tests/runner/inplace-map/message_3.json +++ b/tests/runner/inplace-map/message_3.json @@ -1,6 +1,7 @@ { "_tag": "test1", "_amount": "0", - "_sender" : "0xab345678901234567890123456789012345678ab", - "params": [] + "_sender": "0xab345678901234567890123456789012345678ab", + "params": [], + "_origin": "0xab345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_4.json b/tests/runner/inplace-map/message_4.json index b15e4c678..1ba5656b1 100644 --- a/tests/runner/inplace-map/message_4.json +++ b/tests/runner/inplace-map/message_4.json @@ -1,6 +1,7 @@ { "_tag": "test2", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_5.json b/tests/runner/inplace-map/message_5.json index 19c5fc26a..9d9fb01fc 100644 --- a/tests/runner/inplace-map/message_5.json +++ b/tests/runner/inplace-map/message_5.json @@ -1,6 +1,7 @@ { "_tag": "test3", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_6.json b/tests/runner/inplace-map/message_6.json index 19c5fc26a..9d9fb01fc 100644 --- a/tests/runner/inplace-map/message_6.json +++ b/tests/runner/inplace-map/message_6.json @@ -1,6 +1,7 @@ { "_tag": "test3", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_7.json b/tests/runner/inplace-map/message_7.json index 8b0da8136..ad1e2dab0 100644 --- a/tests/runner/inplace-map/message_7.json +++ b/tests/runner/inplace-map/message_7.json @@ -1,6 +1,7 @@ { "_tag": "test4", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_8.json b/tests/runner/inplace-map/message_8.json index 98fa85bb5..9c8fdbe84 100644 --- a/tests/runner/inplace-map/message_8.json +++ b/tests/runner/inplace-map/message_8.json @@ -1,6 +1,7 @@ { "_tag": "test5", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/message_9.json b/tests/runner/inplace-map/message_9.json index 77838193d..7bad3734f 100644 --- a/tests/runner/inplace-map/message_9.json +++ b/tests/runner/inplace-map/message_9.json @@ -1,6 +1,7 @@ { "_tag": "test6", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/inplace-map/output_1.json b/tests/runner/inplace-map/output_1.json index 579f19708..2d09edbdc 100644 --- a/tests/runner/inplace-map/output_1.json +++ b/tests/runner/inplace-map/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7970", + "gas_remaining": "7962", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_10.json b/tests/runner/inplace-map/output_10.json index d10e9c08e..5a9a678f9 100644 --- a/tests/runner/inplace-map/output_10.json +++ b/tests/runner/inplace-map/output_10.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7973", + "gas_remaining": "7965", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_11.json b/tests/runner/inplace-map/output_11.json index d10e9c08e..b325a7d2e 100644 --- a/tests/runner/inplace-map/output_11.json +++ b/tests/runner/inplace-map/output_11.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7973", + "gas_remaining": "7966", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_12.json b/tests/runner/inplace-map/output_12.json index 70995d78e..d6bdad9e9 100644 --- a/tests/runner/inplace-map/output_12.json +++ b/tests/runner/inplace-map/output_12.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7972", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_13.json b/tests/runner/inplace-map/output_13.json index 70995d78e..d6bdad9e9 100644 --- a/tests/runner/inplace-map/output_13.json +++ b/tests/runner/inplace-map/output_13.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7972", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_14.json b/tests/runner/inplace-map/output_14.json index 71e9c0da1..ef3084923 100644 --- a/tests/runner/inplace-map/output_14.json +++ b/tests/runner/inplace-map/output_14.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7972", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_2.json b/tests/runner/inplace-map/output_2.json index 7c771e4db..fb6ee9514 100644 --- a/tests/runner/inplace-map/output_2.json +++ b/tests/runner/inplace-map/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7969", + "gas_remaining": "7962", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_3.json b/tests/runner/inplace-map/output_3.json index 38d9a7798..ecdd26850 100644 --- a/tests/runner/inplace-map/output_3.json +++ b/tests/runner/inplace-map/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7969", + "gas_remaining": "7962", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_4.json b/tests/runner/inplace-map/output_4.json index c4b3aa91a..92c18ad60 100644 --- a/tests/runner/inplace-map/output_4.json +++ b/tests/runner/inplace-map/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7970", + "gas_remaining": "7963", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_5.json b/tests/runner/inplace-map/output_5.json index 7c921ecd5..67e343ebc 100644 --- a/tests/runner/inplace-map/output_5.json +++ b/tests/runner/inplace-map/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7972", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_6.json b/tests/runner/inplace-map/output_6.json index 4aea893a3..463e0bc5d 100644 --- a/tests/runner/inplace-map/output_6.json +++ b/tests/runner/inplace-map/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7969", + "gas_remaining": "7962", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_7.json b/tests/runner/inplace-map/output_7.json index 514971265..74f3f1a75 100644 --- a/tests/runner/inplace-map/output_7.json +++ b/tests/runner/inplace-map/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7972", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_8.json b/tests/runner/inplace-map/output_8.json index da55bfd75..057ab81d2 100644 --- a/tests/runner/inplace-map/output_8.json +++ b/tests/runner/inplace-map/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7973", + "gas_remaining": "7965", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/inplace-map/output_9.json b/tests/runner/inplace-map/output_9.json index 6d1edd644..34576619b 100644 --- a/tests/runner/inplace-map/output_9.json +++ b/tests/runner/inplace-map/output_9.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7973", + "gas_remaining": "7965", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/listiter/message_1.json b/tests/runner/listiter/message_1.json index a485267e3..9980f64a7 100644 --- a/tests/runner/listiter/message_1.json +++ b/tests/runner/listiter/message_1.json @@ -1,32 +1,30 @@ { "_tag": "updateEntries", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "entries", - "type" : "List 0xabfeccdc9012345678901234567890f777567890.LIAdt", - "value" : - [ + "vname": "entries", + "type": "List 0xabfeccdc9012345678901234567890f777567890.LIAdt", + "value": [ { - "constructor" : "0xabfeccdc9012345678901234567890f777567890.LIC", - "argtypes" : [], - "arguments" : [ + "constructor": "0xabfeccdc9012345678901234567890f777567890.LIC", + "argtypes": [], + "arguments": [ "0x56785678901234567890123456789012345678cd", "666" - ] }, { - "constructor" : "0xabfeccdc9012345678901234567890f777567890.LIC", - "argtypes" : [], - "arguments" : [ + "constructor": "0xabfeccdc9012345678901234567890f777567890.LIC", + "argtypes": [], + "arguments": [ "0x98765678901234567890123456789012345678de", "777" ] } - ] } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/listiter/output_1.json b/tests/runner/listiter/output_1.json index d20931a9a..fcd2b83e4 100644 --- a/tests/runner/listiter/output_1.json +++ b/tests/runner/listiter/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7874", + "gas_remaining": "7872", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/loopy-tree-call/message_1.json b/tests/runner/loopy-tree-call/message_1.json index ac66d4122..8548f1298 100644 --- a/tests/runner/loopy-tree-call/message_1.json +++ b/tests/runner/loopy-tree-call/message_1.json @@ -1,22 +1,23 @@ { "_tag": "Exec", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname" : "chain_length", - "type" : "Uint32", - "value" : "1" + "vname": "chain_length", + "type": "Uint32", + "value": "1" }, { - "vname" : "other_instances", - "type" : "List ByStr20", - "value" : [ + "vname": "other_instances", + "type": "List ByStr20", + "value": [ "0x01345678901234567890123456789012345678ab", "0x02345678901234567890123456789012345678ab", "0x03345678901234567890123456789012345678ab", "0x04345678901234567890123456789012345678ab" ] } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/loopy-tree-call/output_1.json b/tests/runner/loopy-tree-call/output_1.json index e819918d1..6036af6a7 100644 --- a/tests/runner/loopy-tree-call/output_1.json +++ b/tests/runner/loopy-tree-call/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7588", + "gas_remaining": "7581", "_accepted": "false", "messages": [ { diff --git a/tests/runner/map_corners_test/message_1.json b/tests/runner/map_corners_test/message_1.json index ab3e973a1..3379d0c44 100644 --- a/tests/runner/map_corners_test/message_1.json +++ b/tests/runner/map_corners_test/message_1.json @@ -1 +1,7 @@ -{ "_tag": "t1", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t1", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_10.json b/tests/runner/map_corners_test/message_10.json index 6d6bb3a37..e21c74464 100644 --- a/tests/runner/map_corners_test/message_10.json +++ b/tests/runner/map_corners_test/message_10.json @@ -1 +1,7 @@ -{ "_tag": "t10", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t10", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_11.json b/tests/runner/map_corners_test/message_11.json index f2fb60039..eb89f7b64 100644 --- a/tests/runner/map_corners_test/message_11.json +++ b/tests/runner/map_corners_test/message_11.json @@ -1 +1,7 @@ -{ "_tag": "t11", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t11", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_12.json b/tests/runner/map_corners_test/message_12.json index 90bccdf0c..db1083d92 100644 --- a/tests/runner/map_corners_test/message_12.json +++ b/tests/runner/map_corners_test/message_12.json @@ -1 +1,7 @@ -{ "_tag": "t12", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t12", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_13.json b/tests/runner/map_corners_test/message_13.json index 4868a2abf..6534ad307 100644 --- a/tests/runner/map_corners_test/message_13.json +++ b/tests/runner/map_corners_test/message_13.json @@ -1 +1,7 @@ -{ "_tag": "t13", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t13", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_14.json b/tests/runner/map_corners_test/message_14.json index 066945330..bb43e7e80 100644 --- a/tests/runner/map_corners_test/message_14.json +++ b/tests/runner/map_corners_test/message_14.json @@ -1 +1,7 @@ -{ "_tag": "t14", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t14", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_15.json b/tests/runner/map_corners_test/message_15.json index 7cdf1a486..267592410 100644 --- a/tests/runner/map_corners_test/message_15.json +++ b/tests/runner/map_corners_test/message_15.json @@ -1 +1,7 @@ -{ "_tag": "t15", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t15", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_16.json b/tests/runner/map_corners_test/message_16.json index 84a09f842..976e5963e 100644 --- a/tests/runner/map_corners_test/message_16.json +++ b/tests/runner/map_corners_test/message_16.json @@ -1 +1,7 @@ -{ "_tag": "t16", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t16", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_17.json b/tests/runner/map_corners_test/message_17.json index 9ad26891e..4e441f9ba 100644 --- a/tests/runner/map_corners_test/message_17.json +++ b/tests/runner/map_corners_test/message_17.json @@ -1 +1,7 @@ -{ "_tag": "t17", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t17", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_18.json b/tests/runner/map_corners_test/message_18.json index e670c9bc1..2f827f756 100644 --- a/tests/runner/map_corners_test/message_18.json +++ b/tests/runner/map_corners_test/message_18.json @@ -1 +1,7 @@ -{ "_tag": "t18", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t18", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_2.json b/tests/runner/map_corners_test/message_2.json index 630c66ce6..c553cca7b 100644 --- a/tests/runner/map_corners_test/message_2.json +++ b/tests/runner/map_corners_test/message_2.json @@ -1 +1,7 @@ -{ "_tag": "t2", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t2", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_3.json b/tests/runner/map_corners_test/message_3.json index 57fb991c4..dc7d04973 100644 --- a/tests/runner/map_corners_test/message_3.json +++ b/tests/runner/map_corners_test/message_3.json @@ -1 +1,7 @@ -{ "_tag": "t3", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t3", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_4.json b/tests/runner/map_corners_test/message_4.json index 91aaf67b6..75798e675 100644 --- a/tests/runner/map_corners_test/message_4.json +++ b/tests/runner/map_corners_test/message_4.json @@ -1 +1,7 @@ -{ "_tag": "t4", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t4", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_5.json b/tests/runner/map_corners_test/message_5.json index b31d1cb5a..5f05043fa 100644 --- a/tests/runner/map_corners_test/message_5.json +++ b/tests/runner/map_corners_test/message_5.json @@ -1 +1,7 @@ -{ "_tag": "t5", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t5", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_6.json b/tests/runner/map_corners_test/message_6.json index 154c03349..21bf1e5a3 100644 --- a/tests/runner/map_corners_test/message_6.json +++ b/tests/runner/map_corners_test/message_6.json @@ -1 +1,7 @@ -{ "_tag": "t6", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t6", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_7.json b/tests/runner/map_corners_test/message_7.json index c2dedb1de..bdf7acdc0 100644 --- a/tests/runner/map_corners_test/message_7.json +++ b/tests/runner/map_corners_test/message_7.json @@ -1 +1,7 @@ -{ "_tag": "t7", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t7", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_8.json b/tests/runner/map_corners_test/message_8.json index 7c7d71906..408303bdc 100644 --- a/tests/runner/map_corners_test/message_8.json +++ b/tests/runner/map_corners_test/message_8.json @@ -1 +1,7 @@ -{ "_tag": "t8", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t8", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/message_9.json b/tests/runner/map_corners_test/message_9.json index 192f608dd..b71bc2688 100644 --- a/tests/runner/map_corners_test/message_9.json +++ b/tests/runner/map_corners_test/message_9.json @@ -1 +1,7 @@ -{ "_tag": "t9", "_amount": "0", "_sender" : "0x12345678901234567890123456789012345678ab", "params": [] } +{ + "_tag": "t9", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" +} diff --git a/tests/runner/map_corners_test/output_1.json b/tests/runner/map_corners_test/output_1.json index 3cc0520e3..57eda1fe2 100644 --- a/tests/runner/map_corners_test/output_1.json +++ b/tests/runner/map_corners_test/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7974", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_10.json b/tests/runner/map_corners_test/output_10.json index 4ec79e217..97ed08c73 100644 --- a/tests/runner/map_corners_test/output_10.json +++ b/tests/runner/map_corners_test/output_10.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7973", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_11.json b/tests/runner/map_corners_test/output_11.json index 5766dfb4e..1ecd8bfb8 100644 --- a/tests/runner/map_corners_test/output_11.json +++ b/tests/runner/map_corners_test/output_11.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7980", + "gas_remaining": "7971", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_12.json b/tests/runner/map_corners_test/output_12.json index 891cc3779..8b156fcc0 100644 --- a/tests/runner/map_corners_test/output_12.json +++ b/tests/runner/map_corners_test/output_12.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7980", + "gas_remaining": "7971", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_13.json b/tests/runner/map_corners_test/output_13.json index 63808488a..b2085954c 100644 --- a/tests/runner/map_corners_test/output_13.json +++ b/tests/runner/map_corners_test/output_13.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7974", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_14.json b/tests/runner/map_corners_test/output_14.json index 2bbecc5a3..3df08d84e 100644 --- a/tests/runner/map_corners_test/output_14.json +++ b/tests/runner/map_corners_test/output_14.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7975", + "gas_remaining": "7966", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_15.json b/tests/runner/map_corners_test/output_15.json index e3099e02f..2977d9302 100644 --- a/tests/runner/map_corners_test/output_15.json +++ b/tests/runner/map_corners_test/output_15.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7936", + "gas_remaining": "7926", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_16.json b/tests/runner/map_corners_test/output_16.json index 652c4ceec..f5dda570c 100644 --- a/tests/runner/map_corners_test/output_16.json +++ b/tests/runner/map_corners_test/output_16.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7948", + "gas_remaining": "7939", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_17.json b/tests/runner/map_corners_test/output_17.json index 119440261..ebee90ad0 100644 --- a/tests/runner/map_corners_test/output_17.json +++ b/tests/runner/map_corners_test/output_17.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7981", + "gas_remaining": "7972", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_18.json b/tests/runner/map_corners_test/output_18.json index e01b4fd41..26e2d4075 100644 --- a/tests/runner/map_corners_test/output_18.json +++ b/tests/runner/map_corners_test/output_18.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7981", + "gas_remaining": "7972", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_2.json b/tests/runner/map_corners_test/output_2.json index 8c02008b0..4ad146b36 100644 --- a/tests/runner/map_corners_test/output_2.json +++ b/tests/runner/map_corners_test/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7973", + "gas_remaining": "7964", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_3.json b/tests/runner/map_corners_test/output_3.json index 715c52508..42ae250e5 100644 --- a/tests/runner/map_corners_test/output_3.json +++ b/tests/runner/map_corners_test/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7975", + "gas_remaining": "7966", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_4.json b/tests/runner/map_corners_test/output_4.json index 703724cab..82723ef88 100644 --- a/tests/runner/map_corners_test/output_4.json +++ b/tests/runner/map_corners_test/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7978", + "gas_remaining": "7968", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_5.json b/tests/runner/map_corners_test/output_5.json index 304f2f832..6a7451a34 100644 --- a/tests/runner/map_corners_test/output_5.json +++ b/tests/runner/map_corners_test/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7963", + "gas_remaining": "7954", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_6.json b/tests/runner/map_corners_test/output_6.json index 893e83648..9ea69d23c 100644 --- a/tests/runner/map_corners_test/output_6.json +++ b/tests/runner/map_corners_test/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7962", + "gas_remaining": "7953", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_7.json b/tests/runner/map_corners_test/output_7.json index 35b828101..0dedb7c0a 100644 --- a/tests/runner/map_corners_test/output_7.json +++ b/tests/runner/map_corners_test/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7969", + "gas_remaining": "7960", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_8.json b/tests/runner/map_corners_test/output_8.json index ce8d3a580..0b94ba460 100644 --- a/tests/runner/map_corners_test/output_8.json +++ b/tests/runner/map_corners_test/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7969", + "gas_remaining": "7959", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_corners_test/output_9.json b/tests/runner/map_corners_test/output_9.json index 8ddf16d4a..e0b6b2a1c 100644 --- a/tests/runner/map_corners_test/output_9.json +++ b/tests/runner/map_corners_test/output_9.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7975", + "gas_remaining": "7966", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/map_key_test/message_1.json b/tests/runner/map_key_test/message_1.json index a2bd7224c..c23989078 100644 --- a/tests/runner/map_key_test/message_1.json +++ b/tests/runner/map_key_test/message_1.json @@ -1,6 +1,7 @@ { - "_tag" : "testMapKey5", - "_amount" : "0", - "_sender" : "0x12345678901234567890123456789012345678cd", - "params" : [] + "_tag": "testMapKey5", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678cd", + "params": [], + "_origin": "0x12345678901234567890123456789012345678cd" } diff --git a/tests/runner/map_key_test/output_1.json b/tests/runner/map_key_test/output_1.json index a5d6996d2..dd47781a1 100644 --- a/tests/runner/map_key_test/output_1.json +++ b/tests/runner/map_key_test/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7980", + "gas_remaining": "7973", "_accepted": "false", "messages": [], "states": [ { "vname": "_balance", "type": "Uint128", "value": "0" } ], diff --git a/tests/runner/mappair/message_1.json b/tests/runner/mappair/message_1.json index deaf11c98..f895d3adc 100644 --- a/tests/runner/mappair/message_1.json +++ b/tests/runner/mappair/message_1.json @@ -1,6 +1,7 @@ { "_tag": "testMapPair", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_12.json b/tests/runner/mappair/message_12.json index 784e3c741..181aab1cb 100644 --- a/tests/runner/mappair/message_12.json +++ b/tests/runner/mappair/message_12.json @@ -1,12 +1,13 @@ { "_tag": "addNumToList", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "num", - "type" : "Int64", - "value" : "2" + "vname": "num", + "type": "Int64", + "value": "2" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_13.json b/tests/runner/mappair/message_13.json index 913724243..093cdaa27 100644 --- a/tests/runner/mappair/message_13.json +++ b/tests/runner/mappair/message_13.json @@ -1,6 +1,7 @@ { "_tag": "incNat", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_14.json b/tests/runner/mappair/message_14.json index deaf11c98..f895d3adc 100644 --- a/tests/runner/mappair/message_14.json +++ b/tests/runner/mappair/message_14.json @@ -1,6 +1,7 @@ { "_tag": "testMapPair", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_2.json b/tests/runner/mappair/message_2.json index 784e3c741..181aab1cb 100644 --- a/tests/runner/mappair/message_2.json +++ b/tests/runner/mappair/message_2.json @@ -1,12 +1,13 @@ { "_tag": "addNumToList", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "num", - "type" : "Int64", - "value" : "2" + "vname": "num", + "type": "Int64", + "value": "2" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_3.json b/tests/runner/mappair/message_3.json index 6b49526fc..20d380a77 100644 --- a/tests/runner/mappair/message_3.json +++ b/tests/runner/mappair/message_3.json @@ -1,12 +1,13 @@ { "_tag": "addNumToList", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "num", - "type" : "Int64", - "value" : "3" + "vname": "num", + "type": "Int64", + "value": "3" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_4.json b/tests/runner/mappair/message_4.json index 913724243..093cdaa27 100644 --- a/tests/runner/mappair/message_4.json +++ b/tests/runner/mappair/message_4.json @@ -1,6 +1,7 @@ { "_tag": "incNat", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_5.json b/tests/runner/mappair/message_5.json index 913724243..093cdaa27 100644 --- a/tests/runner/mappair/message_5.json +++ b/tests/runner/mappair/message_5.json @@ -1,6 +1,7 @@ { "_tag": "incNat", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_6.json b/tests/runner/mappair/message_6.json index 651adc243..cce4b7cff 100644 --- a/tests/runner/mappair/message_6.json +++ b/tests/runner/mappair/message_6.json @@ -1,6 +1,7 @@ { "_tag": "lflatten", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_7.json b/tests/runner/mappair/message_7.json index afcceb1c1..7081d7efd 100644 --- a/tests/runner/mappair/message_7.json +++ b/tests/runner/mappair/message_7.json @@ -1,6 +1,7 @@ { "_tag": "optlist", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/message_8.json b/tests/runner/mappair/message_8.json index 913724243..093cdaa27 100644 --- a/tests/runner/mappair/message_8.json +++ b/tests/runner/mappair/message_8.json @@ -1,6 +1,7 @@ { "_tag": "incNat", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", - "params": [] + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/mappair/output_1.json b/tests/runner/mappair/output_1.json index 7f7af7ce3..a60560589 100644 --- a/tests/runner/mappair/output_1.json +++ b/tests/runner/mappair/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7965", + "gas_remaining": "7958", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/mappair/output_12.json b/tests/runner/mappair/output_12.json index c60259e48..8d3a47fae 100644 --- a/tests/runner/mappair/output_12.json +++ b/tests/runner/mappair/output_12.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7963", + "gas_remaining": "7956", "errors": [ { "error_message": diff --git a/tests/runner/mappair/output_13.json b/tests/runner/mappair/output_13.json index 1f6ccfff4..077915e08 100644 --- a/tests/runner/mappair/output_13.json +++ b/tests/runner/mappair/output_13.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7978", + "gas_remaining": "7970", "errors": [ { "error_message": diff --git a/tests/runner/mappair/output_14.json b/tests/runner/mappair/output_14.json index 544229d11..0efddaf09 100644 --- a/tests/runner/mappair/output_14.json +++ b/tests/runner/mappair/output_14.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7970", + "gas_remaining": "7963", "errors": [ { "error_message": diff --git a/tests/runner/mappair/output_2.json b/tests/runner/mappair/output_2.json index 2978bade5..56fcb5655 100644 --- a/tests/runner/mappair/output_2.json +++ b/tests/runner/mappair/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7929", + "gas_remaining": "7922", "_accepted": "false", "messages": [ { diff --git a/tests/runner/mappair/output_3.json b/tests/runner/mappair/output_3.json index 905503bdd..be8d2e43c 100644 --- a/tests/runner/mappair/output_3.json +++ b/tests/runner/mappair/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7926", + "gas_remaining": "7919", "_accepted": "false", "messages": [ { diff --git a/tests/runner/mappair/output_4.json b/tests/runner/mappair/output_4.json index b2185d728..7da3c1da8 100644 --- a/tests/runner/mappair/output_4.json +++ b/tests/runner/mappair/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7948", + "gas_remaining": "7940", "_accepted": "false", "messages": [ { diff --git a/tests/runner/mappair/output_5.json b/tests/runner/mappair/output_5.json index 7bfb9f03c..9f1b53faa 100644 --- a/tests/runner/mappair/output_5.json +++ b/tests/runner/mappair/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7946", + "gas_remaining": "7939", "_accepted": "false", "messages": [ { diff --git a/tests/runner/mappair/output_6.json b/tests/runner/mappair/output_6.json index be3aedd45..9f477fb4e 100644 --- a/tests/runner/mappair/output_6.json +++ b/tests/runner/mappair/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7919", + "gas_remaining": "7911", "_accepted": "false", "messages": [ { diff --git a/tests/runner/mappair/output_7.json b/tests/runner/mappair/output_7.json index 03fc7b22b..faf6b4a7a 100644 --- a/tests/runner/mappair/output_7.json +++ b/tests/runner/mappair/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7946", + "gas_remaining": "7938", "_accepted": "false", "messages": [ { diff --git a/tests/runner/mappair/output_8.json b/tests/runner/mappair/output_8.json index f9b122c08..4f7e9d132 100644 --- a/tests/runner/mappair/output_8.json +++ b/tests/runner/mappair/output_8.json @@ -1,5 +1,5 @@ { - "gas_remaining": "7978", + "gas_remaining": "7970", "errors": [ { "error_message": diff --git a/tests/runner/multiple-msgs/message_1.json b/tests/runner/multiple-msgs/message_1.json index 6e425303a..931807765 100644 --- a/tests/runner/multiple-msgs/message_1.json +++ b/tests/runner/multiple-msgs/message_1.json @@ -1,6 +1,7 @@ { "_tag": "multipleMsgs", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", - "params": [] + "_sender": "0x1234567890123456789012345678906784567890", + "params": [], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/multiple-msgs/output_1.json b/tests/runner/multiple-msgs/output_1.json index fbcc515a2..09dc42330 100644 --- a/tests/runner/multiple-msgs/output_1.json +++ b/tests/runner/multiple-msgs/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7946", + "gas_remaining": "7939", "_accepted": "false", "messages": [ { diff --git a/tests/runner/nonfungible-token/message_1.json b/tests/runner/nonfungible-token/message_1.json index 884604153..4a7349069 100644 --- a/tests/runner/nonfungible-token/message_1.json +++ b/tests/runner/nonfungible-token/message_1.json @@ -1,7 +1,7 @@ { "_tag": "mint", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "to", @@ -9,9 +9,10 @@ "value": "0x1234567890123456789012345678901234567892" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "1" + "value": "1" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567890" +} diff --git a/tests/runner/nonfungible-token/message_10.json b/tests/runner/nonfungible-token/message_10.json index 76da3ad58..446e41f03 100644 --- a/tests/runner/nonfungible-token/message_10.json +++ b/tests/runner/nonfungible-token/message_10.json @@ -1,7 +1,7 @@ { "_tag": "transferFrom", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567891", + "_sender": "0x1234567890123456789012345678901234567891", "params": [ { "vname": "from", @@ -14,9 +14,10 @@ "value": "0x1234567890123456789012345678901234567891" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "2" + "value": "2" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567891" +} diff --git a/tests/runner/nonfungible-token/message_11.json b/tests/runner/nonfungible-token/message_11.json index f153adc4a..ce066f5bd 100644 --- a/tests/runner/nonfungible-token/message_11.json +++ b/tests/runner/nonfungible-token/message_11.json @@ -1,7 +1,7 @@ { "_tag": "transferFrom", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567891", + "_sender": "0x1234567890123456789012345678901234567891", "params": [ { "vname": "from", @@ -14,9 +14,10 @@ "value": "0x1234567890123456789012345678901234567893" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "1" + "value": "1" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567891" +} diff --git a/tests/runner/nonfungible-token/message_12.json b/tests/runner/nonfungible-token/message_12.json index 909af7158..86890cf28 100644 --- a/tests/runner/nonfungible-token/message_12.json +++ b/tests/runner/nonfungible-token/message_12.json @@ -1,7 +1,7 @@ { "_tag": "approve", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567891", + "_sender": "0x1234567890123456789012345678901234567891", "params": [ { "vname": "to", @@ -13,5 +13,6 @@ "type": "Uint256", "value": "1" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567891" +} diff --git a/tests/runner/nonfungible-token/message_2.json b/tests/runner/nonfungible-token/message_2.json index 5c013d2c1..eaaada9aa 100644 --- a/tests/runner/nonfungible-token/message_2.json +++ b/tests/runner/nonfungible-token/message_2.json @@ -1,7 +1,7 @@ { "_tag": "mint", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "to", @@ -9,9 +9,10 @@ "value": "0x1234567890123456789012345678901234567892" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "2" + "value": "2" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/nonfungible-token/message_21.json b/tests/runner/nonfungible-token/message_21.json index 6f0af1352..15edbd197 100644 --- a/tests/runner/nonfungible-token/message_21.json +++ b/tests/runner/nonfungible-token/message_21.json @@ -1,7 +1,7 @@ { "_tag": "mint", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "to", @@ -9,9 +9,10 @@ "value": "0x1234567890123456789012345678901234567892" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "1" + "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/nonfungible-token/message_22.json b/tests/runner/nonfungible-token/message_22.json index dbc8910a7..4a7349069 100644 --- a/tests/runner/nonfungible-token/message_22.json +++ b/tests/runner/nonfungible-token/message_22.json @@ -1,7 +1,7 @@ { "_tag": "mint", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "to", @@ -9,9 +9,10 @@ "value": "0x1234567890123456789012345678901234567892" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "1" + "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/nonfungible-token/message_23.json b/tests/runner/nonfungible-token/message_23.json index 8e171707c..d5a772854 100644 --- a/tests/runner/nonfungible-token/message_23.json +++ b/tests/runner/nonfungible-token/message_23.json @@ -1,7 +1,7 @@ { "_tag": "transferFrom", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567894", + "_sender": "0x1234567890123456789012345678901234567894", "params": [ { "vname": "from", @@ -14,9 +14,10 @@ "value": "0x1234567890123456789012345678901234567891" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "1" + "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567894" } diff --git a/tests/runner/nonfungible-token/message_24.json b/tests/runner/nonfungible-token/message_24.json index 4eaf1b1dc..addce3394 100644 --- a/tests/runner/nonfungible-token/message_24.json +++ b/tests/runner/nonfungible-token/message_24.json @@ -1,7 +1,7 @@ { "_tag": "transferFrom", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "from", @@ -14,9 +14,10 @@ "value": "0x1234567890123456789012345678901234567891" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "3" + "value": "3" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567892" } diff --git a/tests/runner/nonfungible-token/message_25.json b/tests/runner/nonfungible-token/message_25.json index ffaf4bad0..09c4c272d 100644 --- a/tests/runner/nonfungible-token/message_25.json +++ b/tests/runner/nonfungible-token/message_25.json @@ -1,7 +1,7 @@ { "_tag": "transferFrom", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "from", @@ -14,9 +14,10 @@ "value": "0x1234567890123456789012345678901234567891" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "1" + "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567892" } diff --git a/tests/runner/nonfungible-token/message_26.json b/tests/runner/nonfungible-token/message_26.json index 0705bebcc..f120abeaf 100644 --- a/tests/runner/nonfungible-token/message_26.json +++ b/tests/runner/nonfungible-token/message_26.json @@ -1,7 +1,7 @@ { "_tag": "approve", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "to", @@ -13,5 +13,6 @@ "type": "Uint256", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/nonfungible-token/message_27.json b/tests/runner/nonfungible-token/message_27.json index 3353a0cee..fd1723b45 100644 --- a/tests/runner/nonfungible-token/message_27.json +++ b/tests/runner/nonfungible-token/message_27.json @@ -1,7 +1,7 @@ { "_tag": "setApprovalForAll", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "to", @@ -12,10 +12,11 @@ "vname": "approved", "type": "Bool", "value": { - "constructor": "True", - "argtypes": [], - "arguments": [] + "constructor": "True", + "argtypes": [], + "arguments": [] } - } - ] + } + ], + "_origin": "0x1234567890123456789012345678901234567892" } diff --git a/tests/runner/nonfungible-token/message_3.json b/tests/runner/nonfungible-token/message_3.json index 48a9cc3e4..0710f2550 100644 --- a/tests/runner/nonfungible-token/message_3.json +++ b/tests/runner/nonfungible-token/message_3.json @@ -1,7 +1,7 @@ { "_tag": "transferFrom", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "from", @@ -14,9 +14,10 @@ "value": "0x1234567890123456789012345678901234567891" }, { - "vname" : "tokenId", + "vname": "tokenId", "type": "Uint256", - "value" : "1" + "value": "1" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567892" +} diff --git a/tests/runner/nonfungible-token/message_4.json b/tests/runner/nonfungible-token/message_4.json index 997440154..1f9a5eb2b 100644 --- a/tests/runner/nonfungible-token/message_4.json +++ b/tests/runner/nonfungible-token/message_4.json @@ -1,12 +1,13 @@ { "_tag": "balanceOf", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "address", "type": "ByStr20", "value": "0x1234567890123456789012345678901234567891" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567892" +} diff --git a/tests/runner/nonfungible-token/message_5.json b/tests/runner/nonfungible-token/message_5.json index 997440154..1f9a5eb2b 100644 --- a/tests/runner/nonfungible-token/message_5.json +++ b/tests/runner/nonfungible-token/message_5.json @@ -1,12 +1,13 @@ { "_tag": "balanceOf", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "address", "type": "ByStr20", "value": "0x1234567890123456789012345678901234567891" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567892" +} diff --git a/tests/runner/nonfungible-token/message_6.json b/tests/runner/nonfungible-token/message_6.json index 375709a97..c715e8c36 100644 --- a/tests/runner/nonfungible-token/message_6.json +++ b/tests/runner/nonfungible-token/message_6.json @@ -1,12 +1,13 @@ { "_tag": "ownerOf", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "tokenId", "type": "Uint256", "value": "1" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567892" +} diff --git a/tests/runner/nonfungible-token/message_7.json b/tests/runner/nonfungible-token/message_7.json index 5ee6703d3..0678e1e37 100644 --- a/tests/runner/nonfungible-token/message_7.json +++ b/tests/runner/nonfungible-token/message_7.json @@ -1,7 +1,7 @@ { "_tag": "approve", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "to", @@ -13,5 +13,6 @@ "type": "Uint256", "value": "1" } - ] -} \ No newline at end of file + ], + "_origin": "0x1234567890123456789012345678901234567892" +} diff --git a/tests/runner/nonfungible-token/message_8.json b/tests/runner/nonfungible-token/message_8.json index eda3e1a1c..464af1639 100644 --- a/tests/runner/nonfungible-token/message_8.json +++ b/tests/runner/nonfungible-token/message_8.json @@ -1,7 +1,7 @@ { "_tag": "setApprovalForAll", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "to", @@ -12,10 +12,11 @@ "vname": "approved", "type": "Bool", "value": { - "constructor": "True", - "argtypes": [], - "arguments": [] + "constructor": "True", + "argtypes": [], + "arguments": [] } - } - ] -} \ No newline at end of file + } + ], + "_origin": "0x1234567890123456789012345678901234567892" +} diff --git a/tests/runner/nonfungible-token/message_9.json b/tests/runner/nonfungible-token/message_9.json index a31e649a5..1e6df48e4 100644 --- a/tests/runner/nonfungible-token/message_9.json +++ b/tests/runner/nonfungible-token/message_9.json @@ -1,7 +1,7 @@ { "_tag": "setApprovalForAll", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567892", + "_sender": "0x1234567890123456789012345678901234567892", "params": [ { "vname": "to", @@ -12,10 +12,11 @@ "vname": "approved", "type": "Bool", "value": { - "constructor": "True", - "argtypes": [], - "arguments": [] + "constructor": "True", + "argtypes": [], + "arguments": [] } - } - ] -} \ No newline at end of file + } + ], + "_origin": "0x1234567890123456789012345678901234567892" +} diff --git a/tests/runner/nonfungible-token/output_1.json b/tests/runner/nonfungible-token/output_1.json index 3853beefe..cf88e844f 100644 --- a/tests/runner/nonfungible-token/output_1.json +++ b/tests/runner/nonfungible-token/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7912", + "gas_remaining": "7904", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_10.json b/tests/runner/nonfungible-token/output_10.json index cedbf2a75..738f92cf1 100644 --- a/tests/runner/nonfungible-token/output_10.json +++ b/tests/runner/nonfungible-token/output_10.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7845", + "gas_remaining": "7838", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_11.json b/tests/runner/nonfungible-token/output_11.json index 101fdd064..ef4a277cb 100644 --- a/tests/runner/nonfungible-token/output_11.json +++ b/tests/runner/nonfungible-token/output_11.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7842", + "gas_remaining": "7835", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_12.json b/tests/runner/nonfungible-token/output_12.json index 508248e36..5d0a4151a 100644 --- a/tests/runner/nonfungible-token/output_12.json +++ b/tests/runner/nonfungible-token/output_12.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7893", + "gas_remaining": "7885", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_2.json b/tests/runner/nonfungible-token/output_2.json index cce7c011b..9456db4f5 100644 --- a/tests/runner/nonfungible-token/output_2.json +++ b/tests/runner/nonfungible-token/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7899", + "gas_remaining": "7892", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_21.json b/tests/runner/nonfungible-token/output_21.json index 668134aff..35a6835be 100644 --- a/tests/runner/nonfungible-token/output_21.json +++ b/tests/runner/nonfungible-token/output_21.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7928", + "gas_remaining": "7920", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_22.json b/tests/runner/nonfungible-token/output_22.json index e512b4ce1..8c94648d1 100644 --- a/tests/runner/nonfungible-token/output_22.json +++ b/tests/runner/nonfungible-token/output_22.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7921", + "gas_remaining": "7913", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_23.json b/tests/runner/nonfungible-token/output_23.json index ea5267a99..278ede01f 100644 --- a/tests/runner/nonfungible-token/output_23.json +++ b/tests/runner/nonfungible-token/output_23.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7885", + "gas_remaining": "7877", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_24.json b/tests/runner/nonfungible-token/output_24.json index eedcb7d9e..668c2df66 100644 --- a/tests/runner/nonfungible-token/output_24.json +++ b/tests/runner/nonfungible-token/output_24.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7898", + "gas_remaining": "7890", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_25.json b/tests/runner/nonfungible-token/output_25.json index 02d7596d3..6925b8449 100644 --- a/tests/runner/nonfungible-token/output_25.json +++ b/tests/runner/nonfungible-token/output_25.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7887", + "gas_remaining": "7879", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_26.json b/tests/runner/nonfungible-token/output_26.json index c5aaa3aee..ad27dca7a 100644 --- a/tests/runner/nonfungible-token/output_26.json +++ b/tests/runner/nonfungible-token/output_26.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7909", + "gas_remaining": "7901", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_27.json b/tests/runner/nonfungible-token/output_27.json index dfa7afa3d..eff4eee5b 100644 --- a/tests/runner/nonfungible-token/output_27.json +++ b/tests/runner/nonfungible-token/output_27.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7912", + "gas_remaining": "7904", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_3.json b/tests/runner/nonfungible-token/output_3.json index 0f45221ca..b21d6db68 100644 --- a/tests/runner/nonfungible-token/output_3.json +++ b/tests/runner/nonfungible-token/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7851", + "gas_remaining": "7844", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_4.json b/tests/runner/nonfungible-token/output_4.json index 785356677..dd0cc399b 100644 --- a/tests/runner/nonfungible-token/output_4.json +++ b/tests/runner/nonfungible-token/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7945", + "gas_remaining": "7937", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_5.json b/tests/runner/nonfungible-token/output_5.json index 785356677..dd0cc399b 100644 --- a/tests/runner/nonfungible-token/output_5.json +++ b/tests/runner/nonfungible-token/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7945", + "gas_remaining": "7937", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_6.json b/tests/runner/nonfungible-token/output_6.json index b3eac2575..fc6343f25 100644 --- a/tests/runner/nonfungible-token/output_6.json +++ b/tests/runner/nonfungible-token/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7943", + "gas_remaining": "7935", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_7.json b/tests/runner/nonfungible-token/output_7.json index da3535540..f8cfe03d8 100644 --- a/tests/runner/nonfungible-token/output_7.json +++ b/tests/runner/nonfungible-token/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7899", + "gas_remaining": "7891", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_8.json b/tests/runner/nonfungible-token/output_8.json index 7621cafc7..2d77efc8a 100644 --- a/tests/runner/nonfungible-token/output_8.json +++ b/tests/runner/nonfungible-token/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7904", + "gas_remaining": "7896", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/nonfungible-token/output_9.json b/tests/runner/nonfungible-token/output_9.json index f02458240..b8d8d4b03 100644 --- a/tests/runner/nonfungible-token/output_9.json +++ b/tests/runner/nonfungible-token/output_9.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7899", + "gas_remaining": "7890", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/one-msg/message_1.json b/tests/runner/one-msg/message_1.json index 6fa2611dc..e72a78e9a 100644 --- a/tests/runner/one-msg/message_1.json +++ b/tests/runner/one-msg/message_1.json @@ -1,6 +1,7 @@ { "_tag": "onemsg", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", - "params": [] + "_sender": "0x1234567890123456789012345678906784567890", + "params": [], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/one-msg/output_1.json b/tests/runner/one-msg/output_1.json index 2ee085cea..4b7199ea7 100644 --- a/tests/runner/one-msg/output_1.json +++ b/tests/runner/one-msg/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7961", + "gas_remaining": "7954", "_accepted": "false", "messages": [ { diff --git a/tests/runner/one-msg1/message_1.json b/tests/runner/one-msg1/message_1.json index 6fa2611dc..e72a78e9a 100644 --- a/tests/runner/one-msg1/message_1.json +++ b/tests/runner/one-msg1/message_1.json @@ -1,6 +1,7 @@ { "_tag": "onemsg", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", - "params": [] + "_sender": "0x1234567890123456789012345678906784567890", + "params": [], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/one-msg1/output_1.json b/tests/runner/one-msg1/output_1.json index 2ee085cea..a733529d4 100644 --- a/tests/runner/one-msg1/output_1.json +++ b/tests/runner/one-msg1/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7961", + "gas_remaining": "7953", "_accepted": "false", "messages": [ { diff --git a/tests/runner/ping/message_0.json b/tests/runner/ping/message_0.json index 6e4fa6ef6..133c4e359 100644 --- a/tests/runner/ping/message_0.json +++ b/tests/runner/ping/message_0.json @@ -3,11 +3,11 @@ "_amount": "0", "_sender": "0xab92d4dfafd282e8a8b3c776eb9fc907d321e21a", "params": [ - { - "vname": "pongAddr", - "type": "ByStr20", - "value": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a" - } - - ] + { + "vname": "pongAddr", + "type": "ByStr20", + "value": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a" + } + ], + "_origin": "0xab92d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/ping/message_1.json b/tests/runner/ping/message_1.json index e7d6281e3..c62c3fdb3 100644 --- a/tests/runner/ping/message_1.json +++ b/tests/runner/ping/message_1.json @@ -2,5 +2,6 @@ "_tag": "Ping", "_amount": "0", "_sender": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a", - "params": [] + "params": [], + "_origin": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/ping/message_2.json b/tests/runner/ping/message_2.json index e7d6281e3..c62c3fdb3 100644 --- a/tests/runner/ping/message_2.json +++ b/tests/runner/ping/message_2.json @@ -2,5 +2,6 @@ "_tag": "Ping", "_amount": "0", "_sender": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a", - "params": [] + "params": [], + "_origin": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/ping/message_3.json b/tests/runner/ping/message_3.json index e7d6281e3..c62c3fdb3 100644 --- a/tests/runner/ping/message_3.json +++ b/tests/runner/ping/message_3.json @@ -2,5 +2,6 @@ "_tag": "Ping", "_amount": "0", "_sender": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a", - "params": [] + "params": [], + "_origin": "0x2992d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/ping/output_0.json b/tests/runner/ping/output_0.json index 38d0289d9..9560c4688 100644 --- a/tests/runner/ping/output_0.json +++ b/tests/runner/ping/output_0.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7961", + "gas_remaining": "7952", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/ping/output_1.json b/tests/runner/ping/output_1.json index 44a47694b..f0149b0ab 100644 --- a/tests/runner/ping/output_1.json +++ b/tests/runner/ping/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7956", + "gas_remaining": "7949", "_accepted": "false", "messages": [ { diff --git a/tests/runner/ping/output_2.json b/tests/runner/ping/output_2.json index d197cf15f..71e800218 100644 --- a/tests/runner/ping/output_2.json +++ b/tests/runner/ping/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7956", + "gas_remaining": "7949", "_accepted": "false", "messages": [ { diff --git a/tests/runner/ping/output_3.json b/tests/runner/ping/output_3.json index cbf9a7b8c..300325cd1 100644 --- a/tests/runner/ping/output_3.json +++ b/tests/runner/ping/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7973", + "gas_remaining": "7965", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/pong/message_0.json b/tests/runner/pong/message_0.json index 7a12e7e3b..c7be99905 100644 --- a/tests/runner/pong/message_0.json +++ b/tests/runner/pong/message_0.json @@ -3,10 +3,11 @@ "_amount": "0", "_sender": "0xab92d4dfafd282e8a8b3c776eb9fc907d321e21a", "params": [ - { - "vname": "pingAddr", - "type": "ByStr20", - "value": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a" - } - ] + { + "vname": "pingAddr", + "type": "ByStr20", + "value": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a" + } + ], + "_origin": "0xab92d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/pong/message_1.json b/tests/runner/pong/message_1.json index 9780f971b..a7d31a59f 100644 --- a/tests/runner/pong/message_1.json +++ b/tests/runner/pong/message_1.json @@ -2,5 +2,6 @@ "_tag": "Pong", "_amount": "0", "_sender": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a", - "params": [] + "params": [], + "_origin": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/pong/message_2.json b/tests/runner/pong/message_2.json index 9780f971b..a7d31a59f 100644 --- a/tests/runner/pong/message_2.json +++ b/tests/runner/pong/message_2.json @@ -2,5 +2,6 @@ "_tag": "Pong", "_amount": "0", "_sender": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a", - "params": [] + "params": [], + "_origin": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/pong/message_3.json b/tests/runner/pong/message_3.json index 9780f971b..a7d31a59f 100644 --- a/tests/runner/pong/message_3.json +++ b/tests/runner/pong/message_3.json @@ -2,5 +2,6 @@ "_tag": "Pong", "_amount": "0", "_sender": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a", - "params": [] + "params": [], + "_origin": "0x1992d4dfafd282e8a8b3c776eb9fc907d321e21a" } diff --git a/tests/runner/pong/output_0.json b/tests/runner/pong/output_0.json index 064f099f3..501904fe5 100644 --- a/tests/runner/pong/output_0.json +++ b/tests/runner/pong/output_0.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7961", + "gas_remaining": "7952", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/pong/output_1.json b/tests/runner/pong/output_1.json index 56923e3d3..58d2d8c2d 100644 --- a/tests/runner/pong/output_1.json +++ b/tests/runner/pong/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7956", + "gas_remaining": "7949", "_accepted": "false", "messages": [ { diff --git a/tests/runner/pong/output_2.json b/tests/runner/pong/output_2.json index f674c712b..96e948fb0 100644 --- a/tests/runner/pong/output_2.json +++ b/tests/runner/pong/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7956", + "gas_remaining": "7949", "_accepted": "false", "messages": [ { diff --git a/tests/runner/pong/output_3.json b/tests/runner/pong/output_3.json index 01380634e..77a59e17a 100644 --- a/tests/runner/pong/output_3.json +++ b/tests/runner/pong/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7977", + "gas_remaining": "7969", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/salarybot/message_0.json b/tests/runner/salarybot/message_0.json index 844e045a2..1c040f692 100644 --- a/tests/runner/salarybot/message_0.json +++ b/tests/runner/salarybot/message_0.json @@ -1,6 +1,7 @@ { "_tag": "add_funds", "_amount": "1000000", - "_sender" : "0x1234567890123456789012345678901234567890", - "params": [] + "_sender": "0x1234567890123456789012345678901234567890", + "params": [], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/salarybot/message_1.json b/tests/runner/salarybot/message_1.json index 252770222..1cb629e91 100644 --- a/tests/runner/salarybot/message_1.json +++ b/tests/runner/salarybot/message_1.json @@ -1,17 +1,18 @@ { "_tag": "add_employee", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname" : "emp_addr", - "type" : "ByStr20", - "value" : "0x00345678901234567890123456789012345678ab" + "vname": "emp_addr", + "type": "ByStr20", + "value": "0x00345678901234567890123456789012345678ab" }, { - "vname" : "salary", - "type" : "Uint128", - "value" : "10000" + "vname": "salary", + "type": "Uint128", + "value": "10000" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/salarybot/message_2.json b/tests/runner/salarybot/message_2.json index 6957a0b24..0f615dd57 100644 --- a/tests/runner/salarybot/message_2.json +++ b/tests/runner/salarybot/message_2.json @@ -1,17 +1,18 @@ { "_tag": "add_employee", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname" : "emp_addr", - "type" : "ByStr20", - "value" : "0x01345678901234567890123456789012345678ab" + "vname": "emp_addr", + "type": "ByStr20", + "value": "0x01345678901234567890123456789012345678ab" }, { - "vname" : "salary", - "type" : "Uint128", - "value" : "11000" + "vname": "salary", + "type": "Uint128", + "value": "11000" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/salarybot/message_3.json b/tests/runner/salarybot/message_3.json index 9183c1adc..7085ecf6a 100644 --- a/tests/runner/salarybot/message_3.json +++ b/tests/runner/salarybot/message_3.json @@ -1,17 +1,18 @@ { "_tag": "add_employee", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname" : "emp_addr", - "type" : "ByStr20", - "value" : "0x02345678901234567890123456789012345678ab" + "vname": "emp_addr", + "type": "ByStr20", + "value": "0x02345678901234567890123456789012345678ab" }, { - "vname" : "salary", - "type" : "Uint128", - "value" : "12000" + "vname": "salary", + "type": "Uint128", + "value": "12000" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/salarybot/message_4.json b/tests/runner/salarybot/message_4.json index 13278ff60..dd5ed391d 100644 --- a/tests/runner/salarybot/message_4.json +++ b/tests/runner/salarybot/message_4.json @@ -1,12 +1,13 @@ { "_tag": "remove_employee", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { - "vname" : "emp_addr", - "type" : "ByStr20", - "value" : "0x00345678901234567890123456789012345678ab" + "vname": "emp_addr", + "type": "ByStr20", + "value": "0x00345678901234567890123456789012345678ab" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/salarybot/message_5.json b/tests/runner/salarybot/message_5.json index 956103e2b..9c2605fab 100644 --- a/tests/runner/salarybot/message_5.json +++ b/tests/runner/salarybot/message_5.json @@ -1,6 +1,7 @@ { "_tag": "pay_all_salaries", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", - "params": [] + "_sender": "0x1234567890123456789012345678901234567890", + "params": [], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/salarybot/output_0.json b/tests/runner/salarybot/output_0.json index bc78f410e..8adf8c080 100644 --- a/tests/runner/salarybot/output_0.json +++ b/tests/runner/salarybot/output_0.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7972", + "gas_remaining": "7965", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/salarybot/output_1.json b/tests/runner/salarybot/output_1.json index 088d4e847..6b6b3836b 100644 --- a/tests/runner/salarybot/output_1.json +++ b/tests/runner/salarybot/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7926", + "gas_remaining": "7919", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/salarybot/output_2.json b/tests/runner/salarybot/output_2.json index 0533daaa3..bb037d290 100644 --- a/tests/runner/salarybot/output_2.json +++ b/tests/runner/salarybot/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7926", + "gas_remaining": "7919", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/salarybot/output_3.json b/tests/runner/salarybot/output_3.json index ebae7596e..68b0ddc3b 100644 --- a/tests/runner/salarybot/output_3.json +++ b/tests/runner/salarybot/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7926", + "gas_remaining": "7919", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/salarybot/output_4.json b/tests/runner/salarybot/output_4.json index 5ca08f254..b4d227b83 100644 --- a/tests/runner/salarybot/output_4.json +++ b/tests/runner/salarybot/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7942", + "gas_remaining": "7934", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/salarybot/output_5.json b/tests/runner/salarybot/output_5.json index a3633fb15..0068a31a6 100644 --- a/tests/runner/salarybot/output_5.json +++ b/tests/runner/salarybot/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7927", + "gas_remaining": "7920", "_accepted": "false", "messages": [ { diff --git a/tests/runner/schnorr/message_1.json b/tests/runner/schnorr/message_1.json index a58d750aa..c38452590 100644 --- a/tests/runner/schnorr/message_1.json +++ b/tests/runner/schnorr/message_1.json @@ -1,17 +1,18 @@ { "_tag": "verify", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "msg", - "type" : "ByStr", - "value" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" + "vname": "msg", + "type": "ByStr", + "value": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" }, { - "vname" : "sig", - "type" : "ByStr64", - "value" : "0x919dbde710bfa1a227d1d51220022a6f5a92509b2072fc0ac50ee97a3a55987a4254276de534b018a0bb7c99a7fbdb468430956935b3ebb668df8b4fa3e25aaf" + "vname": "sig", + "type": "ByStr64", + "value": "0x919dbde710bfa1a227d1d51220022a6f5a92509b2072fc0ac50ee97a3a55987a4254276de534b018a0bb7c99a7fbdb468430956935b3ebb668df8b4fa3e25aaf" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/schnorr/message_2.json b/tests/runner/schnorr/message_2.json index 99d7d335f..615e57191 100644 --- a/tests/runner/schnorr/message_2.json +++ b/tests/runner/schnorr/message_2.json @@ -1,17 +1,18 @@ { "_tag": "verify", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "msg", - "type" : "ByStr", - "value" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" + "vname": "msg", + "type": "ByStr", + "value": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" }, { - "vname" : "sig", - "type" : "ByStr64", - "value" : "0x919dbde710bfa1a227d1d51220022a6f5a92509b2072fc0ac50ee97a3a55987a4254276de534b018a0bb7c99a7fbdb468430956935b3ebb668df8b4fa3e25aad" + "vname": "sig", + "type": "ByStr64", + "value": "0x919dbde710bfa1a227d1d51220022a6f5a92509b2072fc0ac50ee97a3a55987a4254276de534b018a0bb7c99a7fbdb468430956935b3ebb668df8b4fa3e25aad" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/schnorr/message_3.json b/tests/runner/schnorr/message_3.json index 839c612c4..b628dca0e 100644 --- a/tests/runner/schnorr/message_3.json +++ b/tests/runner/schnorr/message_3.json @@ -1,17 +1,18 @@ { "_tag": "verify", "_amount": "0", - "_sender" : "0x12345678901234567890123456789012345678ab", + "_sender": "0x12345678901234567890123456789012345678ab", "params": [ { - "vname" : "msg", - "type" : "ByStr", - "value" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf4" + "vname": "msg", + "type": "ByStr", + "value": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf4" }, { - "vname" : "sig", - "type" : "ByStr64", - "value" : "0x919dbde710bfa1a227d1d51220022a6f5a92509b2072fc0ac50ee97a3a55987a4254276de534b018a0bb7c99a7fbdb468430956935b3ebb668df8b4fa3e25aad" + "vname": "sig", + "type": "ByStr64", + "value": "0x919dbde710bfa1a227d1d51220022a6f5a92509b2072fc0ac50ee97a3a55987a4254276de534b018a0bb7c99a7fbdb468430956935b3ebb668df8b4fa3e25aad" } - ] + ], + "_origin": "0x12345678901234567890123456789012345678ab" } diff --git a/tests/runner/schnorr/output_1.json b/tests/runner/schnorr/output_1.json index 38abd16a0..1d205c533 100644 --- a/tests/runner/schnorr/output_1.json +++ b/tests/runner/schnorr/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7868", + "gas_remaining": "7862", "_accepted": "false", "messages": [ { diff --git a/tests/runner/schnorr/output_2.json b/tests/runner/schnorr/output_2.json index 2c9bbbab2..755a74df1 100644 --- a/tests/runner/schnorr/output_2.json +++ b/tests/runner/schnorr/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7868", + "gas_remaining": "7861", "_accepted": "false", "messages": [ { diff --git a/tests/runner/schnorr/output_3.json b/tests/runner/schnorr/output_3.json index 38abd16a0..1d205c533 100644 --- a/tests/runner/schnorr/output_3.json +++ b/tests/runner/schnorr/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7868", + "gas_remaining": "7862", "_accepted": "false", "messages": [ { diff --git a/tests/runner/shogi/message_1.json b/tests/runner/shogi/message_1.json index 1cf082d34..e0dfac75e 100644 --- a/tests/runner/shogi/message_1.json +++ b/tests/runner/shogi/message_1.json @@ -1,36 +1,37 @@ { "_tag": "PlayerAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "action", - "type" : "ShogiLib.Action", - "value" : { - "constructor" : "ShogiLib.Move", - "argtypes" : [], - "arguments" : [ + "vname": "action", + "type": "ShogiLib.Action", + "value": { + "constructor": "ShogiLib.Move", + "argtypes": [], + "arguments": [ { - "constructor" : "ShogiLib.Square", - "argtypes" : [], - "arguments" : [ + "constructor": "ShogiLib.Square", + "argtypes": [], + "arguments": [ "1", "1" ] }, { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] }, "3", { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "constructor": "False", + "argtypes": [], + "arguments": [] } ] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi/message_2.json b/tests/runner/shogi/message_2.json index 1cf082d34..e0dfac75e 100644 --- a/tests/runner/shogi/message_2.json +++ b/tests/runner/shogi/message_2.json @@ -1,36 +1,37 @@ { "_tag": "PlayerAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "action", - "type" : "ShogiLib.Action", - "value" : { - "constructor" : "ShogiLib.Move", - "argtypes" : [], - "arguments" : [ + "vname": "action", + "type": "ShogiLib.Action", + "value": { + "constructor": "ShogiLib.Move", + "argtypes": [], + "arguments": [ { - "constructor" : "ShogiLib.Square", - "argtypes" : [], - "arguments" : [ + "constructor": "ShogiLib.Square", + "argtypes": [], + "arguments": [ "1", "1" ] }, { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] }, "3", { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "constructor": "False", + "argtypes": [], + "arguments": [] } ] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi/message_3.json b/tests/runner/shogi/message_3.json index 1cf082d34..e0dfac75e 100644 --- a/tests/runner/shogi/message_3.json +++ b/tests/runner/shogi/message_3.json @@ -1,36 +1,37 @@ { "_tag": "PlayerAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "action", - "type" : "ShogiLib.Action", - "value" : { - "constructor" : "ShogiLib.Move", - "argtypes" : [], - "arguments" : [ + "vname": "action", + "type": "ShogiLib.Action", + "value": { + "constructor": "ShogiLib.Move", + "argtypes": [], + "arguments": [ { - "constructor" : "ShogiLib.Square", - "argtypes" : [], - "arguments" : [ + "constructor": "ShogiLib.Square", + "argtypes": [], + "arguments": [ "1", "1" ] }, { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] }, "3", { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "constructor": "False", + "argtypes": [], + "arguments": [] } ] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi/message_4.json b/tests/runner/shogi/message_4.json index 17d61e6d8..cbdce3f9e 100644 --- a/tests/runner/shogi/message_4.json +++ b/tests/runner/shogi/message_4.json @@ -1,42 +1,41 @@ { "_tag": "MoveAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "row", - "type" : "Uint32", - "value" : "1" + "vname": "row", + "type": "Uint32", + "value": "1" }, { - "vname" : "column", - "type" : "Uint32", - "value" : "1" + "vname": "column", + "type": "Uint32", + "value": "1" }, { - "vname" : "direction", - "type" : "ShogiLib.Direction", - "value" : - { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "vname": "direction", + "type": "ShogiLib.Direction", + "value": { + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] } }, { - "vname" : "distance", - "type" : "Uint32", - "value" : "3" + "vname": "distance", + "type": "Uint32", + "value": "3" }, { - "vname" : "promote", - "type" : "Bool", - "value" : - { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "vname": "promote", + "type": "Bool", + "value": { + "constructor": "False", + "argtypes": [], + "arguments": [] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi/output_1.json b/tests/runner/shogi/output_1.json index 2ebc6c6c4..d029d455c 100644 --- a/tests/runner/shogi/output_1.json +++ b/tests/runner/shogi/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7669", + "gas_remaining": "7666", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/shogi/output_2.json b/tests/runner/shogi/output_2.json index e338854b6..de95d9925 100644 --- a/tests/runner/shogi/output_2.json +++ b/tests/runner/shogi/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7668", + "gas_remaining": "7665", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/shogi/output_3.json b/tests/runner/shogi/output_3.json index ece999b58..6b8ea5882 100644 --- a/tests/runner/shogi/output_3.json +++ b/tests/runner/shogi/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7658", + "gas_remaining": "7655", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/shogi_proc/message_1.json b/tests/runner/shogi_proc/message_1.json index 1cf082d34..e0dfac75e 100644 --- a/tests/runner/shogi_proc/message_1.json +++ b/tests/runner/shogi_proc/message_1.json @@ -1,36 +1,37 @@ { "_tag": "PlayerAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "action", - "type" : "ShogiLib.Action", - "value" : { - "constructor" : "ShogiLib.Move", - "argtypes" : [], - "arguments" : [ + "vname": "action", + "type": "ShogiLib.Action", + "value": { + "constructor": "ShogiLib.Move", + "argtypes": [], + "arguments": [ { - "constructor" : "ShogiLib.Square", - "argtypes" : [], - "arguments" : [ + "constructor": "ShogiLib.Square", + "argtypes": [], + "arguments": [ "1", "1" ] }, { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] }, "3", { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "constructor": "False", + "argtypes": [], + "arguments": [] } ] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi_proc/message_2.json b/tests/runner/shogi_proc/message_2.json index 1cf082d34..e0dfac75e 100644 --- a/tests/runner/shogi_proc/message_2.json +++ b/tests/runner/shogi_proc/message_2.json @@ -1,36 +1,37 @@ { "_tag": "PlayerAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "action", - "type" : "ShogiLib.Action", - "value" : { - "constructor" : "ShogiLib.Move", - "argtypes" : [], - "arguments" : [ + "vname": "action", + "type": "ShogiLib.Action", + "value": { + "constructor": "ShogiLib.Move", + "argtypes": [], + "arguments": [ { - "constructor" : "ShogiLib.Square", - "argtypes" : [], - "arguments" : [ + "constructor": "ShogiLib.Square", + "argtypes": [], + "arguments": [ "1", "1" ] }, { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] }, "3", { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "constructor": "False", + "argtypes": [], + "arguments": [] } ] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi_proc/message_3.json b/tests/runner/shogi_proc/message_3.json index 1cf082d34..e0dfac75e 100644 --- a/tests/runner/shogi_proc/message_3.json +++ b/tests/runner/shogi_proc/message_3.json @@ -1,36 +1,37 @@ { "_tag": "PlayerAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "action", - "type" : "ShogiLib.Action", - "value" : { - "constructor" : "ShogiLib.Move", - "argtypes" : [], - "arguments" : [ + "vname": "action", + "type": "ShogiLib.Action", + "value": { + "constructor": "ShogiLib.Move", + "argtypes": [], + "arguments": [ { - "constructor" : "ShogiLib.Square", - "argtypes" : [], - "arguments" : [ + "constructor": "ShogiLib.Square", + "argtypes": [], + "arguments": [ "1", "1" ] }, { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] }, "3", { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "constructor": "False", + "argtypes": [], + "arguments": [] } ] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi_proc/message_4.json b/tests/runner/shogi_proc/message_4.json index 17d61e6d8..cbdce3f9e 100644 --- a/tests/runner/shogi_proc/message_4.json +++ b/tests/runner/shogi_proc/message_4.json @@ -1,42 +1,41 @@ { "_tag": "MoveAction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { - "vname" : "row", - "type" : "Uint32", - "value" : "1" + "vname": "row", + "type": "Uint32", + "value": "1" }, { - "vname" : "column", - "type" : "Uint32", - "value" : "1" + "vname": "column", + "type": "Uint32", + "value": "1" }, { - "vname" : "direction", - "type" : "ShogiLib.Direction", - "value" : - { - "constructor" : "ShogiLib.North", - "argtypes" : [], - "arguments" : [] + "vname": "direction", + "type": "ShogiLib.Direction", + "value": { + "constructor": "ShogiLib.North", + "argtypes": [], + "arguments": [] } }, { - "vname" : "distance", - "type" : "Uint32", - "value" : "3" + "vname": "distance", + "type": "Uint32", + "value": "3" }, { - "vname" : "promote", - "type" : "Bool", - "value" : - { - "constructor" : "False", - "argtypes" : [], - "arguments" : [] + "vname": "promote", + "type": "Bool", + "value": { + "constructor": "False", + "argtypes": [], + "arguments": [] } } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/shogi_proc/output_1.json b/tests/runner/shogi_proc/output_1.json index 2ebc6c6c4..da27ec9af 100644 --- a/tests/runner/shogi_proc/output_1.json +++ b/tests/runner/shogi_proc/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7669", + "gas_remaining": "7665", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/shogi_proc/output_2.json b/tests/runner/shogi_proc/output_2.json index e338854b6..b74b1fc67 100644 --- a/tests/runner/shogi_proc/output_2.json +++ b/tests/runner/shogi_proc/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7668", + "gas_remaining": "7664", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/shogi_proc/output_3.json b/tests/runner/shogi_proc/output_3.json index ece999b58..b6ba6916e 100644 --- a/tests/runner/shogi_proc/output_3.json +++ b/tests/runner/shogi_proc/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7658", + "gas_remaining": "7654", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/simple-dex/message_1.json b/tests/runner/simple-dex/message_1.json index 830168059..8e6f881ad 100644 --- a/tests/runner/simple-dex/message_1.json +++ b/tests/runner/simple-dex/message_1.json @@ -1,32 +1,33 @@ { "_tag": "makeOrder", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "tokenA", "type": "ByStr20", - "value" : "0x1234567890123456789012345678901234567001" + "value": "0x1234567890123456789012345678901234567001" }, { "vname": "valueA", "type": "Uint128", - "value" : "100" + "value": "100" }, { "vname": "tokenB", "type": "ByStr20", - "value" : "0x1234567890123456789012345678901234567002" + "value": "0x1234567890123456789012345678901234567002" }, { "vname": "valueB", "type": "Uint128", - "value" : "200" + "value": "200" }, { "vname": "expirationBlock", "type": "BNum", - "value" : "200" + "value": "200" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/simple-dex/message_2.json b/tests/runner/simple-dex/message_2.json index 2d3d70a64..bf2bfa1d6 100644 --- a/tests/runner/simple-dex/message_2.json +++ b/tests/runner/simple-dex/message_2.json @@ -1,12 +1,13 @@ { "_tag": "fillOrder", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "orderId", "type": "ByStr32", - "value" : "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" + "value": "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/simple-dex/message_3.json b/tests/runner/simple-dex/message_3.json index 2d3d70a64..bf2bfa1d6 100644 --- a/tests/runner/simple-dex/message_3.json +++ b/tests/runner/simple-dex/message_3.json @@ -1,12 +1,13 @@ { "_tag": "fillOrder", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "orderId", "type": "ByStr32", - "value" : "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" + "value": "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/simple-dex/message_4.json b/tests/runner/simple-dex/message_4.json index c8475511f..db87cad56 100644 --- a/tests/runner/simple-dex/message_4.json +++ b/tests/runner/simple-dex/message_4.json @@ -1,12 +1,13 @@ { "_tag": "ClaimBack", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "token", "type": "ByStr20", - "value" : "0x1234567890123456789012345678901234567002" + "value": "0x1234567890123456789012345678901234567002" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/simple-dex/message_5.json b/tests/runner/simple-dex/message_5.json index 3b084e506..bbf7eef24 100644 --- a/tests/runner/simple-dex/message_5.json +++ b/tests/runner/simple-dex/message_5.json @@ -1,12 +1,13 @@ { "_tag": "ClaimBack", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "token", "type": "ByStr20", - "value" : "0x1234567890123456789012345678901234567001" + "value": "0x1234567890123456789012345678901234567001" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/simple-dex/message_6.json b/tests/runner/simple-dex/message_6.json index 3b084e506..bbf7eef24 100644 --- a/tests/runner/simple-dex/message_6.json +++ b/tests/runner/simple-dex/message_6.json @@ -1,12 +1,13 @@ { "_tag": "ClaimBack", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "token", "type": "ByStr20", - "value" : "0x1234567890123456789012345678901234567001" + "value": "0x1234567890123456789012345678901234567001" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/simple-dex/message_7.json b/tests/runner/simple-dex/message_7.json index 08227389f..52cff3496 100644 --- a/tests/runner/simple-dex/message_7.json +++ b/tests/runner/simple-dex/message_7.json @@ -1,12 +1,13 @@ { "_tag": "cancelOrder", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567890", + "_sender": "0x1234567890123456789012345678901234567890", "params": [ { "vname": "orderId", "type": "ByStr32", - "value" : "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" + "value": "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/simple-dex/message_8.json b/tests/runner/simple-dex/message_8.json index 189844c41..d5000b212 100644 --- a/tests/runner/simple-dex/message_8.json +++ b/tests/runner/simple-dex/message_8.json @@ -1,12 +1,13 @@ { "_tag": "cancelOrder", "_amount": "0", - "_sender" : "0x1234567890123456789012345678901234567899", + "_sender": "0x1234567890123456789012345678901234567899", "params": [ { "vname": "orderId", "type": "ByStr32", - "value" : "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" + "value": "0xcb478abde2c28d1808655f39a97d68bec72e7cd29240a0c5e78cfa76590891f1" } - ] + ], + "_origin": "0x1234567890123456789012345678901234567899" } diff --git a/tests/runner/simple-dex/output_1.json b/tests/runner/simple-dex/output_1.json index 2fc512b0a..13bb87c43 100644 --- a/tests/runner/simple-dex/output_1.json +++ b/tests/runner/simple-dex/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7824", + "gas_remaining": "7818", "_accepted": "false", "messages": [ { diff --git a/tests/runner/simple-dex/output_2.json b/tests/runner/simple-dex/output_2.json index 7b207aeb7..fbc1bdc28 100644 --- a/tests/runner/simple-dex/output_2.json +++ b/tests/runner/simple-dex/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7879", + "gas_remaining": "7872", "_accepted": "false", "messages": [ { diff --git a/tests/runner/simple-dex/output_3.json b/tests/runner/simple-dex/output_3.json index af7dc6645..7ce624332 100644 --- a/tests/runner/simple-dex/output_3.json +++ b/tests/runner/simple-dex/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7940", + "gas_remaining": "7932", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/simple-dex/output_4.json b/tests/runner/simple-dex/output_4.json index 9e10abf77..e86e092df 100644 --- a/tests/runner/simple-dex/output_4.json +++ b/tests/runner/simple-dex/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7905", + "gas_remaining": "7898", "_accepted": "false", "messages": [ { diff --git a/tests/runner/simple-dex/output_5.json b/tests/runner/simple-dex/output_5.json index d3cf2cc84..94aa15983 100644 --- a/tests/runner/simple-dex/output_5.json +++ b/tests/runner/simple-dex/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7905", + "gas_remaining": "7898", "_accepted": "false", "messages": [ { diff --git a/tests/runner/simple-dex/output_6.json b/tests/runner/simple-dex/output_6.json index d6712592b..05bbd75f2 100644 --- a/tests/runner/simple-dex/output_6.json +++ b/tests/runner/simple-dex/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7938", + "gas_remaining": "7931", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/simple-dex/output_7.json b/tests/runner/simple-dex/output_7.json index 148adb32f..e3ed6664e 100644 --- a/tests/runner/simple-dex/output_7.json +++ b/tests/runner/simple-dex/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7916", + "gas_remaining": "7909", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/simple-dex/output_8.json b/tests/runner/simple-dex/output_8.json index 334e2c79c..841afcc10 100644 --- a/tests/runner/simple-dex/output_8.json +++ b/tests/runner/simple-dex/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7924", + "gas_remaining": "7916", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/message_1.json b/tests/runner/wallet/message_1.json index 82127f972..7550f1f03 100644 --- a/tests/runner/wallet/message_1.json +++ b/tests/runner/wallet/message_1.json @@ -1,6 +1,7 @@ { "_tag": "AddFunds", "_amount": "100", - "_sender" : "0x1234567890123456789012345678906784567890", - "params": [] + "_sender": "0x1234567890123456789012345678906784567890", + "params": [], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet/message_10.json b/tests/runner/wallet/message_10.json index d6c0cf9b8..19e8549b8 100644 --- a/tests/runner/wallet/message_10.json +++ b/tests/runner/wallet/message_10.json @@ -1,12 +1,13 @@ { "_tag": "RevokeOwnerSignature", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "new_owner", "type": "ByStr20", "value": "0x1234567890123456789012345678906784567891" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet/message_11.json b/tests/runner/wallet/message_11.json index 456b2c67a..dc45de929 100644 --- a/tests/runner/wallet/message_11.json +++ b/tests/runner/wallet/message_11.json @@ -1,6 +1,7 @@ { "_tag": "ClaimOwnership", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567891", - "params": [] + "_sender": "0x1234567890123456789012345678906784567891", + "params": [], + "_origin": "0x1234567890123456789012345678906784567891" } diff --git a/tests/runner/wallet/message_2.json b/tests/runner/wallet/message_2.json index fbceb062e..48ce4bf81 100644 --- a/tests/runner/wallet/message_2.json +++ b/tests/runner/wallet/message_2.json @@ -1,7 +1,7 @@ { "_tag": "SubmitTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906780000000", + "_sender": "0x1234567890123456789012345678906780000000", "params": [ { "vname": "recipient", @@ -13,5 +13,6 @@ "type": "Uint128", "value": "10" } - ] + ], + "_origin": "0x1234567890123456789012345678906780000000" } diff --git a/tests/runner/wallet/message_3.json b/tests/runner/wallet/message_3.json index 598a2382c..e2faf1fa8 100644 --- a/tests/runner/wallet/message_3.json +++ b/tests/runner/wallet/message_3.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "0" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet/message_4.json b/tests/runner/wallet/message_4.json index f4109a230..3fd53d59e 100644 --- a/tests/runner/wallet/message_4.json +++ b/tests/runner/wallet/message_4.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "0" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet/message_5.json b/tests/runner/wallet/message_5.json index eea005efe..dc63cc367 100644 --- a/tests/runner/wallet/message_5.json +++ b/tests/runner/wallet/message_5.json @@ -1,7 +1,7 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906780000000", + "_sender": "0x1234567890123456789012345678906780000000", "params": [ { "vname": "transactionId", @@ -13,5 +13,6 @@ "type": "String", "value": "" } - ] + ], + "_origin": "0x1234567890123456789012345678906780000000" } diff --git a/tests/runner/wallet/message_6.json b/tests/runner/wallet/message_6.json index 0da6da897..0141ef518 100644 --- a/tests/runner/wallet/message_6.json +++ b/tests/runner/wallet/message_6.json @@ -1,6 +1,7 @@ { "_tag": "AddFunds", "_amount": "10", - "_sender" : "0x1234567890123456789012345678906784567890", - "params": [] + "_sender": "0x1234567890123456789012345678906784567890", + "params": [], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet/message_7.json b/tests/runner/wallet/message_7.json index 5ede88be9..da6db050b 100644 --- a/tests/runner/wallet/message_7.json +++ b/tests/runner/wallet/message_7.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet/message_8.json b/tests/runner/wallet/message_8.json index 8ecc64a56..dcadb5e1b 100644 --- a/tests/runner/wallet/message_8.json +++ b/tests/runner/wallet/message_8.json @@ -1,12 +1,13 @@ { "_tag": "AddCandidateOwner", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567891", + "_sender": "0x1234567890123456789012345678906784567891", "params": [ { "vname": "candidate", "type": "ByStr20", "value": "0x1234567890123456789012345678906784567891" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567891" } diff --git a/tests/runner/wallet/message_9.json b/tests/runner/wallet/message_9.json index dd3003a3d..c5532c00f 100644 --- a/tests/runner/wallet/message_9.json +++ b/tests/runner/wallet/message_9.json @@ -1,12 +1,13 @@ { "_tag": "SignOffNewOwner", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "candidate", "type": "ByStr20", "value": "0x1234567890123456789012345678906784567891" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet/output_1.json b/tests/runner/wallet/output_1.json index 04797e1ed..442909b94 100644 --- a/tests/runner/wallet/output_1.json +++ b/tests/runner/wallet/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7905", + "gas_remaining": "7898", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_10.json b/tests/runner/wallet/output_10.json index 1f0a7e61e..a090e211f 100644 --- a/tests/runner/wallet/output_10.json +++ b/tests/runner/wallet/output_10.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7887", + "gas_remaining": "7880", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_11.json b/tests/runner/wallet/output_11.json index e42aded39..44c7bd8fe 100644 --- a/tests/runner/wallet/output_11.json +++ b/tests/runner/wallet/output_11.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7885", + "gas_remaining": "7878", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_2.json b/tests/runner/wallet/output_2.json index ea1a2a7c1..0a72e2688 100644 --- a/tests/runner/wallet/output_2.json +++ b/tests/runner/wallet/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_3.json b/tests/runner/wallet/output_3.json index 1e38fad1d..b4c14dd54 100644 --- a/tests/runner/wallet/output_3.json +++ b/tests/runner/wallet/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7887", + "gas_remaining": "7879", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_4.json b/tests/runner/wallet/output_4.json index 81ad3eb9d..71880689e 100644 --- a/tests/runner/wallet/output_4.json +++ b/tests/runner/wallet/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7881", + "gas_remaining": "7874", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_5.json b/tests/runner/wallet/output_5.json index 223c1ea0a..02a57ad89 100644 --- a/tests/runner/wallet/output_5.json +++ b/tests/runner/wallet/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7856", + "gas_remaining": "7848", "_accepted": "false", "messages": [ { diff --git a/tests/runner/wallet/output_6.json b/tests/runner/wallet/output_6.json index c85538ca3..6f125ea34 100644 --- a/tests/runner/wallet/output_6.json +++ b/tests/runner/wallet/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7923", + "gas_remaining": "7915", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_7.json b/tests/runner/wallet/output_7.json index 90b46fbd6..26760c5bb 100644 --- a/tests/runner/wallet/output_7.json +++ b/tests/runner/wallet/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7897", + "gas_remaining": "7889", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_8.json b/tests/runner/wallet/output_8.json index 982f456fe..57a413275 100644 --- a/tests/runner/wallet/output_8.json +++ b/tests/runner/wallet/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7890", + "gas_remaining": "7883", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet/output_9.json b/tests/runner/wallet/output_9.json index a2d10cd1a..53a95f32f 100644 --- a/tests/runner/wallet/output_9.json +++ b/tests/runner/wallet/output_9.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7864", + "gas_remaining": "7857", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/message_1.json b/tests/runner/wallet_2/message_1.json index 82127f972..7550f1f03 100644 --- a/tests/runner/wallet_2/message_1.json +++ b/tests/runner/wallet_2/message_1.json @@ -1,6 +1,7 @@ { "_tag": "AddFunds", "_amount": "100", - "_sender" : "0x1234567890123456789012345678906784567890", - "params": [] + "_sender": "0x1234567890123456789012345678906784567890", + "params": [], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_11.json b/tests/runner/wallet_2/message_11.json index d2bc1fb37..41ee2f6d8 100644 --- a/tests/runner/wallet_2/message_11.json +++ b/tests/runner/wallet_2/message_11.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906780000012", + "_sender": "0x1234567890123456789012345678906780000012", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "0" } - ] + ], + "_origin": "0x1234567890123456789012345678906780000012" } diff --git a/tests/runner/wallet_2/message_12.json b/tests/runner/wallet_2/message_12.json index df2aa6725..f257431c9 100644 --- a/tests/runner/wallet_2/message_12.json +++ b/tests/runner/wallet_2/message_12.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906780000000", + "_sender": "0x1234567890123456789012345678906780000000", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "0" } - ] + ], + "_origin": "0x1234567890123456789012345678906780000000" } diff --git a/tests/runner/wallet_2/message_14.json b/tests/runner/wallet_2/message_14.json index aa32fd41a..a6d3bbe1f 100644 --- a/tests/runner/wallet_2/message_14.json +++ b/tests/runner/wallet_2/message_14.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "3" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_15.json b/tests/runner/wallet_2/message_15.json index aff5af585..b8b01608c 100644 --- a/tests/runner/wallet_2/message_15.json +++ b/tests/runner/wallet_2/message_15.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "2" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_16.json b/tests/runner/wallet_2/message_16.json index 151d70a5c..73a73ebbf 100644 --- a/tests/runner/wallet_2/message_16.json +++ b/tests/runner/wallet_2/message_16.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "0" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_17.json b/tests/runner/wallet_2/message_17.json index 2fb086682..f0b049adf 100644 --- a/tests/runner/wallet_2/message_17.json +++ b/tests/runner/wallet_2/message_17.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_18.json b/tests/runner/wallet_2/message_18.json index c5bc20bbb..999948565 100644 --- a/tests/runner/wallet_2/message_18.json +++ b/tests/runner/wallet_2/message_18.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_19.json b/tests/runner/wallet_2/message_19.json index c5bc20bbb..999948565 100644 --- a/tests/runner/wallet_2/message_19.json +++ b/tests/runner/wallet_2/message_19.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_2.json b/tests/runner/wallet_2/message_2.json index 8f1d307bc..b1a452891 100644 --- a/tests/runner/wallet_2/message_2.json +++ b/tests/runner/wallet_2/message_2.json @@ -1,6 +1,7 @@ { "_tag": "AddFunds", "_amount": "100", - "_sender" : "0x1234567890123456789012345678906000000000", - "params": [] + "_sender": "0x1234567890123456789012345678906000000000", + "params": [], + "_origin": "0x1234567890123456789012345678906000000000" } diff --git a/tests/runner/wallet_2/message_20.json b/tests/runner/wallet_2/message_20.json index f48214ae2..a1af34467 100644 --- a/tests/runner/wallet_2/message_20.json +++ b/tests/runner/wallet_2/message_20.json @@ -1,12 +1,13 @@ { "_tag": "SignTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_21.json b/tests/runner/wallet_2/message_21.json index b95aa37cb..a302e26ac 100644 --- a/tests/runner/wallet_2/message_21.json +++ b/tests/runner/wallet_2/message_21.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_22.json b/tests/runner/wallet_2/message_22.json index 52743ef6f..6d644f3d8 100644 --- a/tests/runner/wallet_2/message_22.json +++ b/tests/runner/wallet_2/message_22.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "3" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_23.json b/tests/runner/wallet_2/message_23.json index b2add9fe6..cf9304b77 100644 --- a/tests/runner/wallet_2/message_23.json +++ b/tests/runner/wallet_2/message_23.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "0" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_24.json b/tests/runner/wallet_2/message_24.json index 163131271..024811393 100644 --- a/tests/runner/wallet_2/message_24.json +++ b/tests/runner/wallet_2/message_24.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde1267867890abcd5678901234567890", + "_sender": "0xffcdeabcde1267867890abcd5678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde1267867890abcd5678901234567890" } diff --git a/tests/runner/wallet_2/message_25.json b/tests/runner/wallet_2/message_25.json index b95aa37cb..a302e26ac 100644 --- a/tests/runner/wallet_2/message_25.json +++ b/tests/runner/wallet_2/message_25.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_26.json b/tests/runner/wallet_2/message_26.json index b95aa37cb..a302e26ac 100644 --- a/tests/runner/wallet_2/message_26.json +++ b/tests/runner/wallet_2/message_26.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_27.json b/tests/runner/wallet_2/message_27.json index 9d6440e04..a281253df 100644 --- a/tests/runner/wallet_2/message_27.json +++ b/tests/runner/wallet_2/message_27.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_28.json b/tests/runner/wallet_2/message_28.json index 9d6440e04..a281253df 100644 --- a/tests/runner/wallet_2/message_28.json +++ b/tests/runner/wallet_2/message_28.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_29.json b/tests/runner/wallet_2/message_29.json index 9d6440e04..a281253df 100644 --- a/tests/runner/wallet_2/message_29.json +++ b/tests/runner/wallet_2/message_29.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_3.json b/tests/runner/wallet_2/message_3.json index 5edf52f3a..d9207bc91 100644 --- a/tests/runner/wallet_2/message_3.json +++ b/tests/runner/wallet_2/message_3.json @@ -1,7 +1,7 @@ { "_tag": "SubmitTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906780000000", + "_sender": "0x1234567890123456789012345678906780000000", "params": [ { "vname": "recipient", @@ -18,5 +18,6 @@ "type": "String", "value": "" } - ] + ], + "_origin": "0x1234567890123456789012345678906780000000" } diff --git a/tests/runner/wallet_2/message_30.json b/tests/runner/wallet_2/message_30.json index 9d6440e04..a281253df 100644 --- a/tests/runner/wallet_2/message_30.json +++ b/tests/runner/wallet_2/message_30.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_31.json b/tests/runner/wallet_2/message_31.json index 855befdd4..b867afdb0 100644 --- a/tests/runner/wallet_2/message_31.json +++ b/tests/runner/wallet_2/message_31.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906780000000", + "_sender": "0x1234567890123456789012345678906780000000", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906780000000" } diff --git a/tests/runner/wallet_2/message_32.json b/tests/runner/wallet_2/message_32.json index 9d6440e04..a281253df 100644 --- a/tests/runner/wallet_2/message_32.json +++ b/tests/runner/wallet_2/message_32.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_33.json b/tests/runner/wallet_2/message_33.json index 5ede88be9..da6db050b 100644 --- a/tests/runner/wallet_2/message_33.json +++ b/tests/runner/wallet_2/message_33.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_34.json b/tests/runner/wallet_2/message_34.json index 900ed3f81..69735f951 100644 --- a/tests/runner/wallet_2/message_34.json +++ b/tests/runner/wallet_2/message_34.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "3" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_35.json b/tests/runner/wallet_2/message_35.json index e22a3c738..c99078c89 100644 --- a/tests/runner/wallet_2/message_35.json +++ b/tests/runner/wallet_2/message_35.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "0" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_36.json b/tests/runner/wallet_2/message_36.json index 5ede88be9..da6db050b 100644 --- a/tests/runner/wallet_2/message_36.json +++ b/tests/runner/wallet_2/message_36.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906784567890", + "_sender": "0x1234567890123456789012345678906784567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906784567890" } diff --git a/tests/runner/wallet_2/message_37.json b/tests/runner/wallet_2/message_37.json index fb093e9aa..5b3c21304 100644 --- a/tests/runner/wallet_2/message_37.json +++ b/tests/runner/wallet_2/message_37.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0x1234567890123456789012345678906780000000", + "_sender": "0x1234567890123456789012345678906780000000", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0x1234567890123456789012345678906780000000" } diff --git a/tests/runner/wallet_2/message_38.json b/tests/runner/wallet_2/message_38.json index 450d6b036..a1be39436 100644 --- a/tests/runner/wallet_2/message_38.json +++ b/tests/runner/wallet_2/message_38.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_39.json b/tests/runner/wallet_2/message_39.json index 450d6b036..a1be39436 100644 --- a/tests/runner/wallet_2/message_39.json +++ b/tests/runner/wallet_2/message_39.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_4.json b/tests/runner/wallet_2/message_4.json index b77d79714..fcab73b5f 100644 --- a/tests/runner/wallet_2/message_4.json +++ b/tests/runner/wallet_2/message_4.json @@ -1,7 +1,7 @@ { "_tag": "SubmitTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "recipient", @@ -18,5 +18,6 @@ "type": "String", "value": "" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_40.json b/tests/runner/wallet_2/message_40.json index 450d6b036..a1be39436 100644 --- a/tests/runner/wallet_2/message_40.json +++ b/tests/runner/wallet_2/message_40.json @@ -1,12 +1,13 @@ { "_tag": "RevokeSignature", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_42.json b/tests/runner/wallet_2/message_42.json index 9d6440e04..a281253df 100644 --- a/tests/runner/wallet_2/message_42.json +++ b/tests/runner/wallet_2/message_42.json @@ -1,12 +1,13 @@ { "_tag": "ExecuteTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "transactionId", "type": "Uint32", "value": "1" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_5.json b/tests/runner/wallet_2/message_5.json index b77d79714..fcab73b5f 100644 --- a/tests/runner/wallet_2/message_5.json +++ b/tests/runner/wallet_2/message_5.json @@ -1,7 +1,7 @@ { "_tag": "SubmitTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "recipient", @@ -18,5 +18,6 @@ "type": "String", "value": "" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/message_6.json b/tests/runner/wallet_2/message_6.json index 7a424cd99..0ca21f9d2 100644 --- a/tests/runner/wallet_2/message_6.json +++ b/tests/runner/wallet_2/message_6.json @@ -1,7 +1,7 @@ { "_tag": "SubmitTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567891", + "_sender": "0xffcdeabcde126786789012345678901234567891", "params": [ { "vname": "recipient", @@ -18,5 +18,6 @@ "type": "String", "value": "" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567891" } diff --git a/tests/runner/wallet_2/message_7.json b/tests/runner/wallet_2/message_7.json index 1c088b18b..c9a337b4d 100644 --- a/tests/runner/wallet_2/message_7.json +++ b/tests/runner/wallet_2/message_7.json @@ -1,7 +1,7 @@ { "_tag": "SubmitTransaction", "_amount": "0", - "_sender" : "0xabcdeabcde123456786782345678901234567890", + "_sender": "0xabcdeabcde123456786782345678901234567890", "params": [ { "vname": "recipient", @@ -18,5 +18,6 @@ "type": "String", "value": "AddFunds" } - ] + ], + "_origin": "0xabcdeabcde123456786782345678901234567890" } diff --git a/tests/runner/wallet_2/message_8.json b/tests/runner/wallet_2/message_8.json index a394b9267..5fabeeb00 100644 --- a/tests/runner/wallet_2/message_8.json +++ b/tests/runner/wallet_2/message_8.json @@ -1,7 +1,7 @@ { "_tag": "SubmitTransaction", "_amount": "0", - "_sender" : "0xffcdeabcde126786789012345678901234567890", + "_sender": "0xffcdeabcde126786789012345678901234567890", "params": [ { "vname": "recipient", @@ -18,5 +18,6 @@ "type": "String", "value": "" } - ] + ], + "_origin": "0xffcdeabcde126786789012345678901234567890" } diff --git a/tests/runner/wallet_2/output_1.json b/tests/runner/wallet_2/output_1.json index b81b0e9cf..76110f6bb 100644 --- a/tests/runner/wallet_2/output_1.json +++ b/tests/runner/wallet_2/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7898", + "gas_remaining": "7891", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_11.json b/tests/runner/wallet_2/output_11.json index ee4e65994..126f64aa0 100644 --- a/tests/runner/wallet_2/output_11.json +++ b/tests/runner/wallet_2/output_11.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7865", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_12.json b/tests/runner/wallet_2/output_12.json index ee4e65994..126f64aa0 100644 --- a/tests/runner/wallet_2/output_12.json +++ b/tests/runner/wallet_2/output_12.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7865", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_14.json b/tests/runner/wallet_2/output_14.json index 73d35d979..78377bdc3 100644 --- a/tests/runner/wallet_2/output_14.json +++ b/tests/runner/wallet_2/output_14.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_15.json b/tests/runner/wallet_2/output_15.json index 73d35d979..78377bdc3 100644 --- a/tests/runner/wallet_2/output_15.json +++ b/tests/runner/wallet_2/output_15.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_16.json b/tests/runner/wallet_2/output_16.json index 73d35d979..78377bdc3 100644 --- a/tests/runner/wallet_2/output_16.json +++ b/tests/runner/wallet_2/output_16.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_17.json b/tests/runner/wallet_2/output_17.json index 6df8596e6..3c2f99bdf 100644 --- a/tests/runner/wallet_2/output_17.json +++ b/tests/runner/wallet_2/output_17.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7864", + "gas_remaining": "7856", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_18.json b/tests/runner/wallet_2/output_18.json index a34f28dc7..a816699f4 100644 --- a/tests/runner/wallet_2/output_18.json +++ b/tests/runner/wallet_2/output_18.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7864", + "gas_remaining": "7856", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_19.json b/tests/runner/wallet_2/output_19.json index 059936fcd..f08a1f30f 100644 --- a/tests/runner/wallet_2/output_19.json +++ b/tests/runner/wallet_2/output_19.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7864", + "gas_remaining": "7856", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_2.json b/tests/runner/wallet_2/output_2.json index b91c55443..4cae32219 100644 --- a/tests/runner/wallet_2/output_2.json +++ b/tests/runner/wallet_2/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7898", + "gas_remaining": "7891", "_accepted": "true", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_20.json b/tests/runner/wallet_2/output_20.json index b25782e86..cda3e72e6 100644 --- a/tests/runner/wallet_2/output_20.json +++ b/tests/runner/wallet_2/output_20.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7864", + "gas_remaining": "7856", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_21.json b/tests/runner/wallet_2/output_21.json index eaf4cb700..3d0714678 100644 --- a/tests/runner/wallet_2/output_21.json +++ b/tests/runner/wallet_2/output_21.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_22.json b/tests/runner/wallet_2/output_22.json index 73d35d979..78377bdc3 100644 --- a/tests/runner/wallet_2/output_22.json +++ b/tests/runner/wallet_2/output_22.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_23.json b/tests/runner/wallet_2/output_23.json index 73d35d979..78377bdc3 100644 --- a/tests/runner/wallet_2/output_23.json +++ b/tests/runner/wallet_2/output_23.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_24.json b/tests/runner/wallet_2/output_24.json index 3af8ab837..8caae94b0 100644 --- a/tests/runner/wallet_2/output_24.json +++ b/tests/runner/wallet_2/output_24.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7861", + "gas_remaining": "7853", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_25.json b/tests/runner/wallet_2/output_25.json index 433d45e21..e010bdc53 100644 --- a/tests/runner/wallet_2/output_25.json +++ b/tests/runner/wallet_2/output_25.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7858", + "gas_remaining": "7850", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_26.json b/tests/runner/wallet_2/output_26.json index 5489b6eff..0d6657a6e 100644 --- a/tests/runner/wallet_2/output_26.json +++ b/tests/runner/wallet_2/output_26.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7857", + "gas_remaining": "7850", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_27.json b/tests/runner/wallet_2/output_27.json index 5464a3d7f..c3d4eedeb 100644 --- a/tests/runner/wallet_2/output_27.json +++ b/tests/runner/wallet_2/output_27.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7856", + "gas_remaining": "7848", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_28.json b/tests/runner/wallet_2/output_28.json index 3e16a46ee..cdaec0641 100644 --- a/tests/runner/wallet_2/output_28.json +++ b/tests/runner/wallet_2/output_28.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7826", + "gas_remaining": "7819", "_accepted": "false", "messages": [ { diff --git a/tests/runner/wallet_2/output_29.json b/tests/runner/wallet_2/output_29.json index 3e16a46ee..cdaec0641 100644 --- a/tests/runner/wallet_2/output_29.json +++ b/tests/runner/wallet_2/output_29.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7826", + "gas_remaining": "7819", "_accepted": "false", "messages": [ { diff --git a/tests/runner/wallet_2/output_3.json b/tests/runner/wallet_2/output_3.json index 3a03ebb3d..7039492b2 100644 --- a/tests/runner/wallet_2/output_3.json +++ b/tests/runner/wallet_2/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7841", + "gas_remaining": "7833", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_30.json b/tests/runner/wallet_2/output_30.json index 08d1468ba..ee666358d 100644 --- a/tests/runner/wallet_2/output_30.json +++ b/tests/runner/wallet_2/output_30.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7826", + "gas_remaining": "7819", "_accepted": "false", "messages": [ { diff --git a/tests/runner/wallet_2/output_31.json b/tests/runner/wallet_2/output_31.json index 3e16a46ee..cdaec0641 100644 --- a/tests/runner/wallet_2/output_31.json +++ b/tests/runner/wallet_2/output_31.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7826", + "gas_remaining": "7819", "_accepted": "false", "messages": [ { diff --git a/tests/runner/wallet_2/output_32.json b/tests/runner/wallet_2/output_32.json index d056acf26..662d4c4ae 100644 --- a/tests/runner/wallet_2/output_32.json +++ b/tests/runner/wallet_2/output_32.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7826", + "gas_remaining": "7819", "_accepted": "false", "messages": [ { diff --git a/tests/runner/wallet_2/output_33.json b/tests/runner/wallet_2/output_33.json index 63f32b918..7ede8b104 100644 --- a/tests/runner/wallet_2/output_33.json +++ b/tests/runner/wallet_2/output_33.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_34.json b/tests/runner/wallet_2/output_34.json index 60fa08f4b..b050a0822 100644 --- a/tests/runner/wallet_2/output_34.json +++ b/tests/runner/wallet_2/output_34.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_35.json b/tests/runner/wallet_2/output_35.json index 60fa08f4b..b050a0822 100644 --- a/tests/runner/wallet_2/output_35.json +++ b/tests/runner/wallet_2/output_35.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_36.json b/tests/runner/wallet_2/output_36.json index 60fa08f4b..b050a0822 100644 --- a/tests/runner/wallet_2/output_36.json +++ b/tests/runner/wallet_2/output_36.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_37.json b/tests/runner/wallet_2/output_37.json index 60fa08f4b..b050a0822 100644 --- a/tests/runner/wallet_2/output_37.json +++ b/tests/runner/wallet_2/output_37.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7872", + "gas_remaining": "7864", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_38.json b/tests/runner/wallet_2/output_38.json index 6997bfeac..2bd3c6b34 100644 --- a/tests/runner/wallet_2/output_38.json +++ b/tests/runner/wallet_2/output_38.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7871", + "gas_remaining": "7863", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_39.json b/tests/runner/wallet_2/output_39.json index 1345f6762..34d1e3a2b 100644 --- a/tests/runner/wallet_2/output_39.json +++ b/tests/runner/wallet_2/output_39.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7871", + "gas_remaining": "7863", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_4.json b/tests/runner/wallet_2/output_4.json index f66dd8759..36b2c82a5 100644 --- a/tests/runner/wallet_2/output_4.json +++ b/tests/runner/wallet_2/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7807", + "gas_remaining": "7799", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_40.json b/tests/runner/wallet_2/output_40.json index 997282a75..c4edad842 100644 --- a/tests/runner/wallet_2/output_40.json +++ b/tests/runner/wallet_2/output_40.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7871", + "gas_remaining": "7863", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_42.json b/tests/runner/wallet_2/output_42.json index feb2d50ca..e0e884c47 100644 --- a/tests/runner/wallet_2/output_42.json +++ b/tests/runner/wallet_2/output_42.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7826", + "gas_remaining": "7819", "_accepted": "false", "messages": [ { diff --git a/tests/runner/wallet_2/output_5.json b/tests/runner/wallet_2/output_5.json index 057842764..3c08e53f6 100644 --- a/tests/runner/wallet_2/output_5.json +++ b/tests/runner/wallet_2/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7807", + "gas_remaining": "7799", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_6.json b/tests/runner/wallet_2/output_6.json index b6f670e0e..0221205fc 100644 --- a/tests/runner/wallet_2/output_6.json +++ b/tests/runner/wallet_2/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7841", + "gas_remaining": "7833", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_7.json b/tests/runner/wallet_2/output_7.json index b4fa450ee..b34389897 100644 --- a/tests/runner/wallet_2/output_7.json +++ b/tests/runner/wallet_2/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7806", + "gas_remaining": "7798", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/wallet_2/output_8.json b/tests/runner/wallet_2/output_8.json index a6e037c13..bb7516330 100644 --- a/tests/runner/wallet_2/output_8.json +++ b/tests/runner/wallet_2/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7839", + "gas_remaining": "7831", "_accepted": "false", "messages": [], "states": [ diff --git a/tests/runner/zil-game/message_1.json b/tests/runner/zil-game/message_1.json index 0a29a30ab..8b40db880 100644 --- a/tests/runner/zil-game/message_1.json +++ b/tests/runner/zil-game/message_1.json @@ -1,13 +1,13 @@ { - "_tag": "Play", - "_amount": "0", - "_sender": "0xabcdeabcde123456789012345678901234567890", - "params": [ - { - "vname": "guess", - "type": "ByStr32", - "value": - "0x123456789012345678901234567890123456789012345678901234567890abff" - } - ] + "_tag": "Play", + "_amount": "0", + "_sender": "0xabcdeabcde123456789012345678901234567890", + "params": [ + { + "vname": "guess", + "type": "ByStr32", + "value": "0x123456789012345678901234567890123456789012345678901234567890abff" + } + ], + "_origin": "0xabcdeabcde123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_2.json b/tests/runner/zil-game/message_2.json index 1f779c6db..7e092e157 100644 --- a/tests/runner/zil-game/message_2.json +++ b/tests/runner/zil-game/message_2.json @@ -1,8 +1,13 @@ { - "_tag": "ClaimReward", - "_amount": "0", - "_sender": "0xabcdeabcde123456789012345678901234567890", - "params": [ - { "vname": "solution", "type": "Int128", "value": "42" } - ] + "_tag": "ClaimReward", + "_amount": "0", + "_sender": "0xabcdeabcde123456789012345678901234567890", + "params": [ + { + "vname": "solution", + "type": "Int128", + "value": "42" + } + ], + "_origin": "0xabcdeabcde123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_3.json b/tests/runner/zil-game/message_3.json index 78a053d8e..d2fb2a553 100644 --- a/tests/runner/zil-game/message_3.json +++ b/tests/runner/zil-game/message_3.json @@ -1,13 +1,13 @@ { - "_tag": "Play", - "_amount": "0", - "_sender": "0xffcdeabcde123456789012345678901234567890", - "params": [ - { - "vname": "guess", - "type": "ByStr32", - "value": - "0x123456789012345678901234567890123456789012345678901234567890ab12" - } - ] + "_tag": "Play", + "_amount": "0", + "_sender": "0xffcdeabcde123456789012345678901234567890", + "params": [ + { + "vname": "guess", + "type": "ByStr32", + "value": "0x123456789012345678901234567890123456789012345678901234567890ab12" + } + ], + "_origin": "0xffcdeabcde123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_4.json b/tests/runner/zil-game/message_4.json index 1f779c6db..7e092e157 100644 --- a/tests/runner/zil-game/message_4.json +++ b/tests/runner/zil-game/message_4.json @@ -1,8 +1,13 @@ { - "_tag": "ClaimReward", - "_amount": "0", - "_sender": "0xabcdeabcde123456789012345678901234567890", - "params": [ - { "vname": "solution", "type": "Int128", "value": "42" } - ] + "_tag": "ClaimReward", + "_amount": "0", + "_sender": "0xabcdeabcde123456789012345678901234567890", + "params": [ + { + "vname": "solution", + "type": "Int128", + "value": "42" + } + ], + "_origin": "0xabcdeabcde123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_5.json b/tests/runner/zil-game/message_5.json index d6313d94d..f3ca8952b 100644 --- a/tests/runner/zil-game/message_5.json +++ b/tests/runner/zil-game/message_5.json @@ -1,8 +1,13 @@ { - "_tag": "ClaimReward", - "_amount": "0", - "_sender": "0xffcdeabcde123456789012345678901234567890", - "params": [ - { "vname": "solution", "type": "Int128", "value": "43" } - ] + "_tag": "ClaimReward", + "_amount": "0", + "_sender": "0xffcdeabcde123456789012345678901234567890", + "params": [ + { + "vname": "solution", + "type": "Int128", + "value": "43" + } + ], + "_origin": "0xffcdeabcde123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_6.json b/tests/runner/zil-game/message_6.json index 2e73ae86b..602dabca3 100644 --- a/tests/runner/zil-game/message_6.json +++ b/tests/runner/zil-game/message_6.json @@ -1,8 +1,13 @@ { - "_tag": "ClaimReward", - "_amount": "0", - "_sender": "0xabcdeabcde123456789012345678901234567890", - "params": [ - { "vname": "solution", "type": "Int128", "value": "1" } - ] + "_tag": "ClaimReward", + "_amount": "0", + "_sender": "0xabcdeabcde123456789012345678901234567890", + "params": [ + { + "vname": "solution", + "type": "Int128", + "value": "1" + } + ], + "_origin": "0xabcdeabcde123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_7.json b/tests/runner/zil-game/message_7.json index e35320986..2999119c7 100644 --- a/tests/runner/zil-game/message_7.json +++ b/tests/runner/zil-game/message_7.json @@ -1,6 +1,7 @@ { - "_tag": "Withdraw", - "_amount": "0", + "_tag": "Withdraw", + "_amount": "0", "_sender": "0x1234567890123456789012345678901234567890", - "params": [] + "params": [], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_8.json b/tests/runner/zil-game/message_8.json index 6ffdc3155..6a314323f 100644 --- a/tests/runner/zil-game/message_8.json +++ b/tests/runner/zil-game/message_8.json @@ -1,6 +1,7 @@ { - "_tag": "Withdraw", - "_amount": "0", - "_sender": "0xabcdeabcde123456789012345678901234567890", - "params": [] + "_tag": "Withdraw", + "_amount": "0", + "_sender": "0xabcdeabcde123456789012345678901234567890", + "params": [], + "_origin": "0xabcdeabcde123456789012345678901234567890" } diff --git a/tests/runner/zil-game/message_9.json b/tests/runner/zil-game/message_9.json index f83553d13..2999119c7 100644 --- a/tests/runner/zil-game/message_9.json +++ b/tests/runner/zil-game/message_9.json @@ -1,6 +1,7 @@ { - "_tag": "Withdraw", + "_tag": "Withdraw", "_amount": "0", "_sender": "0x1234567890123456789012345678901234567890", - "params": [] + "params": [], + "_origin": "0x1234567890123456789012345678901234567890" } diff --git a/tests/runner/zil-game/output_1.json b/tests/runner/zil-game/output_1.json index a12cb39e2..9a6d2a5bd 100644 --- a/tests/runner/zil-game/output_1.json +++ b/tests/runner/zil-game/output_1.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7914", + "gas_remaining": "7903", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_2.json b/tests/runner/zil-game/output_2.json index 3d8ebbc22..59df9de4b 100644 --- a/tests/runner/zil-game/output_2.json +++ b/tests/runner/zil-game/output_2.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7936", + "gas_remaining": "7921", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_3.json b/tests/runner/zil-game/output_3.json index 54f116446..8175a4eff 100644 --- a/tests/runner/zil-game/output_3.json +++ b/tests/runner/zil-game/output_3.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7926", + "gas_remaining": "7915", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_4.json b/tests/runner/zil-game/output_4.json index 37dc46062..c6921330b 100644 --- a/tests/runner/zil-game/output_4.json +++ b/tests/runner/zil-game/output_4.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7921", + "gas_remaining": "7906", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_5.json b/tests/runner/zil-game/output_5.json index 381420847..0cb2c1cda 100644 --- a/tests/runner/zil-game/output_5.json +++ b/tests/runner/zil-game/output_5.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7925", + "gas_remaining": "7910", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_6.json b/tests/runner/zil-game/output_6.json index 20f862ffb..ce7c13bb1 100644 --- a/tests/runner/zil-game/output_6.json +++ b/tests/runner/zil-game/output_6.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7917", + "gas_remaining": "7902", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_7.json b/tests/runner/zil-game/output_7.json index 0f457e19c..31cd640d2 100644 --- a/tests/runner/zil-game/output_7.json +++ b/tests/runner/zil-game/output_7.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7938", + "gas_remaining": "7930", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_8.json b/tests/runner/zil-game/output_8.json index 96717a750..e46eb0bba 100644 --- a/tests/runner/zil-game/output_8.json +++ b/tests/runner/zil-game/output_8.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7944", + "gas_remaining": "7935", "_accepted": "false", "messages": [ { diff --git a/tests/runner/zil-game/output_9.json b/tests/runner/zil-game/output_9.json index e71906091..3765fa85c 100644 --- a/tests/runner/zil-game/output_9.json +++ b/tests/runner/zil-game/output_9.json @@ -1,6 +1,6 @@ { "scilla_major_version": "0", - "gas_remaining": "7943", + "gas_remaining": "7935", "_accepted": "false", "messages": [ { From 7b5169e5339f0622a363bb50dd5ab2a76a8e111c Mon Sep 17 00:00:00 2001 From: Vaivaswatha Nagaraj Date: Tue, 15 Dec 2020 13:37:22 +0530 Subject: [PATCH 3/3] Add test with different _sender and _origin --- tests/checker/good/gold/mappair.scilla.gold | 10 +++- tests/contracts/mappair.scilla | 5 ++ tests/runner/Testcontracts.ml | 2 + tests/runner/helloWorld/message_9.json | 1 + tests/runner/helloWorld/output_9.json | 4 +- tests/runner/mappair/blockchain_9.json | 1 + tests/runner/mappair/message_9.json | 7 +++ tests/runner/mappair/output_9.json | 59 +++++++++++++++++++++ tests/runner/mappair/state_9.json | 36 +++++++++++++ 9 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 tests/runner/mappair/blockchain_9.json create mode 100644 tests/runner/mappair/message_9.json create mode 100644 tests/runner/mappair/output_9.json create mode 100644 tests/runner/mappair/state_9.json diff --git a/tests/checker/good/gold/mappair.scilla.gold b/tests/checker/good/gold/mappair.scilla.gold index 2fb1bf213..dd8bafdfd 100644 --- a/tests/checker/good/gold/mappair.scilla.gold +++ b/tests/checker/good/gold/mappair.scilla.gold @@ -41,10 +41,18 @@ { "vname": "redef_warn", "params": [ { "vname": "b", "type": "Bool" } ] - } + }, + { "vname": "print_sender_origin", "params": [] } ], "procedures": [], "events": [ + { + "vname": "Source", + "params": [ + { "vname": "_sender", "type": "ByStr20" }, + { "vname": "_origin", "type": "ByStr20" } + ] + }, { "vname": "Foo", "params": [ { "vname": "x", "type": "Uint32" } ] } ], "ADTs": [ diff --git a/tests/contracts/mappair.scilla b/tests/contracts/mappair.scilla index 3f84e8ef7..9e8652d55 100644 --- a/tests/contracts/mappair.scilla +++ b/tests/contracts/mappair.scilla @@ -116,3 +116,8 @@ transition redef_warn(b : Bool) e = {_eventname : "Foo"; x : x}; event e end + +transition print_sender_origin() + e = { _eventname : "Source"; _sender : _sender; _origin : _origin }; + event e +end diff --git a/tests/runner/Testcontracts.ml b/tests/runner/Testcontracts.ml index 6a5434ff6..6c9a63259 100644 --- a/tests/runner/Testcontracts.ml +++ b/tests/runner/Testcontracts.ml @@ -276,6 +276,8 @@ let contract_tests env = >::: build_contract_tests env "auction" succ_code 1 8 []; "mappair" >::: build_contract_tests env "mappair" succ_code 1 7 []; + "mappair" + >::: build_contract_tests env "mappair" succ_code 9 9 []; "bookstore" >::: build_contract_tests env "bookstore" succ_code 1 12 []; "nonfungible-token" diff --git a/tests/runner/helloWorld/message_9.json b/tests/runner/helloWorld/message_9.json index 2aa8528d3..ab90756df 100644 --- a/tests/runner/helloWorld/message_9.json +++ b/tests/runner/helloWorld/message_9.json @@ -2,6 +2,7 @@ "_tag": "setHello", "_amount": "0", "_sender" : "0x1234567890123456789012345678901234567890", + "_origin" : "0x1234567890123456789012345678901234567890", "params": [ { "vname": "msg", diff --git a/tests/runner/helloWorld/output_9.json b/tests/runner/helloWorld/output_9.json index d7fa4e333..9552e77f0 100644 --- a/tests/runner/helloWorld/output_9.json +++ b/tests/runner/helloWorld/output_9.json @@ -1,8 +1,8 @@ { - "gas_remaining": "7965", + "gas_remaining": "7957", "errors": [ { - "error_message": "Member '_origin' not found in json", + "error_message": "Invalid String value Hello\u0016World in JSON", "start_location": { "file": "", "line": 0, "column": 0 }, "end_location": { "file": "", "line": 0, "column": 0 } }, diff --git a/tests/runner/mappair/blockchain_9.json b/tests/runner/mappair/blockchain_9.json new file mode 100644 index 000000000..9c3af9b93 --- /dev/null +++ b/tests/runner/mappair/blockchain_9.json @@ -0,0 +1 @@ +[ { "vname": "BLOCKNUMBER", "type": "BNum", "value": "100" } ] \ No newline at end of file diff --git a/tests/runner/mappair/message_9.json b/tests/runner/mappair/message_9.json new file mode 100644 index 000000000..b261110a6 --- /dev/null +++ b/tests/runner/mappair/message_9.json @@ -0,0 +1,7 @@ +{ + "_tag": "print_sender_origin", + "_amount": "0", + "_sender": "0x12345678901234567890123456789012345678ab", + "params": [], + "_origin": "0x98765678901234567890123456789012345678ab" +} diff --git a/tests/runner/mappair/output_9.json b/tests/runner/mappair/output_9.json new file mode 100644 index 000000000..c075379aa --- /dev/null +++ b/tests/runner/mappair/output_9.json @@ -0,0 +1,59 @@ +{ + "scilla_major_version": "0", + "gas_remaining": "7946", + "_accepted": "false", + "messages": [], + "states": [ + { "vname": "_balance", "type": "Uint128", "value": "0" }, + { + "vname": "gpair", + "type": "Pair (List (Int64)) (Option (Bool))", + "value": { + "constructor": "Pair", + "argtypes": [ "List (Int64)", "Option (Bool)" ], + "arguments": [ + [], + { "constructor": "None", "argtypes": [ "Bool" ], "arguments": [] } + ] + } + }, + { "vname": "llist", "type": "List (List (Int64))", "value": [] }, + { "vname": "plist", "type": "List (Option (Int32))", "value": [] }, + { + "vname": "gnat", + "type": "Nat", + "value": { "constructor": "Zero", "argtypes": [], "arguments": [] } + }, + { + "vname": "gmap", + "type": "Map (ByStr20) (Pair (Int32) (Int32))", + "value": [ + { + "key": "0x12345678901234567890123456789012345678ab", + "val": { + "constructor": "Pair", + "argtypes": [ "Int32", "Int32" ], + "arguments": [ "1", "2" ] + } + } + ] + } + ], + "events": [ + { + "_eventname": "Source", + "params": [ + { + "vname": "_sender", + "type": "ByStr20", + "value": "0x12345678901234567890123456789012345678ab" + }, + { + "vname": "_origin", + "type": "ByStr20", + "value": "0x98765678901234567890123456789012345678ab" + } + ] + } + ] +} \ No newline at end of file diff --git a/tests/runner/mappair/state_9.json b/tests/runner/mappair/state_9.json new file mode 100644 index 000000000..e5ce88d23 --- /dev/null +++ b/tests/runner/mappair/state_9.json @@ -0,0 +1,36 @@ +[ + { "vname": "_balance", "type": "Uint128", "value": "0" }, + { + "vname": "gpair", + "type": "Pair (List (Int64)) (Option (Bool))", + "value": { + "constructor": "Pair", + "argtypes": [ "List (Int64)", "Option (Bool)" ], + "arguments": [ + [], + { "constructor": "None", "argtypes": [ "Bool" ], "arguments": [] } + ] + } + }, + { "vname": "llist", "type": "List (List (Int64))", "value": [] }, + { "vname": "plist", "type": "List (Option (Int32))", "value": [] }, + { + "vname": "gnat", + "type": "Nat", + "value": { "constructor": "Zero", "argtypes": [], "arguments": [] } + }, + { + "vname": "gmap", + "type": "Map (ByStr20) (Pair (Int32) (Int32))", + "value": [ + { + "key": "0x12345678901234567890123456789012345678ab", + "val": { + "constructor": "Pair", + "argtypes": [ "Int32", "Int32" ], + "arguments": [ "1", "2" ] + } + } + ] + } +] \ No newline at end of file