Arguments are in the body of the call, use term_to_fate before serializing them

src/aeso_compiler.erl

@@ -217,7 +217,7 @@ check_call1(ContractString0, FunName, Args, Options) ->
                                             lists:seq($1, $9) ++ lists:seq($A, $Z) ++ lists:seq($a, $z)),
                 ContractString = insert_call_function(ContractString0, CallName, FunName, Args, Options),
                 #{fcode := Fcode} = string_to_fcode(ContractString, Options),
-                #{args := CallArgs} = maps:get({entrypoint, list_to_binary(CallName)}, maps:get(functions, Fcode)),
+                CallArgs = arguments_of_body(CallName, FunName, Fcode),
                 {ok, FunName, CallArgs}
         end
     catch
@@ -233,7 +233,13 @@ check_call1(ContractString0, FunName, Args, Options) ->
                                 fun (E) -> io_lib:format("~p", [E]) end)}
     end.
 
-first_none_match(CallName, Hashes, []) ->
+arguments_of_body(CallName, _FunName, Fcode) ->
+    #{body := Body} = maps:get({entrypoint, list_to_binary(CallName)}, maps:get(functions, Fcode)),
+    {def, _FName, Args} = Body,
+    %% FName is either {entrypoint, list_to_binary(FunName)} or 'init'
+    [ aeso_fcode_to_fate:term_to_fate(A) || A <- Args ].
+
+first_none_match(_CallName, _Hashes, []) ->
     error(unable_to_find_unique_call_name);
 first_none_match(CallName, Hashes, [Char|Chars]) ->
     case not lists:member(aeb_fate_code:symbol_identifier(list_to_binary(CallName)), Hashes) of

src/aeso_fcode_to_fate.erl

@@ -9,7 +9,7 @@
 %%%-------------------------------------------------------------------
 -module(aeso_fcode_to_fate).
 
--export([compile/2]).
+-export([compile/2, term_to_fate/1]).
 
 %% -- Preamble ---------------------------------------------------------------
 
@@ -231,7 +231,32 @@ lookup_var(#env{vars = Vars}, X) ->
 
 %% -- The compiler --
 
+term_to_fate({lit, L}) ->
+     case L of
+        {int, N}             -> aeb_fate_data:make_integer(N);
+        {string, S}          -> aeb_fate_data:make_string(S);
+        {bool, B}            -> aeb_fate_data:make_boolean(B);
+        {account_pubkey, K}  -> aeb_fate_data:make_address(K);
+        {contract_pubkey, K} -> aeb_fate_data:make_contract(K);
+        {oracle_pubkey, K}   -> aeb_fate_data:make_oracle(K);
+        {oracle_query_id, _} -> ?TODO(fate_oracle_query_id_value)
+     end;
+%% negative literals are parsed as 0 - N
+term_to_fate({op, '-', [{lit, {int, 0}}, {lit, {int, N}}]}) ->
+    aeb_fate_data:make_integer(-N);
+term_to_fate(nil) ->
+    aeb_fate_data:make_list([]);
+term_to_fate({op, '::', [Hd | Tl]}) ->
+    aeb_fate_data:make_list([term_to_fate(Hd) | [ term_to_fate(E) || E<-Tl]]);
+term_to_fate({tuple, As}) ->
+    aeb_fate_data:make_tuple(list_to_tuple([ term_to_fate(A) || A<-As]));
+term_to_fate({con, Ar, I, As}) ->
+    FateAs = [ term_to_fate(A) || A <- As ],
+    aeb_fate_data:make_variant(Ar, I, list_to_tuple(FateAs)).
+
+
 to_scode(_Env, {lit, L}) ->
+    %% use term_to_fate here
     case L of
         {int, N}             -> [push(?i(N))];
         {string, S}          -> [push(?i(aeb_fate_data:make_string(S)))];

test/aeso_calldata_tests.erl

@@ -19,14 +19,14 @@ calldata_test_() ->
      [ {"Testing the " ++ ContractName ++ " contract with the " ++ atom_to_list(Backend) ++ " backend",
         fun() ->
             ContractString = aeso_test_utils:read_contract(ContractName),
-            Res = aeso_compiler:create_calldata(ContractString, "init", [], [{backend, Backend}]),
+            Res = aeso_compiler:create_calldata(ContractString, Fun, Args, [{backend, Backend}]),
             case Backend of
                 aevm ->
                     ?assertMatch({ok, _, _, _}, Res);
                 fate ->
                     ?assertMatch({ok, _}, Res)
             end
-        end} || ContractName <- compilable_contracts(), Backend <- [aevm, fate],
+        end} || {ContractName, Fun, Args} <- compilable_contracts(), Backend <- [aevm, fate],
                 not lists:member(ContractName, not_yet_compilable(Backend))].
 
 check_errors(Expect, ErrorString) ->
@@ -43,31 +43,34 @@ check_errors(Expect, ErrorString) ->
 
 compilable_contracts() ->
     [
-     "functions",
-     "identity",
-     "maps",
-     "oracles",
-     "remote_call",
-     "simple",
-     "spend_test",
-     "test",
-     "builtin_bug",
-     "builtin_map_get_bug",
-     "nodeadcode",
-     "deadcode",
-     "variant_types",
-     "events",
-     "basic_auth",
-     "address_literals",
-     "bytes_equality",
-     "address_chain",
-     "__call"
+     {"identity", "init", []},
+     {"maps", "init", []},
+     {"oracles", "init", []},
+     {"variant_types", "init", []},
+     {"basic_auth", "init", []},
+     {"address_literals", "init", []},
+     {"bytes_equality", "init", []},
+     {"address_chain", "init", []},
+     {"counter", "init",
+      ["-3334353637383940202122232425262728293031323334353637"]},
+     {"dutch_auction", "init",
+      ["ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt", "200000", "1000"]},
+     {"maps", "fromlist_i",
+      ["[(1, {x = 1, y = 2}), (2, {x = 3, y = 4}), (3, {x = 4, y = 4})]"]},
+     {"strings", "str_concat", ["\"test\"","\"me\""]},
+     {"complex_types", "filter_some", ["[Some(1), Some(2), None]"]},
+     {"complex_types", "init", ["ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ"]},
+     {"__call" "init", []},
+     {"bitcoin_auth", "init",
+      ["#0102030405060708090a0b0c0d0e0f1017181920212223242526272829303132"
+       "33343536373839401a1b1c1d1e1f202122232425262728293031323334353637"]}
     ].
 
 not_yet_compilable(fate) ->
     ["oracles",             %% Oracle.register
      "events",
      "basic_auth",          %% auth_tx_hash instruction
+     "bitcoin_auth",        %% fate_auth_tx_hash_instruction
      "address_literals",    %% oracle_query_id literals
      "address_chain"        %% Oracle.check_query
     ];