From 4b1e11a0efd0a837c0cf556fe876ebeb8899db46 Mon Sep 17 00:00:00 2001 From: Thomas Arts Date: Mon, 7 Jan 2019 19:16:39 +0100 Subject: [PATCH 1/5] Update LICENCE --- LICENSE | 200 ++++---------------------------------------------------- 1 file changed, 12 insertions(+), 188 deletions(-) diff --git a/LICENSE b/LICENSE index dec7bef..142825a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,191 +1,15 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +ISC License - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Copyright (c) 2017, aeternity developers - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2018, Robert Virding . - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. From 66b1d2e98a5219d1a9fd064621e73feddece7a18 Mon Sep 17 00:00:00 2001 From: Thomas Arts Date: Mon, 7 Jan 2019 19:17:11 +0100 Subject: [PATCH 2/5] Update rebar config --- rebar.config | 18 +++++++++++------- rebar.lock | 8 ++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 rebar.lock diff --git a/rebar.config b/rebar.config index 0a11c7a..2dd387b 100644 --- a/rebar.config +++ b/rebar.config @@ -1,13 +1,17 @@ -%% -*- mode: erlang -*- - -{minimun_otp_vsn, "20.1"}. - {erl_opts, [debug_info]}. -{deps, []}. +%% NOTE: When possible deps are referenced by Git ref to ensure consistency between builds. +{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", + {ref,"99bf097"}}}, + + % waiting for https://github.com/jlouis/enacl/pull/40 to be merged + {enacl, {git, "https://github.com/aeternity/enacl.git", + {ref, "26180f4"}}} + ]}. + {dialyzer, [ {warnings, [unknown]}, {plt_apps, all_deps}, - {base_plt_apps, [erts, kernel, stdlib]} - ]}. + {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]} + ]}. diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 0000000..6cae2d4 --- /dev/null +++ b/rebar.lock @@ -0,0 +1,8 @@ +[{<<"aebytecode">>, + {git,"https://github.com/aeternity/aebytecode.git", + {ref,"99bf097759dedbe7553f87a796bc7e1c7322e64b"}}, + 0}, + {<<"enacl">>, + {git,"https://github.com/aeternity/enacl.git", + {ref,"26180f42c0b3a450905d2efd8bc7fd5fd9cece75"}}, + 0}]. From 4853d386e47fdaaf130154f434b43ab4a42f270a Mon Sep 17 00:00:00 2001 From: Thomas Arts Date: Mon, 7 Jan 2019 19:17:49 +0100 Subject: [PATCH 3/5] update changes from epoch master --- test/aeso_test_utils.erl | 143 +-------------------------------------- 1 file changed, 2 insertions(+), 141 deletions(-) diff --git a/test/aeso_test_utils.erl b/test/aeso_test_utils.erl index 3632551..d799637 100644 --- a/test/aeso_test_utils.erl +++ b/test/aeso_test_utils.erl @@ -8,24 +8,10 @@ -module(aeso_test_utils). --include("apps/aecontract/src/aecontract.hrl"). - --export([read_contract/1, contract_path/0, pp/1, pp/2, - dump_words/1, show_heap/1, show_heap/2, show_heap_value/1, compile/1]). - --export([spend/3, get_balance/2, call_contract/6, get_store/1, set_store/2, - aens_lookup/4]). +-export([read_contract/1, contract_path/0]). contract_path() -> - {ok, Cwd} = file:get_cwd(), - N = length(filename:split(Cwd)), - Rel = ["apps", "aesophia", "test", "contracts"], - %% Try the first matching directory (../)*Rel - Cand = fun(I) -> filename:join(lists:duplicate(I, "..") ++ Rel) end, - case [ Dir || Dir <- lists:map(Cand, lists:seq(0, N)), filelib:is_dir(Dir) ] of - [Dir | _] -> Dir; - [] -> error(failed_to_find_contract_dir) - end. + filename:join(code:lib_dir(aesophia, test), "contracts"). %% Read a contract file from the test/contracts directory. -spec read_contract(string() | atom()) -> string(). @@ -33,128 +19,3 @@ read_contract(Name) -> {ok, Bin} = file:read_file(filename:join(contract_path(), lists:concat([Name, ".aes"]))), binary_to_list(Bin). -pp(Name) -> pp(Name, []). - -pp(Name, Options) -> - case aeso_parser:string(read_contract(Name)) of - {ok, AST} -> - [ io:format("~s\n", [prettypr:format(aeso_pretty:decls(AST))]) || not lists:member(quiet, Options) ]; - {error, {{L, C}, parse_error, Err}} -> - io:format("Parse error at ~p:~p:~p\n~s\n", [Name, L, C, Err]) - end. - -compile(Name) -> - aeso_compiler:from_string(read_contract(Name), - [pp_sophia_code, pp_typed_ast, pp_icode]). - -%% Stack simulator - -simulate([],Stack) -> - Stack; -simulate(['PUSH1',X|More],S) -> - simulate(More,[X|S]); -simulate([Op|More],Stack) -> - simulate(More,simulate(Op,Stack)); -simulate('MSIZE',S) -> - A = new_atom(), - io:format("~p = MSIZE\n",[A]), - [A|S]; -simulate('DUP2',[A,B|S]) -> - [B,A,B|S]; -simulate('DUP3',[A,B,C|S]) -> - [C,A,B,C|S]; -simulate('ADD',[A,B|S]) -> - [add(A,B)|S]; -simulate('MSTORE',[Addr,X|S]) -> - io:format("mem(~p) <- ~p\n",[Addr,X]), - S; -simulate('MLOAD',[Addr|S]) -> - A = new_atom(), - io:format("~p = mem(~p)\n",[A,Addr]), - [A|S]; -simulate('SWAP1',[A,B|S]) -> - [B,A|S]; -simulate('SWAP2',[A,B,C|S]) -> - [C,B,A|S]; -simulate('SUB',[A,B|S]) -> - [{A,'-',B}|S]; -simulate('POP',[_|S]) -> - S. - -add(0,X) -> - X; -add(X,0) -> - X; -add(X,{A,'-',X}) -> - A; -add(X,{A,'+',B}) -> - {A,'+',add(X,B)}; -add(A,B) -> - {A,'+',B}. - -new_atom() -> - catch ets:new(names,[set,public,named_table]), - case ets:lookup(names,index) of - [] -> I = 0; - [{index,I}] -> ok - end, - ets:insert(names,{index,I+1}), - list_to_atom([$a+I]). - -show_heap(Bin) -> - show_heap(0, Bin). - -show_heap(Offs, Bin) -> - Words = dump_words(Bin), - Addrs = lists:seq(0, (length(Words) - 1) * 32, 32), - lists:flatten([io_lib:format("~4b ~p\n", [Addr + Offs, Word]) || {Addr, Word} <- lists:zip(Addrs, Words)]). - -show_heap_value(HeapValue) -> - Maps = aeso_heap:heap_value_maps(HeapValue), - Offs = aeso_heap:heap_value_offset(HeapValue), - Ptr = aeso_heap:heap_value_pointer(HeapValue), - Mem = aeso_heap:heap_value_heap(HeapValue), - Words = dump_words(Mem), - Addrs = lists:seq(Offs, Offs + (length(Words) - 1) * 32, 32), - lists:flatten( - io_lib:format(" Maps: ~p\n Ptr: ~p\n Heap: ~p", - [Maps, Ptr, lists:zip(Addrs, Words)])). - -%% Translate a blob of 256-bit words into readable form. Does a bit of guessing -%% to recover strings. TODO: strings longer than 32 bytes -dump_words(Bin) -> dump_words(Bin, []). - -dump_words(<>, Acc) when N < 32 -> - NotN = (32 - N) * 8, - case W of - <> -> - Str = binary_to_list(S), - case lists:member(0, Str) of - true -> dump_words(<>, [N | Acc]); %% Not a string - false -> dump_words(Rest, [binary_to_list(S), N | Acc]) - end; - _ -> dump_words(<>, [N | Acc]) - end; -dump_words(<>, Acc) -> - dump_words(Rest, [N | Acc]); -dump_words(<<>>, Acc) -> lists:reverse(Acc); -dump_words(Rest, Acc) -> lists:reverse([{error, Rest} | Acc]). - -%% -- Chain API for test ----------------------------------------------------- - -aens_lookup(Name, Key, Type, _S) -> - io:format("aens_lookup(~p, ~p, ~p)\n", [Name, Key, Type]), - {ok, {some, <<0:32/unit:8>>}}. - -spend(Recipient, Amount, S) -> - io:format("+++ SPEND(~p, ~p)\n", [Recipient, Amount]), - {ok, S}. - -get_balance(_, _) -> 1000000. - -call_contract(Contract, Gas, Value, CallData, CallStack, S) -> - io:format("+++ CALL(~p, ~p, ~p, ~p, ~p)\n", [Contract, Gas, Value, CallData, CallStack]), - {ok, <<42:256>>, S}. - -get_store(_) -> #{}. -set_store(_, _) -> ok. From b8f4a6b67a8285cd2b6fef7e88376ebff50c66b0 Mon Sep 17 00:00:00 2001 From: Thomas Arts Date: Mon, 7 Jan 2019 19:54:53 +0100 Subject: [PATCH 4/5] Get rid of lager in the compiler --- src/aeso_abi.erl | 16 ---------------- src/aeso_ast_to_icode.erl | 7 +++---- src/aesophia.app.src | 1 - 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/aeso_abi.erl b/src/aeso_abi.erl index bd7c778..b1df002 100644 --- a/src/aeso_abi.erl +++ b/src/aeso_abi.erl @@ -32,19 +32,6 @@ }. -type type_info() :: [function_type_info()]. --ifdef(COMMON_TEST). --define(TEST_LOG(Format, Data), - try ct:log(Format, Data) - catch - %% Enable setting up node with "test" rebar profile. - error:undef -> ok - end). --define(DEBUG_LOG(Format, Data), begin lager:debug(Format, Data), ?TEST_LOG(Format, Data) end). --else. --define(TEST_LOG(Format, Data), ok). --define(DEBUG_LOG(Format, Data), lager:debug(Format, Data)). --endif. - %%%=================================================================== %%% API %%%=================================================================== @@ -112,15 +99,12 @@ check_calldata(CallData, TypeInfo) -> {error, bad_call_data} catch _T:_E -> - ?TEST_LOG("Error parsing call data: ~p", [{_T, _E}]), {error, bad_call_data} end; {error, _} -> - ?TEST_LOG("Unknown function hash ~p", [Hash]), {error, unknown_function} end; {error, _What} -> - ?TEST_LOG("Bad call data ~p", [_What]), {error, bad_call_data} end. diff --git a/src/aeso_ast_to_icode.erl b/src/aeso_ast_to_icode.erl index 629e700..77508c0 100644 --- a/src/aeso_ast_to_icode.erl +++ b/src/aeso_ast_to_icode.erl @@ -94,8 +94,8 @@ contract_to_icode([{letrec,_,Defs}|Rest], Icode) -> %% just to parse a list of (mutually recursive) definitions. contract_to_icode(Defs++Rest, Icode); contract_to_icode([], Icode) -> Icode; -contract_to_icode(Code, Icode) -> - lager:debug("Unhandled code ~p~n",[Code]), +contract_to_icode(_Code, Icode) -> + %% TODO debug output for debug("Unhandled code ~p~n",[Code]), Icode. ast_id({id, _, Id}) -> Id. @@ -444,9 +444,8 @@ ast_body({typed,_,{record,Attrs,Fields},{record_t,DefFields}}, Icode) -> NamedField = fun({field, _, [{proj, _, {id, _, Name}}], E}) -> {Name, E} end, NamedFields = lists:map(NamedField, Fields), #tuple{cpts = - [case proplists:get_value(Name,NamedFields) of + [case proplists:get_value(Name, NamedFields) of undefined -> - lager:debug("~p not in ~p\n", [Name, NamedFields]), Line = aeso_syntax:get_ann(line, Attrs), #missing_field{format = "Missing field in record: ~s (on line ~p)\n", args = [Name,Line]}; diff --git a/src/aesophia.app.src b/src/aesophia.app.src index 1e43dc3..e796d6a 100644 --- a/src/aesophia.app.src +++ b/src/aesophia.app.src @@ -5,7 +5,6 @@ {applications, [kernel, stdlib, - lager, aebytecode ]}, {env,[]}, From ad028ddf986385e7202a6fb2259bc2187e21d50a Mon Sep 17 00:00:00 2001 From: Thomas Arts Date: Mon, 7 Jan 2019 20:14:21 +0100 Subject: [PATCH 5/5] Make dialyzer happy --- src/aesophia.app.src | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/aesophia.app.src b/src/aesophia.app.src index e796d6a..cdaff43 100644 --- a/src/aesophia.app.src +++ b/src/aesophia.app.src @@ -5,6 +5,8 @@ {applications, [kernel, stdlib, + enacl, + syntax_tools, aebytecode ]}, {env,[]},