change aebytecode ver to the one from full node with my changes on top

CHANGELOG.md

@@ -7,11 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 ### Changed
-- New syntax for tuple types. Now 0-tuple type is encoded as `unit` instead of `()` and
-  regular tuples are encoded by interspersing inner types with `*`, for instance `int * string`. 
-  Parens are not necessary. Note it only affects the types, values remain as their were before,
-  so `(1, "a") : int * string`
-
 ### Removed
 
 ## [3.2.0] - 2019-06-28

src/aeso_fcode_to_fate.erl

@@ -329,14 +329,18 @@ to_scode(Env, {builtin, B, Args}) ->
 
 to_scode(Env, {remote, Ct, Fun, [{builtin, call_gas_left, _}, Value | Args]}) ->
     %% Gas is not limited.
-    Lbl  = make_function_id(Fun),
-    Call = aeb_fate_ops:call_r(?a, Lbl, length(Args), ?a),    %% No remote tail calls
+    Lbl = make_function_id(Fun),
+    Call = if Env#env.tailpos -> aeb_fate_ops:call_tr(?a, Lbl, ?a);
+              true            -> aeb_fate_ops:call_r(?a, Lbl, ?a)
+           end,
     call_to_scode(Env, Call, [Ct, Value | Args]);
 
 to_scode(Env, {remote, Ct, Fun, [Gas, Value | Args]}) ->
     %% Gas is limited.
     Lbl = make_function_id(Fun),
-    Call = aeb_fate_ops:call_gr(?a, Lbl, length(Args), ?a, ?a),   %% No remote tail calls
+    Call = if Env#env.tailpos -> aeb_fate_ops:call_gtr(?a, Lbl, ?a, ?a);
+              true            -> aeb_fate_ops:call_gr(?a, Lbl, ?a, ?a)
+           end,
     call_to_scode(Env, Call, [Ct, Value, Gas | Args]);
 
 to_scode(Env, {closure, Fun, FVs}) ->
@@ -743,9 +747,11 @@ attributes(I) ->
         'RETURN'                              -> Impure(pc, []);
         {'RETURNR', A}                        -> Impure(pc, A);
         {'CALL', _}                           -> Impure(?a, []);
-        {'CALL_R', A, _, _, B}                -> Impure(?a, [A, B]);
-        {'CALL_GR', A, _, _, B, C}            -> Impure(?a, [A, B, C]);
+        {'CALL_R', A, _, B}                   -> Impure(?a, [A, B]);
+        {'CALL_GR', A, _, B, C}               -> Impure(?a, [A, B, C]);
         {'CALL_T', _}                         -> Impure(pc, []);
+        {'CALL_TR', A, _, B}                  -> Impure(pc, [A, B]);
+        {'CALL_GTR', A, _, B, C}              -> Impure(pc, [A, B, C]);
         {'CALL_VALUE', A}                     -> Pure(A, []);
         {'JUMP', _}                           -> Impure(pc, []);
         {'JUMPIF', A, _}                      -> Impure(pc, A);
@@ -1407,6 +1413,8 @@ reorder_blocks(Ref, Code, Blocks, Acc) ->
         ['RETURN'|_]          -> reorder_blocks(Blocks, Acc1);
         [{'RETURNR', _}|_]    -> reorder_blocks(Blocks, Acc1);
         [{'CALL_T', _}|_]     -> reorder_blocks(Blocks, Acc1);
+        [{'CALL_TR', _, _, _}|_] -> reorder_blocks(Blocks, Acc1);
+        [{'CALL_GTR', _, _, _}|_] -> reorder_blocks(Blocks, Acc1);
         [{'EXIT', _}|_]       -> reorder_blocks(Blocks, Acc1);
         [{'ABORT', _}|_]      -> reorder_blocks(Blocks, Acc1);
         [{switch, _, _}|_]    -> reorder_blocks(Blocks, Acc1);
@@ -1446,10 +1454,13 @@ chase_labels([L | Ls], Map, Live) ->
     chase_labels(New ++ Ls, Map, Live#{ L => true }).
 
 %% Replace PUSH, RETURN by RETURNR, drop returns after tail calls.
-tweak_returns(['RETURN', {'PUSH', A} | Code])          -> [{'RETURNR', A} | Code];
-tweak_returns(['RETURN' | Code = [{'CALL_T', _} | _]]) -> Code;
-tweak_returns(['RETURN' | Code = [{'ABORT', _} | _]])  -> Code;
-tweak_returns(['RETURN' | Code = [{'EXIT', _} | _]])   -> Code;
+tweak_returns(['RETURN', {'PUSH', A} | Code])                     -> [{'RETURNR', A} | Code];
+tweak_returns(['RETURN' | Code = [{'CALL_T', _} | _]])            -> Code;
+tweak_returns(['RETURN' | Code = [{'CALL_TR', _, _, _} | _]])     -> Code;
+tweak_returns(['RETURN' | Code = [{'CALL_GT', _} | _]])           -> Code;
+tweak_returns(['RETURN' | Code = [{'CALL_GTR', _, _, _, _} | _]]) -> Code;
+tweak_returns(['RETURN' | Code = [{'ABORT', _} | _]])             -> Code;
+tweak_returns(['RETURN' | Code = [{'EXIT', _} | _]])              -> Code;
 tweak_returns(Code) -> Code.
 
 %% -- Split basic blocks at CALL instructions --