Merge pull request #322 from aeternity/prepare_6.0.1

Prepare 6.0.1

.gitignore

@@ -21,3 +21,4 @@ rebar3.crashdump
 aesophia
 .qcci
 current_counterexample.eqc
+test/contracts/test.aes

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Removed
 
+## [6.0.1] 2021-06-24
+### Changed
+- Fixed a bug in calldata encoding for contracts containing multiple contracts
+- Fixed a missing `include` in the `Frac` standard library
+
 ## [6.0.0] 2021-05-26
 ### Added
 - Child contracts
@@ -298,7 +303,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Simplify calldata creation - instead of passing a compiled contract, simply
   pass a (stubbed) contract string.
 
-[Unreleased]: https://github.com/aeternity/aesophia/compare/v6.0.0...HEAD
+[Unreleased]: https://github.com/aeternity/aesophia/compare/v6.0.1...HEAD
+[6.0.1]: https://github.com/aeternity/aesophia/compare/v6.0.0...v6.0.1
 [6.0.0]: https://github.com/aeternity/aesophia/compare/v5.0.0...v6.0.0
 [5.0.0]: https://github.com/aeternity/aesophia/compare/v4.3.0...v5.0.0
 [4.3.0]: https://github.com/aeternity/aesophia/compare/v4.2.0...v4.3.0

docs/sophia.md

@@ -194,7 +194,7 @@ contract IntHolder =
   entrypoint get() = state
   
 main contract IntHolderFactory =
-  entrypoint new(x : int) : IntHolder =
+  stateful entrypoint new(x : int) : IntHolder =
     let ih = Chain.create(x) : IntHolder
     ih
 ```
@@ -802,8 +802,8 @@ will emit one Event of each kind in the example.
 
 ```sophia
   entrypoint emit_events() : () =
-    Chain.event(TheFirstEvent(42))
-    Chain.event(AnotherEvent(Contract.address, "This is not indexed"))
+    Chain.event(Event1(42, 34, "foo"))
+    Chain.event(Event2("This is not indexed", Contract.address))
 ```
 
 #### Argument order

docs/sophia_stdlib.md

@@ -645,7 +645,7 @@ Call.value : int
 The amount of coins transferred to the contract in the call.
 
 
-#### gas
+#### gas_price
 ```
 Call.gas_price : int
 ```
@@ -653,7 +653,15 @@ Call.gas_price : int
 The gas price of the current call.
 
 
-#### gas
+#### fee
+```
+Call.fee : int
+```
+
+The fee of the current call.
+
+
+#### gas_left
 ```
 Call.gas_left() : int
 ```

priv/stdlib/Frac.aes

@@ -1,3 +1,5 @@
+include "String.aes"
+
 namespace Frac =
 
   private function gcd(a : int, b : int) =

rebar.config

@@ -15,7 +15,7 @@
             {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
            ]}.
 
-{relx, [{release, {aesophia, "6.0.0"},
+{relx, [{release, {aesophia, "6.0.1"},
          [aesophia, aebytecode, getopt]},
 
         {dev_mode, true},

src/aeso_compiler.erl

@@ -244,8 +244,9 @@ check_call1(ContractString0, FunName, Args, Options) ->
             fate ->
                 %% First check the contract without the __call function
                 #{ fcode := OrgFcode
+                 , fcode_env := #{child_con_env := ChildContracts}
                  , ast := Ast } = string_to_code(ContractString0, Options),
-                FateCode = aeso_fcode_to_fate:compile(OrgFcode, []),
+                FateCode = aeso_fcode_to_fate:compile(ChildContracts, OrgFcode, []),
                 %% collect all hashes and compute the first name without hash collision to
                 SymbolHashes = maps:keys(aeb_fate_code:symbols(FateCode)),
                 CallName = first_none_match(?CALL_NAME, SymbolHashes,

src/aesophia.app.src

@@ -1,6 +1,6 @@
 {application, aesophia,
- [{description, "Contract Language for aeternity"},
-  {vsn, "6.0.0"},
+ [{description, "Compiler for Aeternity Sophia language"},
+  {vsn, "6.0.1"},
   {registered, []},
   {applications,
    [kernel,

test/aeso_compiler_tests.erl

@@ -90,6 +90,23 @@ simple_compile_test_() ->
        end} || Backend <- [aevm, fate] ] ++
     [].
 
+%% Check if all modules in the standard library compile
+stdlib_test_() ->
+    {ok, Files} = file:list_dir(aeso_stdlib:stdlib_include_path()),
+    [ { "Testing " ++ File ++ " from the stdlib",
+      fun() ->
+          String = "include \"" ++ File ++ "\"\nmain contract Test =\n  entrypoint f(x) = x",
+          Options = [{src_file, File}, {backend, fate}],
+          case aeso_compiler:from_string(String, Options) of
+              {ok, #{fate_code := Code}} ->
+                  Code1 = aeb_fate_code:deserialize(aeb_fate_code:serialize(Code)),
+                  ?assertMatch({X, X}, {Code1, Code});
+              {error, Error} -> io:format("\n\n~p\n\n", [Error]), print_and_throw(Error)
+          end
+      end} || File <- Files,
+              lists:suffix(".aes", File)
+    ].
+
 check_errors(no_error, Actual) -> ?assertMatch(#{}, Actual);
 check_errors(Expect, #{}) ->
     ?assertEqual({error, Expect}, ok);