Changed deps, rename modules, remove oracles

2025-03-10 13:09:30 +01:00
52 changed files with 548 additions and 1062 deletions
@@ -19,7 +19,6 @@ rebar3.crashdump
 *.erl~
 *.aes~
 aesophia
-sophia
 .qcci
 current_counterexample.eqc
 test/contracts/test.aes
@@ -3,7 +3,6 @@ namespace AENSCompat =
  function pointee_to_V2(p : AENS.pointee) : AENSv2.pointee =
    switch(p)
      AENS.AccountPt(a)  => AENSv2.AccountPt(a)
-      AENS.OraclePt(a)   => AENSv2.OraclePt(a)
      AENS.ContractPt(a) => AENSv2.ContractPt(a)
      AENS.ChannelPt(a)  => AENSv2.ChannelPt(a)

@@ -11,7 +10,6 @@ namespace AENSCompat =
  function pointee_from_V2(p2 : AENSv2.pointee) : option(AENS.pointee) =
    switch(p2)
      AENSv2.AccountPt(a)  => Some(AENS.AccountPt(a))
-      AENSv2.OraclePt(a)   => Some(AENS.OraclePt(a))
      AENSv2.ContractPt(a) => Some(AENS.ContractPt(a))
      AENSv2.ChannelPt(a)  => Some(AENS.ChannelPt(a))
      AENSv2.DataPt(_)     => None
@@ -2,8 +2,7 @@

 {erl_opts, [debug_info]}.

-{deps, [ {gmbytecode, {git, "https://git.qpq.swiss/QPQ-AG/gmbytecode.git",
-                       {ref, "691b9742bf7e4aa6a4e8e209397916be5abe1763"}}}
+{deps, [ {gmbytecode, {git, "https://git.qpq.swiss/QPQ-AG/gmbytecode.git", {ref, "cc4fd04019"}}}
       , {eblake2, "1.0.0"}
       , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}
       ]}.
@@ -11,11 +11,11 @@
 {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},1},
 {<<"gmbytecode">>,
  {git,"https://git.qpq.swiss/QPQ-AG/gmbytecode.git",
-       {ref,"691b9742bf7e4aa6a4e8e209397916be5abe1763"}},
+       {ref,"cc4fd0401903e9ce902a99160ac200e64040217f"}},
  0},
 {<<"gmserialization">>,
  {git,"https://git.qpq.swiss/QPQ-AG/gmserialization.git",
-       {ref,"ac64e01b0f675c1a34c70a827062f381920742db"}},
+       {ref,"9d2ecc00d32ea295309563e54a81636ecb597e96"}},
  1},
 {<<"jsx">>,
  {git,"https://github.com/talentdeficit/jsx.git",
@@ -7,7 +7,7 @@
 %%% Created : 12 Jan 2019
 %%%-------------------------------------------------------------------

-module(aeso_aci).
+-module(so_aci).

 -export([ file/2
        , file/3
@@ -21,7 +21,7 @@
        , json_encode_expr/1
        , json_encode_type/1]).

-include("aeso_utils.hrl").
+-include("so_utils.hrl").

 -type aci_type()  :: json | string.
 -type json()      :: jsx:json_term().
@@ -35,7 +35,7 @@ file(Type, File) ->
    file(Type, File, []).

 file(Type, File, Options0) ->
-    Options = aeso_compiler:add_include_path(File, Options0),
+    Options = so_compiler:add_include_path(File, Options0),
    case file:read_file(File) of
        {ok, BinCode} ->
            do_contract_interface(Type, binary_to_list(BinCode), Options);
@@ -56,11 +56,11 @@ contract_interface(Type, ContractString, CompilerOpts) ->
 render_aci_json(Json) ->
    do_render_aci_json(Json).

-spec json_encode_expr(aeso_syntax:expr()) -> json().
+-spec json_encode_expr(so_syntax:expr()) -> json().
 json_encode_expr(Expr) ->
    encode_expr(Expr).

-spec json_encode_type(aeso_syntax:type()) -> json().
+-spec json_encode_type(so_syntax:type()) -> json().
 json_encode_type(Type) ->
    encode_type(Type).

@@ -69,8 +69,8 @@ do_contract_interface(Type, Contract, Options) when is_binary(Contract) ->
    do_contract_interface(Type, binary_to_list(Contract), Options);
 do_contract_interface(Type, ContractString, Options) ->
    try
-        Ast = aeso_compiler:parse(ContractString, Options),
-        {TypedAst, _, _} = aeso_ast_infer_types:infer(Ast, [dont_unfold | Options]),
+        Ast = so_compiler:parse(ContractString, Options),
+        {TypedAst, _, _} = so_ast_infer_types:infer(Ast, [dont_unfold | Options]),
        from_typed_ast(Type, TypedAst)
    catch
        throw:{error, Errors} -> {error, Errors}
@@ -200,7 +200,7 @@ encode_expr({bytes, _, B})  ->
 encode_expr({Lit, _, L}) when Lit == oracle_pubkey; Lit == oracle_query_id;
                              Lit == contract_pubkey; Lit == account_pubkey;
                              Lit == signature ->
-    aeser_api_encoder:encode(Lit, L);
+    gmser_api_encoder:encode(Lit, L);
 encode_expr({app, _, {'-', _}, [{int, _, N}]}) ->
  encode_expr({int, [], -N});
 encode_expr({app, _, F, As}) ->
@@ -361,14 +361,14 @@ is_type(_)                      -> false.

 sort_decls(Ds) ->
    Sort = fun (D1, D2) ->
-                   aeso_syntax:get_ann(line, D1, 0) =<
-                       aeso_syntax:get_ann(line, D2, 0)
+                   so_syntax:get_ann(line, D1, 0) =<
+                       so_syntax:get_ann(line, D2, 0)
           end,
    lists:sort(Sort, Ds).

-is_entrypoint(Node) -> aeso_syntax:get_ann(entrypoint, Node, false).
-is_stateful(Node) -> aeso_syntax:get_ann(stateful, Node, false).
-is_payable(Node) -> aeso_syntax:get_ann(payable, Node, false).
+is_entrypoint(Node) -> so_syntax:get_ann(entrypoint, Node, false).
+is_stateful(Node) -> so_syntax:get_ann(stateful, Node, false).
+is_payable(Node) -> so_syntax:get_ann(payable, Node, false).

 typedef_name({type_def, _, {id, _, Name}, _, _}) -> Name.

@@ -1,4 +1,4 @@
-module(aeso_ast).
+-module(so_ast).

 -export([int/2,
         line/1,
@@ -17,11 +17,11 @@ line({symbol, Line, _}) -> Line.
 symbol_name({symbol, _, Name}) -> Name.

 pp(Ast) ->
-    String = prettypr:format(aeso_pretty:decls(Ast, [])),
+    String = prettypr:format(so_pretty:decls(Ast, [])),
    io:format("Ast:\n~s\n", [String]).

 pp_typed(TypedAst) ->
    %% io:format("Typed tree:\n~p\n",[TypedAst]),
-    String = prettypr:format(aeso_pretty:decls(TypedAst, [show_generated])),
+    String = prettypr:format(so_pretty:decls(TypedAst, [show_generated])),
    io:format("Type ast:\n~s\n",[String]).

@@ -7,12 +7,12 @@
 %%% Created : 26 Mar 2019
 %%%
 %%%-------------------------------------------------------------------
-module(aeso_ast_to_fcode).
+-module(so_ast_to_fcode).

 -export([ast_to_fcode/2, format_fexpr/1]).
 -export_type([fcode/0, fexpr/0, fun_def/0]).

-include("aeso_utils.hrl").
+-include("so_utils.hrl").

 %% -- Type definitions -------------------------------------------------------

@@ -60,9 +60,9 @@
              | {contract_code, string()} %% for CREATE, by name
              | {typerep, ftype()}.

-type fann() :: [ {file, aeso_syntax:ann_file()} |
-                  {line, aeso_syntax:ann_line()} |
-                  {col, aeso_syntax:ann_col()}
+-type fann() :: [ {file, so_syntax:ann_file()} |
+                  {line, so_syntax:ann_line()} |
+                  {col, so_syntax:ann_col()}
                ].

 -type fexpr() :: {lit, fann(), flit()}
@@ -166,7 +166,7 @@
                  fun_env           := fun_env(),
                  con_env           := con_env(),
                  child_con_env     := child_con_env(),
-                  event_type        => aeso_syntax:typedef(),
+                  event_type        => so_syntax:typedef(),
                  builtins          := builtins(),
                  options           := [option()],
                  state_layout      => state_layout(),
@@ -181,9 +181,9 @@

 %% -- Entrypoint -------------------------------------------------------------

-%% Main entrypoint. Takes typed syntax produced by aeso_ast_infer_types:infer/1,2
+%% Main entrypoint. Takes typed syntax produced by so_ast_infer_types:infer/1,2
 %% and produces Fate intermediate code.
-spec ast_to_fcode(aeso_syntax:ast(), [option()]) -> {env(), fcode()}.
+-spec ast_to_fcode(so_syntax:ast(), [option()]) -> {env(), fcode()}.
 ast_to_fcode(Code, Options) ->
    init_fresh_names(Options),
    {Env1, FCode1} = to_fcode(init_env(Options), Code),
@@ -364,7 +364,7 @@ get_option(Opt, Env, Default) ->

 %% -- Compilation ------------------------------------------------------------

-spec to_fcode(env(), aeso_syntax:ast()) -> {env(), fcode()}.
+-spec to_fcode(env(), so_syntax:ast()) -> {env(), fcode()}.
 to_fcode(Env, [{Contract, Attrs, {con, _, Name}, _Impls, Decls}|Rest])
  when ?IS_CONTRACT_HEAD(Contract) ->
    case Contract =:= contract_interface of
@@ -405,7 +405,7 @@ to_fcode(Env, [{namespace, _, {con, _, Con}, Decls} | Code]) ->
    Env1 = decls_to_fcode(Env#{ context => {namespace, Con} }, Decls),
    to_fcode(Env1, Code).

-spec ann_loc(aeso_syntax:ann() | fann()) -> {File, Line, Column} when
+-spec ann_loc(so_syntax:ann() | fann()) -> {File, Line, Column} when
      File   :: string() | none,
      Line   :: non_neg_integer() | none,
      Column :: non_neg_integer() | none.
@@ -415,7 +415,7 @@ ann_loc(Ann) ->
    Col  = proplists:get_value(col, Ann, none),
    {File, Line, Col}.

-spec to_fann(aeso_syntax:ann()) -> fann().
+-spec to_fann(so_syntax:ann()) -> fann().
 to_fann(Ann) ->
    {File, Line, Col} = ann_loc(Ann),
    [ {Tag, X} ||
@@ -426,7 +426,7 @@ to_fann(Ann) ->
 -spec get_fann(fexpr()) -> fann().
 get_fann(FExpr) -> element(2, FExpr).

-spec decls_to_fcode(env(), [aeso_syntax:decl()]) -> env().
+-spec decls_to_fcode(env(), [so_syntax:decl()]) -> env().
 decls_to_fcode(Env, Decls) ->
    %% First compute mapping from Sophia names to fun_names and add it to the
    %% environment.
@@ -434,7 +434,7 @@ decls_to_fcode(Env, Decls) ->
    lists:foldl(fun(D, E) -> decl_to_fcode(E, D)
                end, Env1, Decls).

-spec decl_to_fcode(env(), aeso_syntax:decl()) -> env().
+-spec decl_to_fcode(env(), so_syntax:decl()) -> env().
 decl_to_fcode(Env, {fun_decl, _, _, _})  -> Env;
 decl_to_fcode(Env, {type_def, _Ann, Name, Args, Def}) ->
    typedef_to_fcode(Env, Name, Args, Def);
@@ -458,7 +458,7 @@ decl_to_fcode(Env = #{ consts := Consts }, {letval, _, {typed, _, {id, _, X}, _}
    NewConsts = Consts#{ qname(Env, X) => FVal },
    Env#{ consts := NewConsts }.

-spec typedef_to_fcode(env(), aeso_syntax:id(), [aeso_syntax:tvar()], aeso_syntax:typedef()) -> env().
+-spec typedef_to_fcode(env(), so_syntax:id(), [so_syntax:tvar()], so_syntax:typedef()) -> env().
 typedef_to_fcode(Env, {id, _, Name}, Xs, Def) ->
    Q = qname(Env, Name),
    FDef = fun(Args) when length(Args) == length(Xs) ->
@@ -525,11 +525,11 @@ compute_state_layout(R, [H | T]) ->
 compute_state_layout(R, _) ->
    {R + 1, {reg, R}}.

-spec type_to_fcode(env(), aeso_syntax:type()) -> ftype().
+-spec type_to_fcode(env(), so_syntax:type()) -> ftype().
 type_to_fcode(Env, Type) ->
    type_to_fcode(Env, #{}, Type).

-spec type_to_fcode(env(), #{var_name() => ftype()}, aeso_syntax:type()) -> ftype().
+-spec type_to_fcode(env(), #{var_name() => ftype()}, so_syntax:type()) -> ftype().
 type_to_fcode(_Env, _Sub, {con, _, _}) -> contract;
 type_to_fcode(Env, Sub, {app_t, _, T = {Id, _, _}, Types}) when Id == id; Id == qid ->
    lookup_type(Env, T, [type_to_fcode(Env, Sub, Type) || Type <- Types]);
@@ -555,7 +555,7 @@ type_to_fcode(Env, Sub, {if_t, _, _, _, Else}) ->
 type_to_fcode(_Env, _Sub, Type) ->
    error({todo, Type}).

-spec args_to_fcode(env(), [aeso_syntax:pat()]) -> [{var_name(), ftype()}].
+-spec args_to_fcode(env(), [so_syntax:pat()]) -> [{var_name(), ftype()}].
 args_to_fcode(Env, Args) ->
    [ case Arg of
          {id, _, Name} -> {Name, type_to_fcode(Env, Type)};
@@ -586,13 +586,13 @@ let_bind(Binds, Body) ->
    lists:foldr(fun({X, E}, Rest) -> let_bind(X, E, Rest) end,
                Body, Binds).

-spec expr_to_fcode(env(), aeso_syntax:expr()) -> fexpr().
+-spec expr_to_fcode(env(), so_syntax:expr()) -> fexpr().
 expr_to_fcode(Env, {typed, _, Expr, Type}) ->
    expr_to_fcode(Env, Type, Expr);
 expr_to_fcode(Env, Expr) ->
    expr_to_fcode(Env, no_type, Expr).

-spec expr_to_fcode(env(), aeso_syntax:type() | no_type, aeso_syntax:expr()) -> fexpr().
+-spec expr_to_fcode(env(), so_syntax:type() | no_type, so_syntax:expr()) -> fexpr().

 %% Literals
 expr_to_fcode(_Env, _Type, {int,             Ann, N}) -> {lit, to_fann(Ann), {int, N}};
@@ -705,7 +705,7 @@ expr_to_fcode(Env, {record_t, FieldTypes}, {record, Ann, Rec, Fields}) ->

 %% Lists
 expr_to_fcode(Env, _Type, {list, Ann, Es}) ->
-    lists:foldr(fun(E, L) -> {op, to_fann(aeso_syntax:get_ann(E)), '::', [expr_to_fcode(Env, E), L]} end,
+    lists:foldr(fun(E, L) -> {op, to_fann(so_syntax:get_ann(E)), '::', [expr_to_fcode(Env, E), L]} end,
                {nil, to_fann(Ann)}, Es);

 expr_to_fcode(Env, _Type, {app, As, {'..', _}, [A, B]}) ->
@@ -783,7 +783,7 @@ expr_to_fcode(Env, _, {app, _, Fun = {typed, Ann, FunE, {fun_t, _, NamedArgsT, A
                var_args -> fcode_error({var_args_not_set, FunE});
                _ ->
                    %% Here we little cheat on the typechecker, but this inconsistency
-                    %% is to be solved in `aeso_fcode_to_fate:type_to_scode/1`
+                    %% is to be solved in `so_fcode_to_fate:type_to_scode/1`
                    FInitArgsT = gmb_fate_data:make_typerep([type_to_fcode(Env, T) || T <- ArgsT]),
                    builtin_to_fcode(state_layout(Env), FAnn, chain_clone, [{lit, FAnn, FInitArgsT}|FArgs])
            end;
@@ -886,8 +886,8 @@ strip_singleton_tuples(T) -> T.

 -spec get_oracle_type(OracleFun, FunT) -> OracleType when
      OracleFun :: atom(),
-      FunT :: aeso_syntax:type(),
-      OracleType :: aeso_syntax:type().
+      FunT :: so_syntax:type(),
+      OracleType :: so_syntax:type().
 get_oracle_type(oracle_register,     {fun_t, _, _, _, OType})       -> OType;
 get_oracle_type(oracle_query,        {fun_t, _, _, [OType | _], _}) -> OType;
 get_oracle_type(oracle_get_question, {fun_t, _, _, [OType | _], _}) -> OType;
@@ -898,7 +898,7 @@ get_oracle_type(oracle_respond,      {fun_t, _, _, [OType | _], _}) -> OType.

 %% -- Pattern matching --

-spec alts_to_fcode(env(), ftype(), var_name(), [aeso_syntax:alt()], aeso_syntax:expr()) -> fsplit().
+-spec alts_to_fcode(env(), ftype(), var_name(), [so_syntax:alt()], so_syntax:expr()) -> fsplit().
 alts_to_fcode(Env, Type, X, Alts, Switch) ->
    FAlts = remove_guards(Env, Alts, Switch),
    split_tree(Env, [{X, Type}], FAlts).
@@ -915,7 +915,7 @@ alts_to_fcode(Env, Type, X, Alts, Switch) ->
              | {con, arities(), tag(), [fpat()]}
              | {assign, fpat(), fpat()}.

-spec remove_guards(env(), [aeso_syntax:alt()], aeso_syntax:expr()) -> [falt()].
+-spec remove_guards(env(), [so_syntax:alt()], so_syntax:expr()) -> [falt()].
 remove_guards(_Env, [], _Switch) ->
    [];
 remove_guards(Env, [Alt = {'case', _, _, [{guarded, _, [], _Expr}]} | Rest], Switch) ->
@@ -1080,19 +1080,19 @@ next_split(Pats) ->
        [I | _] -> I
    end.

-spec alt_to_fcode(env(), aeso_syntax:alt()) -> falt().
+-spec alt_to_fcode(env(), so_syntax:alt()) -> falt().
 alt_to_fcode(Env, {'case', _, Pat, [{guarded, _, [], Expr}]}) ->
    FPat  = pat_to_fcode(Env, Pat),
    FExpr = expr_to_fcode(bind_vars(Env, pat_vars(FPat)), Expr),
    {'case', [FPat], FExpr}.

-spec pat_to_fcode(env(), aeso_syntax:pat()) -> fpat().
+-spec pat_to_fcode(env(), so_syntax:pat()) -> fpat().
 pat_to_fcode(Env, {typed, _, Pat, Type}) ->
    pat_to_fcode(Env, Type, Pat);
 pat_to_fcode(Env, Pat) ->
    pat_to_fcode(Env, no_type, Pat).

-spec pat_to_fcode(env(), aeso_syntax:type() | no_type, aeso_syntax:pat()) -> fpat().
+-spec pat_to_fcode(env(), so_syntax:type() | no_type, so_syntax:pat()) -> fpat().
 pat_to_fcode(_Env, _Type, {id, _, X}) -> {var, X};
 pat_to_fcode(Env, _Type, {C, _, _} = Con) when C == con; C == qcon ->
    #con_tag{tag = I, arities = As} = lookup_con(Env, Con),
@@ -1134,7 +1134,7 @@ pat_to_fcode(_Env, Type, Pat) ->
                       | {atom, fexpr()}
                       | {'if', fexpr(), decision_tree(), decision_tree()}.

-spec decision_op(aeso_syntax:op(), decision_tree(), decision_tree()) -> decision_tree().
+-spec decision_op(so_syntax:op(), decision_tree(), decision_tree()) -> decision_tree().
 decision_op('&&', {atom, A}, B) -> {'if', A, B, false};
 decision_op('&&', false, _)     -> false;
 decision_op('&&', true,  B)     -> B;
@@ -1144,7 +1144,7 @@ decision_op('||', true,  _)     -> true;
 decision_op(Op, {'if', A, Then, Else}, B) ->
    {'if', A, decision_op(Op, Then, B), decision_op(Op, Else, B)}.

-spec expr_to_decision_tree(env(), aeso_syntax:expr()) -> decision_tree().
+-spec expr_to_decision_tree(env(), so_syntax:expr()) -> decision_tree().
 expr_to_decision_tree(Env, {app, _Ann, {Op, _}, [A, B]}) when Op == '&&'; Op == '||' ->
    decision_op(Op, expr_to_decision_tree(Env, A), expr_to_decision_tree(Env, B));
 expr_to_decision_tree(Env, {typed, _, Expr, _}) -> expr_to_decision_tree(Env, Expr);
@@ -1163,7 +1163,7 @@ decision_tree_to_fcode({'if', A, Then, Else}) ->

 %% -- Statements --

-spec stmts_to_fcode(env(), [aeso_syntax:stmt()]) -> fexpr().
+-spec stmts_to_fcode(env(), [so_syntax:stmt()]) -> fexpr().
 stmts_to_fcode(Env, [{letval, Ann, {typed, _, {id, _, X}, _}, Expr} | Stmts]) ->
    {'let', to_fann(Ann), X, expr_to_fcode(Env, Expr), stmts_to_fcode(bind_var(Env, X), Stmts)};
 stmts_to_fcode(Env, [{letval, Ann, Pat, Expr} | Stmts]) ->
@@ -1178,7 +1178,7 @@ stmts_to_fcode(Env, [{letfun, Ann, {id, _, X}, Args, _Type, [{guarded, _, [], Ex
 stmts_to_fcode(Env, [Expr]) ->
    expr_to_fcode(Env, Expr);
 stmts_to_fcode(Env, [Expr | Stmts]) ->
-    {'let', to_fann(aeso_syntax:get_ann(Expr)), "_", expr_to_fcode(Env, Expr), stmts_to_fcode(Env, Stmts)}.
+    {'let', to_fann(so_syntax:get_ann(Expr)), "_", expr_to_fcode(Env, Expr), stmts_to_fcode(Env, Stmts)}.

 %% -- Builtins --

@@ -1810,7 +1810,7 @@ used_functions(Used, [Name | Rest], Defs) ->

 %% -- Types --

-spec lookup_type(env(), aeso_syntax:id() | aeso_syntax:qid() | sophia_name(), [ftype()]) -> ftype().
+-spec lookup_type(env(), so_syntax:id() | so_syntax:qid() | sophia_name(), [ftype()]) -> ftype().
 lookup_type(Env, {id, _, Name}, Args) ->
    lookup_type(Env, [Name], Args);
 lookup_type(Env, {qid, _, Name}, Args) ->
@@ -1842,7 +1842,7 @@ bind_constructors(Env = #{ con_env := ConEnv }, NewCons) ->
 add_child_con(Env = #{child_con_env := CEnv}, Name, Fcode) ->
    Env#{ child_con_env := CEnv#{Name => Fcode} }.

-spec add_fun_env(env(), [aeso_syntax:decl()]) -> env().
+-spec add_fun_env(env(), [so_syntax:decl()]) -> env().
 add_fun_env(Env = #{ context := {abstract_contract, _} }, _) -> Env;  %% no functions from abstract contracts
 add_fun_env(Env = #{ fun_env := FunEnv }, Decls) ->
    Entry = fun({letfun, Ann, {id, _, Name}, Args, _, _}) ->
@@ -1853,7 +1853,7 @@ add_fun_env(Env = #{ fun_env := FunEnv }, Decls) ->
    FunEnv1 = maps:from_list(lists:flatmap(Entry, Decls)),
    Env#{ fun_env := maps:merge(FunEnv, FunEnv1) }.

-spec make_fun_name(env(), aeso_syntax:ann(), aeso_syntax:name()) -> fun_name().
+-spec make_fun_name(env(), so_syntax:ann(), so_syntax:name()) -> fun_name().
 make_fun_name(#{ context := Context }, Ann, Name) ->
    Entrypoint = proplists:get_value(entrypoint, Ann, false),
    case Context of
@@ -1884,7 +1884,7 @@ lookup_fun(#{ fun_env := FunEnv }, Name) ->
        {FName, _} -> FName
    end.

-spec lookup_con(env(), aeso_syntax:con() | aeso_syntax:qcon() | sophia_name()) -> con_tag().
+-spec lookup_con(env(), so_syntax:con() | so_syntax:qcon() | sophia_name()) -> con_tag().
 lookup_con(Env, {con, _, Con})  -> lookup_con(Env, [Con]);
 lookup_con(Env, {qcon, _, Con}) -> lookup_con(Env, Con);
 lookup_con(#{ con_env := ConEnv }, Con) ->
@@ -1900,7 +1900,7 @@ bind_vars(Env, Xs) ->
 -spec bind_var(env(), var_name()) -> env().
 bind_var(Env = #{ vars := Vars }, X) -> Env#{ vars := [X | Vars] }.

-spec resolve_var(env(), aeso_syntax:ann(), [aeso_syntax:name()]) -> fexpr().
+-spec resolve_var(env(), so_syntax:ann(), [so_syntax:name()]) -> fexpr().
 resolve_var(#{ vars := Vars } = Env, Ann, [X]) ->
    case lists:member(X, Vars) of
        true  -> {var, to_fann(Ann), X};
@@ -1922,7 +1922,7 @@ resolve_const(#{ consts := Consts }, Q) ->
        Val       -> Val
    end.

-spec resolve_fun(env(), aeso_syntax:ann(), [aeso_syntax:name()]) -> fexpr().
+-spec resolve_fun(env(), so_syntax:ann(), [so_syntax:name()]) -> fexpr().
 resolve_fun(#{ fun_env := Funs, builtins := Builtin } = Env, Ann, Q) ->
    case {maps:get(Q, Funs, not_found), maps:get(Q, Builtin, not_found)} of
        {not_found, not_found} -> internal_error({unbound_variable, Q});
@@ -2102,7 +2102,7 @@ bottom_up(F, Env, Expr) ->
        {'case', Pat, Split}             -> {'case', Pat, bottom_up(F, Env, Split)}
    end).

-spec get_named_args([aeso_syntax:named_arg_t()], [aeso_syntax:arg_expr()]) -> [aeso_syntax:expr()].
+-spec get_named_args([so_syntax:named_arg_t()], [so_syntax:arg_expr()]) -> [so_syntax:expr()].
 get_named_args(NamedArgsT, Args) ->
    IsNamed = fun({named_arg, _, _, _}) -> true;
                 (_) -> false end,
@@ -2110,7 +2110,7 @@ get_named_args(NamedArgsT, Args) ->
    NamedArgs = [get_named_arg(NamedArg, Named) || NamedArg <- NamedArgsT],
    NamedArgs ++ NotNamed.

-spec get_named_arg(aeso_syntax:named_arg_t(), [aeso_syntax:arg_expr()]) -> aeso_syntax:expr().
+-spec get_named_arg(so_syntax:named_arg_t(), [so_syntax:arg_expr()]) -> so_syntax:expr().
 get_named_arg({named_arg_t, _, {id, _, Name}, _, Default}, Args) ->
    case [ Val || {named_arg, _, {id, _, X}, Val} <- Args, X == Name ] of
        [Val] -> Val;
@@ -2236,15 +2236,15 @@ update_rename(OldRen, NewRen) ->

 %% -- Records --

-spec field_index(aeso_syntax:typedef(), aeso_syntax:name()) -> integer().
+-spec field_index(so_syntax:typedef(), so_syntax:name()) -> integer().
 field_index({record_t, Fields}, X) ->
    IsX = fun({field_t, _, {id, _, Y}, _}) -> X == Y end,
    [I] = [ I || {I, Field} <- indexed(Fields), IsX(Field) ],
    I - 1.  %% Tuples are 0-indexed

-spec field_value(aeso_syntax:field_t(), [aeso_syntax:field(aeso_syntax:pat())]) -> Res when
-      Res :: {upd, aeso_syntax:name(), Expr} | {set, Expr} | false,
-      Expr :: aeso_syntax:expr().
+-spec field_value(so_syntax:field_t(), [so_syntax:field(so_syntax:pat())]) -> Res when
+      Res :: {upd, so_syntax:name(), Expr} | {set, Expr} | false,
+      Expr :: so_syntax:expr().
 field_value({field_t, _, {id, _, X}, _}, Fields) ->
    View = fun({field, _, [{proj, _, {id, _, Y}}], E})    -> {Y, {set, E}};
              ({field_upd, _, [{proj, _, {id, _, Y}}],
@@ -2256,13 +2256,13 @@ field_value({field_t, _, {id, _, X}, _}, Fields) ->

 %% -- Attributes --

-spec get_attributes(aeso_syntax:ann()) -> [stateful | payable | private].
+-spec get_attributes(so_syntax:ann()) -> [stateful | payable | private].
 get_attributes(Ann) ->
    [stateful || proplists:get_value(stateful, Ann, false)] ++
    [payable  || proplists:get_value(payable, Ann, false)] ++
    [private  || not proplists:get_value(entrypoint, Ann, false)].

-spec get_attributes_debug(aeso_syntax:ann()) -> [stateful | payable | private | fann()].
+-spec get_attributes_debug(so_syntax:ann()) -> [stateful | payable | private | fann()].
 get_attributes_debug(Ann) ->
    get_attributes(Ann) ++ to_fann(Ann).

@@ -2283,14 +2283,14 @@ setnth(I, X, Xs) ->

 -spec fcode_error(string()) -> no_return().
 fcode_error(Error) ->
-    Pos = aeso_errors:pos(0, 0),
+    Pos = so_errors:pos(0, 0),
    Msg = lists:flatten(io_lib:format("Unknown error: ~p\n", [Error])),
-    aeso_errors:throw(aeso_errors:new(code_error, Pos, Msg)).
+    so_errors:throw(so_errors:new(code_error, Pos, Msg)).

 -spec internal_error(string()) -> no_return().
 internal_error(Error) ->
    Msg = lists:flatten(io_lib:format("~p\n", [Error])),
-    aeso_errors:throw(aeso_errors:new(internal_error, aeso_errors:pos(0, 0), Msg)).
+    so_errors:throw(so_errors:new(internal_error, so_errors:pos(0, 0), Msg)).

 %% -- Pretty printing --------------------------------------------------------

@@ -2367,7 +2367,7 @@ pp_fexpr({lit, _, {typerep, T}}) ->
 pp_fexpr({lit, _, {contract_code, Contract}}) ->
    pp_beside(pp_text("contract "), pp_text(Contract));
 pp_fexpr({lit, _, {Tag, Lit}}) ->
-    aeso_pretty:expr({Tag, [], Lit});
+    so_pretty:expr({Tag, [], Lit});
 pp_fexpr({nil, _}) ->
    pp_text("[]");
 pp_fexpr({var, _, X}) -> pp_text(X);
@@ -6,7 +6,7 @@
 %%% @end
 %%% Created : 12 Dec 2017
 %%%-------------------------------------------------------------------
-module(aeso_compiler).
+-module(so_compiler).

 -export([ file/1
        , file/2
@@ -28,7 +28,7 @@
        ]).

 -include_lib("gmbytecode/include/gmb_opcodes.hrl").
-include("aeso_utils.hrl").
+-include("so_utils.hrl").


 -type option() :: pp_sophia_code
@@ -43,7 +43,7 @@
                            {explicit_files, #{string() => binary()}}}
                | {src_file, string()}
                | {src_dir, string()}
-                | {aci, aeso_aci:aci_type()}.
+                | {aci, so_aci:aci_type()}.
 -type options() :: [option()].

 -export_type([ option/0
@@ -80,20 +80,20 @@ numeric_version() ->
            Err
    end.

-spec file(string()) -> {ok, map()} | {error, [aeso_errors:error()]}.
+-spec file(string()) -> {ok, map()} | {error, [so_errors:error()]}.
 file(Filename) ->
    file(Filename, []).

-spec file(string(), options()) -> {ok, map()} | {error, [aeso_errors:error()]}.
+-spec file(string(), options()) -> {ok, map()} | {error, [so_errors:error()]}.
 file(File, Options0) ->
    Options = add_include_path(File, Options0),
    case read_contract(File) of
        {ok, Bin} ->
-            SrcDir = aeso_utils:canonical_dir(filename:dirname(File)),
+            SrcDir = so_utils:canonical_dir(filename:dirname(File)),
            from_string(Bin, [{src_file, File}, {src_dir, SrcDir} | Options]);
        {error, Error} ->
            Msg = lists:flatten([File,": ",file:format_error(Error)]),
-            {error, [aeso_errors:new(file_error, Msg)]}
+            {error, [so_errors:new(file_error, Msg)]}
    end.

 add_include_path(File, Options) ->
@@ -102,10 +102,10 @@ add_include_path(File, Options) ->
        false ->
            Dir = filename:dirname(File),
            {ok, Cwd} = file:get_cwd(),
-            [{include, {file_system, [Cwd, aeso_utils:canonical_dir(Dir)]}} | Options]
+            [{include, {file_system, [Cwd, so_utils:canonical_dir(Dir)]}} | Options]
    end.

-spec from_string(binary() | string(), options()) -> {ok, map()} | {error, [aeso_errors:error()]}.
+-spec from_string(binary() | string(), options()) -> {ok, map()} | {error, [so_errors:error()]}.
 from_string(ContractBin, Options) when is_binary(ContractBin) ->
    from_string(binary_to_list(ContractBin), Options);
 from_string(ContractString, Options) ->
@@ -122,7 +122,7 @@ from_string1(ContractString, Options) ->
     , warnings := Warnings } = string_to_code(ContractString, Options),
    #{ child_con_env := ChildContracts } = FCodeEnv,
    SavedFreshNames = maps:get(saved_fresh_names, FCodeEnv, #{}),
-    FateCode = aeso_fcode_to_fate:compile(ChildContracts, FCode, SavedFreshNames, Options),
+    FateCode = so_fcode_to_fate:compile(ChildContracts, FCode, SavedFreshNames, Options),
    pp_assembler(FateCode, Options),
    ByteCode = gmb_fate_code:serialize(FateCode, []),
    {ok, Version} = version(),
@@ -142,7 +142,7 @@ maybe_generate_aci(Result, FoldedTypedAst, Options) ->
        undefined ->
            Result;
        Type ->
-            {ok, Aci} = aeso_aci:from_typed_ast(Type, FoldedTypedAst),
+            {ok, Aci} = so_aci:from_typed_ast(Type, FoldedTypedAst),
            maps:put(aci, Aci, Result)
    end.

@@ -151,9 +151,9 @@ string_to_code(ContractString, Options) ->
    Ast = parse(ContractString, Options),
    pp_sophia_code(Ast, Options),
    pp_ast(Ast, Options),
-    {TypeEnv, FoldedTypedAst, UnfoldedTypedAst, Warnings} = aeso_ast_infer_types:infer(Ast, [return_env | Options]),
+    {TypeEnv, FoldedTypedAst, UnfoldedTypedAst, Warnings} = so_ast_infer_types:infer(Ast, [return_env | Options]),
    pp_typed_ast(UnfoldedTypedAst, Options),
-    {Env, Fcode} = aeso_ast_to_fcode:ast_to_fcode(UnfoldedTypedAst, [{original_src, ContractString}|Options]),
+    {Env, Fcode} = so_ast_to_fcode:ast_to_fcode(UnfoldedTypedAst, [{original_src, ContractString}|Options]),
    #{ fcode => Fcode
    ,  fcode_env => Env
    ,  unfolded_typed_ast => UnfoldedTypedAst
@@ -171,7 +171,7 @@ string_to_code(ContractString, Options) ->
 %% NOTE: Special treatment for "init" since it might be implicit and has
 %%       a special return type (typerep, T)
 -spec check_call(string(), string(), [string()], options()) -> {ok, string(), [term()]}
-                                                             | {error, [aeso_errors:error()]}.
+                                                             | {error, [so_errors:error()]}.
 check_call(Source, "init" = FunName, Args, Options) ->
    case check_call1(Source, FunName, Args, Options) of
        Err = {error, _} when Args == [] ->
@@ -190,7 +190,7 @@ check_call1(ContractString0, FunName, Args, Options) ->
    case add_extra_call(ContractString0, {call, FunName, Args}, Options) of
        {ok, CallName, Code} ->
            {def, _, _, FcodeArgs} = get_call_body(CallName, Code),
-            {ok, FunName, [ aeso_fcode_to_fate:term_to_fate(A) || A <- FcodeArgs ]};
+            {ok, FunName, [ so_fcode_to_fate:term_to_fate(A) || A <- FcodeArgs ]};
        Err = {error, _} ->
            Err
    end.
@@ -201,7 +201,7 @@ add_extra_call(Contract0, Call, Options) ->
        #{fcode := OrgFcode
        , fcode_env := #{child_con_env := ChildContracts}
        , ast := Ast} = string_to_code(Contract0, Options),
-        FateCode = aeso_fcode_to_fate:compile(ChildContracts, OrgFcode, #{}, []),
+        FateCode = so_fcode_to_fate:compile(ChildContracts, OrgFcode, #{}, []),
        %% collect all hashes and compute the first name without hash collision to
        SymbolHashes = maps:keys(gmb_fate_code:symbols(FateCode)),
        CallName = first_none_match(?CALL_NAME, SymbolHashes,
@@ -220,7 +220,7 @@ encode_value(Contract0, Type, Value, Options) ->
    case add_extra_call(Contract0, {value, Type, Value}, Options) of
        {ok, CallName, Code} ->
            Body = get_call_body(CallName, Code),
-            {ok, gmb_fate_encoding:serialize(aeso_fcode_to_fate:term_to_fate(Body))};
+            {ok, gmb_fate_encoding:serialize(so_fcode_to_fate:term_to_fate(Body))};
        Err = {error, _} ->
            Err
    end.
@@ -231,7 +231,7 @@ decode_value(Contract0, Type, FateValue, Options) ->
            #{ folded_typed_ast := TypedAst
             , type_env         := TypeEnv} = Code,
            {ok, _, Type0} = get_decode_type(CallName, TypedAst),
-            Type1 = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
+            Type1 = so_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
                                                              [ unfold_record_types
                                                              , unfold_variant_types
                                                              , not_unfold_system_alias_types ]),
@@ -251,7 +251,7 @@ first_none_match(CallName, Hashes, [Char|Chars]) ->
    end.

 %% Add the __call function to a contract.
-spec insert_call_function(aeso_syntax:ast(), string(), string(),
+-spec insert_call_function(so_syntax:ast(), string(), string(),
                           {call, string(), [string()]} | {value, string(), string()} | {type, string()}) -> string().
 insert_call_function(Ast, Code, Call, {call, FunName, Args}) ->
    Ind = last_contract_indent(Ast),
@@ -290,25 +290,25 @@ insert_init_function(Code, Options) ->

 last_contract_indent(Decls) ->
    case lists:last(Decls) of
-        {_, _, _, _, [Decl | _]} -> aeso_syntax:get_ann(col, Decl, 1) - 1;
+        {_, _, _, _, [Decl | _]} -> so_syntax:get_ann(col, Decl, 1) - 1;
        _                        -> 0
    end.

 -spec to_sophia_value(string(), string(), ok | error | revert, binary()) ->
-          {ok, aeso_syntax:expr()} | {error, [aeso_errors:error()]}.
+          {ok, so_syntax:expr()} | {error, [so_errors:error()]}.
 to_sophia_value(ContractString, Fun, ResType, Data) ->
    to_sophia_value(ContractString, Fun, ResType, Data, []).
 -spec to_sophia_value(string(), string(), ok | error | revert, binary(), options()) ->
-        {ok, aeso_syntax:expr()} | {error, [aeso_errors:error()]}.
+        {ok, so_syntax:expr()} | {error, [so_errors:error()]}.
 to_sophia_value(_, _, error, Err, _Options) ->
    {ok, {app, [], {id, [], "error"}, [{string, [], Err}]}};
 to_sophia_value(_, _, revert, Data, _Options) ->
-    try aeso_vm_decode:from_fate({id, [], "string"}, gmb_fate_encoding:deserialize(Data)) of
+    try so_vm_decode:from_fate({id, [], "string"}, gmb_fate_encoding:deserialize(Data)) of
        Err ->
            {ok, {app, [], {id, [], "abort"}, [Err]}}
    catch _:_ ->
            Msg = "Could not deserialize the revert message",
-            {error, [aeso_errors:new(data_error, Msg)]}
+            {error, [so_errors:new(data_error, Msg)]}
    end;
 to_sophia_value(ContractString, FunName, ok, Data, Options0) ->
    Options = [no_code | Options0],
@@ -316,7 +316,7 @@ to_sophia_value(ContractString, FunName, ok, Data, Options0) ->
        Code = string_to_code(ContractString, Options),
        #{ folded_typed_ast := TypedAst, type_env := TypeEnv} = Code,
        {ok, _, Type0} = get_decode_type(FunName, TypedAst),
-        Type = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
+        Type = so_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
                                                         [ unfold_record_types
                                                         , unfold_variant_types
                                                         , not_unfold_system_alias_types]),
@@ -328,24 +328,24 @@ to_sophia_value(ContractString, FunName, ok, Data, Options0) ->

 fate_data_to_sophia_value(Type, UnfoldedType, FateData) ->
    try
-        {ok, aeso_vm_decode:from_fate(UnfoldedType, gmb_fate_encoding:deserialize(FateData))}
+        {ok, so_vm_decode:from_fate(UnfoldedType, gmb_fate_encoding:deserialize(FateData))}
    catch throw:cannot_translate_to_sophia ->
-            Type1 = prettypr:format(aeso_pretty:type(Type)),
+            Type1 = prettypr:format(so_pretty:type(Type)),
            Msg = io_lib:format("Cannot translate FATE value ~p\n  of Sophia type ~s",
                                [gmb_fate_encoding:deserialize(FateData), Type1]),
-            {error, [aeso_errors:new(data_error, Msg)]};
+            {error, [so_errors:new(data_error, Msg)]};
          _:_ ->
-            Type1 = prettypr:format(aeso_pretty:type(Type)),
+            Type1 = prettypr:format(so_pretty:type(Type)),
            Msg = io_lib:format("Failed to decode binary as type ~s", [Type1]),
-            {error, [aeso_errors:new(data_error, Msg)]}
+            {error, [so_errors:new(data_error, Msg)]}
    end.

 -spec create_calldata(string(), string(), [string()]) ->
-          {ok, binary()} | {error, [aeso_errors:error()]}.
+          {ok, binary()} | {error, [so_errors:error()]}.
 create_calldata(Code, Fun, Args) ->
    create_calldata(Code, Fun, Args, []).
 -spec create_calldata(string(), string(), [string()], [{atom(), any()}]) ->
-                             {ok, binary()} | {error, [aeso_errors:error()]}.
+                             {ok, binary()} | {error, [so_errors:error()]}.
 create_calldata(Code, Fun, Args, Options0) ->
    Options = [no_code | Options0],
    case check_call(Code, Fun, Args, Options) of
@@ -355,13 +355,13 @@ create_calldata(Code, Fun, Args, Options0) ->
    end.

 -spec decode_calldata(string(), string(), binary()) ->
-          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
-        | {error, [aeso_errors:error()]}.
+          {ok, [so_syntax:type()], [so_syntax:expr()]}
+        | {error, [so_errors:error()]}.
 decode_calldata(ContractString, FunName, Calldata) ->
    decode_calldata(ContractString, FunName, Calldata, []).
 -spec decode_calldata(string(), string(), binary(), options()) ->
-          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
-        | {error, [aeso_errors:error()]}.
+          {ok, [so_syntax:type()], [so_syntax:expr()]}
+        | {error, [so_errors:error()]}.
 decode_calldata(ContractString, FunName, Calldata, Options0) ->
    Options = [no_code | Options0],
    try
@@ -373,7 +373,7 @@ decode_calldata(ContractString, FunName, Calldata, Options0) ->
        ArgTypes      = lists:map(GetType, Args),
        Type0         = {tuple_t, [], ArgTypes},
        %% user defined data types such as variants needed to match against
-        Type          = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
+        Type          = so_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
                                                                  [ unfold_record_types
                                                                  , unfold_variant_types
                                                                  , not_unfold_system_alias_types]),
@@ -381,18 +381,18 @@ decode_calldata(ContractString, FunName, Calldata, Options0) ->
            {ok, FateArgs} ->
                try
                    {tuple_t, [], ArgTypes1} = Type,
-                    AstArgs = [ aeso_vm_decode:from_fate(ArgType, FateArg)
+                    AstArgs = [ so_vm_decode:from_fate(ArgType, FateArg)
                                || {ArgType, FateArg} <- lists:zip(ArgTypes1, FateArgs)],
                    {ok, ArgTypes, AstArgs}
                catch throw:cannot_translate_to_sophia ->
-                        Type0Str = prettypr:format(aeso_pretty:type(Type0)),
+                        Type0Str = prettypr:format(so_pretty:type(Type0)),
                        Msg = io_lib:format("Cannot translate FATE value ~p\n  to Sophia type ~s",
                                            [FateArgs, Type0Str]),
-                        {error, [aeso_errors:new(data_error, Msg)]}
+                        {error, [so_errors:new(data_error, Msg)]}
                end;
            {error, _} ->
                Msg = io_lib:format("Failed to decode calldata binary", []),
-                {error, [aeso_errors:new(data_error, Msg)]}
+                {error, [so_errors:new(data_error, Msg)]}
        end
    catch
        throw:{error, Errors} -> {error, Errors}
@@ -410,8 +410,8 @@ get_decode_type(FunName, [{Contract, Ann, _, _, Defs}]) when ?IS_CONTRACT_HEAD(C
                "init" -> {ok, [], {tuple_t, [], []}};
                 _ ->
                    Msg = io_lib:format("Function '~s' is missing in contract", [FunName]),
-                    Pos = aeso_errors:pos(Ann),
-                    aeso_errors:throw(aeso_errors:new(data_error, Pos, Msg))
+                    Pos = so_errors:pos(Ann),
+                    so_errors:throw(so_errors:new(data_error, Pos, Msg))
            end
    end;
 get_decode_type(FunName, [_ | Contracts]) ->
@@ -419,10 +419,10 @@ get_decode_type(FunName, [_ | Contracts]) ->
    get_decode_type(FunName, Contracts).

 pp_sophia_code(C, Opts)->  pp(C, Opts, pp_sophia_code, fun(Code) ->
-                                io:format("~s\n", [prettypr:format(aeso_pretty:decls(Code))])
+                                io:format("~s\n", [prettypr:format(so_pretty:decls(Code))])
                            end).
-pp_ast(C, Opts)      ->  pp(C, Opts, pp_ast, fun aeso_ast:pp/1).
-pp_typed_ast(C, Opts)->  pp(C, Opts, pp_typed_ast, fun aeso_ast:pp_typed/1).
+pp_ast(C, Opts)      ->  pp(C, Opts, pp_ast, fun so_ast:pp/1).
+pp_typed_ast(C, Opts)->  pp(C, Opts, pp_typed_ast, fun so_ast:pp_typed/1).

 pp_assembler(C, Opts) ->  pp(C, Opts, pp_assembler, fun(Asm) -> io:format("~s", [gmb_fate_asm:pp(Asm)]) end).

@@ -438,9 +438,9 @@ pp(Code, Options, Option, PPFun) ->

 -define(protect(Tag, Code), fun() -> try Code catch _:Err1 -> throw({Tag, Err1}) end end()).

-spec validate_byte_code(map(), string(), options()) -> ok | {error, [aeso_errors:error()]}.
+-spec validate_byte_code(map(), string(), options()) -> ok | {error, [so_errors:error()]}.
 validate_byte_code(#{ byte_code := ByteCode, payable := Payable }, Source, Options) ->
-    Fail = fun(Err) -> {error, [aeso_errors:new(data_error, Err)]} end,
+    Fail = fun(Err) -> {error, [so_errors:new(data_error, Err)]} end,
    try
        FCode1 = ?protect(deserialize, gmb_fate_code:strip_init_function(gmb_fate_code:deserialize(ByteCode))),
        {FCode2, SrcPayable} =
@@ -513,13 +513,13 @@ pp_fate_type(T) -> io_lib:format("~w", [T]).

 %% -------------------------------------------------------------------

-spec parse(string(), aeso_compiler:options()) -> none() | aeso_syntax:ast().
+-spec parse(string(), so_compiler:options()) -> none() | so_syntax:ast().
 parse(Text, Options) ->
    parse(Text, sets:new(), Options).

-spec parse(string(), sets:set(), aeso_compiler:options()) -> none() | aeso_syntax:ast().
+-spec parse(string(), sets:set(), so_compiler:options()) -> none() | so_syntax:ast().
 parse(Text, Included, Options) ->
-    aeso_parser:string(Text, Included, Options).
+    so_parser:string(Text, Included, Options).

 read_contract(Name) ->
    file:read_file(Name).
@@ -5,7 +5,7 @@
 %%% @end
 %%%-------------------------------------------------------------------

-module(aeso_errors).
+-module(so_errors).

 -type src_file()   :: no_file | iolist().

@@ -55,9 +55,9 @@ new(Type, Pos, Msg, Ctxt) ->
    #err{ type = Type, pos = Pos, message = Msg, context = Ctxt }.

 pos(Ann) ->
-    File = aeso_syntax:get_ann(file, Ann, no_file),
-    Line = aeso_syntax:get_ann(line, Ann, 0),
-    Col  = aeso_syntax:get_ann(col, Ann, 0),
+    File = so_syntax:get_ann(file, Ann, no_file),
+    Line = so_syntax:get_ann(line, Ann, 0),
+    Col  = so_syntax:get_ann(col, Ann, 0),
    pos(File, Line, Col).

 pos(Line, Col) ->
@@ -7,7 +7,7 @@
 %%% Created : 11 Jan 2019
 %%%
 %%%-------------------------------------------------------------------
-module(aeso_fcode_to_fate).
+-module(so_fcode_to_fate).

 -export([compile/3, compile/4, term_to_fate/1, term_to_fate/2]).

@@ -72,9 +72,9 @@ debug(Tag, Options, Fun) ->

 -dialyzer({nowarn_function, [code_error/1]}).
 code_error(Err) ->
-    Pos = aeso_errors:pos(0, 0),
+    Pos = so_errors:pos(0, 0),
    Msg = lists:flatten(io_lib:format("Unknown error: ~p\n", [Err])),
-    aeso_errors:throw(aeso_errors:new(code_error, Pos, Msg)).
+    so_errors:throw(so_errors:new(code_error, Pos, Msg)).

 %% -- Main -------------------------------------------------------------------

@@ -213,7 +213,7 @@ serialize_contract_code(Env, C) ->
            FCode = maps:get(C, Env#env.child_contracts),
            FateCode = compile(Env#env.child_contracts, FCode, SavedFreshNames, Options),
            ByteCode = gmb_fate_code:serialize(FateCode, []),
-            {ok, Version} = aeso_compiler:version(),
+            {ok, Version} = so_compiler:version(),
            OriginalSourceCode = proplists:get_value(original_src, Options, ""),
            Code = #{byte_code => ByteCode,
                     compiler_version => Version,
@@ -222,7 +222,7 @@ serialize_contract_code(Env, C) ->
                     abi_version => gmb_fate_abi:abi_version(),
                     payable => maps:get(payable, FCode)
                   },
-            Serialized = aeser_contract_code:serialize(Code),
+            Serialized = gmser_contract_code:serialize(Code),
            put(contract_code_cache, maps:put(C, Serialized, Cache)),
            Serialized;
        Serialized -> Serialized
@@ -591,30 +591,6 @@ builtin_to_scode(_Env, call_fee, []) ->
    [gmb_fate_ops:fee(?a)];
 builtin_to_scode(_Env, call_gas_left, []) ->
    [gmb_fate_ops:gas(?a)];
-builtin_to_scode(Env, oracle_register, [_Sign,_Account,_QFee,_TTL,_QType,_RType] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_register(?a, ?a, ?a, ?a, ?a, ?a, ?a), Args);
-builtin_to_scode(Env, oracle_expiry, [_Oracle] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_expiry(?a, ?a), Args);
-builtin_to_scode(Env, oracle_query_fee, [_Oracle] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_query_fee(?a, ?a), Args);
-builtin_to_scode(Env, oracle_query, [_Oracle, _Question, _QFee, _QTTL, _RTTL, _QType, _RType] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_query(?a, ?a, ?a, ?a, ?a, ?a, ?a, ?a), Args);
-builtin_to_scode(Env, oracle_get_question, [_Oracle, _QueryId, _QType, _RType] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_get_question(?a, ?a, ?a, ?a, ?a), Args);
-builtin_to_scode(Env, oracle_respond, [_Sign, _Oracle, _QueryId, _Response, _QType, _RType] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:oracle_respond(?a, ?a, ?a, ?a, ?a, ?a),
-                        tuple(0)], Args);
-builtin_to_scode(Env, oracle_extend, [_Sign, _Oracle, _TTL] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:oracle_extend(?a, ?a, ?a),
-                        tuple(0)], Args);
-builtin_to_scode(Env, oracle_get_answer, [_Oracle, _QueryId, _QType, _RType] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_get_answer(?a, ?a, ?a, ?a, ?a), Args);
-builtin_to_scode(Env, oracle_check, [_Oracle, _QType, _RType] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_check(?a, ?a, ?a, ?a), Args);
-builtin_to_scode(Env, oracle_check_query, [_Oracle, _Query, _QType, _RType] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:oracle_check_query(?a, ?a, ?a, ?a, ?a), Args);
-builtin_to_scode(Env, address_is_oracle, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:is_oracle(?a, ?a), Args);
 builtin_to_scode(Env, address_is_contract, [_] = Args) ->
    call_to_scode(Env, gmb_fate_ops:is_contract(?a, ?a), Args);
 builtin_to_scode(Env, address_is_payable, [_] = Args) ->
@@ -6,7 +6,7 @@
 %%%      Programming 14, 6 (November 2004)
 %%% @end
 %%%-------------------------------------------------------------------
-module(aeso_parse_lib).
+-module(so_parse_lib).

 -export([parse/2,
         return/1, fail/0, fail/1, fail/2, map/2, bind/2,
@@ -27,16 +27,16 @@
 -type tokens() :: [token()].
 -type error()  :: {pos(), string() | no_error}.

-define(lazy(F),     {aeso_parse_lazy, F}).
-define(fail(Err),   {aeso_parse_fail, Err}).
-define(choice(Ps),  {aeso_parse_choice, Ps}).
-define(bind(P, F),  {aeso_parse_bind, P, F}).
-define(right(P, Q), {aeso_parse_right, P, Q}).
-define(left(P, Q),  {aeso_parse_left, P, Q}).
-define(map(F, P),   {aeso_parse_map, F, P}).
-define(layout,       aeso_parse_layout).
-define(tok(Atom),   {aeso_parse_tok, Atom}).
-define(return(X),   {aeso_parse_return, X}).
+-define(lazy(F),     {so_parse_lazy, F}).
+-define(fail(Err),   {so_parse_fail, Err}).
+-define(choice(Ps),  {so_parse_choice, Ps}).
+-define(bind(P, F),  {so_parse_bind, P, F}).
+-define(right(P, Q), {so_parse_right, P, Q}).
+-define(left(P, Q),  {so_parse_left, P, Q}).
+-define(map(F, P),   {so_parse_map, F, P}).
+-define(layout,       so_parse_layout).
+-define(tok(Atom),   {so_parse_tok, Atom}).
+-define(return(X),   {so_parse_return, X}).

 %% Type synonyms since you can't have function types as macro arguments for some reason.
 -type delayed(A)         :: fun(() -> A).
@@ -1,7 +1,7 @@

-define(LET_P(X, P, Q), aeso_parse_lib:bind(P, fun(X) -> Q end)).
-define(LAZY_P(P),      aeso_parse_lib:lazy(fun() -> P end)).
-define(MEMO_P(P),      aeso_parse_lib:lazy(aeso_parse_lib:memoised(fun() -> P end))).
+-define(LET_P(X, P, Q), so_parse_lib:bind(P, fun(X) -> Q end)).
+-define(LAZY_P(P),      so_parse_lib:lazy(fun() -> P end)).
+-define(MEMO_P(P),      so_parse_lib:lazy(so_parse_lib:memoised(fun() -> P end))).

 -define(GUARD_P(G, P),
    case G of
@@ -18,7 +18,7 @@
 -define(RULE(A, B, C, D, E, F, G,    Do), map(fun({_1, _2, _3, _4, _5, _6, _7}) ->     Do end, {A, B, C, D, E, F, G}   )).
 -define(RULE(A, B, C, D, E, F, G, H, Do), map(fun({_1, _2, _3, _4, _5, _6, _7, _8}) -> Do end, {A, B, C, D, E, F, G, H})).

-import(aeso_parse_lib,
+-import(so_parse_lib,
        [tok/1, tok/2, between/3, many/1, many1/1, sep/2, sep1/2,
         infixl/1, infixr/1, choice/1, choice/2, return/1, layout/0,
         fail/0, fail/1, fail/2, map/2, infixl/2, infixr/2, infixl1/2, infixr1/2,
@@ -1,8 +1,8 @@
-%%% File        : aeso_parser.erl
+%%% File        : so_parser.erl
 %%% Author      : Ulf Norell
 %%% Description :
 %%% Created     : 1 Mar 2018 by Ulf Norell
-module(aeso_parser).
+-module(so_parser).
 -compile({no_auto_import,[map_get/2]}).

 -export([string/1,
@@ -17,12 +17,12 @@
         run_parser/2,
         run_parser/3]).

-include("aeso_parse_lib.hrl").
-import(aeso_parse_lib, [current_file/0, set_current_file/1,
+-include("so_parse_lib.hrl").
+-import(so_parse_lib, [current_file/0, set_current_file/1,
                         current_dir/0, set_current_dir/1,
                         current_include_type/0, set_current_include_type/1]).

-type parse_result() :: aeso_syntax:ast() | {aeso_syntax:ast(), sets:set(include_hash())} | none().
+-type parse_result() :: so_syntax:ast() | {so_syntax:ast(), sets:set(include_hash())} | none().

 -type include_hash() :: {string(), binary()}.

@@ -36,14 +36,14 @@ escape_errors({error, Err}) ->
 string(String) ->
    string(String, sets:new(), []).

-spec string(string(), aeso_compiler:options()) -> parse_result().
+-spec string(string(), so_compiler:options()) -> parse_result().
 string(String, Opts) ->
    case lists:keyfind(src_file, 1, Opts) of
        {src_file, File} -> string(String, sets:add_element(File, sets:new()), Opts);
        false -> string(String, sets:new(), Opts)
    end.

-spec string(string(), sets:set(include_hash()), aeso_compiler:options()) -> parse_result().
+-spec string(string(), sets:set(include_hash()), so_compiler:options()) -> parse_result().
 string(String, Included, Opts) ->
    AST = run_parser(file(), String, Opts),
    case expand_includes(AST, Included, Opts) of
@@ -61,18 +61,18 @@ parse_and_scan(P, S, Opts) ->
    set_current_file(proplists:get_value(src_file, Opts, no_file)),
    set_current_dir(proplists:get_value(src_dir, Opts, no_file)),
    set_current_include_type(proplists:get_value(include_type, Opts, none)),
-    case aeso_scan:scan(S) of
-        {ok, Tokens} -> aeso_parse_lib:parse(P, Tokens);
+    case so_scan:scan(S) of
+        {ok, Tokens} -> so_parse_lib:parse(P, Tokens);
        {error, {{Input, Pos}, _}} ->
            {error, {Pos, scan_error, Input}}
    end.

 -dialyzer({nowarn_function, parse_error/1}).
 parse_error(Err) ->
-    aeso_errors:throw(mk_error(Err)).
+    so_errors:throw(mk_error(Err)).

 mk_p_err(Pos, Msg) ->
-    aeso_errors:new(parse_error, mk_pos(Pos), lists:flatten(Msg)).
+    so_errors:new(parse_error, mk_pos(Pos), lists:flatten(Msg)).

 mk_error({Pos, scan_error, Input}) ->
    mk_p_err(Pos, io_lib:format("Lexical error on input: ~s\n", [Input]));
@@ -86,8 +86,8 @@ mk_error({Pos, include_error, File}) ->
    Msg = io_lib:format("Couldn't find include file '~s'\n", [File]),
    mk_p_err(Pos, Msg).

-mk_pos({Line, Col})       -> aeso_errors:pos(Line, Col);
-mk_pos({File, Line, Col}) -> aeso_errors:pos(File, Line, Col).
+mk_pos({Line, Col})       -> so_errors:pos(Line, Col);
+mk_pos({File, Line, Col}) -> so_errors:pos(File, Line, Col).

 %% -- Parsing rules ----------------------------------------------------------

@@ -411,7 +411,7 @@ map_key(Key, {ok, {_, Val}}) -> {map_key, Key, Val}.

 elim(E, [])                              -> E;
 elim(E, [{proj, Ann, P} | Es])           -> elim({proj, Ann, E, P}, Es);
-elim(E, [{app, _Ann, Args} | Es])        -> elim({app, aeso_syntax:get_ann(E), E, Args}, Es);
+elim(E, [{app, _Ann, Args} | Es])        -> elim({app, so_syntax:get_ann(E), E, Args}, Es);
 elim(E, [{rec_upd, Ann, Flds} | Es])     -> elim(record_update(Ann, E, Flds), Es);
 elim(E, [{map_get, Ann, Key} | Es])      -> elim({map_get, Ann, E, Key}, Es);
 elim(E, [{map_get, Ann, Key, Val} | Es]) -> elim({map_get, Ann, E, Key, Val}, Es).
@@ -528,7 +528,7 @@ parse_addr_literal(Id = {id, Ann, Name}) ->
    case lists:member(lists:sublist(Name, 3), ["ak_", "ok_", "oq_", "ct_", "sg_"]) of
        false -> Id;
        true  ->
-            try aeser_api_encoder:decode(list_to_binary(Name)) of
+            try gmser_api_encoder:decode(list_to_binary(Name)) of
                {Type, Bin} -> {Type, Ann, Bin}
            catch _:_ ->
                Id
@@ -557,9 +557,9 @@ bracket_list(P) -> brackets(comma_sep(P)).

 %% -- Annotations ------------------------------------------------------------

-type ann()      :: aeso_syntax:ann().
-type ann_line() :: aeso_syntax:ann_line().
-type ann_col()  :: aeso_syntax:ann_col().
+-type ann()      :: so_syntax:ann().
+-type ann_line() :: so_syntax:ann_line().
+-type ann_col()  :: so_syntax:ann_col().

 -spec pos_ann(ann_line(), ann_col()) -> ann().
 pos_ann(Line, Col) ->
@@ -647,7 +647,7 @@ tuple_e(Ann, Exprs)   -> {tuple, Ann, Exprs}.

 list_comp_e(Ann, Expr, Binds) -> {list_comp, Ann, Expr, Binds}.

-spec parse_pattern(aeso_syntax:expr()) -> aeso_parse_lib:parser(aeso_syntax:pat()).
+-spec parse_pattern(so_syntax:expr()) -> so_parse_lib:parser(so_syntax:pat()).
 parse_pattern({letpat, Ann, Id, Pat}) ->
    {letpat, Ann, Id, parse_pattern(Pat)};
 parse_pattern({app, Ann, Con = {'::', _}, Es}) ->
@@ -674,19 +674,19 @@ parse_pattern(E = {string, _, _}) -> E;
 parse_pattern(E = {char, _, _})   -> E;
 parse_pattern(E) -> bad_expr_err("Not a valid pattern", E).

-spec parse_field_pattern(aeso_syntax:field(aeso_syntax:expr())) -> aeso_parse_lib:parser(aeso_syntax:field(aeso_syntax:pat())).
+-spec parse_field_pattern(so_syntax:field(so_syntax:expr())) -> so_parse_lib:parser(so_syntax:field(so_syntax:pat())).
 parse_field_pattern({field, Ann, F, E}) ->
    {field, Ann, F, parse_pattern(E)}.

-spec ret_doc_err(ann(), prettypr:document()) -> aeso_parse_lib:parser(none()).
+-spec ret_doc_err(ann(), prettypr:document()) -> so_parse_lib:parser(none()).
 ret_doc_err(Ann, Doc) ->
    fail(ann_pos(Ann), prettypr:format(Doc)).

-spec bad_expr_err(string(), aeso_syntax:expr()) -> aeso_parse_lib:parser(none()).
+-spec bad_expr_err(string(), so_syntax:expr()) -> so_parse_lib:parser(none()).
 bad_expr_err(Reason, E) ->
  ret_doc_err(get_ann(E),
              prettypr:sep([prettypr:text(Reason ++ ":"),
-                            prettypr:nest(2, aeso_pretty:expr(E))])).
+                            prettypr:nest(2, so_pretty:expr(E))])).

 %% -- Helper functions -------------------------------------------------------

@@ -761,12 +761,12 @@ read_file(File, Opts) ->
 read_file_(Path, File) ->
    AbsFile = filename:join(Path, File),
    case file:read_file(AbsFile) of
-        {ok, Bin} -> {ok, aeso_utils:canonical_dir(filename:dirname(AbsFile)), Bin};
+        {ok, Bin} -> {ok, so_utils:canonical_dir(filename:dirname(AbsFile)), Bin};
        Err       -> Err
    end.

 stdlib_options() ->
-    StdLibDir = aeso_stdlib:stdlib_include_path(),
+    StdLibDir = so_stdlib:stdlib_include_path(),
    case filelib:is_dir(StdLibDir) of
        true  -> [{include, {file_system, [StdLibDir]}}];
        false -> [{include, escript}]
@@ -5,7 +5,7 @@
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
-module(aeso_pretty).
+-module(so_pretty).

 -import(prettypr, [text/1, sep/1, above/2, beside/2, nest/2, empty/0]).

@@ -13,7 +13,7 @@

 -export_type([options/0]).

-include("aeso_utils.hrl").
+-include("so_utils.hrl").

 -type doc() :: prettypr:document().
 -type options() :: [{indent, non_neg_integer()} | show_generated].
@@ -24,11 +24,11 @@

 %% -- Options ----------------------------------------------------------------

-define(aeso_pretty_opts, aeso_pretty_opts).
+-define(so_pretty_opts, so_pretty_opts).

 -spec options() -> options().
 options() ->
-    case get(?aeso_pretty_opts) of
+    case get(?so_pretty_opts) of
        undefined -> [];
        Opts      -> Opts
    end.
@@ -45,9 +45,9 @@ indent() -> option(indent, 2).

 -spec with_options(options(), fun(() -> A)) -> A.
 with_options(Options, Fun) ->
-    put(?aeso_pretty_opts, Options),
+    put(?so_pretty_opts, Options),
    Res = Fun(),
-    erase(?aeso_pretty_opts),
+    erase(?so_pretty_opts),
    Res.

 %% -- Pretty printing helpers ------------------------------------------------
@@ -125,9 +125,9 @@ record(Ds) ->
 equals(A, B) -> follow(hsep(A, text("=")), B).

 %% typed(A, B) -> A : B.
-spec typed(doc(), aeso_syntax:type()) -> doc().
+-spec typed(doc(), so_syntax:type()) -> doc().
 typed(A, Type) ->
-    case aeso_syntax:get_ann(origin, Type) == system andalso
+    case so_syntax:get_ann(origin, Type) == system andalso
         not show_generated() of
        true  -> A;
        false -> follow(hsep(A, text(":")), type(Type))
@@ -139,18 +139,18 @@ contract_head(contract_interface) -> text("contract interface").

 %% -- Exports ----------------------------------------------------------------

-spec decls([aeso_syntax:decl()], options()) -> doc().
+-spec decls([so_syntax:decl()], options()) -> doc().
 decls(Ds, Options) ->
    with_options(Options, fun() -> decls(Ds) end).

-spec decls([aeso_syntax:decl()]) -> doc().
+-spec decls([so_syntax:decl()]) -> doc().
 decls(Ds) -> above([ decl(D) || D <- Ds ]).

-spec decl(aeso_syntax:decl(), options()) -> doc().
+-spec decl(so_syntax:decl(), options()) -> doc().
 decl(D, Options) ->
    with_options(Options, fun() -> decl(D) end).

-spec decl(aeso_syntax:decl()) -> doc().
+-spec decl(so_syntax:decl()) -> doc().
 decl({Con, Attrs, C, Is, Ds}) when ?IS_CONTRACT_HEAD(Con) ->
    Mod = fun({Mod, true}) when Mod == payable ->
                  text(atom_to_list(Mod));
@@ -172,7 +172,7 @@ decl({fun_decl, Ann, F, T}) ->
    Mod = fun({Mod, true}) when Mod == private; Mod == stateful; Mod == payable ->
                  text(atom_to_list(Mod));
             (_) -> empty() end,
-    Fun = case aeso_syntax:get_ann(entrypoint, Ann, false) of
+    Fun = case so_syntax:get_ann(entrypoint, Ann, false) of
            true  -> text("entrypoint");
            false -> text("function")
          end,
@@ -181,7 +181,7 @@ decl(D = {letfun, Attrs, _, _, _, _}) ->
    Mod = fun({Mod, true}) when Mod == private; Mod == stateful; Mod == payable ->
                            text(atom_to_list(Mod));
             (_) -> empty() end,
-    Fun = case aeso_syntax:get_ann(entrypoint, Attrs, false) of
+    Fun = case so_syntax:get_ann(entrypoint, Attrs, false) of
              true  -> "entrypoint";
              false -> "function"
          end,
@@ -192,20 +192,20 @@ decl(D = {letval, _, _, _}) -> letdecl("let", D);
 decl({block, _, Ds}) ->
    above([ decl(D) || D <- Ds ]).

-spec pragma(aeso_syntax:pragma()) -> doc().
+-spec pragma(so_syntax:pragma()) -> doc().
 pragma({compiler, Op, Ver}) ->
    text("@compiler " ++ atom_to_list(Op) ++ " " ++ string:join([integer_to_list(N) || N <- Ver], ".")).

-spec expr(aeso_syntax:expr(), options()) -> doc().
+-spec expr(so_syntax:expr(), options()) -> doc().
 expr(E, Options) ->
    with_options(Options, fun() -> expr(E) end).

-spec expr(aeso_syntax:expr()) -> doc().
+-spec expr(so_syntax:expr()) -> doc().
 expr(E) -> expr_p(0, E).

 %% -- Not exported -----------------------------------------------------------

-spec name(aeso_syntax:id() | aeso_syntax:qid() | aeso_syntax:con() | aeso_syntax:qcon() | aeso_syntax:tvar()) -> doc().
+-spec name(so_syntax:id() | so_syntax:qid() | so_syntax:con() | so_syntax:qcon() | so_syntax:tvar()) -> doc().
 name({id, _,   Name})  -> text(Name);
 name({con, _,  Name})  -> text(Name);
 name({qid, _,  Names}) -> text(string:join(Names, "."));
@@ -213,7 +213,7 @@ name({qcon, _, Names}) -> text(string:join(Names, "."));
 name({tvar, _, Name})  -> text(Name);
 name({typed, _, Name, _}) -> name(Name).

-spec letdecl(string(), aeso_syntax:letbind()) -> doc().
+-spec letdecl(string(), so_syntax:letbind()) -> doc().
 letdecl(Let, {letval, _, P, E}) ->
    block_expr(0, hsep([text(Let), expr(P), text("=")]), E);
 letdecl(Let, {letfun, _, F, Args, T, [GuardedBody]}) ->
@@ -221,14 +221,14 @@ letdecl(Let, {letfun, _, F, Args, T, [GuardedBody]}) ->
 letdecl(Let, {letfun, _, F, Args, T, GuardedBodies}) ->
    block(hsep([text(Let), typed(beside(name(F), expr({tuple, [], Args})), T)]), above(lists:map(fun(GB) -> guarded_body(GB, "=") end, GuardedBodies))).

-spec args([aeso_syntax:arg()]) -> doc().
+-spec args([so_syntax:arg()]) -> doc().
 args(Args) ->
    tuple(lists:map(fun arg/1, Args)).

-spec arg(aeso_syntax:arg()) -> doc().
+-spec arg(so_syntax:arg()) -> doc().
 arg({arg, _, X, T}) -> typed(name(X), T).

-spec typedecl(alias_t | record_t | variant_t, aeso_syntax:id(), [aeso_syntax:tvar()]) -> doc().
+-spec typedecl(alias_t | record_t | variant_t, so_syntax:id(), [so_syntax:tvar()]) -> doc().
 typedecl(Kind, T, Vars) ->
    KW = case Kind of
            alias_t -> text("type");
@@ -241,26 +241,26 @@ typedecl(Kind, T, Vars) ->
                tuple(lists:map(fun name/1, Vars)))
    end.

-spec typedef(aeso_syntax:typedef()) -> doc().
+-spec typedef(so_syntax:typedef()) -> doc().
 typedef({alias_t, Type})           -> type(Type);
 typedef({record_t, Fields})        ->
    record(lists:map(fun field_t/1, Fields));
 typedef({variant_t, Constructors}) ->
    par(punctuate(text(" |"), lists:map(fun constructor_t/1, Constructors))).

-spec constructor_t(aeso_syntax:constructor_t()) -> doc().
+-spec constructor_t(so_syntax:constructor_t()) -> doc().
 constructor_t({constr_t, _, C, []}) -> name(C);
 constructor_t({constr_t, _, C, Args}) -> beside(name(C), args_type(Args)).

-spec field_t(aeso_syntax:field_t()) -> doc().
+-spec field_t(so_syntax:field_t()) -> doc().
 field_t({field_t, _, Name, Type}) ->
    typed(name(Name), Type).

-spec type(aeso_syntax:type(), options()) -> doc().
+-spec type(so_syntax:type(), options()) -> doc().
 type(Type, Options) ->
    with_options(Options, fun() -> type(Type) end).

-spec type(aeso_syntax:type()) -> doc().
+-spec type(so_syntax:type()) -> doc().
 type(F = {fun_t, _, _, var_args, _}) ->
    type(setelement(4, F, [var_args]));
 type({fun_t, _, Named, Args, Ret}) ->
@@ -296,11 +296,11 @@ type(T = {tvar, _, _}) -> name(T);

 type(var_args) -> text("var_args").

-spec args_type([aeso_syntax:type()]) -> doc().
+-spec args_type([so_syntax:type()]) -> doc().
 args_type(Args) ->
    tuple(lists:map(fun type/1, Args)).

-spec tuple_type([aeso_syntax:type()]) -> doc().
+-spec tuple_type([so_syntax:type()]) -> doc().
 tuple_type([]) ->
    text("unit");
 tuple_type(Factors) ->
@@ -310,7 +310,7 @@ tuple_type(Factors) ->
      , text(")")
      ]).

-spec expr_p(integer(), aeso_syntax:arg_expr()) -> doc().
+-spec expr_p(integer(), so_syntax:arg_expr()) -> doc().
 expr_p(P, {letpat, _, Id, Pat}) ->
    paren(P > 100, follow(hsep(expr(Id), text("=")), expr(Pat)));
 expr_p(P, {named_arg, _, Name, E}) ->
@@ -318,7 +318,7 @@ expr_p(P, {named_arg, _, Name, E}) ->
 expr_p(P, {lam, _, Args, E}) ->
    paren(P > 100, follow(hsep(args(Args), text("=>")), expr_p(100, E)));
 expr_p(P, If = {'if', Ann, Cond, Then, Else}) ->
-    Format   = aeso_syntax:get_ann(format, If),
+    Format   = so_syntax:get_ann(format, If),
    if  Format == '?:' ->
            paren(P > 100,
                follow(expr_p(200, Cond),
@@ -361,7 +361,7 @@ expr_p(P, {assign, _, LV, E}) ->
 expr_p(_, {app, _, {'..', _}, [A, B]}) ->
    list([infix(0, '..', A, B)]);
 expr_p(P, E = {app, _, F = {Op, _}, Args}) when is_atom(Op) ->
-    case {aeso_syntax:get_ann(format, E), Args} of
+    case {so_syntax:get_ann(format, E), Args} of
        {infix, [A, B]} -> infix(P, Op, A, B);
        {prefix, [A]}   -> prefix(P, Op, A);
        _               -> app(P, F, Args)
@@ -372,7 +372,7 @@ expr_p(P, {app, _, F, Args}) ->
    app(P, F, Args);
 %% -- Constants
 expr_p(_, E = {int, _, N}) ->
-    S = case aeso_syntax:get_ann(format, E) of
+    S = case so_syntax:get_ann(format, E) of
            hex -> "0x" ++ integer_to_list(N, 16);
            _   -> integer_to_list(N)
           end,
@@ -389,7 +389,7 @@ expr_p(_, {Type, _, Bin})
         Type == oracle_pubkey;
         Type == oracle_query_id;
         Type == signature ->
-    text(binary_to_list(aeser_api_encoder:encode(Type, Bin)));
+    text(binary_to_list(gmser_api_encoder:encode(Type, Bin)));
 expr_p(_, {string, _, <<>>}) -> text("\"\"");
 expr_p(_, {string, _, S}) ->
    text(io_lib:format("\"~s\"", [binary_to_list(S)]));
@@ -402,7 +402,7 @@ expr_p(_, {char, _, C}) ->
            text("'" ++ tl(lists:droplast(S)) ++ "'");
        _  ->
            S = lists:flatten(
-                  io_lib:format("'~ts'", [list_to_binary(aeso_scan:utf8_encode([C]))])),
+                  io_lib:format("'~ts'", [list_to_binary(so_scan:utf8_encode([C]))])),
            text(S)
    end;
 %% -- Names
@@ -421,7 +421,7 @@ stmt_p({elif, _, Cond, Then}) ->
    block_expr(200, beside(text("elif"), paren(expr(Cond))), Then);
 stmt_p({'else', Else}) ->
    HideGenerated = not show_generated(),
-    case aeso_syntax:get_ann(origin, Else) of
+    case so_syntax:get_ann(origin, Else) of
        system when HideGenerated -> empty();
        _ -> block_expr(200, text("else"), Else)
    end.
@@ -433,7 +433,7 @@ lc_bind({comprehension_if, _, E}) ->
 lc_bind(Let) ->
    letdecl("let", Let).

-spec bin_prec(aeso_syntax:bin_op()) -> {integer(), integer(), integer()}.
+-spec bin_prec(so_syntax:bin_op()) -> {integer(), integer(), integer()}.
 bin_prec('..')   -> {  0,   0,   0};  %% Always printed inside '[ ]'
 bin_prec('=')    -> {  0,   0,   0};  %% Always printed inside '[ ]'
 bin_prec('@')    -> {  0,   0,   0};  %% Only in error messages
@@ -460,7 +460,7 @@ bin_prec('/')    -> {700, 700, 750};
 bin_prec(mod)    -> {700, 700, 750};
 bin_prec('^')    -> {750, 750, 800}.

-spec un_prec(aeso_syntax:un_op()) -> {integer(), integer()}.
+-spec un_prec(so_syntax:un_op()) -> {integer(), integer()}.
 un_prec('-')    -> {650, 650};
 un_prec('!')    -> {800, 800};
 un_prec('bnot') -> {850, 850}.
@@ -468,7 +468,7 @@ un_prec('bnot') -> {850, 850}.
 equals(Ann, A, B) ->
    {app, [{format, infix} | Ann], {'=', Ann}, [A, B]}.

-spec infix(integer(), aeso_syntax:bin_op(), aeso_syntax:expr(), aeso_syntax:expr()) -> doc().
+-spec infix(integer(), so_syntax:bin_op(), so_syntax:expr(), so_syntax:expr()) -> doc().
 infix(P, Op, A, B) ->
    {Top, L, R} = bin_prec(Op),
    paren(P > Top,
@@ -530,7 +530,7 @@ statement(E) -> expr(E).
 get_elifs(Expr) -> get_elifs(Expr, []).

 get_elifs(If = {'if', Ann, Cond, Then, Else}, Elifs) ->
-    case aeso_syntax:get_ann(format, If) of
+    case so_syntax:get_ann(format, If) of
        elif -> get_elifs(Else, [{elif, Ann, Cond, Then} | Elifs]);
        _    -> {lists:reverse(Elifs), If}
    end;
@@ -5,12 +5,12 @@
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
-module(aeso_scan).
+-module(so_scan).

 -export([scan/1, utf8_encode/1]).

-import(aeso_scan_lib, [token/1, token/2, symbol/0, skip/0,
-                        override/2, push/2, pop/1]).
+-import(so_scan_lib, [token/1, token/2, symbol/0, skip/0,
+                      override/2, push/2, pop/1]).

 lexer() ->
    Number   = fun(Digit) -> [Digit, "+(_", Digit, "+)*"] end,
@@ -79,8 +79,8 @@ lexer() ->
    [{code, Rules}, {comment, CommentRules}].

 scan(String) ->
-    Lexer = aeso_scan_lib:compile(lexer()),
-    aeso_scan_lib:string(Lexer, code, String).
+    Lexer = so_scan_lib:compile(lexer()),
+    so_scan_lib:string(Lexer, code, String).

 %% -- Helpers ----------------------------------------------------------------

@@ -4,7 +4,7 @@
 %%% @doc A customisable lexer.
 %%% @end
 %%%-------------------------------------------------------------------
-module(aeso_scan_lib).
+-module(so_scan_lib).

 -export([compile/1, string/3,
         token/1, token/2, symbol/0, skip/0,
@@ -8,7 +8,7 @@
 %%%
 %%%-------------------------------------------------------------------

-module(aeso_stdlib).
+-module(so_stdlib).

 -export([stdlib_include_path/0]).

@@ -6,7 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------

-module(aeso_syntax).
+-module(so_syntax).

 -export([get_ann/1, get_ann/2, get_ann/3, set_ann/2, qualify/2]).

@@ -4,7 +4,7 @@
 %%%     Sophia syntax utilities.
 %%% @end
 %%%-------------------------------------------------------------------
-module(aeso_syntax_utils).
+-module(so_syntax_utils).

 -export([used_ids/1, used_ids/2, used_types/2, used/1]).

@@ -17,19 +17,19 @@
 -type kind() :: decl | type | bind_type | expr | bind_expr.

 -spec fold(alg(A), fun((kind(), _) -> A), kind(), E | [E]) -> A
-    when E :: aeso_syntax:decl()
-            | aeso_syntax:typedef()
-            | aeso_syntax:field_t()
-            | aeso_syntax:constructor_t()
-            | aeso_syntax:type()
-            | aeso_syntax:expr()
-            | aeso_syntax:pat()
-            | aeso_syntax:arg()
-            | aeso_syntax:alt()
-            | aeso_syntax:elim()
-            | aeso_syntax:arg_expr()
-            | aeso_syntax:field(aeso_syntax:expr())
-            | aeso_syntax:stmt().
+    when E :: so_syntax:decl()
+            | so_syntax:typedef()
+            | so_syntax:field_t()
+            | so_syntax:constructor_t()
+            | so_syntax:type()
+            | so_syntax:expr()
+            | so_syntax:pat()
+            | so_syntax:arg()
+            | so_syntax:alt()
+            | so_syntax:elim()
+            | so_syntax:arg_expr()
+            | so_syntax:field(so_syntax:expr())
+            | so_syntax:stmt().
 fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
    ExprKind = if K == bind_expr -> bind_expr; true -> expr end,
    TypeKind = if K == bind_type -> bind_type; true -> type end,
@@ -132,7 +132,7 @@ used_types([Top] = _CurrentNS, T) ->
                | {type, [string()]}
                | {namespace, [string()]}.

-spec entity_alg() -> alg(#{entity() => aeso_syntax:ann()}).
+-spec entity_alg() -> alg(#{entity() => so_syntax:ann()}).
 entity_alg() ->
    IsBound = fun({K, _}) -> lists:member(K, [bound_term, bound_type]) end,
    Unbind  = fun(bound_term) -> term; (bound_type) -> type end,
@@ -147,7 +147,7 @@ entity_alg() ->
        , plus   = fun maps:merge/2
        , scoped = Scoped }.

-spec used(_) -> [{entity(), aeso_syntax:ann()}].
+-spec used(_) -> [{entity(), so_syntax:ann()}].
 used(D) ->
    Kind = fun(expr)      -> term;
              (bind_expr) -> bound_term;
@@ -4,7 +4,7 @@
 %%%     Sophia utility functions.
 %%% @end
 %%%-------------------------------------------------------------------
-module(aeso_utils).
+-module(so_utils).

 -export([scc/1, canonical_dir/1]).

@@ -4,13 +4,13 @@
 %%% @end
 %%%-------------------------------------------------------------------

-module(aeso_vm_decode).
+-module(so_vm_decode).

 -export([ from_fate/2 ]).

 -include_lib("gmbytecode/include/gmb_fate_data.hrl").

-spec from_fate(aeso_syntax:type(), gmb_fate_data:fate_type()) -> aeso_syntax:expr().
+-spec from_fate(so_syntax:type(), gmb_fate_data:fate_type()) -> so_syntax:expr().
 from_fate({id, _, "address"}, ?FATE_ADDRESS(Bin)) -> {account_pubkey, [], Bin};
 from_fate({id, _, "signature"}, ?FATE_BYTES(Bin)) -> {signature, [], Bin};
 from_fate({id, _, "hash"}, ?FATE_BYTES(Bin)) -> {bytes, [], Bin};
@@ -1,6 +1,6 @@
-module(aeso_warnings).
+-module(so_warnings).

-record(warn, { pos     :: aeso_errors:pos()
+-record(warn, { pos     :: so_errors:pos()
              , message :: iolist()
              }).

@@ -16,16 +16,16 @@
        ]).

 new(Msg) ->
-    new(aeso_errors:pos(0, 0), Msg).
+    new(so_errors:pos(0, 0), Msg).

 new(Pos, Msg) ->
    #warn{ pos = Pos, message = Msg }.

 warn_to_err(Kind, #warn{ pos = Pos, message = Msg }) ->
-    aeso_errors:new(Kind, Pos, lists:flatten(Msg)).
+    so_errors:new(Kind, Pos, lists:flatten(Msg)).

 sort_warnings(Warnings) ->
    lists:sort(fun(W1, W2) -> W1#warn.pos =< W2#warn.pos end, Warnings).

 pp(#warn{ pos = Pos, message = Msg }) ->
-    lists:flatten(io_lib:format("Warning~s:\n~s", [aeso_errors:pp_pos(Pos), Msg])).
+    lists:flatten(io_lib:format("Warning~s:\n~s", [so_errors:pp_pos(Pos), Msg])).
@@ -1,5 +1,5 @@
 {application, sophia,
- [{description, "Compiler for Aeternity Sophia language"},
+ [{description, "Compiler for the Sophia language"},
  {vsn, "8.0.1"},
  {registered, []},
  {applications,
@@ -1,22 +0,0 @@
-module(aeso_eunit_SUITE).
-
-compile([export_all, nowarn_export_all]).
-
-include_lib("common_test/include/ct.hrl").
-
-all() ->
-    [{group, eunit}].
-
-groups() ->
-    [{eunit, [], [ aeso_scan_tests
-                 , aeso_parser_tests
-                 , aeso_compiler_tests
-                 , aeso_abi_tests
-		 , aeso_aci_tests
-                 ]}].
-
-aeso_scan_tests(_Config)   -> ok = eunit:test(aeso_scan_tests).
-aeso_parser_tests(_Config) -> ok = eunit:test(aeso_parser_tests).
-aeso_compiler_tests(_Config) -> ok = eunit:test(aeso_compiler_tests).
-aeso_abi_tests(_Config) -> ok = eunit:test(aeso_abi_tests).
-aeso_aci_tests(_Config) -> ok = eunit:test(aeso_aci_tests).
@@ -2,27 +2,13 @@ contract interface Remote =
  entrypoint main_fun : (int) => unit

 contract AddrChain =
-  type o_type = oracle(string, map(string, int))
-  type oq_type = oracle_query(string, map(string, int))
-
-  entrypoint is_o(a : address) =
-    Address.is_oracle(a)

  entrypoint is_c(a : address) =
    Address.is_contract(a)

-//   entrypoint get_o(a : address) : option(o_type) =
-//     Address.get_oracle(a)
-
 //   entrypoint get_c(a : address) : option(Remote) =
 //     Address.get_contract(a)

-  entrypoint check_o(o : o_type) =
-    Oracle.check(o)
-
-  entrypoint check_oq(o : o_type, oq : oq_type) =
-    Oracle.check_query(o, oq)
-
 //   entrypoint h_to_i(h : hash) : int =
 //     Hash.to_int(h)

@@ -5,10 +5,6 @@ contract interface Remote =
 contract AddressLiterals =
  entrypoint addr() : address =
    ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt
-  entrypoint oracle() : oracle(int, bool) =
-    ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-  entrypoint query() : oracle_query(int, bool) =
-    oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
  entrypoint contr() : Remote =
    ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ
  entrypoint contr_addr() : Remote =
@@ -14,12 +14,6 @@ main contract AENSTest =
  stateful entrypoint resolve_contract(name : string, key : string) : option(C) =
    AENSv2.resolve(name, key)

-  stateful entrypoint resolve_oracle(name : string, key : string) : option(oracle(int, int)) =
-    AENSv2.resolve(name, key)
-
-  stateful entrypoint resolve_oracle_query(name : string, key : string) : option(oracle_query(int, int)) =
-    AENSv2.resolve(name, key)
-
  // Transactions

  stateful entrypoint preclaim(addr  : address,     // Claim on behalf of this account (can be Contract.address)
@@ -8,14 +8,13 @@ contract interface OldAENSContract =
 main contract AENSUpdate =
  stateful entrypoint update_name(owner : address, name : string, b : bytes(2)) =
    let p1 : AENSv2.pointee = AENSv2.AccountPt(Call.caller)
-    let p2 : AENSv2.pointee = AENSv2.OraclePt(Call.caller)
-    let p3 : AENSv2.pointee = AENSv2.ContractPt(Call.caller)
-    let p4 : AENSv2.pointee = AENSv2.ChannelPt(Call.caller)
-    let p5 : AENSv2.pointee = AENSv2.DataPt(String.to_bytes("any something will do"))
-    let p6 : AENSv2.pointee = AENSv2.DataPt(Int.to_bytes(1345, 4))
+    let p2 : AENSv2.pointee = AENSv2.ContractPt(Call.caller)
+    let p3 : AENSv2.pointee = AENSv2.ChannelPt(Call.caller)
+    let p4 : AENSv2.pointee = AENSv2.DataPt(String.to_bytes("any something will do"))
+    let p5 : AENSv2.pointee = AENSv2.DataPt(Int.to_bytes(1345, 4))
    AENSv2.update(owner, name, None, None,
-                  Some({ ["account_pubkey"] = p1, ["oracle_pubkey"] = p2,
-                         ["contract_pubkey"] = p3, ["misc"] = p4, ["data"] = p5, ["data2"] = p6 }))
+                  Some({ ["account_pubkey"] = p1,
+                         ["contract_pubkey"] = p2, ["misc"] = p3, ["data"] = p4, ["data2"] = p5 }))

  stateful entrypoint old_interaction(c : OldAENSContract, owner : address, name : string) =
    let p : AENS.pointee = c.lookup(name, "key1")
@@ -27,6 +26,3 @@ main contract AENSUpdate =
  entrypoint get_ttl(name : string) =
    switch(AENSv2.lookup(name))
     Some(AENSv2.Name(_, FixedTTL(ttl), _)) => ttl
-
-  entrypoint expiry(o : oracle(int, int)) : int =
-    Oracle.expiry(o)
@@ -7,27 +7,9 @@ contract AddressLiterals =
    ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt
  entrypoint addr2() : Remote =
    ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt
-  entrypoint addr3() : oracle(int, bool) =
-    ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt
-
-  entrypoint oracle1() : oracle_query(int, bool) =
-    ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-  entrypoint oracle2() : bytes(32) =
-    ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-  entrypoint oracle3() : Remote =
-    ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-
-  entrypoint query1() : oracle(int, bool) =
-    oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
-  entrypoint query2() : bytes(32) =
-    oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
-  entrypoint query3() : Remote =
-    oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY

  entrypoint contr1() : address =
    ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ
-  entrypoint contr2() : oracle(int, bool) =
-    ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ
  entrypoint contr3() : bytes(32) =
    ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ
  entrypoint contr4() : address =
@@ -9,7 +9,6 @@
 //   datatype ga_meta_tx = GAMetaTx(address, int)
 //   datatype paying_for_tx = PayingForTx(address, int)
 //   datatype base_tx = SpendTx(address, int, string)
-//                    | OracleRegisterTx | OracleQueryTx | OracleResponseTx | OracleExtendTx
 //                    | NamePreclaimTx | NameClaimTx(hash) | NameUpdateTx(string)
 //                    | NameRevokeTx(hash) | NameTransferTx(address, string)
 //                    | ChannelCreateTx(address) | ChannelDepositTx(address, int) | ChannelWithdrawTx(address, int) |
@@ -42,10 +41,6 @@ contract BasicAuthTx =
                             fee = 123, ttl = 0, actor = Call.caller }
        switch(tx0.tx)
          Chain.SpendTx(receiver, amount, payload) => verify(tx_hash, n, s)
-          Chain.OracleRegisterTx                   => false
-          Chain.OracleQueryTx                      => false
-          Chain.OracleResponseTx                   => false
-          Chain.OracleExtendTx                     => false
          Chain.NamePreclaimTx                     => false
          Chain.NameClaimTx(name)                  => false
          Chain.NameUpdateTx(name)                 => false
@@ -11,8 +11,6 @@ contract Events =
  type ix5 = hash // bytes(32)
  type ix6 = address
  type ix7 = Remote
-  type ix8 = oracle(int, int)
-  type ix9 = oracle_query(int, int)

  // Valid payload types
  type data1 = string
@@ -26,7 +24,6 @@ contract Events =
    | Nodata3(ix4, ix5, ix6)
    | Data0(data1)
    | Data1(data2, ix7)
-    | Data2(ix8, data3, ix9)
    | Data3(ix1, ix2, ix5, data1)

  entrypoint nodata0()                   = Chain.event(Nodata0)
@@ -35,6 +32,5 @@ contract Events =
  entrypoint nodata3(ix4, ix5, ix6)      = Chain.event(Nodata3(ix4, ix5, ix6))
  entrypoint data0(data1)                = Chain.event(Data0(data1))
  entrypoint data1(data2, ix7)           = Chain.event(Data1(data2, ix7))
-  entrypoint data2(ix8, data3, ix9)      = Chain.event(Data2(ix8, data3, ix9))
  entrypoint data3(ix1, ix2, ix5, data1) = Chain.event(Data3(ix1, ix2, ix5, data1))

@@ -31,12 +31,6 @@ contract FunctionArguments =
  entrypoint trettiotva(b : bytes(32)) =
     b

-  entrypoint find_oracle(o : oracle(int, bool)) =
-     true
-
-  entrypoint find_query(q : oracle_query(int, bool)) =
-     true
-
  datatype colour() = Green | Yellow | Red | Pantone(int)

  entrypoint traffic_light(c : colour) =
@@ -1,5 +0,0 @@
-contract HigherOrderResponseType =
-  stateful function foo(o, q : oracle_query(string, _)) =
-    Oracle.respond(o, q, (x) => x + 1)
-
-  entrypoint main_fun() = ()
@@ -1,110 +0,0 @@
-contract Oracles =
-
-  type fee = int
-  type ttl = Chain.ttl
-
-  type query_t  = string
-  type answer_t = int
-
-  type oracle_id = oracle(query_t, answer_t)
-  type query_id  = oracle_query(query_t, answer_t)
-
-  stateful entrypoint registerOracle(acct : address,
-                          qfee : fee,
-                          ttl  : ttl) : oracle_id =
-     Oracle.register(acct, qfee, ttl)
-
-  stateful entrypoint registerIntIntOracle(acct : address,
-                                qfee : fee,
-                                ttl  : ttl) : oracle(int, int) =
-     Oracle.register(acct, qfee, ttl)
-
-  stateful entrypoint registerStringStringOracle(acct : address,
-                                      qfee : fee,
-                                      ttl  : ttl) : oracle(string, string) =
-     Oracle.register(acct, qfee, ttl)
-
-  stateful entrypoint signedRegisterOracle(acct : address,
-                                sign : signature,
-                                qfee : fee,
-                                ttl  : ttl) : oracle_id =
-     Oracle.register(acct, qfee, ttl, signature = sign)
-
-  entrypoint queryFee(o : oracle_id) : fee =
-    Oracle.query_fee(o)
-
-  stateful entrypoint createQuery(o    : oracle_id,
-                       q    : query_t,
-                       qfee : fee,
-                       qttl : ttl,
-                       rttl : ttl) : query_id =
-    require(qfee =< Call.value, "insufficient value for qfee")
-    Oracle.query(o, q, qfee, qttl, rttl)
-
-  // Do not use in production!
-  stateful entrypoint unsafeCreateQuery(o    : oracle_id,
-                       q    : query_t,
-                       qfee : fee,
-                       qttl : ttl,
-                       rttl : ttl) : query_id =
-    Oracle.query(o, q, qfee, qttl, rttl)
-
-  // Do not use in production!
-  stateful entrypoint unsafeCreateQueryThenErr(o    : oracle_id,
-                       q    : query_t,
-                       qfee : fee,
-                       qttl : ttl,
-                       rttl : ttl) : query_id =
-    let res = Oracle.query(o, q, qfee, qttl, rttl)
-    require(qfee >= 100000000000000000, "causing a late error")
-    res
-
-  stateful entrypoint extendOracle(o    : oracle_id,
-                        ttl  : ttl) : unit =
-    Oracle.extend(o, ttl)
-
-  stateful entrypoint signedExtendOracle(o    : oracle_id,
-                              sign : signature,   // Signed oracle address
-                              ttl  : ttl) : unit =
-    Oracle.extend(o, signature = sign, ttl)
-
-  stateful entrypoint respond(o    : oracle_id,
-                   q    : query_id,
-                   r    : answer_t) : unit =
-    Oracle.respond(o, q, r)
-
-  stateful entrypoint signedRespond(o    : oracle_id,
-                         q    : query_id,
-                         sign : signature,
-                         r    : answer_t) : unit =
-    Oracle.respond(o, q, signature = sign, r)
-
-  entrypoint getQuestion(o : oracle_id,
-                       q : query_id) : query_t =
-    Oracle.get_question(o, q)
-
-  entrypoint hasAnswer(o : oracle_id,
-                     q : query_id) =
-    switch(Oracle.get_answer(o, q))
-      None    => false
-      Some(_) => true
-
-  entrypoint getAnswer(o : oracle_id,
-                     q : query_id) : option(answer_t) =
-    Oracle.get_answer(o, q)
-
-  datatype complexQuestion = Why(int) | How(string)
-  datatype complexAnswer   = NoAnswer | Answer(complexQuestion, string, int)
-
-  stateful entrypoint complexOracle(question) =
-    let o = Oracle.register(Contract.address, 0, FixedTTL(1000)) : oracle(complexQuestion, complexAnswer)
-    let q = Oracle.query(o, question, 0, RelativeTTL(100), RelativeTTL(100))
-    Oracle.respond(o, q, Answer(question, "magic", 1337))
-    Oracle.get_answer(o, q)
-
-  stateful entrypoint signedComplexOracle(question, sig) =
-    let o = Oracle.register(signature = sig, Contract.address, 0, FixedTTL(1000)) : oracle(complexQuestion, complexAnswer)
-    let q = Oracle.query(o, question, 0, RelativeTTL(100), RelativeTTL(100))
-    Oracle.respond(o, q, Answer(question, "magic", 1337), signature = sig)
-    Oracle.get_answer(o, q)
-
@@ -1,5 +0,0 @@
-contract PolymorphicQueryType =
-  stateful function is_oracle(o) =
-    Oracle.check(o)
-
-  entrypoint main_fun() = ()
@@ -1,5 +0,0 @@
-contract PolymorphicResponseType =
-  function is_oracle(o : oracle(string, 'r)) =
-    Oracle.check(o)
-
-  entrypoint main_fun(o : oracle(string, int)) = is_oracle(o)
@@ -1,47 +0,0 @@
-contract interface Animal =
-    entrypoint sound : () => string
-
-contract Cat : Animal =
-    entrypoint sound() = "meow"
-
-main contract Main =
-    entrypoint oracle() = ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-
-    entrypoint query() = oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
-
-    entrypoint init() =
-        let o01 : oracle(Animal, Animal) = oracle() : oracle(Animal, Animal)  // success
-        let o02 : oracle(Animal, Animal) = oracle() : oracle(Animal, Cat)     // success
-        let o03 : oracle(Animal, Animal) = oracle() : oracle(Cat, Animal)     // fail
-        let o04 : oracle(Animal, Animal) = oracle() : oracle(Cat, Cat)        // fail
-        let o05 : oracle(Animal, Cat)    = oracle() : oracle(Animal, Animal)  // fail
-        let o06 : oracle(Animal, Cat)    = oracle() : oracle(Animal, Cat)     // success
-        let o07 : oracle(Animal, Cat)    = oracle() : oracle(Cat, Animal)     // fail
-        let o08 : oracle(Animal, Cat)    = oracle() : oracle(Cat, Cat)        // fail
-        let o09 : oracle(Cat, Animal)    = oracle() : oracle(Animal, Animal)  // success
-        let o10 : oracle(Cat, Animal)    = oracle() : oracle(Animal, Cat)     // success
-        let o11 : oracle(Cat, Animal)    = oracle() : oracle(Cat, Animal)     // success
-        let o12 : oracle(Cat, Animal)    = oracle() : oracle(Cat, Cat)        // success
-        let o13 : oracle(Cat, Cat)       = oracle() : oracle(Animal, Animal)  // fail
-        let o14 : oracle(Cat, Cat)       = oracle() : oracle(Animal, Cat)     // success
-        let o15 : oracle(Cat, Cat)       = oracle() : oracle(Cat, Animal)     // fail
-        let o16 : oracle(Cat, Cat)       = oracle() : oracle(Cat, Cat)        // success
-
-        let q01 : oracle_query(Animal, Animal) = query() : oracle_query(Animal, Animal)  // success
-        let q02 : oracle_query(Animal, Animal) = query() : oracle_query(Animal, Cat)     // success
-        let q03 : oracle_query(Animal, Animal) = query() : oracle_query(Cat, Animal)     // success
-        let q04 : oracle_query(Animal, Animal) = query() : oracle_query(Cat, Cat)        // success
-        let q05 : oracle_query(Animal, Cat)    = query() : oracle_query(Animal, Animal)  // fail
-        let q06 : oracle_query(Animal, Cat)    = query() : oracle_query(Animal, Cat)     // success
-        let q07 : oracle_query(Animal, Cat)    = query() : oracle_query(Cat, Animal)     // fail
-        let q08 : oracle_query(Animal, Cat)    = query() : oracle_query(Cat, Cat)        // success
-        let q09 : oracle_query(Cat, Animal)    = query() : oracle_query(Animal, Animal)  // fail
-        let q10 : oracle_query(Cat, Animal)    = query() : oracle_query(Animal, Cat)     // fail
-        let q11 : oracle_query(Cat, Animal)    = query() : oracle_query(Cat, Animal)     // success
-        let q12 : oracle_query(Cat, Animal)    = query() : oracle_query(Cat, Cat)        // success
-        let q13 : oracle_query(Cat, Cat)       = query() : oracle_query(Animal, Animal)  // fail
-        let q14 : oracle_query(Cat, Cat)       = query() : oracle_query(Animal, Cat)     // fail
-        let q15 : oracle_query(Cat, Cat)       = query() : oracle_query(Cat, Animal)     // fail
-        let q16 : oracle_query(Cat, Cat)       = query() : oracle_query(Cat, Cat)        // success
-
-        ()
@@ -28,13 +28,11 @@ contract C =
    let c16 = #000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f
    let c17 = #000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f
    let c18 = RelativeTTL(50)
-    let c19 = ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-    let c20 = oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
-    let c21 = ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ : C
-    let c22 = N.nsconst
-    let c23 = c01
-    let c24 = c11.name
-    let c25 : int = 1
+    let c19 = ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ : C
+    let c20 = N.nsconst
+    let c21 = c01
+    let c22 = c11.name
+    let c23 : int = 1

    entrypoint f01() = c01
    entrypoint f02() = c02
@@ -59,6 +57,4 @@ contract C =
    entrypoint f21() = c21
    entrypoint f22() = c22
    entrypoint f23() = c23
-    entrypoint f24() = c24
-    entrypoint f25() = c25
    entrypoint fqual() = C.c01
@@ -1,16 +1,12 @@
 // Builtins without named arguments can appear unapplied.
 // Named argument builtins are:
-//    Oracle.register
-//    Oracle.respond
 //    AENSv2.preclaim
 //    AENSv2.claim
 //    AENSv2.transfer
 //    AENSv2.revoke
-//    Oracle.extend
 include "String.aes"
 contract UnappliedBuiltins =
  entrypoint main_fun() = ()
-  type o = oracle(int, int)
  type t = list(int * string)
  type m = map(int, int)
  datatype event = Event(int)
@@ -21,13 +17,6 @@ contract UnappliedBuiltins =
  function call_gas_left()               = Call.gas_left
  function b_abort()                     = abort
  function b_require()                   = require
-  function oracle_query_fee()            = Oracle.query_fee
-  function oracle_expiry()               = Oracle.expiry
-  stateful function oracle_query()       = Oracle.query        : (o, _, _, _, _) => _
-  function oracle_get_question()         = Oracle.get_question : (o, _) => _
-  function oracle_get_answer()           = Oracle.get_answer   : (o, _) => _
-  function oracle_check()                = Oracle.check        : o => _
-  function oracle_check_query()          = Oracle.check_query  : (o, _) => _
  function aens_resolve()                = AENSv2.resolve      : (_, _) => option(string)
  function map_lookup()                  = Map.lookup          : (_, m) => _
  function map_lookup_default()          = Map.lookup_default  : (_, m, _) => _
@@ -57,7 +46,6 @@ contract UnappliedBuiltins =
  function bits_sum()                    = Bits.sum
  function int_to_str()                  = Int.to_str
  function address_to_str()              = Address.to_str
-  function address_is_oracle()           = Address.is_oracle
  function address_is_contract()         = Address.is_contract
  function address_is_payable()          = Address.is_payable
  function bytes_to_int()                = Bytes.to_int : bytes(10) => int
@@ -1,4 +0,0 @@
-contract UnappliedNamedArgBuiltin =
-  stateful entrypoint main_fun(s) =
-    let reg = Oracle.register
-    reg(signature = s, Contract.address, 100, RelativeTTL(100)) : oracle(int, int)
@@ -1,4 +1,4 @@
-module(aeso_abi_tests).
+-module(so_abi_tests).

 -include_lib("eunit/include/eunit.hrl").
 -compile([export_all, nowarn_export_all]).
@@ -69,11 +69,11 @@ to_sophia_value_mcl_bls12_381_test() ->
    CallValue48 = gmb_fate_encoding:serialize({bytes, <<55:384>>}),
    CallValueTp = gmb_fate_encoding:serialize({tuple, {{bytes, <<15:256>>}, {bytes, <<160:256>>}, {bytes, <<1234:256>>}}}),

-    {ok,     _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fp", ok, CallValue32, Opts),
-    {error,  _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fp", ok, CallValue48, Opts),
-    {ok,     _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fr", ok, CallValue48, Opts),
-    {error,  _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_fr", ok, CallValue32, Opts),
-    {ok,     _} = aeso_compiler:to_sophia_value(Code, "test_bls12_381_g1", ok, CallValueTp, Opts),
+    {ok,     _} = so_compiler:to_sophia_value(Code, "test_bls12_381_fp", ok, CallValue32, Opts),
+    {error,  _} = so_compiler:to_sophia_value(Code, "test_bls12_381_fp", ok, CallValue48, Opts),
+    {ok,     _} = so_compiler:to_sophia_value(Code, "test_bls12_381_fr", ok, CallValue48, Opts),
+    {error,  _} = so_compiler:to_sophia_value(Code, "test_bls12_381_fr", ok, CallValue32, Opts),
+    {ok,     _} = so_compiler:to_sophia_value(Code, "test_bls12_381_g1", ok, CallValueTp, Opts),

    ok.

@@ -81,11 +81,11 @@ to_sophia_value_neg_test() ->
    Code = [ "contract Foo =\n"
             "  entrypoint f(x : int) : string = \"hello\"\n" ],

-    {error, [Err1]} = aeso_compiler:to_sophia_value(Code, "f", ok, encode(12)),
-    ?assertEqual("Data error:\nCannot translate FATE value 12\n  of Sophia type string\n", aeso_errors:pp(Err1)),
+    {error, [Err1]} = so_compiler:to_sophia_value(Code, "f", ok, encode(12)),
+    ?assertEqual("Data error:\nCannot translate FATE value 12\n  of Sophia type string\n", so_errors:pp(Err1)),

-    {error, [Err2]} = aeso_compiler:to_sophia_value(Code, "f", revert, encode(12)),
-    ?assertEqual("Data error:\nCould not deserialize the revert message\n", aeso_errors:pp(Err2)),
+    {error, [Err2]} = so_compiler:to_sophia_value(Code, "f", revert, encode(12)),
+    ?assertEqual("Data error:\nCould not deserialize the revert message\n", so_errors:pp(Err2)),
    ok.

 encode_calldata_neg_test() ->
@@ -97,8 +97,8 @@ encode_calldata_neg_test() ->
              "  `f : (int) => string`\n"
              "to arguments\n"
              "  `true : bool`\n",
-    {error, [Err1]} = aeso_compiler:create_calldata(Code, "f", ["true"]),
-    ?assertEqual(ExpErr1, aeso_errors:pp(Err1)),
+    {error, [Err1]} = so_compiler:create_calldata(Code, "f", ["true"]),
+    ?assertEqual(ExpErr1, so_errors:pp(Err1)),

    ok.

@@ -108,15 +108,15 @@ decode_calldata_neg_test() ->
    Code2 = [ "contract Foo =\n"
              "  entrypoint f(x : string) : int = 42\n" ],

-    {ok, CallDataFATE} = aeso_compiler:create_calldata(Code1, "f", ["42"]),
+    {ok, CallDataFATE} = so_compiler:create_calldata(Code1, "f", ["42"]),

-    {error, [Err1]} = aeso_compiler:decode_calldata(Code2, "f", <<1,2,3>>),
-    ?assertEqual("Data error:\nFailed to decode calldata binary\n", aeso_errors:pp(Err1)),
-    {error, [Err2]} = aeso_compiler:decode_calldata(Code2, "f", CallDataFATE),
-    ?assertEqual("Data error:\nCannot translate FATE value \"*\"\n  to Sophia type (string)\n", aeso_errors:pp(Err2)),
+    {error, [Err1]} = so_compiler:decode_calldata(Code2, "f", <<1,2,3>>),
+    ?assertEqual("Data error:\nFailed to decode calldata binary\n", so_errors:pp(Err1)),
+    {error, [Err2]} = so_compiler:decode_calldata(Code2, "f", CallDataFATE),
+    ?assertEqual("Data error:\nCannot translate FATE value \"*\"\n  to Sophia type (string)\n", so_errors:pp(Err2)),

-    {error, [Err3]} = aeso_compiler:decode_calldata(Code2, "x", CallDataFATE),
-    ?assertEqual("Data error at line 1, col 1:\nFunction 'x' is missing in contract\n", aeso_errors:pp(Err3)),
+    {error, [Err3]} = so_compiler:decode_calldata(Code2, "x", CallDataFATE),
+    ?assertEqual("Data error at line 1, col 1:\nFunction 'x' is missing in contract\n", so_errors:pp(Err3)),
    ok.


@@ -128,12 +128,12 @@ encode_decode_sophia_string(SophiaType, String) ->
           , "  record r = {x : an_alias(int), y : variant}\n"
           , "  datatype variant = Red | Blue(map(string, int))\n"
           , "  entrypoint foo : arg_type => arg_type\n" ],
-    case aeso_compiler:check_call(lists:flatten(Code), "foo", [String], [no_code]) of
+    case so_compiler:check_call(lists:flatten(Code), "foo", [String], [no_code]) of
        {ok, _, [Arg]} ->
            Data = encode(Arg),
-            case aeso_compiler:to_sophia_value(Code, "foo", ok, Data, [no_code]) of
+            case so_compiler:to_sophia_value(Code, "foo", ok, Data, [no_code]) of
                {ok, Sophia} ->
-                    lists:flatten(io_lib:format("~s", [prettypr:format(aeso_pretty:expr(Sophia))]));
+                    lists:flatten(io_lib:format("~s", [prettypr:format(so_pretty:expr(Sophia))]));
                {error, Err} ->
                    io:format("~s\n", [Err]),
                    {error, Err}
@@ -194,35 +194,13 @@ parameterized_contract(ExtraCode, FunName, Types) ->
         "  datatype variant = Red | Blue(map(string, int))\n"
         "  entrypoint ", FunName, " : (", string:join(Types, ", "), ") => int\n" ]).

-oracle_test() ->
-    Contract =
-        "contract OracleTest =\n"
-        "  entrypoint question(o, q : oracle_query(list(string), option(int))) =\n"
-        "    Oracle.get_question(o, q)\n",
-    ?assertEqual({ok, "question", [{oracle, <<291:256>>}, {oracle_query, <<1110:256>>}]},
-                 aeso_compiler:check_call(Contract, "question", ["ok_111111111111111111111111111111ZrdqRz9",
-                                                                 "oq_1111111111111111111111111111113AFEFpt5"], [no_code])),
-
-    ok.
-
-permissive_literals_fail_test() ->
-    Contract =
-        "contract OracleTest =\n"
-        "  stateful entrypoint haxx(o : oracle(list(string), option(int))) =\n"
-        "    Chain.spend(o, 1000000)\n",
-    {error, [Err]} =
-        aeso_compiler:check_call(Contract, "haxx", ["#123"], []),
-    ?assertMatch("Type error at line 3, col 5:\nCannot unify" ++ _, aeso_errors:pp(Err)),
-    ?assertEqual(type_error, aeso_errors:type(Err)),
-    ok.
-
 encode_decode_calldata(FunName, Types, Args) ->
    Code = parameterized_contract(FunName, Types),
    encode_decode_calldata_(Code, FunName, Args).

 encode_decode_calldata_(Code, FunName, Args) ->
-    {ok, Calldata} = aeso_compiler:create_calldata(Code, FunName, Args, []),
-    {ok, _, _} = aeso_compiler:check_call(Code, FunName, Args, [no_code]),
+    {ok, Calldata} = so_compiler:create_calldata(Code, FunName, Args, []),
+    {ok, _, _} = so_compiler:check_call(Code, FunName, Args, [no_code]),
    case FunName of
        "init" ->
            [];
@@ -1,4 +1,4 @@
-module(aeso_aci_tests).
+-module(so_aci_tests).

 -include_lib("eunit/include/eunit.hrl").

@@ -9,11 +9,11 @@ simple_aci_test_() ->

 test_contract(N) ->
    {Contract,MapACI,DecACI} = test_cases(N),
-    {ok,JSON} = aeso_aci:contract_interface(json, Contract),
+    {ok,JSON} = so_aci:contract_interface(json, Contract),
    ?assertEqual([MapACI], JSON),
-    ?assertEqual({ok, DecACI}, aeso_aci:render_aci_json(JSON)),
+    ?assertEqual({ok, DecACI}, so_aci:render_aci_json(JSON)),
    %% Check if the compiler provides correct aci
-    {ok,#{aci := JSON2}} = aeso_compiler:from_string(Contract, [{aci, json}]),
+    {ok,#{aci := JSON2}} = so_compiler:from_string(Contract, [{aci, json}]),
    ?assertEqual(JSON, JSON2).

 test_cases(1) ->
@@ -95,39 +95,39 @@ aci_test_() ->
      fun() -> aci_test_contract(ContractName) end}
     || ContractName <- all_contracts()].

-all_contracts() -> aeso_compiler_tests:compilable_contracts().
+all_contracts() -> so_compiler_tests:compilable_contracts().

 aci_test_contract(Name) ->
-    String = aeso_test_utils:read_contract(Name),
-    Opts   = case lists:member(Name, aeso_compiler_tests:debug_mode_contracts()) of
+    String = so_test_utils:read_contract(Name),
+    Opts   = case lists:member(Name, so_compiler_tests:debug_mode_contracts()) of
                 true  -> [debug_mode];
                 false -> []
-             end ++ [{include, {file_system, [aeso_test_utils:contract_path()]}}],
-    JSON = case aeso_aci:contract_interface(json, String, Opts) of
+             end ++ [{include, {file_system, [so_test_utils:contract_path()]}}],
+    JSON = case so_aci:contract_interface(json, String, Opts) of
               {ok, J} -> J;
               {error, ErrorStringJ} when is_binary(ErrorStringJ) -> error(ErrorStringJ);
-               {error, ErrorJ} -> aeso_compiler_tests:print_and_throw(ErrorJ)
+               {error, ErrorJ} -> so_compiler_tests:print_and_throw(ErrorJ)
           end,
-    case aeso_compiler:from_string(String, [{aci, json} | Opts]) of
+    case so_compiler:from_string(String, [{aci, json} | Opts]) of
        {ok, #{aci := JSON1}} ->
            ?assertEqual(JSON, JSON1),
            io:format("JSON:\n~p\n", [JSON]),
-            {ok, ContractStub} = aeso_aci:render_aci_json(JSON),
+            {ok, ContractStub} = so_aci:render_aci_json(JSON),

            io:format("STUB:\n~s\n", [ContractStub]),
            check_stub(ContractStub, [{src_file, Name}]),

            ok;
        {error, ErrorString} when is_binary(ErrorString) -> error(ErrorString);
-        {error, Error} -> aeso_compiler_tests:print_and_throw(Error)
+        {error, Error} -> so_compiler_tests:print_and_throw(Error)
    end.

 check_stub(Stub, Options) ->
-    try aeso_parser:string(binary_to_list(Stub), Options) of
+    try so_parser:string(binary_to_list(Stub), Options) of
        Ast ->
            try
                %% io:format("AST: ~120p\n", [Ast]),
-                aeso_ast_infer_types:infer(Ast, [no_code])
+                so_ast_infer_types:infer(Ast, [no_code])
            catch throw:{type_errors, TE} ->
                io:format("Type error:\n~s\n", [TE]),
                error(TE);
@@ -136,6 +136,6 @@ check_stub(Stub, Options) ->
                error(R)
            end
    catch throw:{error, Errs} ->
-        _ = [ io:format("~s\n", [aeso_errors:pp(E)]) || E <- Errs ],
+        _ = [ io:format("~s\n", [so_errors:pp(E)]) || E <- Errs ],
        error({parse_errors, Errs})
    end.
@@ -6,7 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------

-module(aeso_calldata_tests).
+-module(so_calldata_tests).

 -compile([export_all, nowarn_export_all]).

@@ -18,7 +18,7 @@
 calldata_test_() ->
     [ {"Testing " ++ ContractName ++ " contract calling " ++ Fun,
        fun() ->
-           ContractString = aeso_test_utils:read_contract(ContractName),
+           ContractString = so_test_utils:read_contract(ContractName),
           FateExprs = ast_exprs(ContractString, Fun, Args),
           ParsedExprs = parse_args(Fun, Args),
           ?assertEqual(ParsedExprs, FateExprs),
@@ -28,8 +28,8 @@ calldata_test_() ->
 calldata_aci_test_() ->
     [ {"Testing " ++ ContractName ++ " contract calling " ++ Fun,
        fun() ->
-           ContractString       = aeso_test_utils:read_contract(ContractName),
-           {ok, ContractACIBin} = aeso_aci:contract_interface(string, ContractString, [no_code]),
+           ContractString       = so_test_utils:read_contract(ContractName),
+           {ok, ContractACIBin} = so_aci:contract_interface(string, ContractString, [no_code]),
           ContractACI = binary_to_list(ContractACIBin),
           io:format("ACI:\n~s\n", [ContractACIBin]),
           FateExprs = ast_exprs(ContractACI, Fun, Args),
@@ -40,7 +40,7 @@ calldata_aci_test_() ->

 parse_args(Fun, Args) ->
    [{contract_main, _, _, _, [{letfun, _, _, _, _, [{guarded, _, [], {app, _, _, AST}}]}]}] =
-        aeso_parser:string("main contract Temp = function foo() = " ++ Fun ++ "(" ++ string:join(Args, ", ") ++ ")"),
+        so_parser:string("main contract Temp = function foo() = " ++ Fun ++ "(" ++ string:join(Args, ", ") ++ ")"),
    strip_ann(AST).

 strip_ann(T) when is_tuple(T) ->
@@ -58,8 +58,8 @@ strip_ann1(X) -> X.
 ast_exprs(ContractString, Fun, Args) ->
    ast_exprs(ContractString, Fun, Args, []).
 ast_exprs(ContractString, Fun, Args, Opts) ->
-    {ok, Data} = (catch aeso_compiler:create_calldata(ContractString, Fun, Args, Opts)),
-    {ok, _Types, Exprs} = (catch aeso_compiler:decode_calldata(ContractString, Fun, Data, Opts)),
+    {ok, Data} = (catch so_compiler:create_calldata(ContractString, Fun, Args, Opts)),
+    {ok, _Types, Exprs} = (catch so_compiler:decode_calldata(ContractString, Fun, Data, Opts)),
    ?assert(is_list(Exprs)),
    strip_ann(Exprs).

@@ -90,8 +90,6 @@ compilable_contracts() ->
     {"funargs", "sextiosju", ["#01020304050607080910111213141516171819202122232425262728293031323334353637383940"
                               "414243444546474849505152535455565758596061626364656667"]},
     {"funargs", "trettiotva", ["#0102030405060708091011121314151617181920212223242526272829303132"]},
-     {"funargs", "find_oracle", ["ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5"]},
-     {"funargs", "find_query", ["oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY"]},
     {"funargs", "traffic_light", ["Green"]},
     {"funargs", "traffic_light", ["Pantone(12)"]},
     {"funargs", "tuples", ["()"]},
@@ -99,7 +97,6 @@ compilable_contracts() ->
     {"funargs", "singleton_rec", ["{x = 1000}"]},
     {"funargs", "aens_name", ["AENS.Name(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, RelativeTTL(100), {[\"pt1\"] = AENS.AccountPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)})"]},
     {"funargs", "aens_pointee", ["AENS.AccountPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
-     {"funargs", "aens_pointee", ["AENS.OraclePt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
     {"funargs", "aens_pointee", ["AENS.ContractPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
     {"funargs", "aens_pointee", ["AENS.ChannelPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
     {"funargs", "chain_ga_meta_tx", ["Chain.GAMetaTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 42)"]},
@@ -107,10 +104,6 @@ compilable_contracts() ->
     {"funargs", "chain_base_tx", ["Chain.SpendTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 42,\"foo\")"]},
     {"funargs", "chain_base_tx", ["Chain.ContractCreateTx(12234)"]},
     {"funargs", "chain_base_tx", ["Chain.ContractCallTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 12234)"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleRegisterTx"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleQueryTx"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleResponseTx"]},
-     {"funargs", "chain_base_tx", ["Chain.OracleExtendTx"]},
     {"funargs", "chain_base_tx", ["Chain.NamePreclaimTx"]},
     {"funargs", "chain_base_tx", ["Chain.NameClaimTx(\"acoolname.chain\")"]},
     {"funargs", "chain_base_tx", ["Chain.NameUpdateTx(#ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
@@ -6,7 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------

-module(aeso_compiler_tests).
+-module(so_compiler_tests).

 -compile([export_all, nowarn_export_all]).

@@ -35,7 +35,7 @@ simple_compile_test_() ->
       end} || ContractName <- compilable_contracts()] ++
    [ {"Test file not found error",
       fun() ->
-           {error, Errors} = aeso_compiler:file("does_not_exist.aes"),
+           {error, Errors} = so_compiler:file("does_not_exist.aes"),
           ExpErr = <<"File error:\ndoes_not_exist.aes: no such file or directory">>,
           check_errors([ExpErr], Errors)
       end} ] ++
@@ -49,7 +49,7 @@ simple_compile_test_() ->
       fun() ->
           FileSystem = maps:from_list(
               [ begin
-                   {ok, Bin} = file:read_file(filename:join([aeso_test_utils:contract_path(), File])),
+                   {ok, Bin} = file:read_file(filename:join([so_test_utils:contract_path(), File])),
                   {File, Bin}
                 end || File <- ["included.aes", "../contracts/included2.aes"] ]),
           #{byte_code := Code1} = compile("include", [{include, {explicit_files, FileSystem}}]),
@@ -77,12 +77,12 @@ simple_compile_test_() ->

 %% Check if all modules in the standard library compile
 stdlib_test_() ->
-    {ok, Files} = file:list_dir(aeso_stdlib:stdlib_include_path()),
+    {ok, Files} = file:list_dir(so_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}],
-          case aeso_compiler:from_string(String, Options) of
+          case so_compiler:from_string(String, Options) of
              {ok, #{fate_code := Code}} ->
                  Code1 = gmb_fate_code:deserialize(gmb_fate_code:serialize(Code)),
                  ?assertMatch({X, X}, {Code1, Code});
@@ -97,7 +97,7 @@ check_errors(Expect, #{}) ->
    ?assertEqual({error, Expect}, ok);
 check_errors(Expect0, Actual0) ->
    Expect = lists:sort(Expect0),
-    Actual = [ list_to_binary(string:trim(aeso_errors:pp(Err))) || Err <- Actual0 ],
+    Actual = [ list_to_binary(string:trim(so_errors:pp(Err))) || Err <- Actual0 ],
    case {Expect -- Actual, Actual -- Expect} of
        {[], Extra}   -> ?assertMatch({unexpected, []}, {unexpected, Extra});
        {Missing, []} -> ?assertMatch({missing, []}, {missing, Missing});
@@ -106,7 +106,7 @@ check_errors(Expect0, Actual0) ->

 check_warnings(Expect0, Actual0) ->
    Expect = lists:sort(Expect0),
-    Actual = [ list_to_binary(string:trim(aeso_warnings:pp(Warn))) || Warn <- Actual0 ],
+    Actual = [ list_to_binary(string:trim(so_warnings:pp(Warn))) || Warn <- Actual0 ],
    case {Expect -- Actual, Actual -- Expect} of
        {[], Extra}   -> ?assertMatch({unexpected, []}, {unexpected, Extra});
        {Missing, []} -> ?assertMatch({missing, []}, {missing, Missing});
@@ -114,19 +114,19 @@ check_warnings(Expect0, Actual0) ->
    end.

 compile(Name) ->
-    compile( Name, [{include, {file_system, [aeso_test_utils:contract_path()]}}]).
+    compile( Name, [{include, {file_system, [so_test_utils:contract_path()]}}]).

 compile(Name, Options) ->
-    String = aeso_test_utils:read_contract(Name),
+    String = so_test_utils:read_contract(Name),
    Options1 =
        case lists:member(Name, debug_mode_contracts()) of
            true  -> [debug_mode];
            false -> []
        end ++
        [ {src_file, Name ++ ".aes"}
-        , {include, {file_system, [aeso_test_utils:contract_path()]}}
+        , {include, {file_system, [so_test_utils:contract_path()]}}
        ] ++ Options,
-    case aeso_compiler:from_string(String, Options1) of
+    case so_compiler:from_string(String, Options1) of
        {ok, Map}                                        -> Map;
        {error, ErrorString} when is_binary(ErrorString) -> ErrorString;
        {error, Errors}                                  -> Errors
@@ -145,7 +145,6 @@ compilable_contracts() ->
     "fundme",
     "identity",
     "maps",
-     "oracles",
     "remote_call",
     "remote_call_ambiguous_record",
     "simple",
@@ -223,7 +222,6 @@ compilable_contracts() ->
     "polymorphic_entrypoint_return",
     "polymorphic_map_keys",
     "unapplied_contract_call",
-     "unapplied_named_arg_builtin",
     "resolve_field_constraint_by_arity",
     "toplevel_constants",
     "ceres",
@@ -299,7 +297,7 @@ warnings() ->
     ]).

 failing_contracts() ->
-    {ok, V} = aeso_compiler:numeric_version(),
+    {ok, V} = so_compiler:numeric_version(),
    Version = list_to_binary(string:join([integer_to_list(N) || N <- V], ".")),
    %% Parse errors
    [ ?PARSE_ERROR(field_parse_error,
@@ -466,10 +464,7 @@ failing_contracts() ->
        [<<?Pos(2, 12)
           "Nested contracts are not allowed. Contract `Con` is not defined at top level.">>])
    , ?TYPE_ERROR(bad_address_literals,
-        [<<?Pos(11, 5)
-           "Cannot unify `address` and `oracle(int, bool)`\n"
-           "when checking the type of the expression `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt : address` "
-           "against the expected type `oracle(int, bool)`">>,
+        [
         <<?Pos(9, 5)
           "Cannot unify `address` and `Remote`\n"
           "when checking the type of the expression `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt : address` "
@@ -478,52 +473,17 @@ failing_contracts() ->
           "Cannot unify `address` and `bytes(32)`\n"
           "when checking the type of the expression `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt : address` "
           "against the expected type `bytes(32)`">>,
-         <<?Pos(14, 5)
-           "Cannot unify `oracle('a, 'b)` and `oracle_query(int, bool)`\n"
-           "when checking the type of the expression "
-           "`ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5 : oracle('a, 'b)` "
-           "against the expected type `oracle_query(int, bool)`">>,
-         <<?Pos(16, 5)
-           "Cannot unify `oracle('c, 'd)` and `bytes(32)`\n"
-           "when checking the type of the expression "
-           "`ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5 : oracle('c, 'd)` "
-           "against the expected type `bytes(32)`">>,
-         <<?Pos(18, 5)
-           "Cannot unify `oracle('e, 'f)` and `Remote`\n"
-           "when checking the type of the expression "
-           "`ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5 : oracle('e, 'f)` "
-           "against the expected type `Remote`">>,
-         <<?Pos(21, 5)
-           "Cannot unify `oracle_query('g, 'h)` and `oracle(int, bool)`\n"
-           "when checking the type of the expression "
-           "`oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY : oracle_query('g, 'h)` "
-           "against the expected type `oracle(int, bool)`">>,
-         <<?Pos(23, 5)
-           "Cannot unify `oracle_query('i, 'j)` and `bytes(32)`\n"
-           "when checking the type of the expression "
-           "`oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY : oracle_query('i, 'j)` "
-           "against the expected type `bytes(32)`">>,
-         <<?Pos(25, 5)
-           "Cannot unify `oracle_query('k, 'l)` and `Remote`\n"
-           "when checking the type of the expression "
-           "`oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY : oracle_query('k, 'l)` "
-           "against the expected type `Remote`">>,
-         <<?Pos(28, 5)
+         <<?Pos(12, 5)
           "The type `address` is not a contract type\n"
           "when checking that the contract literal "
           "`ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ` "
           "has the type `address`">>,
-         <<?Pos(30, 5)
-           "The type `oracle(int, bool)` is not a contract type\n"
-           "when checking that the contract literal "
-           "`ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ` "
-           "has the type `oracle(int, bool)`">>,
-         <<?Pos(32, 5)
+         <<?Pos(14, 5)
           "The type `bytes(32)` is not a contract type\n"
           "when checking that the contract literal "
           "`ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ` "
           "has the type `bytes(32)`">>,
-         <<?Pos(34, 5),
+         <<?Pos(16, 5),
           "The type `address` is not a contract type\n"
           "when checking that the call to `Address.to_contract` "
           "has the type `address`">>])
@@ -1036,56 +996,6 @@ failing_contracts() ->
                     "Cannot unify `Animal` and `Cat` in a invariant context\n"
                     "when checking the type of the pattern `r11 : rec_inv(Cat)` against the expected type `Main.rec_inv(Animal)`">>
                  ])
-    , ?TYPE_ERROR(polymorphism_variance_switching_oracles,
-                  [<<?Pos(15,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o03 : oracle(Animal, Animal)` against the expected type `oracle(Cat, Animal)`">>,
-                   <<?Pos(16,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o04 : oracle(Animal, Animal)` against the expected type `oracle(Cat, Cat)`">>,
-                   <<?Pos(17,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `o05 : oracle(Animal, Cat)` against the expected type `oracle(Animal, Animal)`">>,
-                   <<?Pos(19,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o07 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Animal)`">>,
-                   <<?Pos(19,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `o07 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Animal)`">>,
-                   <<?Pos(20,13)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the pattern `o08 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Cat)`">>,
-                   <<?Pos(25,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `o13 : oracle(Cat, Cat)` against the expected type `oracle(Animal, Animal)`">>,
-                   <<?Pos(27,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `o15 : oracle(Cat, Cat)` against the expected type `oracle(Cat, Animal)`">>,
-                   <<?Pos(34,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q05 : oracle_query(Animal, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
-                   <<?Pos(36,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q07 : oracle_query(Animal, Cat)` against the expected type `oracle_query(Cat, Animal)`">>,
-                   <<?Pos(38,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q09 : oracle_query(Cat, Animal)` against the expected type `oracle_query(Animal, Animal)`">>,
-                   <<?Pos(39,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q10 : oracle_query(Cat, Animal)` against the expected type `oracle_query(Animal, Cat)`">>,
-                   <<?Pos(42,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q13 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
-                   <<?Pos(42,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q13 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
-                   <<?Pos(43,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q14 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Cat)`">>,
-                   <<?Pos(44,13)
-                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
-                     "when checking the type of the pattern `q15 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Cat, Animal)`">>
-                  ])
    , ?TYPE_ERROR(polymorphism_variance_switching_chain_create_fail,
                  [<<?Pos(9,22)
                     "I is not implemented.\n"
@@ -1142,47 +1052,19 @@ failing_contracts() ->
                  [<<?Pos(4,5)
                     "Invalid return type of `AENSv2.resolve`:\n"
                     "  `'a`\n"
-                     "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
+                     "It must be a `string` or a pubkey type (`address`, etc)">>
                  ])
    , ?TYPE_ERROR(bad_aens_resolve,
                  [<<?Pos(6,5)
                     "Invalid return type of `AENSv2.resolve`:\n"
                     "  `list(int)`\n"
-                     "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
+                     "It must be a `string` or a pubkey type (`address`, etc)">>
                  ])
    , ?TYPE_ERROR(bad_aens_resolve_using,
                  [<<?Pos(7,5)
                     "Invalid return type of `AENSv2.resolve`:\n"
                     "  `list(int)`\n"
-                     "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
-                  ])
-    , ?TYPE_ERROR(polymorphic_query_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle('a, 'b)`\n"
-                     "The query type must not be polymorphic (contain type variables)">>,
-                   <<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle('a, 'b)`\n"
-                     "The response type must not be polymorphic (contain type variables)">>
-                  ])
-    , ?TYPE_ERROR(polymorphic_response_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle(string, 'r)`\n"
-                     "The response type must not be polymorphic (contain type variables)">>
-                  ])
-    , ?TYPE_ERROR(higher_order_query_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle((int) => int, string)`\n"
-                     "The query type must not be higher-order (contain function types)">>
-                  ])
-    , ?TYPE_ERROR(higher_order_response_type,
-                  [<<?Pos(3,5)
-                     "Invalid oracle type\n"
-                     "  `oracle(string, (int) => int)`\n"
-                     "The response type must not be higher-order (contain function types)">>
+                     "It must be a `string` or a pubkey type (`address`, etc)">>
                  ])
    , ?TYPE_ERROR(var_args_unify_let,
                  [<<?Pos(3,9)
@@ -1346,15 +1228,15 @@ validate(Contract1, Contract2) ->
    case compile(Contract1) of
        ByteCode = #{ fate_code := FCode } ->
            FCode1   = gmb_fate_code:serialize(gmb_fate_code:strip_init_function(FCode)),
-            Source   = aeso_test_utils:read_contract(Contract2),
-            aeso_compiler:validate_byte_code(
+            Source   = so_test_utils:read_contract(Contract2),
+            so_compiler:validate_byte_code(
              ByteCode#{ byte_code := FCode1 }, Source,
              case lists:member(Contract2, debug_mode_contracts()) of
                  true  -> [debug_mode];
                  false -> []
              end ++
                  [ {src_file, lists:concat([Contract2, ".aes"])}
-                  , {include, {file_system, [aeso_test_utils:contract_path()]}}
+                  , {include, {file_system, [so_test_utils:contract_path()]}}
                  ]);
        Error -> print_and_throw(Error)
    end.
@@ -1365,6 +1247,6 @@ print_and_throw(Err) ->
            io:format("\n~s", [ErrBin]),
            error(ErrBin);
        Errors ->
-            io:format("Compilation error:\n~s", [string:join([aeso_errors:pp(E) || E <- Errors], "\n\n")]),
+            io:format("Compilation error:\n~s", [string:join([so_errors:pp(E) || E <- Errors], "\n\n")]),
            error(compilation_error)
    end.
@@ -1,4 +1,4 @@
-module(aeso_encode_decode_tests).
+-module(so_encode_decode_tests).

 -compile([export_all, nowarn_export_all]).

@@ -9,9 +9,9 @@
 encode_decode_test_() ->
    [ {lists:flatten(io_lib:format("Testing encode-decode roundtrip for ~p : ~p", [Value, {EType, DType}])),
       fun() ->
-           {ok, SerRes} = aeso_compiler:encode_value(?EMPTY, EType, Value, []),
-           {ok, Expr} = aeso_compiler:decode_value(?EMPTY, DType, SerRes, []),
-           Value2 = prettypr:format(aeso_pretty:expr(Expr)),
+           {ok, SerRes} = so_compiler:encode_value(?EMPTY, EType, Value, []),
+           {ok, Expr} = so_compiler:decode_value(?EMPTY, DType, SerRes, []),
+           Value2 = prettypr:format(so_pretty:expr(Expr)),
           ?assertEqual(Value, Value2)
       end} || {Value, EType, DType} <- test_data() ].

@@ -0,0 +1,22 @@
+-module(so_eunit_SUITE).
+
+-compile([export_all, nowarn_export_all]).
+
+-include_lib("common_test/include/ct.hrl").
+
+all() ->
+    [{group, eunit}].
+
+groups() ->
+    [{eunit, [], [ so_scan_tests
+                 , so_parser_tests
+                 , so_compiler_tests
+                 , so_abi_tests
+		 , so_aci_tests
+                 ]}].
+
+so_scan_tests(_Config)   -> ok = eunit:test(so_scan_tests).
+so_parser_tests(_Config) -> ok = eunit:test(so_parser_tests).
+so_compiler_tests(_Config) -> ok = eunit:test(so_compiler_tests).
+so_abi_tests(_Config) -> ok = eunit:test(so_abi_tests).
+so_aci_tests(_Config) -> ok = eunit:test(so_aci_tests).
@@ -1,4 +1,4 @@
-module(aeso_parser_tests).
+-module(so_parser_tests).

 -export([parse_contract/1]).

@@ -68,15 +68,15 @@ simple_contracts_test_() ->
    }.

 parse_contract(Name) ->
-    parse_string(aeso_test_utils:read_contract(Name)).
+    parse_string(so_test_utils:read_contract(Name)).

 roundtrip_contract(Name) ->
-    round_trip(aeso_test_utils:read_contract(Name)).
+    round_trip(so_test_utils:read_contract(Name)).

 parse_string(Text) -> parse_string(Text, []).

 parse_string(Text, Opts) ->
-    aeso_parser:string(Text, Opts).
+    so_parser:string(Text, Opts).

 parse_expr(Text) ->
    [{letval, _, _, Expr}] =
@@ -85,8 +85,8 @@ parse_expr(Text) ->

 round_trip(Text) ->
    Contract  = parse_string(Text),
-    Text1     = prettypr:format(aeso_pretty:decls(strip_stdlib(Contract))),
-    Contract1 = parse_string(aeso_scan:utf8_encode(Text1)),
+    Text1     = prettypr:format(so_pretty:decls(strip_stdlib(Contract))),
+    Contract1 = parse_string(so_scan:utf8_encode(Text1)),
    NoSrcLoc  = remove_line_numbers(Contract),
    NoSrcLoc1 = remove_line_numbers(Contract1),
    ?assertMatch(NoSrcLoc, diff(NoSrcLoc, NoSrcLoc1)).
@@ -1,4 +1,4 @@
-module(aeso_scan_tests).
+-module(so_scan_tests).

 -include_lib("eunit/include/eunit.hrl").

@@ -13,7 +13,7 @@ empty_contract_test_() ->
     [{"Scan an empty contract.",
       fun() ->
               Text = " ",
-               {ok, []} = aeso_scan:scan(Text),
+               {ok, []} = so_scan:scan(Text),
               ok
       end}
     ]}.
@@ -26,7 +26,7 @@ all_tokens_test_() ->
            Tokens = all_tokens(),
            Text = string:join(lists:map(fun show_token/1, Tokens), " "),
            io:format("~s\n", [Text]),
-            {ok, Tokens1} = aeso_scan:scan(Text),
+            {ok, Tokens1} = so_scan:scan(Text),
            true = compare_tokens(Tokens, Tokens1),
            ok
        end}
@@ -6,7 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------

-module(aeso_test_utils).
+-module(so_test_utils).

 -export([read_contract/1, contract_path/0]).