Remove unexported functions

This reverts commit f835862a48e7ba4740ed8f8624540b8dfe552758.

.circleci/config.yml

@@ -0,0 +1,53 @@
+version: 2.1
+
+executors:
+  aebuilder:
+    docker:
+      - image: aeternity/builder:bionic-otp24
+        user: builder
+    working_directory: ~/aesophia
+
+jobs:
+  verify_rebar_lock:
+    executor: aebuilder
+    steps:
+      - checkout
+      - run:
+          name: Ensure lock file is up-to-date
+          command: |
+            ./rebar3 upgrade
+            git diff --quiet -- rebar.lock || (echo "rebar.lock is not up-to-date" && exit 1)
+  build:
+    executor: aebuilder
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - dialyzer-cache-v2-{{ .Branch }}-{{ .Revision }}
+            - dialyzer-cache-v2-{{ .Branch }}-
+            - dialyzer-cache-v2-
+      - run:
+          name: Build
+          command: ./rebar3 compile
+      - run:
+          name: Static Analysis
+          command: ./rebar3 dialyzer
+      - run:
+          name: Eunit
+          command: ./rebar3 eunit
+      - run:
+          name: Common Tests
+          command: ./rebar3 ct
+      - save_cache:
+          key: dialyzer-cache-v2-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - _build/default/rebar3_20.3.8_plt
+      - store_artifacts:
+          path: _build/test/logs
+
+workflows:
+  version: 2
+  build_test:
+    jobs:
+      - build
+      - verify_rebar_lock

.gitea/workflows/test.yaml

@@ -1,14 +0,0 @@
-name: Sophia Tests
-run-name: ${{ gitea.actor }} testing Sophia
-on: [push, workflow_dispatch]
-
-jobs:
-  tests:
-    runs-on: linux_amd64
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: test
-        run: |
-          . /home/act_runner/.erts/27.2.1/activate
-          ./rebar3 eunit

.github/workflows/docs-develop.yml

@@ -0,0 +1,21 @@
+name: Publish development docs
+on:
+  push:
+    branches: ['master']
+      
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - run: pip3 install -r .github/workflows/requirements.txt -U
+      - run: git config --global user.email "github-action@users.noreply.github.com"
+      - run: git config --global user.name "GitHub Action"
+      - run: |
+          cd .docssite
+          mike deploy --push master

.github/workflows/docs-release.yml

@@ -0,0 +1,22 @@
+name: Publish release docs
+on:
+  release:
+    types: [released]
+      
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - run: pip3 install -r .github/workflows/requirements.txt -U
+      - run: git config --global user.email "github-action@users.noreply.github.com"
+      - run: git config --global user.name "GitHub Action"
+      - run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
+      - run: |
+          cd .docssite
+          mike deploy --push --update-aliases $RELEASE_VERSION latest

.github/workflows/requirements.txt

@@ -0,0 +1,5 @@
+mkdocs==1.4.2
+mkdocs-simple-hooks==0.1.5
+mkdocs-material==9.0.9
+mike==1.1.2
+pygments==2.14.0

.gitignore

@@ -18,10 +18,9 @@ _build
 rebar3.crashdump
 *.erl~
 *.aes~
-sophia
+aesophia
 .qcci
 current_counterexample.eqc
 test/contracts/test.aes
 __pycache__
 .docssite/docs/*.md
-.vscode

CHANGELOG.md

@@ -6,79 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- Added a check for number of type variables in a type signature; it is serialized using 8 bits,
-  so the upper limit is 256.
-### Changed
-### Removed
-
-## [9.0.0]
-### Changed
-- stdlib dir discovery now works by finding a relative path from the loaded Sophia installation
-###Removed
-- Oracles
-
-## [8.0.1]
-### Changed
-- Upgrade aebytecode to v3.4.1 to fix C warnings
-
-## [8.0.0]
-### Added
-- Bitwise operations for integers: `band`, `bor`, `bxor`, `bnot`, `<<` and `>>`.
-- `Int.mulmod` - combined builtin operation for multiplication and modulus.
-- `Crypto.poseidon` - a ZK/SNARK-friendly hash function (over the BLS12-381 scalar field).
-- `Address.to_bytes` - convert an address to its binary representation (for hashing, etc.).
-- Raw data pointers added to AENS. In short we have introduced a new namespace
-  `AENSv2`; they contain types similar to the old `AENS`; `AENS.name` and
-  `AENS.pointee`, where the latter now has a constructor `DataPt(bytes())`. All
-  AENS actions have been moved to `AENSv2`, and `AENSv2.lookup` and
-  `AENSv2.update` consume and produce the new types. The old `AENS` namespace
-  only contains the old datatypes, that can be used to interface existing
-  contracts. Standard library `AENSCompat` is added to convert between old and
-  new pointers.
-- Introduce arbitrary sized binary arrays (type `bytes()`); adding `Bytes.split_any`,
-  `Bytes.to_fixed_size`, `Bytes.to_any_size`, `Bytes.size`, `String.to_bytes`,
-  and `Int.to_bytes`; and adjust `Bytes.concat` to allow both fixed and arbitrary
-  sized byte arrays.
-- `Chain.network_id` - a function to get hold of the Chain's network id.
-- Allowing `Bytes.to_any_size` in calldata creation, to enable creation of arguments
-  with arbitray size.
-- Signature literals `sg_...` - they have type `signature` (which is an alias for `bytes(64)`).
-- Support for OTP-27 - no changes in behavior.
-### Changed
-- `Crypto.verify_sig` is changed to have `msg : bytes()`. I.e. the
-  signed data can be of any length (used to be limited to `bytes(32)`/`hash`).
-- System aliases are handled explicitly when converting to a Sophia value, this is only
-  observable for `signature` where a value of type `signature` is now represented as a
-  (new) signature literal.
-- Allow self-qualification, i.e. referencing `X.foo` when in namespace `X`.
-### Removed
-- `Bitwise.aes` standard library is removed - the builtin operations are superior.
-
-## [7.4.1]
-### Changed
-- Improve how includes with relative paths are resolved during parsing/compilation. Relative
-  include paths are now always relative to the file containing the `include` statement.
-### Fixed
-- Disable unused type warnings for types used inside of records.
-
-## [7.4.0]
-### Changed
-- Names of lifted lambdas now consist of parent function's name and their
-  position in the source code.
-### Fixed
-- Lifted lambdas get their names assigned deterministically.
-
-## [7.3.0]
-### Fixed
-- Fixed a bug with polymorphism that allowed functions with the same name but different type to be considered as implementations for their corresponding interface function.
-- Fixed a bug in the byte code optimization that incorrectly reordered dependent instructions.
-
-## [7.2.1]
-### Fixed
-- Fixed bugs with the newly added debugging symbols
-
-## [7.2.0]
-### Added
 - Toplevel compile-time constants
   ```
   namespace N =
@@ -86,9 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   contract C =
     let cc = 2
   ```
-- API functions for encoding/decoding Sophia values to/from FATE.
+### Changed
 ### Removed
-- Remove the mapping from variables to FATE registers from the compilation output.
 ### Fixed
 - Warning about unused include when there is no include.
 
@@ -462,14 +388,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Simplify calldata creation - instead of passing a compiled contract, simply
   pass a (stubbed) contract string.
 
-[Unreleased]: https://github.com/aeternity/aesophia/compare/v8.0.1...HEAD
-[8.0.1]: https://github.com/aeternity/aesophia/compare/v8.0.0...v8.0.1
-[8.0.0]: https://github.com/aeternity/aesophia/compare/v7.4.1...v8.0.0
-[7.4.1]: https://github.com/aeternity/aesophia/compare/v7.4.0...v7.4.1
-[7.4.0]: https://github.com/aeternity/aesophia/compare/v7.3.0...v7.4.0
-[7.3.0]: https://github.com/aeternity/aesophia/compare/v7.2.1...v7.3.0
-[7.2.1]: https://github.com/aeternity/aesophia/compare/v7.2.0...v7.2.1
-[7.2.0]: https://github.com/aeternity/aesophia/compare/v7.1.0...v7.2.0
+[Unreleased]: https://github.com/aeternity/aesophia/compare/v7.1.0...HEAD
 [7.1.0]: https://github.com/aeternity/aesophia/compare/v7.0.1...v7.1.0
 [7.0.1]: https://github.com/aeternity/aesophia/compare/v7.0.0...v7.0.1
 [7.0.0]: https://github.com/aeternity/aesophia/compare/v6.1.0...v7.0.0

Emakefile

@@ -1 +0,0 @@
-{"src/*",  [debug_info, {i, "include/"}, {outdir, "ebin/"}]}.

LICENSE

@@ -1,6 +1,5 @@
 ISC License
 
-Copyright (c) 2025, QPQ AG
 Copyright (c) 2017, æternity developers
 
 Permission to use, copy, modify, and/or distribute this software for any

README.md

@@ -1,11 +1,11 @@
-# The Sophia smart contract language
+# aesophia
 
-This is the __sophia__ compiler which compiles contracts written in __sophia__ to [FATE](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/contracts/fate.md) instructions.
+This is the __sophia__ compiler for the æternity system which compiles contracts written in __sophia__ to [FATE](https://github.com/aeternity/protocol/blob/master/contracts/fate.md) instructions.
 
 The compiler is currently being used three places
- - [The command line compiler](https://git.qpq.swiss/QPQ-AG/sophia_cli)
- - [Desktop wallet](https://git.qpq.swiss/QPQ-AG/GajuDesk)
- - In the [Gajumaru core node](https://git.qpq.swiss/QPQ-AG/gajumaru) tests
+ - [The command line compiler](https://github.com/aeternity/aesophia_cli)
+ - [The HTTP compiler](https://github.com/aeternity/aesophia_http)
+ - In [æternity node](https://github.com/aeternity/aeternity) tests
 
 ## Documentation
 
@@ -16,7 +16,7 @@ The compiler is currently being used three places
 * [Contract examples](docs/sophia_examples.md)
 * [Contributing](CONTRIBUTING.md)
 
-Additionally you can check out the [contracts section](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/contracts) of the Gajumaru blockchain specification.
+Additionally you can check out the [contracts section](https://github.com/aeternity/protocol/blob/master/contracts/contracts.md) of the æternity blockchain specification.
 
 ## Versioning
 
@@ -31,5 +31,5 @@ Versioning should follow the [semantic versioning](https://semver.org/spec/v2.0.
 
 The basic modules for interfacing the compiler:
 
-* [so_compiler: the Sophia compiler](docs/so_compiler.md)
-* [so_aci: the ACI interface](docs/so_aci.md)
+* [aeso_compiler: the Sophia compiler](docs/aeso_compiler.md)
+* [aeso_aci: the ACI interface](docs/aeso_aci.md)

docs/aeso_aci.md

@@ -1,8 +1,8 @@
-# so_aci
+# aeso_aci
 
 ### Module
 
-### so_aci
+### aeso_aci
 
 The ACI interface encoder and decoder.
 
@@ -123,7 +123,7 @@ be included inside another contract.
 ``` erlang
 1> {ok,Contract} = file:read_file("aci_test.aes").
 {ok,<<"contract Answers =\n  record state = { a : answers }\n  type answers() = map(string, int)\n\n  stateful function"...>>}
-2> {ok,JsonACI} = so_aci:contract_interface(json, Contract).
+2> {ok,JsonACI} = aeso_aci:contract_interface(json, Contract).
 {ok,[#{contract =>
            #{functions =>
                  [#{arguments => [],name => <<"init">>,
@@ -144,7 +144,7 @@ be included inside another contract.
                     vars => []}]}}]}
 3> file:write_file("aci_test.aci", jsx:encode(JsonACI)).
 ok
-4> {ok,InterfaceStub} = so_aci:render_aci_json(JsonACI).
+4> {ok,InterfaceStub} = aeso_aci:render_aci_json(JsonACI).
 {ok,<<"contract Answers =\n  record state = {a : Answers.answers}\n  type answers = map(string, int)\n  function init "...>>}
 5> file:write_file("aci_test.include", InterfaceStub).
 ok

docs/aeso_compiler.md

@@ -1,8 +1,8 @@
-# so_compiler
+# aeso_compiler
 
 ### Module
 
-### so_compiler
+### aeso_compiler
 
 The Sophia compiler
 
@@ -53,6 +53,8 @@ The **pp_** options all print to standard output the following:
 
 The option `include_child_contract_symbols` includes the symbols of child contracts functions in the generated fate code. It is turned off by default to avoid making contracts bigger on chain.
 
+The option `debug_info` includes information related to debugging in the compiler output. Currently this option only includes the mapping from variables to registers.
+
 #### Options to control which compiler optimizations should run:
 
 By default all optimizations are turned on, to disable an optimization, it should be

docs/index.md

@@ -1,9 +1,12 @@
 # Introduction
-Sophia is a functional language designed for smart contract development.
-It is strongly typed and has restricted mutable state.
+Sophia is a functional language designed for smart contract development. It is strongly typed and has
+restricted mutable state.
 
-Sophia is customized for smart contracts, which can be published to a blockchain.
-Thus some features of conventional languages (such as floating point arithmetic) are not present in Sophia,
-and some blockchain specific primitives, constructions and types have been added.
+Sophia is customized for smart contracts, which can be published
+to a blockchain. Thus some features of conventional
+languages, such as floating point arithmetic, are not present in Sophia, and
+some [æternity blockchain](https://aeternity.com) specific primitives, constructions and types have been added.
 
-The file extension used for Sophia source files is ".aes", reflecting Sophia's Aeternity heritage.
+!!! Note
+    - For rapid prototyping of smart contracts check out [AEstudio](https://studio.aepps.com/)!
+    - For playing around and diving deeper into the language itself check out the [REPL](https://repl.aeternity.io/)!

docs/sophia_examples.md

@@ -65,3 +65,9 @@ contract FundMe =
            amount    = state.contributions[to]})
     put(state{ contributions @ c = Map.delete(to, c) })
 ```
+
+## Repositories
+This is a list with repositories that include smart contracts written in Sophia:
+
+- [aepp-sophia-examples](https://github.com/aeternity/aepp-sophia-examples)
+    - A repository that contains lots of different examples. The functionality of these examples is - to some extent - also covered by tests written in JavaScript.

docs/sophia_features.md

@@ -84,7 +84,7 @@ the return value of the call.
 
 ```sophia
 contract interface VotingType =
-  entrypoint vote : string => unit
+  entrypoint : vote : string => unit
 
 contract Voter =
   entrypoint tryVote(v : VotingType, alt : string) =
@@ -204,7 +204,7 @@ When a `contract` or a `contract interface` implements another `contract interfa
 
 #### Subtyping and variance
 
-Subtyping in Sophia follows common rules that take type variance into account. As described by [Wikipedia](https://en.wikipedia.org/wiki/Covariance_and_contravariance_(computer_science)),
+Subtyping in Sophia follows common rules that take type variance into account. As described by [Wikipedia](https://en.wikipedia.org/wiki/Covariance_and_contravariance_(computer_science)), 
 
 >Variance refers to how subtyping between more complex types relates to subtyping between their components.
 
@@ -224,11 +224,11 @@ A good example of where it matters can be pictured by subtyping of function type
 ```sophia
 contract interface Animal =
   entrypoint age : () => int
-
+  
 contract Dog : Animal =
   entrypoint age() = // ...
   entrypoint woof() = "woof"
-
+  
 contract Cat : Animal =
   entrypoint age() = // ...
   entrypoint meow() = "meow"
@@ -274,6 +274,12 @@ counterpart in `Args1`.
 - A map type `map(A1, A2)` is a subtype of `map(B1, B2)` if `A1` is a subtype
 of `B1`, and `A2` is a subtype of `B2`.
 
+- An oracle type `oracle(A1, A2)` is a subtype of `oracle(B1, B2)` if `B1` is
+a subtype of `A1`, and `A2` is a subtype of `B2`.
+
+- An oracle_query type `oracle_query(A1, A2)` is a subtype of `oracle_query(B1, B2)`
+if `A1` is a subtype of `B1`, and `A2` is a subtype of `B2`.
+
 - A user-defined datatype `t(Args1)` is a subtype of `t(Args2)`
 
 - When a user-defined type `t('a)` is covariant in `'a`, then `t(A)` is a
@@ -289,11 +295,6 @@ of `A`.
 - When a user-defined type `t('a)` is invariant in `'a`, then `t(A)` can never be
 a subtype of `t(B)`.
 
-#### Type variable limitation
-
-Because of how FATE represents types as values there is a fixed upper limit (256)
-of type variables that can be used in a single type signature.
-
 ## Mutable state
 
 Sophia does not have arbitrary mutable state, but only a limited form of state
@@ -334,6 +335,10 @@ Without the `stateful` annotation the compiler does not allow the call to
 * Use a stateful primitive function. These are
   - `put`
   - `Chain.spend`
+  - `Oracle.register`
+  - `Oracle.query`
+  - `Oracle.respond`
+  - `Oracle.extend`
   - `AENS.preclaim`
   - `AENS.claim`
   - `AENS.transfer`
@@ -488,24 +493,6 @@ the file, except that error messages will refer to the original source
 locations. The language will try to include each file at most one time automatically,
 so even cyclic includes should be working without any special tinkering.
 
-### Include files using relative paths
-
-When including code from another file using the `include` statement, the path
-is relative to _the file that includes it_. Consider the following file tree:
-```
-c1.aes
-c3.aes
-dir1/c2.aes
-dir1/c3.aes
-```
-
-If `c1.aes` contains `include "c3.aes"` it will include the top level `c3.aes`,
-while if `c2.aes` contained the same line it would as expected include
-`dir1/c3.aes`.
-
-Note: Prior to v7.5.0, it would consider the include path relative to _the main
-contract file_ (or any explicitly set include path).
-
 ## Standard library
 
 Sophia offers [standard library](sophia_stdlib.md) which exposes some
@@ -546,12 +533,13 @@ Sophia has the following types:
 | hash                 | A 32-byte hash - equivalent to `bytes(32)`                                                  |                                                              |
 | signature            | A signature - equivalent to `bytes(64)`                                                     |                                                              |
 | Chain.ttl            | Time-to-live (fixed height or relative to current block)                                    | ```FixedTTL(1050)``` ```RelativeTTL(50)```                   |
+| oracle('a, 'b)       | And oracle answering questions of type 'a with answers of type 'b                           | ```Oracle.register(acct, qfee, ttl)```                       |
+| oracle_query('a, 'b) | A specific oracle query                                                                     | ```Oracle.query(o, q, qfee, qttl, rttl)```                   |
 | contract             | A user defined, typed, contract address                                                     | ```function call_remote(r : RemoteContract) = r.fun()```     |
 
 ## Literals
 | Type                 | Constant/Literal example(s)                                                                                                         |
 | ----------           | -------------------------------                                                                                                     |
-| unit                 | ()                                                                                                                                  |
 | int                  | `-1`, `2425`, `4598275923475723498573485768`                                                                                        |
 | address              | `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt`                                                                             |
 | bool                 | `true`, `false`                                                                                                                     |
@@ -566,8 +554,10 @@ Sophia has the following types:
 | state                | `state{ owner = Call.origin, magic_key = #a298105f }`                                                                               |
 | event                | `EventX(0, "Hello")`                                                                                                                |
 | hash                 | `#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f`                                                                 |
-| signature            | `sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj`, `#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f` |
+| signature            | `#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f` |
 | Chain.ttl            | `FixedTTL(1050)`, `RelativeTTL(50)`                                                                                                 |
+| oracle('a, 'b)       | `ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5`                                                                             |
+| oracle_query('a, 'b) | `oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY`                                                                             |
 | contract             | `ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ`                                                                              |
 
 ## Hole expression
@@ -620,28 +610,14 @@ arithmetic operations:
 - remainder (`x mod y`), satisfying `y * (x / y) + x mod y == x` for non-zero `y`
 - exponentiation (`x ^ y`)
 
-All operations are *safe* with respect to overflow and underflow.
+All operations are *safe* with respect to overflow and underflow. 
 The division and modulo operations throw an arithmetic error if the
 right-hand operand is zero.
 
-Sophia arbitrary-sized integers (FATE) also supports the following bitwise operations:
-- bitwise and (`x band y`)
-- bitwise or (`x bor y`)
-- bitwise xor (`x bxor y`)
-- bitwise not (`bnot x`)
-- arithmetic bitshift left (`x << n`)
-- arithmetic bitshift right (`x >> n`)
-
-Note: Arithmetic bitshift treats the number as a signed integer (in 2s
-complement), and "retains" the topmost bit. I.e. shifting in zeros if the
-topmost bit was 0, and ones if it was one.
-
 ## Bit fields
 
-Originally Sophia integers did not support bit arithmetic. Instead we used a
-separate type `bits` (see the standard library
-[documentation](sophia_stdlib.md#bits)) - it is still provided as an
-alternative to bit arithmetic.
+Sophia integers do not support bit arithmetic. Instead there is a separate
+type `bits`. See the standard library [documentation](sophia_stdlib.md#bits).
 
 A bit field can be of arbitrary size (but it is still represented by the
 corresponding integer, so setting very high bits can be expensive).
@@ -877,19 +853,85 @@ wrapping a transaction.) The transaction and the transaction hash is available i
 `Auth.tx` and `Auth.tx_hash` respectively, they are *only* available during authentication if invoked by a
 normal contract call they return `None`.
 
+## Oracle interface
+You can attach an oracle to the current contract and you can interact with oracles
+through the Oracle interface.
+
+For a full description of how Oracle works see
+[Oracles](https://github.com/aeternity/protocol/blob/master/oracles/oracles.md#oracles).
+For a functionality documentation refer to the [standard library](sophia_stdlib.md#oracle).
+
+### Example
+
+Example for an oracle answering questions of type `string` with answers of type `int`:
+```sophia
+contract Oracles =
+
+  stateful entrypoint registerOracle(acct : address,
+                                     sign : signature,   // Signed network id + oracle address + contract address
+                                     qfee : int,
+                                     ttl  : Chain.ttl) : oracle(string, int) =
+     Oracle.register(acct, signature = sign, qfee, ttl)
+
+  entrypoint queryFee(o : oracle(string, int)) : int =
+    Oracle.query_fee(o)
+
+  payable stateful entrypoint createQuery(o    : oracle_query(string, int),
+                                          q    : string,
+                                          qfee : int,
+                                          qttl : Chain.ttl,
+                                          rttl : int) : oracle_query(string, int) =
+    require(qfee =< Call.value, "insufficient value for qfee")
+    Oracle.query(o, q, qfee, qttl, RelativeTTL(rttl))
+
+  stateful entrypoint extendOracle(o   : oracle(string, int),
+                                   ttl : Chain.ttl) : unit =
+    Oracle.extend(o, ttl)
+
+  stateful entrypoint signExtendOracle(o    : oracle(string, int),
+                                       sign : signature,   // Signed network id + oracle address + contract address
+                                       ttl  : Chain.ttl) : unit =
+    Oracle.extend(o, signature = sign, ttl)
+
+  stateful entrypoint respond(o    : oracle(string, int),
+                              q    : oracle_query(string, int),
+                              sign : signature,        // Signed network id + oracle query id + contract address
+                              r    : int) =
+    Oracle.respond(o, q, signature = sign, r)
+
+  entrypoint getQuestion(o : oracle(string, int),
+                         q : oracle_query(string, int)) : string =
+    Oracle.get_question(o, q)
+
+  entrypoint hasAnswer(o : oracle(string, int),
+                       q : oracle_query(string, int)) =
+    switch(Oracle.get_answer(o, q))
+      None    => false
+      Some(_) => true
+
+  entrypoint getAnswer(o : oracle(string, int),
+                       q : oracle_query(string, int)) : option(int) =
+    Oracle.get_answer(o, q)
+```
+
+### Sanity checks
+
+When an Oracle literal is passed to a contract, no deep checks are performed.
+For extra safety [Oracle.check](sophia_stdlib.md#check) and [Oracle.check_query](sophia_stdlib.md#check_query)
+functions are provided.
+
 ## AENS interface
 
-Contracts can interact with the [æternity naming system](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/AENS.md). For this
-purpose the [AENS](sophia_stdlib.md#aens) and later the
-[AENSv2](sophia_stdlib.md#aensv2) library was exposed.
+Contracts can interact with the
+[æternity naming system](https://github.com/aeternity/protocol/blob/master/AENS.md).
+For this purpose the [AENS](sophia_stdlib.md#aens) library was exposed.
 
 ### Example
 
 In this example we assume that the name `name` already exists, and is owned by
 an account with address `addr`. In order to allow a contract `ct` to handle
-`name` the account holder needs to create a [delegation
-signature](#delegation-signature) `sig` from the name owner address `addr`, the
-name hash and the contract address.
+`name` the account holder needs to create a
+[signature](#delegation-signature) `sig` of `addr | name.hash | ct.address`.
 
 Armed with this information we can for example write a function that extends
 the name if it expires within 1000 blocks:
@@ -927,9 +969,10 @@ automatically removed so they will not appear in the pointers map.
 
 ## Events
 
-Sophia contracts log structured messages to an event log in the resulting blockchain transaction.
-The event log is quite similar to [Events in Solidity](https://solidity.readthedocs.io/en/v0.4.24/contracts.html#events).
-Events are further discussed in the [protocol](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/contracts/events.md).
+Sophia contracts log structured messages to an event log in the resulting
+blockchain transaction. The event log is quite similar to [Events in
+Solidity](https://solidity.readthedocs.io/en/v0.4.24/contracts.html#events).
+Events are further discussed in the [protocol](https://github.com/aeternity/protocol/blob/master/contracts/events.md).
 
 
 To use events a contract must declare a datatype `event`, and events are then
@@ -949,6 +992,8 @@ field is indexed if it fits in a 32-byte word, i.e.
 - `int`
 - `bits`
 - `address`
+- `oracle(_, _)`
+- `oracle_query(_, _)`
 - contract types
 - `bytes(n)` for `n` ≤ 32, in particular `hash`
 
@@ -1028,15 +1073,8 @@ however is in the gas consumption — while `abort` returns unused gas, a call t
 
 ## Delegation signature
 
-Some chain operations (`AENSv2.<operation>`) have an
+Some chain operations (`Oracle.<operation>` and `AENS.<operation>`) have an
 optional delegation signature. This is typically used when a user/accounts
-would like to allow a contract to act on it's behalf.
-
-There are five different delegation signatures:
-
- - AENS wildcard - the user signs: `owner account + contract`
- - `AENS_PRECLAIM` - the user signs: `owner account + contract`
- - `AENS_CLAIM, AENS_UPDATE, AENS_TRANSFER, AENS_REVOKE` - the user signs: `owner account + name hash + contract`
-
-See [Serialized signature data](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/serializations.md)
-for the exact structure used.
+would like to allow a contract to act on it's behalf. The exact data to be
+signed varies for the different operations, but in all cases you should prepend
+the signature data with the `network_id` (`ae_mainnet` for the æternity mainnet, etc.).

docs/sophia_stdlib.md

@@ -14,7 +14,6 @@ The out-of-the-box namespaces are:
 
 - [Address](#address)
 - [AENS](#aens)
-- [AENSv2](#aensv2)
 - [Auth](#auth)
 - [Bits](#bits)
 - [Bytes](#bytes)
@@ -25,13 +24,13 @@ The out-of-the-box namespaces are:
 - [Crypto](#crypto)
 - [Int](#int)
 - [Map](#map)
+- [Oracle](#oracle)
 
 The following ones need to be included as regular files with `.aes` suffix, for example
 ```
 include "List.aes"
 ```
 
-- [AENSCompat](#aenscompat)
 - [Bitwise](#bitwise)
 - [BLS12_381](#bls12_381)
 - [Func](#func)
@@ -56,12 +55,6 @@ Address.to_str(a : address) : string
 
 Base58 encoded string
 
-#### to_bytes
-```
-Address.to_bytes(a : address) : bytes(32)
-```
-
-The binary representation of the address.
 
 #### is_contract
 ```
@@ -71,6 +64,14 @@ Address.is_contract(a : address) : bool
 Is the address a contract
 
 
+#### is_oracle
+```
+Address.is_oracle(a : address) : bool
+```
+
+Is the address a registered oracle
+
+
 #### is_payable
 ```
 Address.is_payable(a : address) : bool
@@ -89,10 +90,13 @@ Cast address to contract type C (where `C` is a contract)
 
 ### AENS
 
-The old AENS namespace, kept in the compiler to be able to interact with
-contracts from before Ceres, compiled using sophia compiler version 7.x and
-earlier. Used in [AENSCompat](#aenscompat) when converting between old and new
-pointers.
+The following functionality is available for interacting with the æternity
+naming system (AENS).
+If `owner` is equal to `Contract.address` the signature `signature` is
+ignored, and can be left out since it is a named argument. Otherwise we need
+a signature to prove that we are allowed to do AENS operations on behalf of
+`owner`. The [signature is tied to a network id](https://github.com/aeternity/protocol/blob/iris/consensus/consensus.md#transaction-signature),
+i.e. the signature material should be prefixed by the network id.
 
 #### Types
 
@@ -105,48 +109,16 @@ datatype name = Name(address, Chain.ttl, map(string, AENS.pointee))
 ##### pointee
 
 ```
-datatype pointee = AccountPt(address)
-                 | ContractPt(address)
-                 | ChannelPt(address)
+datatype pointee = AccountPt(address) | OraclePt(address)
+                 | ContractPt(address) | ChannelPt(address)
 ```
 
-### AENSv2
-
-Note: introduced in v8.0
-
-The following functionality is available for interacting with the æternity
-naming system (AENS).  If `owner` is equal to `Contract.address` the signature
-`signature` is ignored, and can be left out since it is a named argument.
-Otherwise we need a signature to prove that we are allowed to do AENS
-operations on behalf of `owner`. The [signature is tied to a network
-id](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/consensus/README.md#transaction-signature),
-i.e. the signature material should be prefixed by the network id.
-
-#### Types
-
-##### name
-```
-datatype name = Name(address, Chain.ttl, map(string, AENSv2.pointee))
-```
-
-
-##### pointee
-
-```
-datatype pointee = AccountPt(address)
-                 | ContractPt(address)
-                 | ChannelPt(address)
-                 | DataPt(bytes())
-```
-
-Note: on-chain there is a maximum length enforced for `DataPt`, it is 1024 bytes.
-Sophia itself does _not_ check for this.
 
 #### Functions
 
 ##### resolve
 ```
-AENSv2.resolve(name : string, key : string) : option('a)
+AENS.resolve(name : string, key : string) : option('a)
 ```
 
 Name resolution. Here `name` should be a registered name and `key` one of the attributes
@@ -157,106 +129,74 @@ type checked against this type at run time.
 
 ##### lookup
 ```
-AENSv2.lookup(name : string) : option(AENSv2.name)
+AENS.lookup(name : string) : option(AENS.name)
 ```
 
-If `name` is an active name `AENSv2.lookup` returns a name object.
+If `name` is an active name `AENS.lookup` returns a name object.
 The three arguments to `Name` are `owner`, `expiry` and a map of the
 `pointees` for the name. Note: the expiry of the name is always a fixed TTL.
 For example:
 ```
-let Some(AENSv2.Name(owner, FixedTTL(expiry), ptrs)) = AENSv2.lookup("example.chain")
+let Some(Name(owner, FixedTTL(expiry), ptrs)) = AENS.lookup("example.chain")
 ```
 
-Note: Changed to produce `AENSv2.name` in v8.0 (Ceres protocol upgrade).
 
 ##### preclaim
 ```
-AENSv2.preclaim(owner : address, commitment_hash : hash, <signature : signature>) : unit
+AENS.preclaim(owner : address, commitment_hash : hash, <signature : signature>) : unit
 ```
 
-The [signature](./sophia_features.md#delegation-signature) should be a
-serialized structure containing `network id`, `owner address`, and
-`Contract.address`.
-
-The [signature](./sophia_features.md#delegation-signature) can also be generic
-(allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `Contract.address`.
+The [signature](./sophia_features.md#delegation-signature) should be over
+`network id` + `owner address` + `Contract.address` (concatenated as byte arrays).
 
 
 ##### claim
 ```
-AENSv2.claim(owner : address, name : string, salt : int, name_fee : int, <signature : signature>) : unit
+AENS.claim(owner : address, name : string, salt : int, name_fee : int, <signature : signature>) : unit
 ```
 
-The [signature](./sophia_features.md#delegation-signature) should be a
-serialized structure containing `network id`, `owner address`, and
-`Contract.address`. Using the private key of `owner address` for signing.
-
-From Ceres (i.e. FATE VM version 3) the
-[signature](./sophia_features.md#delegation-signature) can also be generic
-(allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
-`Contract.address`.
+The [signature](./sophia_features.md#delegation-signature) should be over
+`network id` + `owner address` + `name_hash` + `Contract.address`
+(concatenated as byte arrays)
+using the private key of the `owner` account for signing.
 
 
 ##### transfer
 ```
-AENSv2.transfer(owner : address, new_owner : address, name : string, <signature : signature>) : unit
+AENS.transfer(owner : address, new_owner : address, name : string, <signature : signature>) : unit
 ```
 
 Transfers name to the new owner.
 
-The [signature](./sophia_features.md#delegation-signature) should be a
-serialized structure containing `network id`, `owner address`, and
-`Contract.address`. Using the private key of `owner address` for signing.
-
-From Ceres (i.e. FATE VM version 3) the
-[signature](./sophia_features.md#delegation-signature) can also be generic
-(allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
-`Contract.address`.
+The [signature](./sophia_features.md#delegation-signature) should be over
+`network id` + `owner address` + `name_hash` + `Contract.address`
+(concatenated as byte arrays)
+using the private key of the `owner` account for signing.
 
 
 ##### revoke
 ```
-AENSv2.revoke(owner : address, name : string, <signature : signature>) : unit
+AENS.revoke(owner : address, name : string, <signature : signature>) : unit
 ```
 
 Revokes the name to extend the ownership time.
 
-The [signature](./sophia_features.md#delegation-signature) should be a
-serialized structure containing `network id`, `owner address`, and
-`Contract.address`. Using the private key of `owner address` for signing.
-
-From Ceres (i.e. FATE VM version 3) the
-[signature](./sophia_features.md#delegation-signature) can also be generic
-(allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
-`Contract.address`.
+The [signature](./sophia_features.md#delegation-signature) should be over
+`network id` + `owner address` + `name_hash` + `Contract.address`
+(concatenated as byte arrays)
+using the private key of the `owner` account for signing.
 
 
 ##### update
 ```
-AENSv2.update(owner : address, name : string, expiry : option(Chain.ttl), client_ttl : option(int),
-              new_ptrs : option(map(string, AENSv2.pointee)), <signature : signature>) : unit
+AENS.update(owner : address, name : string, expiry : option(Chain.ttl), client_ttl : option(int),
+            new_ptrs : map(string, AENS.pointee), <signature : signature>) : unit
 ```
 
 Updates the name. If the optional parameters are set to `None` that parameter
 will not be updated, for example if `None` is passed as `expiry` the expiry
 block of the name is not changed.
 
-Note: Changed to consume `AENSv2.pointee` in v8.0 (Ceres protocol upgrade).
-
-The [signature](./sophia_features.md#delegation-signature) should be a
-serialized structure containing `network id`, `owner address`, and
-`Contract.address`. Using the private key of `owner address` for signing.
-
-From Ceres (i.e. FATE VM version 3) the
-[signature](./sophia_features.md#delegation-signature) can also be generic
-(allowing _all_, existing and future, names to be delegated with one
-signature), i.e. containing `network id`, `owner address`, `name_hash`, and
-`Contract.address`.
 
 ### Auth
 
@@ -280,6 +220,7 @@ namespace Chain =
   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) |
@@ -295,10 +236,7 @@ namespace Chain =
 Auth.tx_hash : option(hash)
 ```
 
-Gets the transaction hash during authentication. Note: `Auth.tx_hash`
-computation differs between protocol versions (changed in Ceres!), see
-[aeserialisation](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/serializations.md)
-specification for details.
+Gets the transaction hash during authentication.
 
 
 ### Bits
@@ -377,7 +315,7 @@ Each bit is true if and only if it was 1 in `a` and 0 in `b`
 
 ### Bytes
 
-#### to\_int
+#### to_int
 ```
 Bytes.to_int(b : bytes(n)) : int
 ```
@@ -385,7 +323,7 @@ Bytes.to_int(b : bytes(n)) : int
 Interprets the byte array as a big endian integer
 
 
-#### to\_str
+#### to_str
 ```
 Bytes.to_str(b : bytes(n)) : string
 ```
@@ -398,8 +336,7 @@ Returns the hexadecimal representation of the byte array
 Bytes.concat : (a : bytes(m), b : bytes(n)) => bytes(m + n)
 ```
 
-Concatenates two byte arrays. If `m` and `n` are known at compile time, the
-result can be used as a fixed size byte array, otherwise it has type `bytes()`.
+Concatenates two byte arrays
 
 
 #### split
@@ -409,38 +346,6 @@ Bytes.split(a : bytes(m + n)) : bytes(m) * bytes(n)
 
 Splits a byte array at given index
 
-#### split\_any
-```
-Bytes.split_any(a : bytes(), at : int) : option(bytes() * bytes(n))
-```
-
-Splits an arbitrary size byte array at index `at`. If `at` is positive split
-from the beginning of the array, if `at` is negative, split `abs(at)` from the
-_end_ of the array. If the array is shorter than `abs(at)` then `None` is
-returned.
-
-#### to\_fixed\_size
-```
-Bytes.to_fixed_size(a : bytes()) : option(bytes(n))
-```
-
-Converts an arbitrary size byte array to a fix size byte array. If `a` is
-not `n` bytes, `None` is returned.
-
-#### to\_any\_size
-```
-Bytes.to_any_size(a : bytes(n)) : bytes()
-```
-
-Converts a fixed size byte array to an arbitrary size byte array. This is a
-no-op at run-time, and only used during type checking.
-
-#### size
-```
-Bytes.size(a : bytes()) : int
-```
-
-Computes the lenght/size of a byte array.
 
 ### Call
 
@@ -476,12 +381,6 @@ Call.gas_price : int
 
 The gas price of the current call.
 
-#### mulmod
-```
-Int.mulmod : (a : int, b : int, q : int) : int
-```
-
-Combined multiplication and modulus, returns `(a * b) mod q`.
 
 #### fee
 ```
@@ -529,6 +428,7 @@ datatype paying_for_tx = PayingForTx(address, int)
 ##### base_tx
 ```
 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) |
@@ -569,6 +469,39 @@ Chain.block_height : int"
 
 The height of the current block (i.e. the block in which the current call will be included).
 
+
+##### coinbase
+```
+Chain.coinbase : address
+```
+
+The address of the account that mined the current block.
+
+
+##### timestamp
+```
+Chain.timestamp : int
+```
+
+The timestamp of the current block (unix time, milliseconds).
+
+
+##### difficulty
+```
+Chain.difficulty : int
+```
+
+The difficulty of the current block.
+
+
+##### gas
+```
+Chain.gas_limit : int
+```
+
+The gas limit of the current block.
+
+
 ##### bytecode_hash
 ```
 Chain.bytecode_hash : 'c => option(hash)
@@ -605,6 +538,7 @@ charging the calling contract. Note that this won't be visible in `Call.value`
 in the `init` call of the new contract. It will be included in
 `Contract.balance`, however.
 
+
 The type `'c` must be instantiated with a contract.
 
 
@@ -631,7 +565,6 @@ main contract Market =
 The typechecker must be certain about the created contract's type, so it is
 worth writing it explicitly as shown in the example.
 
-
 ##### clone
 ```
 Chain.clone : ( ref : 'c, gas : int, value : int, protected : bool, ...
@@ -670,8 +603,8 @@ Example usage:
 ```
 payable contract interface Auction =
   entrypoint init : (int, string) => void
-  stateful payable entrypoint buy : (int) => unit
-  stateful entrypoint sell : (int) => unit
+  stateful payable entrypoint buy : (int) => ()
+  stateful entrypoint sell : (int) => ()
 
 main contract Market =
   type state = list(Auction)
@@ -690,71 +623,11 @@ implementation of the `init` function does not actually return `state`, but
 calls `put` instead. Moreover, FATE prevents even handcrafted calls to `init`.
 
 
-##### coinbase
-```
-Chain.coinbase : address
-```
-
-The address of the account that mined the current block.
-
-
-##### difficulty
-```
-Chain.difficulty : int
-```
-
-The difficulty of the current block.
-
-
 ##### event
 ```
 Chain.event(e : event) : unit
 ```
-
-Emits the event. To use this function one needs to define the `event` type as a
-`datatype` in the contract.
-
-
-##### gas\_limit
-```
-Chain.gas_limit : int
-```
-
-The gas limit of the current block.
-
-
-##### network\_id
-```
-Chain.network\_id : string
-```
-
-The network id of the chain.
-
-
-#### poseidon
-```
-Crypto.poseidon(x1 : int, x2 : int) : int
-```
-
-Hash two integers (in the scalar field of BLS12-381) to another integer (in the scalar
-field of BLS12-281). This is a ZK/SNARK-friendly hash function.
-
-
-##### spend
-```
-Chain.spend(to : address, amount : int) : unit
-```
-
-Spend `amount` tokens to `to`. Will fail (and abort the contract) if contract
-doesn't have `amount` tokens to transfer, or, if `to` is not `payable`.
-
-
-##### timestamp
-```
-Chain.timestamp : int
-```
-
-The timestamp of the current block (unix time, milliseconds).
+Emits the event. To use this function one needs to define the `event` type as a `datatype` in the contract.
 
 
 ### Char
@@ -832,14 +705,11 @@ Hash any object to blake2b
 
 #### verify_sig
 ```
-Crypto.verify_sig(msg : bytes(), pubkey : address, sig : signature) : bool
+Crypto.verify_sig(msg : hash, pubkey : address, sig : signature) : bool
 ```
 
 Checks if the signature of `msg` was made using private key corresponding to
-the `pubkey`.
-
-Note: before v8 of the compiler, `msg` had type `hash` (i.e. `bytes(32)`).
-
+the `pubkey`
 
 #### ecverify_secp256k1
 ```
@@ -872,21 +742,12 @@ Verifies a standard 64-byte ECDSA signature (`R || S`).
 
 ### Int
 
-#### to\_str
+#### to_str
 ```
-Int.to_str(n : int) : string
+Int.to_str : int => string
 ```
 
-Casts the integer to a string (in decimal representation).
-
-#### to\_bytes
-```
-Int.to_bytes(n : int, size : int) : bytes()
-```
-
-Casts the integer to a byte array with `size` bytes (big endian, truncating if
-necessary not preserving signedness). I.e. if you try to squeeze `-129` into a
-single byte that will be indistinguishable from `127`.
+Casts integer to string using decimal representation
 
 
 ### Map
@@ -935,26 +796,206 @@ Returns a list containing pairs of keys and their respective elements.
 Turns a list of pairs of form `(key, value)` into a map
 
 
+### Oracle
+
+#### register
+```
+Oracle.register(<signature : bytes(64)>, acct : address, qfee : int, ttl : Chain.ttl) : oracle('a, 'b)
+```
+
+Registers new oracle answering questions of type `'a` with answers of type `'b`.
+
+* The `acct` is the address of the oracle to register (can be the same as the contract).
+* `signature` is a signature proving that the contract is allowed to register the account -
+  the `network id` + `account address` + `contract address` (concatenated as byte arrays) is
+  [signed](./sophia_features.md#delegation-signature) with the
+  private key of the account, proving you have the private key of the oracle to be. If the
+  address is the same as the contract `sign` is ignored and can be left out entirely.
+* The `qfee` is the minimum query fee to be paid by a user when asking a question of the oracle.
+* The `ttl` is the Time To Live for the oracle in key blocks, either relative to the current
+  key block height (`RelativeTTL(delta)`) or a fixed key block height (`FixedTTL(height)`).
+* The type `'a` is the type of the question to ask.
+* The type `'b` is the type of the oracle answers.
+
+Examples:
+```
+  Oracle.register(addr0, 25, RelativeTTL(400))
+  Oracle.register(addr1, 25, RelativeTTL(500), signature = sign1)
+```
+
+
+#### get_question
+```
+Oracle.get_question(o : oracle('a, 'b), q : oracle_query('a, 'b)) : 'a
+```
+
+Checks what was the question of query `q` on oracle `o`
+
+
+#### respond
+```
+Oracle.respond(<signature : bytes(64)>, o : oracle('a, 'b), q : oracle_query('a, 'b), 'b) : unit
+```
+
+Responds to the question `q` on `o`.
+Unless the contract address is the same as the oracle address the `signature`
+(which is an optional, named argument)
+needs to be provided. Proving that we have the private key of the oracle by
+[signing](./sophia_features.md#delegation-signature)
+the `network id` + `oracle query id` + `contract address`
+
+
+#### extend
+```
+Oracle.extend(<signature : bytes(64)>, o : oracle('a, 'b), ttl : Chain.ttl) : unit
+```
+
+Extends TTL of an oracle.
+* `singature` is a named argument and thus optional. Must be the same as for `Oracle.register`
+* `o` is the oracle being extended
+* `ttl` must be `RelativeTTL`. The time to live of `o` will be extended by this value.
+
+#### query_fee
+```
+Oracle.query_fee(o : oracle('a, 'b)) : int
+```
+
+Returns the query fee of the oracle
+
+
+#### query
+```
+Oracle.query(o : oracle('a, 'b), q : 'a, qfee : int, qttl : Chain.ttl, rttl : Chain.ttl) : oracle_query('a, 'b)
+```
+
+Asks the oracle a question.
+* The `qfee` is the query fee debited to the contract account (`Contract.address`).
+* The `qttl` controls the last height at which the oracle can submit a response
+  and can be either fixed or relative.
+* The `rttl` must be relative and controls how long an answer is kept on the chain.
+The call fails if the oracle could expire before an answer.
+
+
+#### get_answer
+```
+Oracle.get_answer(o : oracle('a, 'b), q : oracle_query('a, 'b)) : option('b)
+```
+
+Checks what is the optional query answer
+
+
+#### expiry
+
+```
+Oracle.expiry(o : oracle('a, 'b)) : int
+```
+
+Ask the oracle when it expires. The result is the block height at which it will happen.
+
+
+#### check
+```
+Oracle.check(o : oracle('a, 'b)) : bool
+```
+
+Returns `true` iff the oracle `o` exists and has correct type
+
+
+#### check_query
+```
+Oracle.check_query(o : oracle('a, 'b), q : oracle_query('a, 'b)) : bool
+```
+
+It returns `true` iff the oracle query exist and has the expected type.
+
+
 ## Includable namespaces
 
 These need to be explicitly included (with `.aes` suffix)
 
 
-### AENSCompat
+### Bitwise
 
-#### pointee\_to\_V2
+Bitwise operations on arbitrary precision integers.
+
+#### bsr
 ```
-AENSCompat.pointee_to_V2(p : AENS.pointee) : AENSv2.pointee
+Bitwise.bsr(n : int, x : int) : int
 ```
 
-Translate old pointee format to new, this is always possible.
+Logical bit shift `x` right `n` positions.
 
-#### pointee\_from\_V2
+
+#### bsl
 ```
-AENSCompat.pointee_from_V2(p2 : AENSv2.pointee) : option(AENS.pointee)
+Bitwise.bsl(n : int, x : int) : int
 ```
 
-Translate new pointee format to old, `DataPt` can't be translated, so `None` is returned in this case.
+Logical bit shift `x` left `n` positions.
+
+
+#### bsli
+```
+Bitwise.bsli(n : int, x : int, lim : int) : int
+```
+
+Logical bit shift `x` left `n` positions, limit to `lim` bits.
+
+
+#### band
+```
+Bitwise.band(x : int, y : int) : int
+```
+
+Bitwise `and` of `x` and `y`.
+
+
+#### bor
+```
+Bitwise.bor(x : int, y : int) : int
+```
+
+Bitwise `or` of `x` and `y`.
+
+
+#### bxor
+```
+Bitwise.bxor(x : int, y : int) : int
+```
+
+Bitwise `xor` of `x` and `y`.
+
+
+#### bnot
+```
+Bitwise.bnot(x : int) : int
+```
+
+Bitwise `not` of `x`. Defined and implemented as `bnot(x) = bxor(x, -1)`.
+
+
+#### uband
+```
+Bitwise.uband(x : int, y : int) : int
+```
+
+Bitwise `and` of _non-negative_ numbers `x` and `y`.
+
+
+#### ubor
+```
+Bitwise.ubor(x : int, y : int) : int
+```
+
+Bitwise `or` of _non-negative_ `x` and `y`.
+
+
+#### ubxor
+```
+Bitwise.ubxor(x : int, y : int) : int
+```
+
+Bitwise `xor` of _non-negative_ `x` and `y`.
 
 
 ### BLS12\_381
@@ -1543,7 +1584,7 @@ point where the error would exceed the `loss` value.
 
 For debugging. If it ever returns false in a code that doesn't call `frac` constructors or
 accept arbitrary `frac`s from the surface you should report it as a
-[bug](https://git.qpq.swiss/QPQ-AG/sophia/issues/new)
+[bug](https://github.com/aeternity/aesophia/issues/new)
 
 If you expect getting calls with malformed `frac`s in your contract, you should use
 this function to verify the input.
@@ -2350,15 +2391,6 @@ to_int(s : string) : option(int)
 Converts a decimal ("123", "-253") or a hexadecimal ("0xa2f", "-0xBBB") string into
 an integer. If the string doesn't contain a valid number `None` is returned.
 
-#### to\_bytes
-```
-to_bytes(s : string) : bytes()
-```
-
-Converts string into byte array. String is UTF-8 encoded. I.e.
-`String.length(s)` is not guaranteed to be equal to
-`Bytes.size(String.to_bytes(s))`.
-
 #### sha3
 ```
 sha3(s : string) : hash

docs/sophia_syntax.md

@@ -28,7 +28,8 @@ interface main using as for hiding
 - `Char` character literal enclosed in `'` with escape character `\`
 - `AccountAddress` base58-encoded 32 byte account pubkey with `ak_` prefix
 - `ContractAddress` base58-encoded 32 byte contract address with `ct_` prefix
-- `Signature` base58-encoded 64 byte cryptographic signature with `sg_` prefix
+- `OracleAddress` base58-encoded 32 byte oracle address with `ok_` prefix
+- `OracleQueryId` base58-encoded 32 byte oracle query id with `oq_` prefix
 
 Valid string escape codes are
 
@@ -44,7 +45,7 @@ Valid string escape codes are
 | `\xHexDigits` | *HexDigits* |   |
 
 
-See the [identifier encoding scheme](https://git.qpq.swiss/QPQ-AG/protocol/src/branch/master/node/api/api_encoding.md) for the
+See the [identifier encoding scheme](https://github.com/aeternity/protocol/blob/master/node/api/api_encoding.md) for the
 details on the base58 literals.
 
 ## Layout blocks
@@ -237,7 +238,7 @@ Expr ::= '(' LamArgs ')' '=>' Block(Stmt)   // Anonymous function    (x) => x +
        | Id | Con | QId | QCon              // Identifiers           x, None, Map.member, AELib.Token
        | Int | Bytes | String | Char        // Literals              123, 0xff, #00abc123, "foo", '%'
        | AccountAddress | ContractAddress   // Chain identifiers
-       | Signature                          // Signature
+       | OracleAddress | OracleQueryId      // Chain identifiers
        | '???'                              // Hole expression       1 + ???
 
 Generator ::= Pattern '<-' Expr   // Generator
@@ -255,8 +256,8 @@ Path ::= Id                 // Record field
 
 BinOp ::= '||' | '&&' | '<' | '>' | '=<' | '>=' | '==' | '!='
         | '::' | '++' | '+' | '-' | '*' | '/' | 'mod' | '^'
-        | 'band' | 'bor' | 'bxor' | '<<' | '>>' | '|>'
-UnOp  ::= '-' | '!' | 'bnot'
+        | '|>'
+UnOp  ::= '-' | '!'
 ```
 
 ## Operators types
@@ -264,11 +265,10 @@ UnOp  ::= '-' | '!' | 'bnot'
 | Operators | Type
 | --- | ---
 | `-` `+` `*` `/` `mod` `^` | arithmetic operators
-| `!` `&&` `\|\|` | logical operators
-| `band` `bor` `bxor` `bnot` `<<` `>>` | bitwise operators
+| `!` `&&` `||` | logical operators
 | `==` `!=` `<` `>` `=<` `>=` | comparison operators
 | `::` `++` | list operators
-| `\|>` | functional operators
+| `|>` | functional operators
 
 ## Operator precedence
 
@@ -276,17 +276,13 @@ In order of highest to lowest precedence.
 
 | Operators | Associativity
 | --- | ---
-| `!` `bnot`| right
+| `!` | right
 | `^` | left
 | `*` `/` `mod` | left
 | `-` (unary) | right
 | `+` `-` | left
-| `<<` `>>` | left
 | `::` `++` | right
 | `<` `>` `=<` `>=` `==` `!=` | none
-| `band` | left
-| `bxor` | left
-| `bor` | left
 | `&&` | right
-| `\|\|` | right
-| `\|>` | left
+| `||` | right
+| `|>` | left

priv/stdlib/AENSCompat.aes

@@ -1,17 +0,0 @@
-namespace AENSCompat =
-  // Translate old format to new format - always possible
-  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)
-
-  // Translate new format to old format - option type!
-  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

priv/stdlib/Bitwise.aes

@@ -0,0 +1,126 @@
+@compiler >= 4.3
+
+namespace Bitwise =
+
+  // bit shift 'x' right 'n' postions
+  function bsr(n : int, x : int) : int =
+    let step = 2^n
+    let res  = x / step
+    if (x >= 0 || x mod step == 0)
+      res
+    else
+      res - 1
+
+  // bit shift 'x' left 'n' positions
+  function bsl(n : int, x : int) : int =
+    x * 2^n
+
+  // bit shift 'x' left 'n' positions, limit at 'lim' bits
+  function bsli(n : int, x : int, lim : int) : int =
+    (x * 2^n) mod (2^lim)
+
+  // bitwise 'and' for arbitrary precision integers
+  function band(a : int, b : int) : int =
+      if (a >= 0 && b >= 0)
+        uband_(a, b)
+      elif (b >= 0)
+        ubnand_(b, -1 - a)
+      elif (a >= 0)
+        ubnand_(a, -1 - b)
+      else
+        -1 - ubor_(-1 - a, -1 - b)
+
+  // bitwise 'or' for arbitrary precision integers
+  function
+    bor : (int, int) => int
+    bor(0, b) = b
+    bor(a, 0) = a
+    bor(a : int, b : int) : int =
+      if (a >= 0 && b >= 0)
+        ubor_(a, b)
+      elif (b >= 0)
+        -1 - ubnand_(-1 - a, b)
+      elif (a >= 0)
+        -1 - ubnand_(-1 - b, a)
+      else
+        -1 - uband_(-1 - a, -1 - b)
+
+  // bitwise 'xor' for arbitrary precision integers
+  function
+    bxor : (int, int) => int
+    bxor(0, b) = b
+    bxor(a, 0) = a
+    bxor(a, b) =
+      if (a >= 0 && b >= 0)
+        ubxor_(a, b)
+      elif (b >= 0)
+        -1 - ubxor_(-1 - a, b)
+      elif (a >= 0)
+        -1 - ubxor_(a, -1 - b)
+      else
+        ubxor_(-1 - a, -1 - b)
+
+  // bitwise 'not' for arbitrary precision integers
+  function bnot(a : int) = bxor(a, -1)
+
+  // Bitwise 'and' for non-negative integers
+  function uband(a : int, b : int) : int =
+    require(a >= 0 && b >= 0, "uband is only defined for non-negative integers")
+    switch((a, b))
+      (0, _) => 0
+      (_, 0) => 0
+      _      => uband__(a, b, 1, 0)
+
+  private function uband_(a, b) = uband__(a, b, 1, 0)
+
+  private function
+    uband__(0, b, val, acc) = acc
+    uband__(a, 0, val, acc) = acc
+    uband__(a, b, val, acc) =
+      switch (a mod 2 + b mod 2)
+        2 => uband__(a / 2, b / 2, val * 2, acc + val)
+        _ => uband__(a / 2, b / 2, val * 2, acc)
+
+  // Bitwise 'or' for non-negative integers
+  function ubor(a, b) =
+    require(a >= 0 && b >= 0, "ubor is only defined for non-negative integers")
+    switch((a, b))
+      (0, _) => b
+      (_, 0) => a
+      _      => ubor__(a, b, 1, 0)
+
+  private function ubor_(a, b) = ubor__(a, b, 1, 0)
+
+  private function
+    ubor__(0, 0, val, acc) = acc
+    ubor__(a, b, val, acc) =
+      switch (a mod 2 + b mod 2)
+        0 => ubor__(a / 2, b / 2, val * 2, acc)
+        _ => ubor__(a / 2, b / 2, val * 2, acc + val)
+
+  //Bitwise 'xor' for non-negative integers
+  function
+    ubxor : (int, int) => int
+    ubxor(0, b) = b
+    ubxor(a, 0) = a
+    ubxor(a, b) =
+      require(a >= 0 && b >= 0, "ubxor is only defined for non-negative integers")
+      ubxor__(a, b, 1, 0)
+
+  private function ubxor_(a, b) = ubxor__(a, b, 1, 0)
+
+  private function
+    ubxor__(0, 0, val, acc) = acc
+    ubxor__(a, b, val, acc) =
+      switch(a mod 2 + b mod 2)
+        1 => ubxor__(a / 2, b / 2, val * 2, acc + val)
+        _ => ubxor__(a / 2, b / 2, val * 2, acc)
+
+  private function ubnand_(a, b) = ubnand__(a, b, 1, 0)
+
+  private function
+    ubnand__(0, b, val, acc) = acc
+    ubnand__(a, b, val, acc) =
+      switch((a mod 2, b mod 2))
+        (1, 0) => ubnand__(a / 2, b / 2, val * 2, acc + val)
+        _      => ubnand__(a / 2, b / 2, val * 2, acc)

priv/stdlib/List.aes

@@ -282,9 +282,9 @@ namespace List =
   private function
     asc : (('a, 'a) => bool, 'a, list('a), list('a)) => list(list('a))
     asc(lt, x, acc, h::t) =
-      if(lt(h, x)) reverse(x::acc) :: monotonic_subs(lt, h::t)
+      if(lt(h, x)) List.reverse(x::acc) :: monotonic_subs(lt, h::t)
       else asc(lt, h, x::acc, t)
-    asc(_, x, acc, []) = [reverse(x::acc)]
+    asc(_, x, acc, []) = [List.reverse(x::acc)]
 
   /** Merges list of sorted lists
    */

priv/stdlib/String.aes

@@ -1,8 +1,5 @@
 include "List.aes"
 namespace String =
-  // Gives a bytes() representation of the string
-  function to_bytes(s : string) : bytes() = StringInternal.to_bytes(s)
-
   // Computes the SHA3/Keccak hash of the string
   function sha3(s : string) : hash    = StringInternal.sha3(s)
   // Computes the SHA256 hash of the string.

rebar.config

@@ -2,9 +2,8 @@
 
 {erl_opts, [debug_info]}.
 
-{deps, [ {gmbytecode,
-          {git, "https://git.qpq.swiss/QPQ-AG/gmbytecode.git",
-          {ref, "97cea33be8f3a35d26055664da7aa59531ff5537"}}}
+{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.2.0"}}}
+       , {getopt, "1.0.1"}
        , {eblake2, "1.0.0"}
        , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}
        ]}.
@@ -15,11 +14,10 @@
             {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
            ]}.
 
-{relx, [{release, {sophia, "9.0.0"},
-         [sophia, gmbytecode]},
+{relx, [{release, {aesophia, "7.1.0"},
+         [aesophia, aebytecode, getopt]},
 
         {dev_mode, true},
         {include_erts, false},
 
         {extended_start_script, true}]}.
-

rebar.lock

@@ -1,30 +1,31 @@
 {"1.2.0",
-[{<<"gmbytecode">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/gmbytecode.git",
-       {ref, "97cea33be8f3a35d26055664da7aa59531ff5537"}},
+[{<<"aebytecode">>,
+  {git,"https://github.com/aeternity/aebytecode.git",
+       {ref,"2a0a397afad6b45da52572170f718194018bf33c"}},
   0},
- {<<"gmserialization">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/gmserialization.git",
-       {ref,"ac64e01b0f675c1a34c70a827062f381920742db"}},
+ {<<"aeserialization">>,
+  {git,"https://github.com/aeternity/aeserialization.git",
+       {ref,"eb68fe331bd476910394966b7f5ede7a74d37e35"}},
   1},
  {<<"base58">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/erl-base58.git",
-       {ref,"e6aa62eeae3d4388311401f06e4b939bf4e94b9c"}},
+  {git,"https://github.com/aeternity/erl-base58.git",
+       {ref,"60a335668a60328a29f9731b67c4a0e9e3d50ab6"}},
   2},
- {<<"eblake2">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/eblake2.git",
-       {ref,"b29d585b8760746142014884007eb8441a3b6a14"}},
-  0},
+ {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0},
  {<<"enacl">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/enacl.git",
-       {ref,"4eb7ec70084ba7c87b1af8797c4c4e90c84f95a2"}},
+  {git,"https://github.com/aeternity/enacl.git",
+       {ref,"793ddb502f7fe081302e1c42227dca70b09f8e17"}},
   2},
- {<<"getopt">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/getopt.git",
-       {ref,"dbab6262a2430809430deda9d8650f58f9d80898"}},
-  1},
+ {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
  {<<"jsx">>,
   {git,"https://github.com/talentdeficit/jsx.git",
        {ref,"3074d4865b3385a050badf7828ad31490d860df5"}},
   0}]}.
-
+[
+{pkg_hash,[
+ {<<"eblake2">>, <<"EC8AD20E438AAB3F2E8D5D118C366A0754219195F8A0F536587440F8F9BCF2EF">>},
+ {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]},
+{pkg_hash_ext,[
+ {<<"eblake2">>, <<"3C4D300A91845B25D501929A26AC2E6F7157480846FAB2347A4C11AE52E08A99">>},
+ {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}]}
+].

src/aeso_aci.erl

@@ -1,14 +1,13 @@
 %%%-------------------------------------------------------------------
 %%% @author Robert Virding
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2019, Aeternity Anstalt
 %%% @doc
 %%%     ACI interface
 %%% @end
+%%% Created : 12 Jan 2019
 %%%-------------------------------------------------------------------
 
--module(so_aci).
--vsn("9.0.0").
+-module(aeso_aci).
 
 -export([ file/2
         , file/3
@@ -22,7 +21,7 @@
         , json_encode_expr/1
         , json_encode_type/1]).
 
--include("so_utils.hrl").
+-include("aeso_utils.hrl").
 
 -type aci_type()  :: json | string.
 -type json()      :: jsx:json_term().
@@ -36,7 +35,7 @@ file(Type, File) ->
     file(Type, File, []).
 
 file(Type, File, Options0) ->
-    Options = so_compiler:add_include_path(File, Options0),
+    Options = aeso_compiler:add_include_path(File, Options0),
     case file:read_file(File) of
         {ok, BinCode} ->
             do_contract_interface(Type, binary_to_list(BinCode), Options);
@@ -57,11 +56,11 @@ contract_interface(Type, ContractString, CompilerOpts) ->
 render_aci_json(Json) ->
     do_render_aci_json(Json).
 
--spec json_encode_expr(so_syntax:expr()) -> json().
+-spec json_encode_expr(aeso_syntax:expr()) -> json().
 json_encode_expr(Expr) ->
     encode_expr(Expr).
 
--spec json_encode_type(so_syntax:type()) -> json().
+-spec json_encode_type(aeso_syntax:type()) -> json().
 json_encode_type(Type) ->
     encode_type(Type).
 
@@ -70,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 = so_compiler:parse(ContractString, Options),
-        {TypedAst, _, _} = so_ast_infer_types:infer(Ast, [dont_unfold | Options]),
+        Ast = aeso_compiler:parse(ContractString, Options),
+        {TypedAst, _, _} = aeso_ast_infer_types:infer(Ast, [dont_unfold | Options]),
         from_typed_ast(Type, TypedAst)
     catch
         throw:{error, Errors} -> {error, Errors}
@@ -199,9 +198,8 @@ encode_expr({bytes, _, B})  ->
     <<N:Digits/unit:8>> = B,
     list_to_binary(lists:flatten(io_lib:format("#~*.16.0b", [Digits*2, N])));
 encode_expr({Lit, _, L}) when Lit == oracle_pubkey; Lit == oracle_query_id;
-                              Lit == contract_pubkey; Lit == account_pubkey;
-                              Lit == signature ->
-    gmser_api_encoder:encode(Lit, L);
+                              Lit == contract_pubkey; Lit == account_pubkey ->
+    aeser_api_encoder:encode(Lit, L);
 encode_expr({app, _, {'-', _}, [{int, _, N}]}) ->
   encode_expr({int, [], -N});
 encode_expr({app, _, F, As}) ->
@@ -284,8 +282,6 @@ decode_type(#{list := [Et]}) ->
 decode_type(#{map := Ets}) ->
     Ts = decode_types(Ets),
     ["map",$(,lists:join(",", Ts),$)];
-decode_type(#{bytes := any}) ->
-    ["bytes()"];
 decode_type(#{bytes := Len}) ->
     ["bytes(", integer_to_list(Len), ")"];
 decode_type(#{variant := Ets}) ->
@@ -362,14 +358,14 @@ is_type(_)                      -> false.
 
 sort_decls(Ds) ->
     Sort = fun (D1, D2) ->
-                   so_syntax:get_ann(line, D1, 0) =<
-                       so_syntax:get_ann(line, D2, 0)
+                   aeso_syntax:get_ann(line, D1, 0) =<
+                       aeso_syntax:get_ann(line, D2, 0)
            end,
     lists:sort(Sort, Ds).
 
-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).
+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).
 
 typedef_name({type_def, _, {id, _, Name}, _, _}) -> Name.
 

src/aeso_compiler.erl

@@ -1,20 +1,17 @@
 %%%-------------------------------------------------------------------
 %%% @author Happi (Erik Stenman)
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2017, Aeternity Anstalt
 %%% @doc
-%%%     Compiler from Sophia language to FATE.
+%%%     Compiler from Aeterinty Sophia language to FATE.
 %%% @end
+%%% Created : 12 Dec 2017
 %%%-------------------------------------------------------------------
--module(so_compiler).
--vsn("9.0.0").
+-module(aeso_compiler).
 
 -export([ file/1
         , file/2
         , from_string/2
         , check_call/4
-        , decode_value/4
-        , encode_value/4
         , create_calldata/3
         , create_calldata/4
         , version/0
@@ -28,8 +25,8 @@
         , validate_byte_code/3
         ]).
 
--include_lib("gmbytecode/include/gmb_opcodes.hrl").
--include("so_utils.hrl").
+-include_lib("aebytecode/include/aeb_opcodes.hrl").
+-include("aeso_utils.hrl").
 
 
 -type option() :: pp_sophia_code
@@ -43,8 +40,7 @@
                 | {include, {file_system, [string()]} |
                             {explicit_files, #{string() => binary()}}}
                 | {src_file, string()}
-                | {src_dir, string()}
-                | {aci, so_aci:aci_type()}.
+                | {aci, aeso_aci:aci_type()}.
 -type options() :: [option()].
 
 -export_type([ option/0
@@ -53,15 +49,15 @@
 
 -spec version() -> {ok, binary()} | {error, term()}.
 version() ->
-    case lists:keyfind(sophia, 1, application:loaded_applications()) of
+    case lists:keyfind(aesophia, 1, application:loaded_applications()) of
         false ->
-            case application:load(sophia) of
+            case application:load(aesophia) of
                 ok ->
-                    case application:get_key(sophia, vsn) of
+                    case application:get_key(aesophia, vsn) of
                         {ok, VsnString} ->
                             {ok, list_to_binary(VsnString)};
                         undefined ->
-                            {error, failed_to_load_sophia}
+                            {error, failed_to_load_aesophia}
                     end;
                 Err = {error, _} ->
                     Err
@@ -81,20 +77,18 @@ numeric_version() ->
             Err
     end.
 
--spec file(string()) -> {ok, map()} | {error, [so_errors:error()]}.
+-spec file(string()) -> {ok, map()} | {error, [aeso_errors:error()]}.
 file(Filename) ->
     file(Filename, []).
 
--spec file(string(), options()) -> {ok, map()} | {error, [so_errors:error()]}.
+-spec file(string(), options()) -> {ok, map()} | {error, [aeso_errors:error()]}.
 file(File, Options0) ->
     Options = add_include_path(File, Options0),
     case read_contract(File) of
-        {ok, Bin} ->
-            SrcDir = so_utils:canonical_dir(filename:dirname(File)),
-            from_string(Bin, [{src_file, File}, {src_dir, SrcDir} | Options]);
+        {ok, Bin} -> from_string(Bin, [{src_file, File} | Options]);
         {error, Error} ->
             Msg = lists:flatten([File,": ",file:format_error(Error)]),
-            {error, [so_errors:new(file_error, Msg)]}
+            {error, [aeso_errors:new(file_error, Msg)]}
     end.
 
 add_include_path(File, Options) ->
@@ -103,10 +97,10 @@ add_include_path(File, Options) ->
         false ->
             Dir = filename:dirname(File),
             {ok, Cwd} = file:get_cwd(),
-            [{include, {file_system, [Cwd, so_utils:canonical_dir(Dir)]}} | Options]
+            [{include, {file_system, [Cwd, Dir]}} | Options]
     end.
 
--spec from_string(binary() | string(), options()) -> {ok, map()} | {error, [so_errors:error()]}.
+-spec from_string(binary() | string(), options()) -> {ok, map()} | {error, [aeso_errors:error()]}.
 from_string(ContractBin, Options) when is_binary(ContractBin) ->
     from_string(binary_to_list(ContractBin), Options);
 from_string(ContractString, Options) ->
@@ -123,27 +117,33 @@ from_string1(ContractString, Options) ->
      , warnings := Warnings } = string_to_code(ContractString, Options),
     #{ child_con_env := ChildContracts } = FCodeEnv,
     SavedFreshNames = maps:get(saved_fresh_names, FCodeEnv, #{}),
-    FateCode = so_fcode_to_fate:compile(ChildContracts, FCode, SavedFreshNames, Options),
+    {FateCode, VarsRegs} = aeso_fcode_to_fate:compile(ChildContracts, FCode, SavedFreshNames, Options),
     pp_assembler(FateCode, Options),
-    ByteCode = gmb_fate_code:serialize(FateCode, []),
+    ByteCode = aeb_fate_code:serialize(FateCode, []),
     {ok, Version} = version(),
     Res = #{byte_code => ByteCode,
             compiler_version => Version,
             contract_source => ContractString,
             type_info => [],
             fate_code => FateCode,
-            abi_version => gmb_fate_abi:abi_version(),
+            abi_version => aeb_fate_abi:abi_version(),
             payable => maps:get(payable, FCode),
             warnings => Warnings
            },
-    {ok, maybe_generate_aci(Res, FoldedTypedAst, Options)}.
+    ResDbg = Res#{variables_registers => VarsRegs},
+    FinalRes =
+        case proplists:get_value(debug_info, Options, false) of
+            true  -> ResDbg;
+            false -> Res
+        end,
+    {ok, maybe_generate_aci(FinalRes, FoldedTypedAst, Options)}.
 
 maybe_generate_aci(Result, FoldedTypedAst, Options) ->
     case proplists:get_value(aci, Options) of
         undefined ->
             Result;
         Type ->
-            {ok, Aci} = so_aci:from_typed_ast(Type, FoldedTypedAst),
+            {ok, Aci} = aeso_aci:from_typed_ast(Type, FoldedTypedAst),
             maps:put(aci, Aci, Result)
     end.
 
@@ -152,9 +152,9 @@ string_to_code(ContractString, Options) ->
     Ast = parse(ContractString, Options),
     pp_sophia_code(Ast, Options),
     pp_ast(Ast, Options),
-    {TypeEnv, FoldedTypedAst, UnfoldedTypedAst, Warnings} = so_ast_infer_types:infer(Ast, [return_env | Options]),
+    {TypeEnv, FoldedTypedAst, UnfoldedTypedAst, Warnings} = aeso_ast_infer_types:infer(Ast, [return_env | Options]),
     pp_typed_ast(UnfoldedTypedAst, Options),
-    {Env, Fcode} = so_ast_to_fcode:ast_to_fcode(UnfoldedTypedAst, [{original_src, ContractString}|Options]),
+    {Env, Fcode} = aeso_ast_to_fcode:ast_to_fcode(UnfoldedTypedAst, [{original_src, ContractString}|Options]),
     #{ fcode => Fcode
     ,  fcode_env => Env
     ,  unfolded_typed_ast => UnfoldedTypedAst
@@ -172,7 +172,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, [so_errors:error()]}.
+                                                             | {error, [aeso_errors:error()]}.
 check_call(Source, "init" = FunName, Args, Options) ->
     case check_call1(Source, FunName, Args, Options) of
         Err = {error, _} when Args == [] ->
@@ -188,63 +188,35 @@ check_call(Source, FunName, Args, Options) ->
     check_call1(Source, FunName, Args, Options).
 
 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, [ so_fcode_to_fate:term_to_fate(A) || A <- FcodeArgs ]};
-        Err = {error, _} ->
-            Err
-    end.
-
-add_extra_call(Contract0, Call, Options) ->
     try
         %% First check the contract without the __call function
         #{fcode := OrgFcode
         , fcode_env := #{child_con_env := ChildContracts}
-        , ast := Ast} = string_to_code(Contract0, Options),
-        FateCode = so_fcode_to_fate:compile(ChildContracts, OrgFcode, #{}, []),
+        , ast := Ast} = string_to_code(ContractString0, Options),
+        {FateCode, _} = aeso_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)),
+        SymbolHashes = maps:keys(aeb_fate_code:symbols(FateCode)),
         CallName = first_none_match(?CALL_NAME, SymbolHashes,
                                     lists:seq($1, $9) ++ lists:seq($A, $Z) ++ lists:seq($a, $z)),
-        Contract = insert_call_function(Ast, Contract0, CallName, Call),
-        {ok, CallName, string_to_code(Contract, Options)}
+        ContractString = insert_call_function(Ast, ContractString0, CallName, FunName, Args),
+        #{fcode := Fcode} = string_to_code(ContractString, Options),
+        CallArgs = arguments_of_body(CallName, FunName, Fcode),
+
+        {ok, FunName, CallArgs}
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
-get_call_body(CallName, #{fcode := Fcode}) ->
+arguments_of_body(CallName, _FunName, Fcode) ->
     #{body := Body} = maps:get({entrypoint, list_to_binary(CallName)}, maps:get(functions, Fcode)),
-    Body.
-
-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(so_fcode_to_fate:term_to_fate(Body))};
-        Err = {error, _} ->
-            Err
-    end.
-
-decode_value(Contract0, Type, FateValue, Options) ->
-    case add_extra_call(Contract0, {type, Type}, Options) of
-        {ok, CallName, Code} ->
-            #{ folded_typed_ast := TypedAst
-             , type_env         := TypeEnv} = Code,
-            {ok, _, Type0} = get_decode_type(CallName, TypedAst),
-            Type1 = so_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
-                                                              [ unfold_record_types
-                                                              , unfold_variant_types
-                                                              , not_unfold_system_alias_types ]),
-            fate_data_to_sophia_value(Type0, Type1, FateValue);
-        Err = {error, _} ->
-            Err
-    end.
+    {def, _FName, Args} = Body,
+    %% FName is either {entrypoint, list_to_binary(FunName)} or 'init'
+    [ aeso_fcode_to_fate:term_to_fate(A) || A <- Args ].
 
 first_none_match(_CallName, _Hashes, []) ->
     error(unable_to_find_unique_call_name);
 first_none_match(CallName, Hashes, [Char|Chars]) ->
-    case not lists:member(gmb_fate_code:symbol_identifier(list_to_binary(CallName)), Hashes) of
+    case not lists:member(aeb_fate_code:symbol_identifier(list_to_binary(CallName)), Hashes) of
         true ->
             CallName;
         false ->
@@ -252,31 +224,14 @@ first_none_match(CallName, Hashes, [Char|Chars]) ->
     end.
 
 %% Add the __call function to a contract.
--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}) ->
+-spec insert_call_function(aeso_syntax:ast(), string(), string(), string(), [string()]) -> string().
+insert_call_function(Ast, Code, Call, FunName, Args) ->
     Ind = last_contract_indent(Ast),
     lists:flatten(
         [ Code,
           "\n\n",
           lists:duplicate(Ind, " "),
           "stateful entrypoint ", Call, "() = ", FunName, "(", string:join(Args, ","), ")\n"
-        ]);
-insert_call_function(Ast, Code, Call, {value, Type, Value}) ->
-    Ind = last_contract_indent(Ast),
-    lists:flatten(
-        [ Code,
-          "\n\n",
-          lists:duplicate(Ind, " "),
-          "entrypoint ", Call, "() : ", Type, " = ", Value, "\n"
-        ]);
-insert_call_function(Ast, Code, Call, {type, Type}) ->
-    Ind = last_contract_indent(Ast),
-    lists:flatten(
-        [ Code,
-          "\n\n",
-          lists:duplicate(Ind, " "),
-          "entrypoint ", Call, "(val : ", Type, ") : ", Type, " = val\n"
         ]).
 
 -spec insert_init_function(string(), options()) -> string().
@@ -291,109 +246,100 @@ insert_init_function(Code, Options) ->
 
 last_contract_indent(Decls) ->
     case lists:last(Decls) of
-        {_, _, _, _, [Decl | _]} -> so_syntax:get_ann(col, Decl, 1) - 1;
+        {_, _, _, _, [Decl | _]} -> aeso_syntax:get_ann(col, Decl, 1) - 1;
         _                        -> 0
     end.
 
 -spec to_sophia_value(string(), string(), ok | error | revert, binary()) ->
-          {ok, so_syntax:expr()} | {error, [so_errors:error()]}.
+          {ok, aeso_syntax:expr()} | {error, [aeso_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, so_syntax:expr()} | {error, [so_errors:error()]}.
+        {ok, aeso_syntax:expr()} | {error, [aeso_errors:error()]}.
 to_sophia_value(_, _, error, Err, _Options) ->
     {ok, {app, [], {id, [], "error"}, [{string, [], Err}]}};
 to_sophia_value(_, _, revert, Data, _Options) ->
-    try so_vm_decode:from_fate({id, [], "string"}, gmb_fate_encoding:deserialize(Data)) of
+    try aeso_vm_decode:from_fate({id, [], "string"}, aeb_fate_encoding:deserialize(Data)) of
         Err ->
             {ok, {app, [], {id, [], "abort"}, [Err]}}
     catch _:_ ->
             Msg = "Could not deserialize the revert message",
-            {error, [so_errors:new(data_error, Msg)]}
+            {error, [aeso_errors:new(data_error, Msg)]}
     end;
 to_sophia_value(ContractString, FunName, ok, Data, Options0) ->
     Options = [no_code | Options0],
     try
         Code = string_to_code(ContractString, Options),
-        #{ folded_typed_ast := TypedAst, type_env := TypeEnv} = Code,
+        #{ unfolded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
         {ok, _, Type0} = get_decode_type(FunName, TypedAst),
-        Type = so_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
-                                                         [ unfold_record_types
-                                                         , unfold_variant_types
-                                                         , not_unfold_system_alias_types]),
+        Type   = aeso_tc_type_unfolding:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
 
-        fate_data_to_sophia_value(Type0, Type, Data)
+        try
+            {ok, aeso_vm_decode:from_fate(Type, aeb_fate_encoding:deserialize(Data))}
+        catch throw:cannot_translate_to_sophia ->
+                Type1 = prettypr:format(aeso_pretty:type(Type0)),
+                Msg = io_lib:format("Cannot translate FATE value ~p\n  of Sophia type ~s",
+                                    [aeb_fate_encoding:deserialize(Data), Type1]),
+                {error, [aeso_errors:new(data_error, Msg)]};
+              _:_ ->
+                Type1 = prettypr:format(aeso_pretty:type(Type0)),
+                Msg = io_lib:format("Failed to decode binary as type ~s", [Type1]),
+                {error, [aeso_errors:new(data_error, Msg)]}
+        end
     catch
         throw:{error, Errors} -> {error, Errors}
     end.
 
-fate_data_to_sophia_value(Type, UnfoldedType, FateData) ->
-    try
-        {ok, so_vm_decode:from_fate(UnfoldedType, gmb_fate_encoding:deserialize(FateData))}
-    catch throw:cannot_translate_to_sophia ->
-            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, [so_errors:new(data_error, Msg)]};
-          _:_ ->
-            Type1 = prettypr:format(so_pretty:type(Type)),
-            Msg = io_lib:format("Failed to decode binary as type ~s", [Type1]),
-            {error, [so_errors:new(data_error, Msg)]}
-    end.
-
 -spec create_calldata(string(), string(), [string()]) ->
-          {ok, binary()} | {error, [so_errors:error()]}.
+          {ok, binary()} | {error, [aeso_errors:error()]}.
 create_calldata(Code, Fun, Args) ->
     create_calldata(Code, Fun, Args, []).
 -spec create_calldata(string(), string(), [string()], [{atom(), any()}]) ->
-                             {ok, binary()} | {error, [so_errors:error()]}.
+                             {ok, binary()} | {error, [aeso_errors:error()]}.
 create_calldata(Code, Fun, Args, Options0) ->
     Options = [no_code | Options0],
     case check_call(Code, Fun, Args, Options) of
         {ok, FunName, FateArgs} ->
-            gmb_fate_abi:create_calldata(FunName, FateArgs);
+            aeb_fate_abi:create_calldata(FunName, FateArgs);
         {error, _} = Err -> Err
     end.
 
 -spec decode_calldata(string(), string(), binary()) ->
-          {ok, [so_syntax:type()], [so_syntax:expr()]}
-        | {error, [so_errors:error()]}.
+          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
+        | {error, [aeso_errors:error()]}.
 decode_calldata(ContractString, FunName, Calldata) ->
     decode_calldata(ContractString, FunName, Calldata, []).
 -spec decode_calldata(string(), string(), binary(), options()) ->
-          {ok, [so_syntax:type()], [so_syntax:expr()]}
-        | {error, [so_errors:error()]}.
+          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
+        | {error, [aeso_errors:error()]}.
 decode_calldata(ContractString, FunName, Calldata, Options0) ->
     Options = [no_code | Options0],
     try
         Code = string_to_code(ContractString, Options),
-        #{ folded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
+        #{ unfolded_typed_ast := TypedAst, type_env  := TypeEnv} = Code,
 
         {ok, Args, _} = get_decode_type(FunName, TypedAst),
         GetType       = fun({typed, _, _, T}) -> T; (T) -> T end,
         ArgTypes      = lists:map(GetType, Args),
         Type0         = {tuple_t, [], ArgTypes},
         %% user defined data types such as variants needed to match against
-        Type          = so_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
-                                                                  [ unfold_record_types
-                                                                  , unfold_variant_types
-                                                                  , not_unfold_system_alias_types]),
-        case gmb_fate_abi:decode_calldata(FunName, Calldata) of
+        Type          = aeso_tc_type_unfolding:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
+        case aeb_fate_abi:decode_calldata(FunName, Calldata) of
             {ok, FateArgs} ->
                 try
                     {tuple_t, [], ArgTypes1} = Type,
-                    AstArgs = [ so_vm_decode:from_fate(ArgType, FateArg)
+                    AstArgs = [ aeso_vm_decode:from_fate(ArgType, FateArg)
                                 || {ArgType, FateArg} <- lists:zip(ArgTypes1, FateArgs)],
                     {ok, ArgTypes, AstArgs}
                 catch throw:cannot_translate_to_sophia ->
-                        Type0Str = prettypr:format(so_pretty:type(Type0)),
+                        Type0Str = prettypr:format(aeso_pretty:type(Type0)),
                         Msg = io_lib:format("Cannot translate FATE value ~p\n  to Sophia type ~s",
                                             [FateArgs, Type0Str]),
-                        {error, [so_errors:new(data_error, Msg)]}
+                        {error, [aeso_errors:new(data_error, Msg)]}
                 end;
             {error, _} ->
                 Msg = io_lib:format("Failed to decode calldata binary", []),
-                {error, [so_errors:new(data_error, Msg)]}
+                {error, [aeso_errors:new(data_error, Msg)]}
         end
     catch
         throw:{error, Errors} -> {error, Errors}
@@ -411,8 +357,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 = so_errors:pos(Ann),
-                    so_errors:throw(so_errors:new(data_error, Pos, Msg))
+                    Pos = aeso_errors:pos(Ann),
+                    aeso_errors:throw(aeso_errors:new(data_error, Pos, Msg))
             end
     end;
 get_decode_type(FunName, [_ | Contracts]) ->
@@ -420,12 +366,12 @@ 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(so_pretty:decls(Code))])
+                                io:format("~s\n", [prettypr:format(aeso_pretty:decls(Code))])
                             end).
-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_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_assembler(C, Opts) ->  pp(C, Opts, pp_assembler, fun(Asm) -> io:format("~s", [gmb_fate_asm:pp(Asm)]) end).
+pp_assembler(C, Opts) ->  pp(C, Opts, pp_assembler, fun(Asm) -> io:format("~s", [aeb_fate_asm:pp(Asm)]) end).
 
 pp(Code, Options, Option, PPFun) ->
     case proplists:lookup(Option, Options) of
@@ -439,18 +385,18 @@ 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, [so_errors:error()]}.
+-spec validate_byte_code(map(), string(), options()) -> ok | {error, [aeso_errors:error()]}.
 validate_byte_code(#{ byte_code := ByteCode, payable := Payable }, Source, Options) ->
-    Fail = fun(Err) -> {error, [so_errors:new(data_error, Err)]} end,
+    Fail = fun(Err) -> {error, [aeso_errors:new(data_error, Err)]} end,
     try
-        FCode1 = ?protect(deserialize, gmb_fate_code:strip_init_function(gmb_fate_code:deserialize(ByteCode))),
+        FCode1 = ?protect(deserialize, aeb_fate_code:strip_init_function(aeb_fate_code:deserialize(ByteCode))),
         {FCode2, SrcPayable} =
             ?protect(compile,
                      begin
                          {ok, #{ byte_code := SrcByteCode, payable := SrcPayable }} =
                              from_string1(Source, Options),
-                         FCode = gmb_fate_code:deserialize(SrcByteCode),
-                         {gmb_fate_code:strip_init_function(FCode), SrcPayable}
+                         FCode = aeb_fate_code:deserialize(SrcByteCode),
+                         {aeb_fate_code:strip_init_function(FCode), SrcPayable}
                      end),
         case compare_fate_code(FCode1, FCode2) of
             ok when SrcPayable /= Payable ->
@@ -466,10 +412,10 @@ validate_byte_code(#{ byte_code := ByteCode, payable := Payable }, Source, Optio
     end.
 
 compare_fate_code(FCode1, FCode2) ->
-    Funs1 = gmb_fate_code:functions(FCode1),
-    Funs2 = gmb_fate_code:functions(FCode2),
-    Syms1 = gmb_fate_code:symbols(FCode1),
-    Syms2 = gmb_fate_code:symbols(FCode2),
+    Funs1 = aeb_fate_code:functions(FCode1),
+    Funs2 = aeb_fate_code:functions(FCode2),
+    Syms1 = aeb_fate_code:symbols(FCode1),
+    Syms2 = aeb_fate_code:symbols(FCode2),
     FunHashes1 = maps:keys(Funs1),
     FunHashes2 = maps:keys(Funs2),
     case FunHashes1 == FunHashes2 of
@@ -514,13 +460,13 @@ pp_fate_type(T) -> io_lib:format("~w", [T]).
 
 %% -------------------------------------------------------------------
 
--spec parse(string(), so_compiler:options()) -> none() | so_syntax:ast().
+-spec parse(string(), aeso_compiler:options()) -> none() | aeso_syntax:ast().
 parse(Text, Options) ->
     parse(Text, sets:new(), Options).
 
--spec parse(string(), sets:set(), so_compiler:options()) -> none() | so_syntax:ast().
+-spec parse(string(), sets:set(), aeso_compiler:options()) -> none() | aeso_syntax:ast().
 parse(Text, Included, Options) ->
-    so_parser:string(Text, Included, Options).
+    aeso_parser:string(Text, Included, Options).
 
 read_contract(Name) ->
     file:read_file(Name).

src/aeso_errors.erl

@@ -1,13 +1,11 @@
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2019, Aeternity Anstalt
 %%% @doc ADT for structured error messages + formatting.
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_errors).
--vsn("9.0.0").
+-module(aeso_errors).
 
 -type src_file()   :: no_file | iolist().
 
@@ -57,9 +55,9 @@ new(Type, Pos, Msg, Ctxt) ->
     #err{ type = Type, pos = Pos, message = Msg, context = Ctxt }.
 
 pos(Ann) ->
-    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),
+    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),
     pos(File, Line, Col).
 
 pos(Line, Col) ->

src/aeso_parse_lib.erl

@@ -1,14 +1,12 @@
 %%% -*- erlang-indent-level:4; indent-tabs-mode: nil -*-
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2018, Aeternity Anstalt
 %%% @doc Parser combinators for the Sophia parser. Based on
 %%%      Koen Claessen. 2004. Parallel Parsing Processes. J. Functional
 %%%      Programming 14, 6 (November 2004)
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_parse_lib).
--vsn("9.0.0").
+-module(aeso_parse_lib).
 
 -export([parse/2,
          return/1, fail/0, fail/1, fail/2, map/2, bind/2,
@@ -17,7 +15,7 @@
          many/1, many1/1, sep/2, sep1/2,
          infixl/2, infixr/2]).
 
--export([current_file/0, set_current_file/1, current_dir/0, set_current_dir/1,
+-export([current_file/0, set_current_file/1,
          current_include_type/0, set_current_include_type/1]).
 
 %% -- Types ------------------------------------------------------------------
@@ -29,16 +27,16 @@
 -type tokens() :: [token()].
 -type error()  :: {pos(), string() | no_error}.
 
--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}).
+-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}).
 
 %% Type synonyms since you can't have function types as macro arguments for some reason.
 -type delayed(A)         :: fun(() -> A).
@@ -482,13 +480,6 @@ current_file() ->
 set_current_file(File) ->
     put('$current_file', File).
 
-%% Current source directory
-current_dir() ->
-    get('$current_dir').
-
-set_current_dir(File) ->
-    put('$current_dir', File).
-
 add_current_file({L, C}) -> {current_file(), L, C};
 add_current_file(Pos)    -> Pos.
 

src/aeso_parse_lib.hrl

@@ -1,7 +1,7 @@
 
--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(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(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(so_parse_lib,
+-import(aeso_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,

src/aeso_parser.erl

@@ -1,9 +1,8 @@
-%%% File        : so_parser.erl
+%%% File        : aeso_parser.erl
 %%% Author      : Ulf Norell
 %%% Description :
 %%% Created     : 1 Mar 2018 by Ulf Norell
--module(so_parser).
--vsn("9.0.0").
+-module(aeso_parser).
 -compile({no_auto_import,[map_get/2]}).
 
 -export([string/1,
@@ -18,12 +17,11 @@
          run_parser/2,
          run_parser/3]).
 
--include("so_parse_lib.hrl").
--import(so_parse_lib, [current_file/0, set_current_file/1,
-                         current_dir/0, set_current_dir/1,
+-include("aeso_parse_lib.hrl").
+-import(aeso_parse_lib, [current_file/0, set_current_file/1,
                          current_include_type/0, set_current_include_type/1]).
 
--type parse_result() :: so_syntax:ast() | {so_syntax:ast(), sets:set(include_hash())} | none().
+-type parse_result() :: aeso_syntax:ast() | {aeso_syntax:ast(), sets:set(include_hash())} | none().
 
 -type include_hash() :: {string(), binary()}.
 
@@ -37,14 +35,14 @@ escape_errors({error, Err}) ->
 string(String) ->
     string(String, sets:new(), []).
 
--spec string(string(), so_compiler:options()) -> parse_result().
+-spec string(string(), aeso_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()), so_compiler:options()) -> parse_result().
+-spec string(string(), sets:set(include_hash()), aeso_compiler:options()) -> parse_result().
 string(String, Included, Opts) ->
     AST = run_parser(file(), String, Opts),
     case expand_includes(AST, Included, Opts) of
@@ -60,20 +58,19 @@ run_parser(P, Inp, Opts) ->
 
 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 so_scan:scan(S) of
-        {ok, Tokens} -> so_parse_lib:parse(P, Tokens);
+    case aeso_scan:scan(S) of
+        {ok, Tokens} -> aeso_parse_lib:parse(P, Tokens);
         {error, {{Input, Pos}, _}} ->
             {error, {Pos, scan_error, Input}}
     end.
 
 -dialyzer({nowarn_function, parse_error/1}).
 parse_error(Err) ->
-    so_errors:throw(mk_error(Err)).
+    aeso_errors:throw(mk_error(Err)).
 
 mk_p_err(Pos, Msg) ->
-    so_errors:new(parse_error, mk_pos(Pos), lists:flatten(Msg)).
+    aeso_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]));
@@ -87,8 +84,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})       -> so_errors:pos(Line, Col);
-mk_pos({File, Line, Col}) -> so_errors:pos(File, Line, Col).
+mk_pos({Line, Col})       -> aeso_errors:pos(Line, Col);
+mk_pos({File, Line, Col}) -> aeso_errors:pos(File, Line, Col).
 
 %% -- Parsing rules ----------------------------------------------------------
 
@@ -267,11 +264,10 @@ type300() ->
 type400() ->
     choice(
     [?RULE(typeAtom(), optional(type_args()),
-          any_bytes(
-            case _2 of
-              none       -> _1;
-              {ok, Args} -> {app_t, get_ann(_1), _1, Args}
-            end)),
+          case _2 of
+            none       -> _1;
+            {ok, Args} -> {app_t, get_ann(_1), _1, Args}
+          end),
      ?RULE(id("bytes"), parens(token(int)),
            {bytes_t, get_ann(_1), element(3, _2)})
     ]).
@@ -303,7 +299,7 @@ stmt() ->
     , {switch, keyword(switch), parens(expr()), maybe_block(branch())}
     , {'if', keyword('if'), parens(expr()), body()}
     , {elif, keyword(elif), parens(expr()), body()}
-    , {'else', keyword('else'), body()}
+    , {else, keyword(else), body()}
     ])).
 
 branch() ->
@@ -327,7 +323,7 @@ expr100() ->
     Expr150 = ?LAZY_P(expr150()),
     choice(
     [ ?RULE(lam_args(), keyword('=>'), body(), {lam, _2, _1, _3})   %% TODO: better location
-    , {'if', keyword('if'), parens(Expr100), Expr150, right(tok('else'), Expr100)}
+    , {'if', keyword('if'), parens(Expr100), Expr150, right(tok(else), Expr100)}
     , ?RULE(Expr150, optional(right(tok(':'), type())),
             case _2 of
                 none       -> _1;
@@ -337,19 +333,14 @@ expr100() ->
 
 expr150() -> infixl(expr200(), binop('|>')).
 expr200() -> infixr(expr300(), binop('||')).
-expr300() -> infixr(expr325(), binop('&&')).
-expr325() -> infixl(expr350(), binop('bor')).
-expr350() -> infixl(expr375(), binop('bxor')).
-expr375() -> infixl(expr400(), binop('band')).
+expr300() -> infixr(expr400(), binop('&&')).
 expr400() -> infix(expr500(),  binop(['<', '>', '=<', '>=', '==', '!='])).
-expr500() -> infixr(expr550(), binop(['::', '++'])).
-expr550() -> infixl(expr600(), binop(['<<', '>>'])).
+expr500() -> infixr(expr600(), binop(['::', '++'])).
 expr600() -> infixl(expr650(), binop(['+', '-'])).
 expr650() -> ?RULE(many(token('-')), expr700(), prefixes(_1, _2)).
 expr700() -> infixl(expr750(), binop(['*', '/', mod])).
 expr750() -> infixl(expr800(), binop(['^'])).
-expr800() -> ?RULE(many(token('!')), expr850(), prefixes(_1, _2)).
-expr850() -> ?RULE(many(token('bnot')), expr900(), prefixes(_1, _2)).
+expr800() -> ?RULE(many(token('!')), expr900(), prefixes(_1, _2)).
 expr900() -> ?RULE(exprAtom(), many(elim()), elim(_1, _2)).
 
 exprAtom() ->
@@ -412,7 +403,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, so_syntax:get_ann(E), E, Args}, Es);
+elim(E, [{app, _Ann, Args} | Es])        -> elim({app, aeso_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).
@@ -526,10 +517,10 @@ id_or_addr() ->
     ?RULE(id(), parse_addr_literal(_1)).
 
 parse_addr_literal(Id = {id, Ann, Name}) ->
-    case lists:member(lists:sublist(Name, 3), ["ak_", "ok_", "oq_", "ct_", "sg_"]) of
+    case lists:member(lists:sublist(Name, 3), ["ak_", "ok_", "oq_", "ct_"]) of
         false -> Id;
         true  ->
-            try gmser_api_encoder:decode(list_to_binary(Name)) of
+            try aeser_api_encoder:decode(list_to_binary(Name)) of
                 {Type, Bin} -> {Type, Ann, Bin}
             catch _:_ ->
                 Id
@@ -558,14 +549,13 @@ bracket_list(P) -> brackets(comma_sep(P)).
 
 %% -- Annotations ------------------------------------------------------------
 
--type ann()      :: so_syntax:ann().
--type ann_line() :: so_syntax:ann_line().
--type ann_col()  :: so_syntax:ann_col().
+-type ann()      :: aeso_syntax:ann().
+-type ann_line() :: aeso_syntax:ann_line().
+-type ann_col()  :: aeso_syntax:ann_col().
 
 -spec pos_ann(ann_line(), ann_col()) -> ann().
 pos_ann(Line, Col) ->
     [ {file, current_file()}
-    , {dir, current_dir()}
     , {include_type, current_include_type()}
     , {line, Line}
     , {col, Col} ].
@@ -613,7 +603,7 @@ group_ifs([], Acc) ->
 group_ifs([{'if', Ann, Cond, Then} | Stmts], Acc) ->
     {Elses, Rest} = else_branches(Stmts, []),
     group_ifs(Rest, [build_if(Ann, Cond, Then, Elses) | Acc]);
-group_ifs([{'else', Ann, _} | _], _) ->
+group_ifs([{else, Ann, _} | _], _) ->
     fail({Ann, "No matching 'if' for 'else'"});
 group_ifs([{elif, Ann, _, _} | _], _) ->
     fail({Ann, "No matching 'if' for 'elif'"});
@@ -623,14 +613,14 @@ group_ifs([Stmt | Stmts], Acc) ->
 build_if(Ann, Cond, Then, [{elif, Ann1, Cond1, Then1} | Elses]) ->
     {'if', Ann, Cond, Then,
         set_ann(format, elif, build_if(Ann1, Cond1, Then1, Elses))};
-build_if(Ann, Cond, Then, [{'else', _Ann, Else}]) ->
+build_if(Ann, Cond, Then, [{else, _Ann, Else}]) ->
     {'if', Ann, Cond, Then, Else};
 build_if(Ann, Cond, Then, []) ->
     {'if', Ann, Cond, Then, {tuple, [{origin, system}], []}}.
 
 else_branches([Elif = {elif, _, _, _} | Stmts], Acc) ->
     else_branches(Stmts, [Elif | Acc]);
-else_branches([Else = {'else', _, _} | Stmts], Acc) ->
+else_branches([Else = {else, _, _} | Stmts], Acc) ->
     {lists:reverse([Else | Acc]), Stmts};
 else_branches(Stmts, Acc) ->
     {lists:reverse(Acc), Stmts}.
@@ -648,7 +638,7 @@ tuple_e(Ann, Exprs)   -> {tuple, Ann, Exprs}.
 
 list_comp_e(Ann, Expr, Binds) -> {list_comp, Ann, Expr, Binds}.
 
--spec parse_pattern(so_syntax:expr()) -> so_parse_lib:parser(so_syntax:pat()).
+-spec parse_pattern(aeso_syntax:expr()) -> aeso_parse_lib:parser(aeso_syntax:pat()).
 parse_pattern({letpat, Ann, Id, Pat}) ->
     {letpat, Ann, Id, parse_pattern(Pat)};
 parse_pattern({app, Ann, Con = {'::', _}, Es}) ->
@@ -675,19 +665,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(so_syntax:field(so_syntax:expr())) -> so_parse_lib:parser(so_syntax:field(so_syntax:pat())).
+-spec parse_field_pattern(aeso_syntax:field(aeso_syntax:expr())) -> aeso_parse_lib:parser(aeso_syntax:field(aeso_syntax:pat())).
 parse_field_pattern({field, Ann, F, E}) ->
     {field, Ann, F, parse_pattern(E)}.
 
--spec ret_doc_err(ann(), prettypr:document()) -> so_parse_lib:parser(none()).
+-spec ret_doc_err(ann(), prettypr:document()) -> aeso_parse_lib:parser(none()).
 ret_doc_err(Ann, Doc) ->
     fail(ann_pos(Ann), prettypr:format(Doc)).
 
--spec bad_expr_err(string(), so_syntax:expr()) -> so_parse_lib:parser(none()).
+-spec bad_expr_err(string(), aeso_syntax:expr()) -> aeso_parse_lib:parser(none()).
 bad_expr_err(Reason, E) ->
   ret_doc_err(get_ann(E),
               prettypr:sep([prettypr:text(Reason ++ ":"),
-                            prettypr:nest(2, so_pretty:expr(E))])).
+                            prettypr:nest(2, aeso_pretty:expr(E))])).
 
 %% -- Helper functions -------------------------------------------------------
 
@@ -706,7 +696,7 @@ expand_includes([], Included, Acc, Opts) ->
     end;
 expand_includes([{include, Ann, {string, _SAnn, File}} | AST], Included, Acc, Opts) ->
     case get_include_code(File, Ann, Opts) of
-        {ok, AbsDir, Code} ->
+        {ok, Code} ->
             Hashed = hash_include(File, Code),
             case sets:is_element(Hashed, Included) of
                 false ->
@@ -716,10 +706,9 @@ expand_includes([{include, Ann, {string, _SAnn, File}} | AST], Included, Acc, Op
                                       _       -> indirect
                                   end,
                     Opts1 = lists:keystore(src_file, 1, Opts, {src_file, File}),
-                    Opts2 = lists:keystore(src_dir, 1, Opts1, {src_dir, AbsDir}),
-                    Opts3 = lists:keystore(include_type, 1, Opts2, {include_type, IncludeType}),
+                    Opts2 = lists:keystore(include_type, 1, Opts1, {include_type, IncludeType}),
                     Included1 = sets:add_element(Hashed, Included),
-                    case parse_and_scan(file(), Code, Opts3) of
+                    case parse_and_scan(file(), Code, Opts2) of
                         {ok, AST1} ->
                             expand_includes(AST1 ++ AST, Included1, Acc, Opts);
                         Err = {error, _} ->
@@ -737,21 +726,22 @@ expand_includes([E | AST], Included, Acc, Opts) ->
 read_file(File, Opts) ->
     case proplists:get_value(include, Opts, {explicit_files, #{}}) of
         {file_system, Paths} ->
-            lists:foldr(fun(Path, {error, _}) -> read_file_(Path, File);
-                           (_Path, OK)        -> OK end, {error, not_found}, Paths);
+            CandidateNames = [ filename:join(Dir, File) || Dir <- Paths ],
+            lists:foldr(fun(F, {error, _}) -> file:read_file(F);
+                           (_F, OK) -> OK end, {error, not_found}, CandidateNames);
         {explicit_files, Files} ->
             case maps:get(binary_to_list(File), Files, not_found) of
                 not_found -> {error, not_found};
-                Src       -> {ok, File, Src}
+                Src       -> {ok, Src}
             end;
         escript ->
             try
                 Escript        = escript:script_name(),
                 {ok, Sections} = escript:extract(Escript, []),
                 Archive        = proplists:get_value(archive, Sections),
-                FileName       = binary_to_list(filename:join([sophia, priv, stdlib, File])),
+                FileName       = binary_to_list(filename:join([aesophia, priv, stdlib, File])),
                 case zip:extract(Archive, [{file_list, [FileName]}, memory]) of
-                    {ok, [{_, Src}]} -> {ok, escript, Src};
+                    {ok, [{_, Src}]} -> {ok, Src};
                     _                -> {error, not_found}
                 end
             catch _:_ ->
@@ -759,52 +749,31 @@ read_file(File, Opts) ->
             end
     end.
 
-read_file_(Path, File) ->
-    AbsFile = filename:join(Path, File),
-    case file:read_file(AbsFile) of
-        {ok, Bin} -> {ok, so_utils:canonical_dir(filename:dirname(AbsFile)), Bin};
-        Err       -> Err
-    end.
-
 stdlib_options() ->
-    StdLibDir = so_stdlib:stdlib_include_path(),
+    StdLibDir = aeso_stdlib:stdlib_include_path(),
     case filelib:is_dir(StdLibDir) of
         true  -> [{include, {file_system, [StdLibDir]}}];
         false -> [{include, escript}]
     end.
 
 get_include_code(File, Ann, Opts) ->
-    %% Temporarily extend include paths with the directory of the current file
-    Opts1 = include_current_file_dir(Opts, Ann),
-    case {read_file(File, Opts1), read_file(File, stdlib_options())} of
-        {{ok, Dir, Bin}, {ok, _}} ->
+    case {read_file(File, Opts), read_file(File, stdlib_options())} of
+        {{ok, Bin}, {ok, _}} ->
             case filename:basename(File) == File of
                 true -> { error
                         , fail( ann_pos(Ann)
                               , "Illegal redefinition of standard library " ++ binary_to_list(File))};
                 %% If a path is provided then the stdlib takes lower priority
-                false -> {ok, Dir, binary_to_list(Bin)}
+                false -> {ok, binary_to_list(Bin)}
             end;
-        {_, {ok, _, Bin}} ->
-            {ok, stdlib, binary_to_list(Bin)};
-        {{ok, Dir, Bin}, _} ->
-            {ok, Dir, binary_to_list(Bin)};
+        {_, {ok, Bin}} ->
+            {ok, binary_to_list(Bin)};
+        {{ok, Bin}, _} ->
+            {ok, binary_to_list(Bin)};
         {_, _} ->
             {error, {ann_pos(Ann), include_error, File}}
     end.
 
-include_current_file_dir(Opts, Ann) ->
-    case {proplists:get_value(dir, Ann, undefined),
-          proplists:get_value(include, Opts, undefined)} of
-        {undefined, _} -> Opts;
-        {CurrDir, {file_system, Paths}} ->
-            case lists:member(CurrDir, Paths) of
-                false -> [{include, {file_system, [CurrDir | Paths]}} | Opts];
-                true  -> Opts
-            end;
-        {_, _} -> Opts
-    end.
-
 -spec hash_include(string() | binary(), string()) -> include_hash().
 hash_include(File, Code) when is_binary(File) ->
     hash_include(binary_to_list(File), Code);
@@ -818,7 +787,3 @@ auto_imports(L) when is_list(L) ->
 auto_imports(T) when is_tuple(T) ->
     auto_imports(tuple_to_list(T));
 auto_imports(_) -> [].
-
-any_bytes({id, Ann, "bytes"})                 -> {bytes_t, Ann, any};
-any_bytes({app_t, _, {id, Ann, "bytes"}, []}) -> {bytes_t, Ann, any};
-any_bytes(Type)                               -> Type.

src/aeso_pretty.erl

@@ -1,13 +1,11 @@
 %%% -*- erlang-indent-level:4; indent-tabs-mode: nil -*-
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2017, Aeternity Anstalt
 %%% @doc Pretty printer for Sophia.
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_pretty).
--vsn("9.0.0").
+-module(aeso_pretty).
 
 -import(prettypr, [text/1, sep/1, above/2, beside/2, nest/2, empty/0]).
 
@@ -15,7 +13,7 @@
 
 -export_type([options/0]).
 
--include("so_utils.hrl").
+-include("aeso_utils.hrl").
 
 -type doc() :: prettypr:document().
 -type options() :: [{indent, non_neg_integer()} | show_generated].
@@ -26,11 +24,11 @@
 
 %% -- Options ----------------------------------------------------------------
 
--define(so_pretty_opts, so_pretty_opts).
+-define(aeso_pretty_opts, aeso_pretty_opts).
 
 -spec options() -> options().
 options() ->
-    case get(?so_pretty_opts) of
+    case get(?aeso_pretty_opts) of
         undefined -> [];
         Opts      -> Opts
     end.
@@ -47,9 +45,9 @@ indent() -> option(indent, 2).
 
 -spec with_options(options(), fun(() -> A)) -> A.
 with_options(Options, Fun) ->
-    put(?so_pretty_opts, Options),
+    put(?aeso_pretty_opts, Options),
     Res = Fun(),
-    erase(?so_pretty_opts),
+    erase(?aeso_pretty_opts),
     Res.
 
 %% -- Pretty printing helpers ------------------------------------------------
@@ -127,9 +125,9 @@ record(Ds) ->
 equals(A, B) -> follow(hsep(A, text("=")), B).
 
 %% typed(A, B) -> A : B.
--spec typed(doc(), so_syntax:type()) -> doc().
+-spec typed(doc(), aeso_syntax:type()) -> doc().
 typed(A, Type) ->
-    case so_syntax:get_ann(origin, Type) == system andalso
+    case aeso_syntax:get_ann(origin, Type) == system andalso
          not show_generated() of
         true  -> A;
         false -> follow(hsep(A, text(":")), type(Type))
@@ -141,18 +139,18 @@ contract_head(contract_interface) -> text("contract interface").
 
 %% -- Exports ----------------------------------------------------------------
 
--spec decls([so_syntax:decl()], options()) -> doc().
+-spec decls([aeso_syntax:decl()], options()) -> doc().
 decls(Ds, Options) ->
     with_options(Options, fun() -> decls(Ds) end).
 
--spec decls([so_syntax:decl()]) -> doc().
+-spec decls([aeso_syntax:decl()]) -> doc().
 decls(Ds) -> above([ decl(D) || D <- Ds ]).
 
--spec decl(so_syntax:decl(), options()) -> doc().
+-spec decl(aeso_syntax:decl(), options()) -> doc().
 decl(D, Options) ->
     with_options(Options, fun() -> decl(D) end).
 
--spec decl(so_syntax:decl()) -> doc().
+-spec decl(aeso_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));
@@ -174,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 so_syntax:get_ann(entrypoint, Ann, false) of
+    Fun = case aeso_syntax:get_ann(entrypoint, Ann, false) of
             true  -> text("entrypoint");
             false -> text("function")
           end,
@@ -183,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 so_syntax:get_ann(entrypoint, Attrs, false) of
+    Fun = case aeso_syntax:get_ann(entrypoint, Attrs, false) of
               true  -> "entrypoint";
               false -> "function"
           end,
@@ -194,20 +192,20 @@ decl(D = {letval, _, _, _}) -> letdecl("let", D);
 decl({block, _, Ds}) ->
     above([ decl(D) || D <- Ds ]).
 
--spec pragma(so_syntax:pragma()) -> doc().
+-spec pragma(aeso_syntax:pragma()) -> doc().
 pragma({compiler, Op, Ver}) ->
     text("@compiler " ++ atom_to_list(Op) ++ " " ++ string:join([integer_to_list(N) || N <- Ver], ".")).
 
--spec expr(so_syntax:expr(), options()) -> doc().
+-spec expr(aeso_syntax:expr(), options()) -> doc().
 expr(E, Options) ->
     with_options(Options, fun() -> expr(E) end).
 
--spec expr(so_syntax:expr()) -> doc().
+-spec expr(aeso_syntax:expr()) -> doc().
 expr(E) -> expr_p(0, E).
 
 %% -- Not exported -----------------------------------------------------------
 
--spec name(so_syntax:id() | so_syntax:qid() | so_syntax:con() | so_syntax:qcon() | so_syntax:tvar()) -> doc().
+-spec name(aeso_syntax:id() | aeso_syntax:qid() | aeso_syntax:con() | aeso_syntax:qcon() | aeso_syntax:tvar()) -> doc().
 name({id, _,   Name})  -> text(Name);
 name({con, _,  Name})  -> text(Name);
 name({qid, _,  Names}) -> text(string:join(Names, "."));
@@ -215,7 +213,7 @@ name({qcon, _, Names}) -> text(string:join(Names, "."));
 name({tvar, _, Name})  -> text(Name);
 name({typed, _, Name, _}) -> name(Name).
 
--spec letdecl(string(), so_syntax:letbind()) -> doc().
+-spec letdecl(string(), aeso_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]}) ->
@@ -223,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([so_syntax:arg()]) -> doc().
+-spec args([aeso_syntax:arg()]) -> doc().
 args(Args) ->
     tuple(lists:map(fun arg/1, Args)).
 
--spec arg(so_syntax:arg()) -> doc().
+-spec arg(aeso_syntax:arg()) -> doc().
 arg({arg, _, X, T}) -> typed(name(X), T).
 
--spec typedecl(alias_t | record_t | variant_t, so_syntax:id(), [so_syntax:tvar()]) -> doc().
+-spec typedecl(alias_t | record_t | variant_t, aeso_syntax:id(), [aeso_syntax:tvar()]) -> doc().
 typedecl(Kind, T, Vars) ->
     KW = case Kind of
             alias_t -> text("type");
@@ -243,26 +241,26 @@ typedecl(Kind, T, Vars) ->
                 tuple(lists:map(fun name/1, Vars)))
     end.
 
--spec typedef(so_syntax:typedef()) -> doc().
+-spec typedef(aeso_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(so_syntax:constructor_t()) -> doc().
+-spec constructor_t(aeso_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(so_syntax:field_t()) -> doc().
+-spec field_t(aeso_syntax:field_t()) -> doc().
 field_t({field_t, _, Name, Type}) ->
     typed(name(Name), Type).
 
--spec type(so_syntax:type(), options()) -> doc().
+-spec type(aeso_syntax:type(), options()) -> doc().
 type(Type, Options) ->
     with_options(Options, fun() -> type(Type) end).
 
--spec type(so_syntax:type()) -> doc().
+-spec type(aeso_syntax:type()) -> doc().
 type(F = {fun_t, _, _, var_args, _}) ->
     type(setelement(4, F, [var_args]));
 type({fun_t, _, Named, Args, Ret}) ->
@@ -277,9 +275,7 @@ type({tuple_t, _, Args}) ->
     tuple_type(Args);
 type({args_t, _, Args}) ->
     args_type(Args);
-type({bytes_t, _, any}) -> text("bytes()");
-type({bytes_t, _, '_'}) -> text("bytes(_)");
-type({bytes_t, _, fixed}) -> text("bytes(_)");
+type({bytes_t, _, any}) -> text("bytes(_)");
 type({bytes_t, _, Len}) ->
     text(lists:concat(["bytes(", Len, ")"]));
 type({if_t, _, Id, Then, Else}) ->
@@ -298,11 +294,11 @@ type(T = {tvar, _, _}) -> name(T);
 
 type(var_args) -> text("var_args").
 
--spec args_type([so_syntax:type()]) -> doc().
+-spec args_type([aeso_syntax:type()]) -> doc().
 args_type(Args) ->
     tuple(lists:map(fun type/1, Args)).
 
--spec tuple_type([so_syntax:type()]) -> doc().
+-spec tuple_type([aeso_syntax:type()]) -> doc().
 tuple_type([]) ->
     text("unit");
 tuple_type(Factors) ->
@@ -312,7 +308,7 @@ tuple_type(Factors) ->
       , text(")")
       ]).
 
--spec expr_p(integer(), so_syntax:arg_expr()) -> doc().
+-spec expr_p(integer(), aeso_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}) ->
@@ -320,7 +316,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   = so_syntax:get_ann(format, If),
+    Format   = aeso_syntax:get_ann(format, If),
     if  Format == '?:' ->
             paren(P > 100,
                 follow(expr_p(200, Cond),
@@ -363,7 +359,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 {so_syntax:get_ann(format, E), Args} of
+    case {aeso_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)
@@ -374,7 +370,7 @@ expr_p(P, {app, _, F, Args}) ->
     app(P, F, Args);
 %% -- Constants
 expr_p(_, E = {int, _, N}) ->
-    S = case so_syntax:get_ann(format, E) of
+    S = case aeso_syntax:get_ann(format, E) of
             hex -> "0x" ++ integer_to_list(N, 16);
             _   -> integer_to_list(N)
            end,
@@ -389,9 +385,8 @@ expr_p(_, {Type, _, Bin})
     when Type == account_pubkey;
          Type == contract_pubkey;
          Type == oracle_pubkey;
-         Type == oracle_query_id;
-         Type == signature ->
-    text(binary_to_list(gmser_api_encoder:encode(Type, Bin)));
+         Type == oracle_query_id ->
+    text(binary_to_list(aeser_api_encoder:encode(Type, Bin)));
 expr_p(_, {string, _, <<>>}) -> text("\"\"");
 expr_p(_, {string, _, S}) ->
     text(io_lib:format("\"~s\"", [binary_to_list(S)]));
@@ -404,7 +399,7 @@ expr_p(_, {char, _, C}) ->
             text("'" ++ tl(lists:droplast(S)) ++ "'");
         _  ->
             S = lists:flatten(
-                  io_lib:format("'~ts'", [list_to_binary(so_scan:utf8_encode([C]))])),
+                  io_lib:format("'~ts'", [list_to_binary(aeso_scan:utf8_encode([C]))])),
             text(S)
     end;
 %% -- Names
@@ -421,9 +416,9 @@ stmt_p({'if', _, Cond, Then}) ->
     block_expr(200, beside(text("if"), paren(expr(Cond))), Then);
 stmt_p({elif, _, Cond, Then}) ->
     block_expr(200, beside(text("elif"), paren(expr(Cond))), Then);
-stmt_p({'else', Else}) ->
+stmt_p({else, Else}) ->
     HideGenerated = not show_generated(),
-    case so_syntax:get_ann(origin, Else) of
+    case aeso_syntax:get_ann(origin, Else) of
         system when HideGenerated -> empty();
         _ -> block_expr(200, text("else"), Else)
     end.
@@ -435,26 +430,21 @@ lc_bind({comprehension_if, _, E}) ->
 lc_bind(Let) ->
     letdecl("let", Let).
 
--spec bin_prec(so_syntax:bin_op()) -> {integer(), integer(), integer()}.
+-spec bin_prec(aeso_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
 bin_prec('|>')   -> {150, 150, 200};
 bin_prec('||')   -> {200, 300, 200};
-bin_prec('&&')   -> {300, 325, 300};
-bin_prec('bor')  -> {325, 350, 325};
-bin_prec('bxor') -> {350, 375, 350};
-bin_prec('band') -> {375, 400, 375};
+bin_prec('&&')   -> {300, 400, 300};
 bin_prec('<')    -> {400, 500, 500};
 bin_prec('>')    -> {400, 500, 500};
 bin_prec('=<')   -> {400, 500, 500};
 bin_prec('>=')   -> {400, 500, 500};
 bin_prec('==')   -> {400, 500, 500};
 bin_prec('!=')   -> {400, 500, 500};
-bin_prec('++')   -> {500, 550, 500};
-bin_prec('::')   -> {500, 550, 500};
-bin_prec('<<')   -> {550, 600, 550};
-bin_prec('>>')   -> {550, 600, 550};
+bin_prec('++')   -> {500, 600, 500};
+bin_prec('::')   -> {500, 600, 500};
 bin_prec('+')    -> {600, 600, 650};
 bin_prec('-')    -> {600, 600, 650};
 bin_prec('*')    -> {700, 700, 750};
@@ -462,15 +452,14 @@ bin_prec('/')    -> {700, 700, 750};
 bin_prec(mod)    -> {700, 700, 750};
 bin_prec('^')    -> {750, 750, 800}.
 
--spec un_prec(so_syntax:un_op()) -> {integer(), integer()}.
+-spec un_prec(aeso_syntax:un_op()) -> {integer(), integer()}.
 un_prec('-')    -> {650, 650};
-un_prec('!')    -> {800, 800};
-un_prec('bnot') -> {850, 850}.
+un_prec('!')    -> {800, 800}.
 
 equals(Ann, A, B) ->
     {app, [{format, infix} | Ann], {'=', Ann}, [A, B]}.
 
--spec infix(integer(), so_syntax:bin_op(), so_syntax:expr(), so_syntax:expr()) -> doc().
+-spec infix(integer(), aeso_syntax:bin_op(), aeso_syntax:expr(), aeso_syntax:expr()) -> doc().
 infix(P, Op, A, B) ->
     {Top, L, R} = bin_prec(Op),
     paren(P > Top,
@@ -532,9 +521,9 @@ statement(E) -> expr(E).
 get_elifs(Expr) -> get_elifs(Expr, []).
 
 get_elifs(If = {'if', Ann, Cond, Then, Else}, Elifs) ->
-    case so_syntax:get_ann(format, If) of
+    case aeso_syntax:get_ann(format, If) of
         elif -> get_elifs(Else, [{elif, Ann, Cond, Then} | Elifs]);
         _    -> {lists:reverse(Elifs), If}
     end;
-get_elifs(Else, Elifs) -> {lists:reverse(Elifs), {'else', Else}}.
+get_elifs(Else, Elifs) -> {lists:reverse(Elifs), {else, Else}}.
 

src/aeso_scan.erl

@@ -1,17 +1,15 @@
 %%% -*- erlang-indent-level:4; indent-tabs-mode: nil -*-
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2017, Aeternity Anstalt
 %%% @doc The Sophia lexer.
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_scan).
--vsn("9.0.0").
+-module(aeso_scan).
 
 -export([scan/1, utf8_encode/1]).
 
--import(so_scan_lib, [token/1, token/2, symbol/0, skip/0,
+-import(aeso_scan_lib, [token/1, token/2, symbol/0, skip/0,
                         override/2, push/2, pop/1]).
 
 lexer() ->
@@ -47,7 +45,7 @@ lexer() ->
 
     Keywords = ["contract", "include", "let", "switch", "type", "record", "datatype", "if", "elif", "else", "function",
                 "stateful", "payable", "true", "false", "mod", "public", "entrypoint", "private", "indexed", "namespace",
-                "interface", "main", "using", "as", "for", "hiding", "band", "bor", "bxor", "bnot"
+                "interface", "main", "using", "as", "for", "hiding"
                ],
     KW = string:join(Keywords, "|"),
 
@@ -81,8 +79,8 @@ lexer() ->
     [{code, Rules}, {comment, CommentRules}].
 
 scan(String) ->
-    Lexer = so_scan_lib:compile(lexer()),
-    so_scan_lib:string(Lexer, code, String).
+    Lexer = aeso_scan_lib:compile(lexer()),
+    aeso_scan_lib:string(Lexer, code, String).
 
 %% -- Helpers ----------------------------------------------------------------
 

src/aeso_scan_lib.erl

@@ -1,12 +1,10 @@
 %%% -*- erlang-indent-level:4; indent-tabs-mode: nil -*-
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2017, Aeternity Anstalt
 %%% @doc A customisable lexer.
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_scan_lib).
--vsn("9.0.0").
+-module(aeso_scan_lib).
 
 -export([compile/1, string/3,
          token/1, token/2, symbol/0, skip/0,

src/aeso_stdlib.erl

@@ -1,18 +1,17 @@
 %%%-------------------------------------------------------------------
 %%% @author Radosław Rowicki
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2019, Aeternity Anstalt
 %%% @doc
 %%%     Standard library for Sophia
 %%% @end
+%%% Created : 6 July 2019
+%%%
 %%%-------------------------------------------------------------------
 
--module(so_stdlib).
--vsn("9.0.0").
+-module(aeso_stdlib).
 
 -export([stdlib_include_path/0]).
 
 stdlib_include_path() ->
-    {file, BEAM} = code:is_loaded(?MODULE),
-    filename:join(filename:dirname(filename:dirname(BEAM)), "priv/stdlib").
+    filename:join([code:priv_dir(aesophia), "stdlib"]).
 

src/aeso_syntax.erl

@@ -1,18 +1,16 @@
 %%% -*- erlang-indent-level:4; indent-tabs-mode: nil -*-
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2017, Aeternity Anstalt
 %%% @doc Sophia abstract syntax types.
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_syntax).
--vsn("9.0.0").
+-module(aeso_syntax).
 
 -export([get_ann/1, get_ann/2, get_ann/3, set_ann/2, qualify/2]).
 
--export_type([ann_file/0, ann_line/0, ann_col/0, ann_origin/0, ann_format/0, ann/0]).
+-export_type([ann_line/0, ann_col/0, ann_origin/0, ann_format/0, ann/0]).
 -export_type([name/0, id/0, con/0, qid/0, qcon/0, tvar/0, op/0]).
 -export_type([bin_op/0, un_op/0]).
 -export_type([decl/0, letbind/0, typedef/0, pragma/0, fundecl/0]).
@@ -26,9 +24,8 @@
 -type ann_col()    :: integer().
 -type ann_origin() :: system | user.
 -type ann_format() :: '?:' | hex | infix | prefix | elif.
--type ann_file()   :: string() | no_file.
 
--type ann() :: [ {file, ann_file()} | {line, ann_line()} | {col, ann_col()} | {format, ann_format()} | {origin, ann_origin()}
+-type ann() :: [ {line, ann_line()} | {col, ann_col()} | {format, ann_format()} | {origin, ann_origin()}
                | stateful | private | payable | main | interface | entrypoint].
 
 -type name() :: string().
@@ -102,7 +99,6 @@
      | {contract_pubkey, ann(), binary()}
      | {oracle_pubkey, ann(), binary()}
      | {oracle_query_id, ann(), binary()}
-     | {signature, ann(), binary()}
      | {string, ann(), binary()}
      | {char, ann(), integer()}.
 
@@ -110,8 +106,8 @@
 
 -type bin_op() :: '+' | '-' | '*' | '/' | mod | '^'
                 | '++' | '::' | '<' | '>' | '=<' | '>=' | '==' | '!='
-                | '||' | '&&' | '..' | 'band' | 'bor' | 'bxor' | '>>' | '<<' | '|>'.
--type un_op() :: '-' | '!' | 'bnot'.
+                | '||' | '&&' | '..' | '|>'.
+-type un_op() :: '-' | '!'.
 
 -type expr()
     :: {lam, ann(), [arg()], expr()}

src/aeso_syntax_utils.erl

@@ -1,14 +1,12 @@
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2018, Aeternity Anstalt
 %%% @doc
 %%%     Sophia syntax utilities.
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_syntax_utils).
--vsn("9.0.0").
+-module(aeso_syntax_utils).
 
--export([used_ids/1, used_ids/2, used_types/2, used/1]).
+-export([used_ids/1, used_types/2, used/1]).
 
 -record(alg, {zero, plus, scoped}).
 
@@ -19,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 :: 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().
+    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().
 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,
@@ -112,16 +110,8 @@ fold(Alg = #alg{zero = Zero, plus = Plus, scoped = Scoped}, Fun, K, X) ->
 
 %% Name dependencies
 
-%% Used ids, top level
 used_ids(E) ->
-    used_ids([], E).
-
-%% Used ids, top level or in (current) namespace
-used_ids(Ns, E) ->
-    [ lists:last(Xs) || {{term, Xs}, _} <- used(E), in_ns(Xs, Ns) ].
-
-in_ns([_], _) -> true;
-in_ns(Xs, Ns) -> lists:droplast(Xs) == Ns.
+    [ X || {{term, [X]}, _} <- used(E) ].
 
 used_types([Top] = _CurrentNS, T) ->
     F = fun({{type, [X]}, _}) -> [X];
@@ -134,7 +124,7 @@ used_types([Top] = _CurrentNS, T) ->
                 | {type, [string()]}
                 | {namespace, [string()]}.
 
--spec entity_alg() -> alg(#{entity() => so_syntax:ann()}).
+-spec entity_alg() -> alg(#{entity() => aeso_syntax:ann()}).
 entity_alg() ->
     IsBound = fun({K, _}) -> lists:member(K, [bound_term, bound_type]) end,
     Unbind  = fun(bound_term) -> term; (bound_type) -> type end,
@@ -149,7 +139,7 @@ entity_alg() ->
         , plus   = fun maps:merge/2
         , scoped = Scoped }.
 
--spec used(_) -> [{entity(), so_syntax:ann()}].
+-spec used(_) -> [{entity(), aeso_syntax:ann()}].
 used(D) ->
     Kind = fun(expr)      -> term;
               (bind_expr) -> bound_term;

src/aeso_tc_ann_manip.erl

@@ -0,0 +1,17 @@
+-module(aeso_tc_ann_manip).
+
+-export([ pos/1
+        , pos/2
+        , loc/1
+        ]).
+
+src_file(T)      -> aeso_syntax:get_ann(file, T, no_file).
+include_type(T)  -> aeso_syntax:get_ann(include_type, T, none).
+line_number(T)   -> aeso_syntax:get_ann(line, T, 0).
+column_number(T) -> aeso_syntax:get_ann(col, T, 0).
+
+pos(T)    -> aeso_errors:pos(src_file(T), line_number(T), column_number(T)).
+pos(L, C) -> aeso_errors:pos(L, C).
+
+loc(T) ->
+    {src_file(T), include_type(T), line_number(T), column_number(T)}.

src/aeso_tc_constraints.erl

@@ -0,0 +1,593 @@
+-module(aeso_tc_constraints).
+
+-export([ solve_constraints/1
+        , solve_then_destroy_and_report_unsolved_constraints/1
+        , create_constraints/0
+        , add_is_contract_constraint/2
+        , add_is_contract_constraint/3
+        , add_aens_resolve_constraint/1
+        , add_oracle_type_constraint/2
+        , add_named_argument_constraint/3
+        , add_field_constraint/5
+        , add_dependent_type_constraint/5
+        , add_record_create_constraint/3
+        , freshen_type/2
+        , freshen_type_sig/2
+        ]).
+
+%% -- Duplicated types -------------------------------------------------------
+
+-type uvar() :: {uvar, aeso_syntax:ann(), reference()}.
+-type named_args_t() :: uvar() | [{named_arg_t, aeso_syntax:ann(), aeso_syntax:id(), utype(), aeso_syntax:expr()}].
+-type utype() :: aeso_tc_typedefs:utype().
+
+%% -- Duplicated macros ------------------------------------------------------
+
+-define(is_type_id(T), element(1, T) =:= id orelse
+                       element(1, T) =:= qid orelse
+                       element(1, T) =:= con orelse
+                       element(1, T) =:= qcon).
+
+%% -- Moved functions --------------------------------------------------------
+
+unify(A, B, C, D) -> aeso_tc_unify:unify(A, B, C, D).
+
+%% -------
+
+unfold_types_in_type(A, B) -> aeso_tc_type_unfolding:unfold_types_in_type(A, B).
+
+%% -------
+
+qname(A) -> aeso_tc_name_manip:qname(A).
+
+%% -------
+
+type_error(A) -> aeso_tc_errors:type_error(A).
+
+%% -------
+
+is_monomorphic(A) -> aeso_tc_type_utils:is_monomorphic(A).
+is_first_order(A) -> aeso_tc_type_utils:is_first_order(A).
+app_t(A, B, C) -> aeso_tc_type_utils:app_t(A, B, C).
+fresh_uvar(A) -> aeso_tc_type_utils:fresh_uvar(A).
+
+%% ---------------------------------------------------------------------------
+
+-type env() :: aeso_tc_env:env().
+
+-type why_record() :: aeso_syntax:field(aeso_syntax:expr())
+                    | {var_args, aeso_syntax:ann(), aeso_syntax:expr()}
+                    | {proj, aeso_syntax:ann(), aeso_syntax:expr(), aeso_syntax:id()}.
+
+-record(named_argument_constraint,
+    {args :: named_args_t(),
+     name :: aeso_syntax:id(),
+     type :: utype()}).
+
+-record(dependent_type_constraint,
+    { named_args_t     :: named_args_t()
+    , named_args       :: [aeso_syntax:arg_expr()]
+    , general_type     :: utype()
+    , specialized_type :: utype()
+    , context          :: term() }).
+
+-type named_argument_constraint() :: #named_argument_constraint{} | #dependent_type_constraint{}.
+
+-record(field_constraint,
+    { record_t :: utype()
+    , field    :: aeso_syntax:id()
+    , field_t  :: utype()
+    , kind     :: project | create | update %% Projection constraints can match contract
+    , context  :: why_record() }).          %% types, but field constraints only record types.
+
+%% Constraint checking that 'record_t' has precisely 'fields'.
+-record(record_create_constraint,
+    { record_t :: utype()
+    , fields   :: [aeso_syntax:id()]
+    , context  :: why_record() }).
+
+-record(is_contract_constraint,
+    { contract_t :: utype(),
+      context    :: {contract_literal, aeso_syntax:expr()} |
+                    {address_to_contract, aeso_syntax:ann()} |
+                    {bytecode_hash, aeso_syntax:ann()} |
+                    {var_args, aeso_syntax:ann(), aeso_syntax:expr()},
+      force_def = false :: boolean()
+    }).
+
+-type field_constraint() :: #field_constraint{} | #record_create_constraint{} | #is_contract_constraint{}.
+
+-type byte_constraint() :: {is_bytes, utype()}
+                         | {add_bytes, aeso_syntax:ann(), concat | split, utype(), utype(), utype()}.
+
+-type aens_resolve_constraint() :: {aens_resolve_type, utype()}.
+-type oracle_type_constraint() :: {oracle_type, aeso_syntax:ann(), utype()}.
+
+-type constraint() :: named_argument_constraint() | field_constraint() | byte_constraint()
+                    | aens_resolve_constraint() | oracle_type_constraint().
+
+-spec add_constraint(constraint()) -> true.
+add_constraint(Constraint) ->
+    aeso_tc_ets_manager:ets_insert_ordered(constraints, Constraint).
+
+add_is_contract_constraint(ContractT, Context) ->
+    add_constraint(
+        #is_contract_constraint{
+            contract_t = ContractT,
+            context    = Context }).
+
+add_is_contract_constraint(ContractT, Context, ForceDef) ->
+    add_constraint(
+        #is_contract_constraint{
+            contract_t = ContractT,
+            context    = Context,
+            force_def  = ForceDef }).
+
+add_aens_resolve_constraint(Type) ->
+    add_constraint({aens_resolve_type, Type}).
+
+add_oracle_type_constraint(Ann, Type) ->
+    add_constraint({oracle_type, Ann, Type}).
+
+add_named_argument_constraint(Args, Name, Type) ->
+    add_constraint(
+        #named_argument_constraint{
+            args = Args,
+            name = Name,
+            type = Type }).
+
+add_field_constraint(RecordT, Field, FieldT, Kind, Context) ->
+    add_constraint(#field_constraint{
+        record_t = RecordT,
+        field    = Field,
+        field_t  = FieldT,
+        kind     = Kind,
+        context  = Context }).
+
+add_dependent_type_constraint(NamedArgsT, NamedArgs, GeneralType, SpecializedType, Context) ->
+    add_constraint(#dependent_type_constraint{
+        named_args_t     = NamedArgsT,
+        named_args       = NamedArgs,
+        general_type     = GeneralType,
+        specialized_type = SpecializedType,
+        context          = Context }).
+
+add_record_create_constraint(RecordT, Fields, Context) ->
+    add_constraint(#record_create_constraint{
+        record_t = RecordT,
+        fields   = Fields,
+        context  = Context }).
+
+create_constraints() ->
+    aeso_tc_ets_manager:ets_new(constraints, [ordered_set]).
+
+get_constraints() ->
+    aeso_tc_ets_manager:ets_tab2list_ordered(constraints).
+
+destroy_constraints() ->
+    aeso_tc_ets_manager:ets_delete(constraints).
+
+-spec solve_constraints(env()) -> ok.
+solve_constraints(Env) ->
+    %% First look for record fields that appear in only one type definition
+    IsAmbiguous =
+        fun(#field_constraint{
+               record_t = RecordType,
+               field    = Field={id, _Attrs, FieldName},
+               field_t  = FieldType,
+               kind     = Kind,
+               context  = When }) ->
+                Arity = aeso_tc_type_utils:fun_arity(aeso_tc_type_utils:dereference_deep(FieldType)),
+                FieldInfos = case Arity of
+                                 none -> aeso_tc_env:lookup_record_field(Env, FieldName, Kind);
+                                 _    -> aeso_tc_env:lookup_record_field_arity(Env, FieldName, Arity, Kind)
+                             end,
+                case FieldInfos of
+                    [] ->
+                        type_error({undefined_field, Field}),
+                        false;
+                    [Fld] ->
+                        FldType = aeso_tc_env:field_info_field_t(Fld),
+                        RecType = aeso_tc_env:field_info_record_t(Fld),
+                        create_freshen_tvars(),
+                        FreshFldType = freshen(FldType),
+                        FreshRecType = freshen(RecType),
+                        destroy_freshen_tvars(),
+                        unify(Env, FreshFldType, FieldType, {field_constraint, FreshFldType, FieldType, When}),
+                        unify(Env, FreshRecType, RecordType, {record_constraint, FreshRecType, RecordType, When}),
+                        false;
+                    _ ->
+                        %% ambiguity--need cleverer strategy
+                        true
+                end;
+           (_) -> true
+        end,
+    AmbiguousConstraints = lists:filter(IsAmbiguous, get_constraints()),
+
+    % The two passes on AmbiguousConstraints are needed
+    solve_ambiguous_constraints(Env, AmbiguousConstraints ++ AmbiguousConstraints).
+
+-spec solve_ambiguous_constraints(env(), [constraint()]) -> ok.
+solve_ambiguous_constraints(Env, Constraints) ->
+    Unknown = solve_known_record_types(Env, Constraints),
+    if Unknown == [] -> ok;
+       length(Unknown) < length(Constraints) ->
+            %% progress! Keep trying.
+            solve_ambiguous_constraints(Env, Unknown);
+       true ->
+            case solve_unknown_record_types(Env, Unknown) of
+                true -> %% Progress!
+                    solve_ambiguous_constraints(Env, Unknown);
+                _ -> ok %% No progress. Report errors later.
+            end
+    end.
+
+solve_then_destroy_and_report_unsolved_constraints(Env) ->
+    solve_constraints(Env),
+    destroy_and_report_unsolved_constraints(Env).
+
+destroy_and_report_unsolved_constraints(Env) ->
+    {FieldCs, OtherCs} =
+        lists:partition(fun(#field_constraint{}) -> true; (_) -> false end,
+                        get_constraints()),
+    {CreateCs, OtherCs1} =
+        lists:partition(fun(#record_create_constraint{}) -> true; (_) -> false end,
+                        OtherCs),
+    {ContractCs, OtherCs2} =
+        lists:partition(fun(#is_contract_constraint{}) -> true; (_) -> false end, OtherCs1),
+    {NamedArgCs, OtherCs3} =
+        lists:partition(fun(#dependent_type_constraint{}) -> true;
+                           (#named_argument_constraint{}) -> true;
+                           (_)                            -> false
+                        end, OtherCs2),
+    {BytesCs, OtherCs4} =
+        lists:partition(fun({is_bytes, _})              -> true;
+                           ({add_bytes, _, _, _, _, _}) -> true;
+                           (_)                          -> false
+                        end, OtherCs3),
+    {AensResolveCs, OtherCs5} =
+        lists:partition(fun({aens_resolve_type, _}) -> true;
+                           (_)                      -> false
+                        end, OtherCs4),
+    {OracleTypeCs, []} =
+        lists:partition(fun({oracle_type, _, _}) -> true;
+                           (_)                   -> false
+                        end, OtherCs5),
+
+    Unsolved = [ S || S <- [ solve_constraint(Env, aeso_tc_type_utils:dereference_deep(C)) || C <- NamedArgCs ],
+                      S == unsolved ],
+    [ type_error({unsolved_named_argument_constraint, Name, Type})
+        || #named_argument_constraint{name = Name, type = Type} <- Unsolved ],
+
+    Unknown = solve_known_record_types(Env, FieldCs),
+    if Unknown == [] -> ok;
+       true ->
+            case solve_unknown_record_types(Env, Unknown) of
+                true   -> ok;
+                Errors -> [ type_error(Err) || Err <- Errors ]
+            end
+    end,
+
+    check_record_create_constraints(Env, CreateCs),
+    check_is_contract_constraints(Env, ContractCs),
+    check_bytes_constraints(Env, BytesCs),
+    check_aens_resolve_constraints(Env, AensResolveCs),
+    check_oracle_type_constraints(Env, OracleTypeCs),
+
+    destroy_constraints().
+
+%% If false, a type error has been emitted, so it's safe to drop the constraint.
+-spec check_named_argument_constraint(env(), named_argument_constraint()) -> true | false | unsolved.
+check_named_argument_constraint(_Env, #named_argument_constraint{ args = {uvar, _, _} }) ->
+    unsolved;
+check_named_argument_constraint(Env,
+    #named_argument_constraint{ args = Args,
+                                name = Id = {id, _, Name},
+                                type = Type }) ->
+    case [ T || {named_arg_t, _, {id, _, Name1}, T, _} <- Args, Name1 == Name ] of
+        []  ->
+            type_error({bad_named_argument, Args, Id}),
+            false;
+        [T] -> unify(Env, T, Type, {check_named_arg_constraint, Args, Id, Type}), true
+    end;
+check_named_argument_constraint(Env,
+        #dependent_type_constraint{ named_args_t = NamedArgsT0,
+                                    named_args = NamedArgs,
+                                    general_type = GenType,
+                                    specialized_type = SpecType,
+                                    context = {check_return, App} }) ->
+    NamedArgsT = aeso_tc_type_utils:dereference(NamedArgsT0),
+    case aeso_tc_type_utils:dereference(NamedArgsT0) of
+        [_ | _] = NamedArgsT ->
+            GetVal = fun(Name, Default) ->
+                        hd([ Val || {named_arg, _, {id, _, N}, Val} <- NamedArgs, N == Name] ++
+                           [ Default ])
+                     end,
+            ArgEnv = maps:from_list([ {Name, GetVal(Name, Default)}
+                                      || {named_arg_t, _, {id, _, Name}, _, Default} <- NamedArgsT ]),
+            GenType1 = specialize_dependent_type(ArgEnv, GenType),
+            unify(Env, GenType1, SpecType, {check_expr, App, GenType1, SpecType}),
+            true;
+        _ -> unify(Env, GenType, SpecType, {check_expr, App, GenType, SpecType}), true
+    end.
+
+specialize_dependent_type(Env, Type) ->
+    case aeso_tc_type_utils:dereference(Type) of
+        {if_t, _, {id, _, Arg}, Then, Else} ->
+            Val = maps:get(Arg, Env),
+            case Val of
+                {typed, _, {bool, _, true}, _}  -> Then;
+                {typed, _, {bool, _, false}, _} -> Else;
+                _ ->
+                    type_error({named_argument_must_be_literal_bool, Arg, Val}),
+                    fresh_uvar(aeso_syntax:get_ann(Val))
+            end;
+        _ -> Type   %% Currently no deep dependent types
+    end.
+
+%% -- Bytes constraints --
+
+solve_constraint(_Env, #field_constraint{record_t = {uvar, _, _}}) ->
+    not_solved;
+solve_constraint(Env, C = #field_constraint{record_t = RecType,
+                                            field    = FieldName,
+                                            field_t  = FieldType,
+                                            context  = When}) ->
+    RecId = record_type_name(RecType),
+    Attrs = aeso_syntax:get_ann(RecId),
+    case aeso_tc_env:lookup_type(Env, RecId) of
+        {_, {_Ann, {Formals, {What, Fields}}}} when What =:= record_t; What =:= contract_t ->
+            FieldTypes = [{Name, Type} || {field_t, _, {id, _, Name}, Type} <- Fields],
+            {id, _, FieldString} = FieldName,
+            case proplists:get_value(FieldString, FieldTypes) of
+                undefined ->
+                    type_error({missing_field, FieldName, RecId}),
+                    not_solved;
+                FldType ->
+                    create_freshen_tvars(),
+                    FreshFldType = freshen(FldType),
+                    FreshRecType = freshen(app_t(Attrs, RecId, Formals)),
+                    destroy_freshen_tvars(),
+                    unify(Env, FreshFldType, FieldType, {field_constraint, FreshFldType, FieldType, When}),
+                    unify(Env, FreshRecType, RecType, {record_constraint, FreshRecType, RecType, When}),
+                    C
+            end;
+        _ ->
+            type_error({not_a_record_type, aeso_tc_type_utils:instantiate(RecType), When}),
+            not_solved
+    end;
+solve_constraint(Env, C = #dependent_type_constraint{}) ->
+    check_named_argument_constraint(Env, C);
+solve_constraint(Env, C = #named_argument_constraint{}) ->
+    check_named_argument_constraint(Env, C);
+solve_constraint(_Env, {is_bytes, _}) -> ok;
+solve_constraint(Env, {add_bytes, Ann, _, A0, B0, C0}) ->
+    A = unfold_types_in_type(Env, aeso_tc_type_utils:dereference(A0)),
+    B = unfold_types_in_type(Env, aeso_tc_type_utils:dereference(B0)),
+    C = unfold_types_in_type(Env, aeso_tc_type_utils:dereference(C0)),
+    case {A, B, C} of
+        {{bytes_t, _, M}, {bytes_t, _, N}, _} -> unify(Env, {bytes_t, Ann, M + N}, C, {at, Ann});
+        {{bytes_t, _, M}, _, {bytes_t, _, R}} when R >= M -> unify(Env, {bytes_t, Ann, R - M}, B, {at, Ann});
+        {_, {bytes_t, _, N}, {bytes_t, _, R}} when R >= N -> unify(Env, {bytes_t, Ann, R - N}, A, {at, Ann});
+        _ -> ok
+    end;
+solve_constraint(_, _) -> ok.
+
+check_bytes_constraints(Env, Constraints) ->
+    InAddConstraint = [ T || {add_bytes, _, _, A, B, C} <- Constraints,
+                             T <- [A, B, C],
+                             element(1, T) /= bytes_t ],
+    %% Skip is_bytes constraints for types that occur in add_bytes constraints
+    %% (no need to generate error messages for both is_bytes and add_bytes).
+    Skip = fun({is_bytes, T}) -> lists:member(T, InAddConstraint);
+              (_) -> false end,
+    [ check_bytes_constraint(Env, C) || C <- Constraints, not Skip(C) ].
+
+check_bytes_constraint(Env, {is_bytes, Type}) ->
+    Type1 = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(Type)),
+    case Type1 of
+        {bytes_t, _, _} -> ok;
+        _               ->
+            type_error({unknown_byte_length, Type})
+    end;
+check_bytes_constraint(Env, {add_bytes, Ann, Fun, A0, B0, C0}) ->
+    A = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(A0)),
+    B = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(B0)),
+    C = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(C0)),
+    case {A, B, C} of
+        {{bytes_t, _, _M}, {bytes_t, _, _N}, {bytes_t, _, _R}} ->
+            ok; %% If all are solved we checked M + N == R in solve_constraint.
+        _ -> type_error({unsolved_bytes_constraint, Ann, Fun, A, B, C})
+    end.
+
+check_aens_resolve_constraints(_Env, []) ->
+    ok;
+check_aens_resolve_constraints(Env, [{aens_resolve_type, Type} | Rest]) ->
+    Type1 = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(Type)),
+    {app_t, _, {id, _, "option"}, [Type2]} = Type1,
+    case Type2 of
+        {id, _, "string"} -> ok;
+        {id, _, "address"} -> ok;
+        {con, _, _} -> ok;
+        {app_t, _, {id, _, "oracle"}, [_, _]} -> ok;
+        {app_t, _, {id, _, "oracle_query"}, [_, _]} -> ok;
+        _ -> type_error({invalid_aens_resolve_type, aeso_syntax:get_ann(Type), Type2})
+    end,
+    check_aens_resolve_constraints(Env, Rest).
+
+check_oracle_type_constraints(_Env, []) ->
+    ok;
+check_oracle_type_constraints(Env, [{oracle_type, Ann, OType} | Rest]) ->
+    Type = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(OType)),
+    {app_t, _, {id, _, "oracle"}, [QType, RType]} = Type,
+    is_monomorphic(QType) orelse type_error({invalid_oracle_type, polymorphic,  query,    Ann, Type}),
+    is_monomorphic(RType) orelse type_error({invalid_oracle_type, polymorphic,  response, Ann, Type}),
+    is_first_order(QType) orelse type_error({invalid_oracle_type, higher_order, query,    Ann, Type}),
+    is_first_order(RType) orelse type_error({invalid_oracle_type, higher_order, response, Ann, Type}),
+    check_oracle_type_constraints(Env, Rest).
+
+%% -- Field constraints --
+
+check_record_create_constraints(_, []) -> ok;
+check_record_create_constraints(Env, [C | Cs]) ->
+    #record_create_constraint{
+        record_t = Type,
+        fields   = Fields,
+        context  = When } = C,
+    Type1 = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(Type)),
+    try aeso_tc_env:lookup_type(Env, record_type_name(Type1)) of
+        {_QId, {_Ann, {_Args, {record_t, RecFields}}}} ->
+            ActualNames = [ Fld || {field_t, _, {id, _, Fld}, _} <- RecFields ],
+            GivenNames  = [ Fld || {id, _, Fld} <- Fields ],
+            case ActualNames -- GivenNames of   %% We know already that we don't have too many fields
+                []      -> ok;
+                Missing -> type_error({missing_fields, When, Type1, Missing})
+            end;
+        _ -> %% We can get here if there are other type errors.
+            ok
+    catch _:_ ->    %% Might be unsolved, we get a different error in that case
+        ok
+    end,
+    check_record_create_constraints(Env, Cs).
+
+is_contract_defined(C) ->
+    aeso_tc_ets_manager:ets_lookup(defined_contracts, qname(C)) =/= [].
+
+check_is_contract_constraints(_Env, []) -> ok;
+check_is_contract_constraints(Env, [C | Cs]) ->
+    #is_contract_constraint{ contract_t = Type, context = Cxt, force_def = ForceDef } = C,
+    Type1 = unfold_types_in_type(Env, aeso_tc_type_utils:instantiate(Type)),
+    TypeName = record_type_name(Type1),
+    case aeso_tc_env:lookup_type(Env, TypeName) of
+        {_, {_Ann, {[], {contract_t, _}}}} ->
+            case not ForceDef orelse is_contract_defined(TypeName) of
+                true -> ok;
+                false -> type_error({contract_lacks_definition, Type1, Cxt})
+                end;
+        _ -> type_error({not_a_contract_type, Type1, Cxt})
+    end,
+    check_is_contract_constraints(Env, Cs).
+
+-spec solve_unknown_record_types(env(), [field_constraint()]) -> true | [tuple()].
+solve_unknown_record_types(Env, Unknown) ->
+    UVars = lists:usort([UVar || #field_constraint{record_t = UVar = {uvar, _, _}} <- Unknown]),
+    Solutions = [solve_for_uvar(Env, UVar, [{Kind, When, Field}
+                                            || #field_constraint{record_t = U, field = Field, kind = Kind, context = When} <- Unknown,
+                                               U == UVar])
+                 || UVar <- UVars],
+    case lists:member(true, Solutions) of
+        true  -> true;
+        false -> Solutions
+    end.
+
+%% This will solve all kinds of constraints but will only return the
+%% unsolved field constraints
+-spec solve_known_record_types(env(), [constraint()]) -> [field_constraint()].
+solve_known_record_types(Env, Constraints) ->
+    DerefConstraints = lists:map(fun(C = #field_constraint{record_t = RecordType}) ->
+                                        C#field_constraint{record_t = aeso_tc_type_utils:dereference(RecordType)};
+                                    (C) -> aeso_tc_type_utils:dereference_deep(C)
+                                 end, Constraints),
+    SolvedConstraints = lists:map(fun(C) -> solve_constraint(Env, aeso_tc_type_utils:dereference_deep(C)) end, DerefConstraints),
+    Unsolved = DerefConstraints--SolvedConstraints,
+    lists:filter(fun(#field_constraint{}) -> true; (_) -> false end, Unsolved).
+
+record_type_name({app_t, _Attrs, RecId, _Args}) when ?is_type_id(RecId) ->
+    RecId;
+record_type_name(RecId) when ?is_type_id(RecId) ->
+    RecId;
+record_type_name(_Other) ->
+    %% io:format("~p is not a record type\n", [Other]),
+    {id, [{origin, system}], "not_a_record_type"}.
+
+solve_for_uvar(Env, UVar = {uvar, Attrs, _}, Fields0) ->
+    Fields = [{Kind, Fld} || {Kind, _, Fld} <- Fields0],
+    [{_, When, _} | _] = Fields0,    %% Get the location from the first field
+    %% If we have 'create' constraints they must be complete.
+    Covering = lists:usort([ Name || {create, {id, _, Name}} <- Fields ]),
+    %% Does this set of fields uniquely identify a record type?
+    FieldNames = [ Name || {_Kind, {id, _, Name}} <- Fields ],
+    UniqueFields = lists:usort(FieldNames),
+    Candidates = [aeso_tc_env:field_info_record_t(Fld) || Fld <- aeso_tc_env:lookup_record_field(Env, hd(FieldNames))],
+    TypesAndFields = [case aeso_tc_env:lookup_type(Env, record_type_name(RecType)) of
+                        {_, {_, {_, {record_t, RecFields}}}} ->
+                            {RecType, [Field || {field_t, _, {id, _, Field}, _} <- RecFields]};
+                        {_, {_, {_, {contract_t, ConFields}}}} ->
+                            %% TODO: is this right?
+                            {RecType, [Field || {field_t, _, {id, _, Field}, _} <- ConFields]};
+                        false -> %% impossible?
+                            error({no_definition_for, record_type_name(RecType), in, Env})
+                      end
+                      || RecType <- Candidates],
+    PartialSolutions =
+        lists:sort([{RecType, if Covering == [] -> []; true -> RecFields -- Covering end}
+                    || {RecType, RecFields} <- TypesAndFields,
+                       UniqueFields -- RecFields == []]),
+    Solutions = [RecName || {RecName, []} <- PartialSolutions],
+    case {Solutions, PartialSolutions} of
+        {[], []} ->
+            {no_records_with_all_fields, Fields};
+        {[], _} ->
+            case PartialSolutions of
+                [{RecType, Missing} | _] -> %% TODO: better error if ambiguous
+                    {missing_fields, When, RecType, Missing}
+            end;
+        {[RecType], _} ->
+            RecName = record_type_name(RecType),
+            {_, {_, {Formals, {_RecOrCon, _}}}} = aeso_tc_env:lookup_type(Env, RecName),
+            create_freshen_tvars(),
+            FreshRecType = freshen(app_t(Attrs, RecName, Formals)),
+            destroy_freshen_tvars(),
+            unify(Env, UVar, FreshRecType, {solve_rec_type, UVar, Fields}),
+            true;
+        {StillPossible, _} ->
+            {ambiguous_record, Fields, StillPossible}
+    end.
+
+create_freshen_tvars() ->
+    aeso_tc_ets_manager:ets_new(freshen_tvars, [set]).
+
+destroy_freshen_tvars() ->
+    aeso_tc_ets_manager:ets_delete(freshen_tvars).
+
+freshen(Type) ->
+    freshen(aeso_syntax:get_ann(Type), Type).
+
+freshen(Ann, {tvar, _, Name}) ->
+    NewT = case aeso_tc_ets_manager:ets_lookup(freshen_tvars, Name) of
+               []          -> fresh_uvar(Ann);
+               [{Name, T}] -> T
+           end,
+    aeso_tc_ets_manager:ets_insert(freshen_tvars, {Name, NewT}),
+    NewT;
+freshen(Ann, {bytes_t, _, any}) ->
+    X = fresh_uvar(Ann),
+    add_constraint({is_bytes, X}),
+    X;
+freshen(Ann, T) when is_tuple(T) ->
+    list_to_tuple(freshen(Ann, tuple_to_list(T)));
+freshen(Ann, [A | B]) ->
+    [freshen(Ann, A) | freshen(Ann, B)];
+freshen(_, X) ->
+    X.
+
+freshen_type(Ann, Type) ->
+    create_freshen_tvars(),
+    Type1 = freshen(Ann, Type),
+    destroy_freshen_tvars(),
+    Type1.
+
+freshen_type_sig(Ann, TypeSig = {type_sig, _, Constr, _, _, _}) ->
+    FunT = freshen_type(Ann, aeso_tc_type_utils:typesig_to_fun_t(TypeSig)),
+    apply_typesig_constraint(Ann, Constr, FunT),
+    FunT.
+
+apply_typesig_constraint(_Ann, none, _FunT) -> ok;
+apply_typesig_constraint(Ann, address_to_contract, {fun_t, _, [], [_], Type}) ->
+    aeso_tc_constraints:add_is_contract_constraint(Type, {address_to_contract, Ann});
+apply_typesig_constraint(Ann, bytes_concat, {fun_t, _, [], [A, B], C}) ->
+    add_constraint({add_bytes, Ann, concat, A, B, C});
+apply_typesig_constraint(Ann, bytes_split, {fun_t, _, [], [C], {tuple_t, _, [A, B]}}) ->
+    add_constraint({add_bytes, Ann, split, A, B, C});
+apply_typesig_constraint(Ann, bytecode_hash, {fun_t, _, _, [Con], _}) ->
+    aeso_tc_constraints:add_is_contract_constraint(Con, {bytecode_hash, Ann}).

src/aeso_tc_desugar.erl

@@ -0,0 +1,138 @@
+-module(aeso_tc_desugar).
+
+-export([ desugar/1
+        , desugar_clauses/4
+        , process_blocks/1
+        ]).
+
+%% -- Moved functions --------------------------------------------------------
+
+type_error(A) -> aeso_tc_errors:type_error(A).
+
+%% ---------------------------------------------------------------------------
+
+%% Restructure blocks into multi-clause fundefs (`fun_clauses`).
+-spec process_blocks([aeso_syntax:decl()]) -> [aeso_syntax:decl()].
+process_blocks(Decls) ->
+    lists:flatmap(
+      fun({block, Ann, Ds}) -> process_block(Ann, Ds);
+         (Decl)             -> [Decl] end, Decls).
+
+-spec process_block(aeso_syntax:ann(), [aeso_syntax:decl()]) -> [aeso_syntax:decl()].
+process_block(_, []) -> [];
+process_block(_, [Decl]) -> [Decl];
+process_block(_Ann, [Decl | Decls]) ->
+    IsThis = fun(Name) -> fun({letfun, _, {id, _, Name1}, _, _, _}) -> Name == Name1;
+                             (_) -> false end end,
+    case Decl of
+        {fun_decl, Ann1, Id = {id, _, Name}, Type} ->
+            {Clauses, Rest} = lists:splitwith(IsThis(Name), Decls),
+            [type_error({mismatched_decl_in_funblock, Name, D1}) || D1 <- Rest],
+            [{fun_clauses, Ann1, Id, Type, Clauses}];
+        {letfun, Ann1, Id = {id, _, Name}, _, _, _} ->
+            {Clauses, Rest} = lists:splitwith(IsThis(Name), [Decl | Decls]),
+            [type_error({mismatched_decl_in_funblock, Name, D1}) || D1 <- Rest],
+            [{fun_clauses, Ann1, Id, {id, [{origin, system} | Ann1], "_"}, Clauses}]
+    end.
+
+desugar_clauses(Ann, Fun, {type_sig, _, _, _, ArgTypes, RetType}, Clauses) ->
+    NeedDesugar =
+        case Clauses of
+            [{letfun, _, _, As, _, [{guarded, _, [], _}]}] -> lists:any(fun({typed, _, {id, _, _}, _}) -> false; (_) -> true end, As);
+            _                                              -> true
+        end,
+    case NeedDesugar of
+        false -> [Clause] = Clauses, Clause;
+        true  ->
+            NoAnn = [{origin, system}],
+            Args = [ {typed, NoAnn, {id, NoAnn, "x#" ++ integer_to_list(I)}, Type}
+                     || {I, Type} <- indexed(1, ArgTypes) ],
+            Tuple = fun([X]) -> X;
+                       (As) -> {typed, NoAnn, {tuple, NoAnn, As}, {tuple_t, NoAnn, ArgTypes}}
+                    end,
+            {letfun, Ann, Fun, Args, RetType, [{guarded, NoAnn, [], {typed, NoAnn,
+               {switch, NoAnn, Tuple(Args),
+                 [ {'case', AnnC, Tuple(ArgsC), GuardedBodies}
+                 || {letfun, AnnC, _, ArgsC, _, GuardedBodies} <- Clauses ]}, RetType}}]}
+    end.
+
+%% -- Pre-type checking desugaring -------------------------------------------
+
+%% Desugars nested record/map updates as follows:
+%%  { x.y = v1, x.z @ z = f(z) } becomes { x @ __x = __x { y = v1, z @ z = f(z) } }
+%%  { [k1].x = v1, [k2].y = v2 } becomes { [k1] @ __x = __x { x = v1 }, [k2] @ __x = __x { y = v2 } }
+%% There's no comparison of k1 and k2 to group the updates if they are equal.
+desugar({record, Ann, Rec, Updates}) ->
+    {record, Ann, Rec, desugar_updates(Updates)};
+desugar({map, Ann, Map, Updates}) ->
+    {map, Ann, Map, desugar_updates(Updates)};
+desugar([H|T]) ->
+  [desugar(H) | desugar(T)];
+desugar(T) when is_tuple(T) ->
+  list_to_tuple(desugar(tuple_to_list(T)));
+desugar(X) -> X.
+
+desugar_updates([]) -> [];
+desugar_updates([Upd | Updates]) ->
+    {Key, MakeField, Rest} = update_key(Upd),
+    {More, Updates1}       = updates_key(Key, Updates),
+    %% Check conflicts
+    case length([ [] || [] <- [Rest | More] ]) of
+        N when N > 1 -> type_error({conflicting_updates_for_field, Upd, Key});
+        _ -> ok
+    end,
+    [MakeField(lists:append([Rest | More])) | desugar_updates(Updates1)].
+
+%% TODO: refactor representation to make this not horrible
+update_key(Fld = {field, _, [Elim], _}) ->
+    {elim_key(Elim), fun(_) -> Fld end, []};
+update_key(Fld = {field, _, [Elim], _, _}) ->
+    {elim_key(Elim), fun(_) -> Fld end, []};
+update_key({field, Ann, [P = {proj, _, {id, _, Name}} | Rest], Value}) ->
+    {Name, fun(Flds) -> {field, Ann, [P], {id, [], "__x"},
+                            desugar(map_or_record(Ann, {id, [], "__x"}, Flds))}
+           end, [{field, Ann, Rest, Value}]};
+update_key({field, Ann, [P = {proj, _, {id, _, Name}} | Rest], Id, Value}) ->
+    {Name, fun(Flds) -> {field, Ann, [P], {id, [], "__x"},
+                            desugar(map_or_record(Ann, {id, [], "__x"}, Flds))}
+           end, [{field, Ann, Rest, Id, Value}]};
+update_key({field, Ann, [K = {map_get, _, _} | Rest], Value}) ->
+    {map_key, fun(Flds) -> {field, Ann, [K], {id, [], "__x"},
+                            desugar(map_or_record(Ann, {id, [], "__x"}, Flds))}
+              end, [{field, Ann, Rest, Value}]};
+update_key({field, Ann, [K = {map_get, _, _, _} | Rest], Value}) ->
+    {map_key, fun(Flds) -> {field, Ann, [K], {id, [], "__x"},
+                            desugar(map_or_record(Ann, {id, [], "__x"}, Flds))}
+              end, [{field, Ann, Rest, Value}]};
+update_key({field, Ann, [K = {map_get, _, _, _} | Rest], Id, Value}) ->
+    {map_key, fun(Flds) -> {field, Ann, [K], {id, [], "__x"},
+                            desugar(map_or_record(Ann, {id, [], "__x"}, Flds))}
+              end, [{field, Ann, Rest, Id, Value}]};
+update_key({field, Ann, [K = {map_get, _, _} | Rest], Id, Value}) ->
+    {map_key, fun(Flds) -> {field, Ann, [K], {id, [], "__x"},
+                            desugar(map_or_record(Ann, {id, [], "__x"}, Flds))}
+              end, [{field, Ann, Rest, Id, Value}]}.
+
+map_or_record(Ann, Val, Flds = [Fld | _]) ->
+    Kind = case element(3, Fld) of
+             [{proj, _, _}       | _] -> record;
+             [{map_get, _, _}    | _] -> map;
+             [{map_get, _, _, _} | _] -> map
+           end,
+    {Kind, Ann, Val, Flds}.
+
+elim_key({proj, _, {id, _, Name}}) -> Name;
+elim_key({map_get, _, _, _})       -> map_key;  %% no grouping on map keys (yet)
+elim_key({map_get, _, _})          -> map_key.
+
+updates_key(map_key, Updates) -> {[], Updates};
+updates_key(Name, Updates) ->
+    Xs = [ {Upd, Name1 == Name, Rest}
+           || Upd <- Updates,
+              {Name1, _, Rest} <- [update_key(Upd)] ],
+    Updates1 = [ Upd  || {Upd, false, _} <- Xs ],
+    More     = [ Rest || {_, true, Rest} <- Xs ],
+    {More, Updates1}.
+
+indexed(I, Xs) ->
+    lists:zip(lists:seq(I, I + length(Xs) - 1), Xs).

src/aeso_tc_env.erl

@@ -0,0 +1,941 @@
+-module(aeso_tc_env).
+
+%% Getters
+-export([ contract_parents/1
+        , current_function/1
+        , in_guard/1
+        , in_pattern/1
+        , namespace/1
+        , stateful/1
+        , typevars/1
+        , unify_throws/1
+        , used_namespaces/1
+        , vars/1
+        , what/1
+        ]).
+
+-export([ field_info_field_t/1
+        , field_info_record_t/1
+        ]).
+
+-export([ scope_ann/1
+        , scope_consts/1
+        , scope_funs/1
+        , scope_kind/1
+        ]).
+
+%% Setters
+-export([ set_contract_parents/2
+        , set_current_const/2
+        , set_current_function/2
+        , set_in_guard/2
+        , set_in_pattern/2
+        , set_stateful/2
+        , set_used_namespaces/2
+        , set_what/2
+        ]).
+
+-export([ push_scope/3
+        , pop_scope/1
+        , get_scope/2
+        , get_current_scope/1
+        , on_scopes/2
+        , switch_scope/2
+        , bind_var/3
+        , bind_vars/2
+        , bind_contract/3
+        , bind_state/1
+        , bind_fun/3
+        , bind_funs/2
+        , bind_tvars/2
+        , bind_type/4
+        , bind_const/4
+        , bind_fields_append/4
+        ]).
+
+-export([ lookup_env/4
+        , lookup_type/2
+        , lookup_record_field/2
+        , lookup_record_field/3
+        , lookup_record_field_arity/4
+        ]).
+
+%% Env constructors
+-export([ init_env/0
+        , init_env/1
+        , empty_env/0
+        ]).
+
+-export([destroy_and_report_type_errors/1]).
+
+-export_type([env/0]).
+
+-include("aeso_utils.hrl").
+
+-record(field_info,
+    { ann      :: aeso_syntax:ann()
+    , field_t  :: utype()
+    , record_t :: utype()
+    , kind     :: contract | record }).
+
+-type field_info() :: #field_info{}.
+
+-type type_id() :: aeso_syntax:id() | aeso_syntax:qid() | aeso_syntax:con() | aeso_syntax:qcon().
+
+-type typedef() :: {[aeso_syntax:tvar()], aeso_syntax:typedef() | {contract_t, [aeso_syntax:field_t()]}}
+                 | {builtin, non_neg_integer()}.
+
+-type namespace_alias() :: none | name().
+-type namespace_parts() :: none | {for, [name()]} | {hiding, [name()]}.
+-type used_namespaces() :: [{qname(), namespace_alias(), namespace_parts()}].
+
+-type fun_info()   :: {aeso_syntax:ann(), typesig() | type()}.
+-type type_info()  :: {aeso_syntax:ann(), typedef()}.
+-type const_info() :: {aeso_syntax:ann(), type()}.
+-type var_info()   :: {aeso_syntax:ann(), utype()}.
+
+-type fun_env()   :: [{name(), fun_info()}].
+-type type_env()  :: [{name(), type_info()}].
+-type const_env() :: [{name(), const_info()}].
+
+-record(scope, { funs   = [] :: fun_env()
+               , types  = [] :: type_env()
+               , consts = [] :: const_env()
+               , kind   = namespace :: namespace | contract
+               , ann    = [{origin, system}] :: aeso_syntax:ann()
+               }).
+
+-type scope() :: #scope{}.
+
+-record(env,
+    { scopes           = #{ [] => #scope{}} :: #{ qname() => scope() }
+    , vars             = []                 :: [{name(), var_info()}]
+    , typevars         = unrestricted       :: unrestricted | [name()]
+    , fields           = #{}                :: #{ name() => [field_info()] }    %% fields are global
+    , contract_parents = #{}                :: #{ name() => [name()] }
+    , namespace        = []                 :: qname()
+    , used_namespaces  = []                 :: used_namespaces()
+    , in_pattern       = false              :: boolean()
+    , in_guard         = false              :: boolean()
+    , stateful         = false              :: boolean()
+    , unify_throws     = true               :: boolean()
+    , current_const    = none               :: none | aeso_syntax:id()
+    , current_function = none               :: none | aeso_syntax:id()
+    , what             = top                :: top | namespace | contract | contract_interface
+    }).
+
+-opaque env() :: #env{}.
+
+%% -- Duplicated types -------------------------------------------------------
+
+-type name() :: string().
+-type qname() :: [string()].
+-type type() :: aeso_syntax:type().
+-type utype() :: aeso_tc_typedefs:utype().
+-type typesig() :: aeso_tc_typedefs:typesig().
+
+%% -- Duplicated macros ------------------------------------------------------
+
+-define(CONSTRUCTOR_MOCK_NAME, "#__constructor__#").
+
+%% -- Moved functions --------------------------------------------------------
+
+name(A) -> aeso_tc_name_manip:name(A).
+qname(A) -> aeso_tc_name_manip:qname(A).
+qid(A, B) -> aeso_tc_name_manip:qid(A, B).
+qcon(A, B) -> aeso_tc_name_manip:qcon(A, B).
+
+%% -------
+
+type_error(A) -> aeso_tc_errors:type_error(A).
+
+%% -------
+
+warn_potential_shadowing(A, B, C) -> aeso_tc_warnings:warn_potential_shadowing(A, B, C).
+used_include(A) -> aeso_tc_warnings:used_include(A).
+
+%% -------
+
+get_option(A, B) -> aeso_tc_options:get_option(A, B).
+when_warning(A, B) -> aeso_tc_options:when_warning(A, B).
+
+%% -------
+
+fresh_uvar(A) -> aeso_tc_type_utils:fresh_uvar(A).
+
+%% -- Getters ------------------------------------------------------------
+
+contract_parents(#env{contract_parents = ContractParents}) ->
+    ContractParents.
+
+current_function(#env{current_function = CurrentFunction}) ->
+    CurrentFunction.
+
+in_guard(#env{in_guard = InGuard}) ->
+    InGuard.
+
+in_pattern(#env{in_pattern = InPattern}) ->
+    InPattern.
+
+namespace(#env{namespace = Namespace}) ->
+    Namespace.
+
+stateful(#env{stateful = Stateful}) ->
+    Stateful.
+
+typevars(#env{typevars = Typevars}) ->
+    Typevars.
+
+unify_throws(#env{unify_throws = UnifyThrows}) ->
+    UnifyThrows.
+
+used_namespaces(#env{used_namespaces = UsedNamespaces}) ->
+    UsedNamespaces.
+
+vars(#env{vars = Vars}) ->
+    Vars.
+
+what(#env{what = What}) ->
+    What.
+
+%% -- Field Info Getters -------------------------------------------------
+
+field_info_field_t(#field_info{field_t = FieldT}) ->
+    FieldT.
+
+field_info_record_t(#field_info{record_t = RecordT}) ->
+    RecordT.
+
+%% -- Scope Getters ------------------------------------------------------
+
+scope_ann(#scope{ann = Ann}) ->
+    Ann.
+
+scope_consts(#scope{consts = Consts}) ->
+    Consts.
+
+scope_funs(#scope{funs = Funs}) ->
+    Funs.
+
+scope_kind(#scope{kind = Kind}) ->
+    Kind.
+
+%% -- Setters ------------------------------------------------------------
+
+set_contract_parents(ContractParents, Env) ->
+    Env#env{contract_parents = ContractParents}.
+
+set_current_const(CurrentConst, Env) ->
+    Env#env{current_const = CurrentConst}.
+
+set_current_function(CurrentFunction, Env) ->
+    Env#env{current_function = CurrentFunction}.
+
+set_in_guard(InGuard, Env) ->
+    Env#env{in_guard = InGuard}.
+
+set_in_pattern(InPattern, Env) ->
+    Env#env{in_pattern = InPattern}.
+
+set_stateful(Stateful, Env) ->
+    Env#env{stateful = Stateful}.
+
+set_used_namespaces(UsedNamespaces, Env) ->
+    Env#env{used_namespaces = UsedNamespaces}.
+
+set_what(What, Env) ->
+    Env#env{what = What}.
+
+%% -- Environment manipulation -----------------------------------------------
+
+-spec switch_scope(qname(), env()) -> env().
+switch_scope(Scope, Env) ->
+    Env#env{namespace = Scope}.
+
+-spec push_scope(namespace | contract, aeso_syntax:con(), env()) -> env().
+push_scope(Kind, Con, Env) ->
+    Ann  = aeso_syntax:get_ann(Con),
+    Name = name(Con),
+    New  = Env#env.namespace ++ [Name],
+    Env#env{ namespace = New, scopes = (Env#env.scopes)#{ New => #scope{ kind = Kind, ann = Ann } } }.
+
+-spec pop_scope(env()) -> env().
+pop_scope(Env) ->
+    Env#env{ namespace = lists:droplast(Env#env.namespace) }.
+
+-spec get_scope(env(), qname()) -> false | scope().
+get_scope(#env{ scopes = Scopes }, Name) ->
+    maps:get(Name, Scopes, false).
+
+-spec get_current_scope(env()) -> scope().
+get_current_scope(#env{ namespace = NS, scopes = Scopes }) ->
+    maps:get(NS, Scopes).
+
+-spec on_current_scope(env(), fun((scope()) -> scope())) -> env().
+on_current_scope(Env = #env{ namespace = NS, scopes = Scopes }, Fun) ->
+    Scope = get_current_scope(Env),
+    Env#env{ scopes = Scopes#{ NS => Fun(Scope) } }.
+
+-spec on_scopes(env(), fun((scope()) -> scope())) -> env().
+on_scopes(Env = #env{ scopes = Scopes }, Fun) ->
+    Env#env{ scopes = maps:map(fun(_, Scope) -> Fun(Scope) end, Scopes) }.
+
+-spec bind_var(aeso_syntax:id(), utype(), env()) -> env().
+bind_var({id, Ann, X}, T, Env) ->
+    when_warning(warn_shadowing, fun() -> warn_potential_shadowing(Env, Ann, X) end),
+    Env#env{ vars = [{X, {Ann, T}} | Env#env.vars] }.
+
+-spec bind_vars([{aeso_syntax:id(), utype()}], env()) -> env().
+bind_vars([], Env) -> Env;
+bind_vars([{X, T} | Vars], Env) ->
+    bind_vars(Vars, bind_var(X, T, Env)).
+
+-spec bind_tvars([aeso_syntax:tvar()], env()) -> env().
+bind_tvars(Xs, Env) ->
+    Env#env{ typevars = [X || {tvar, _, X} <- Xs] }.
+
+-spec bind_fun(name(), type() | typesig(), env()) -> env().
+bind_fun(X, Type, Env) ->
+    case lookup_env(Env, term, [], [X]) of
+        false -> force_bind_fun(X, Type, Env);
+        {_QId, {Ann1, _}} ->
+            type_error({duplicate_definition, X, [Ann1, aeso_syntax:get_ann(Type)]}),
+            Env
+    end.
+
+-spec force_bind_fun(name(), type() | typesig(), env()) -> env().
+force_bind_fun(X, Type, Env = #env{ what = What }) ->
+    Ann    = aeso_syntax:get_ann(Type),
+    NoCode = get_option(no_code, false),
+    Entry = if X == "init", What == contract, not NoCode ->
+                    {reserved_init, Ann, Type};
+               What == contract; What == contract_interface -> {contract_fun, Ann, Type};
+               true -> {Ann, Type}
+            end,
+    on_current_scope(Env, fun(Scope = #scope{ funs = Funs }) ->
+                            Scope#scope{ funs = [{X, Entry} | Funs] }
+                          end).
+
+-spec bind_funs([{name(), type() | typesig()}], env()) -> env().
+bind_funs([], Env) -> Env;
+bind_funs([{Id, Type} | Rest], Env) ->
+    bind_funs(Rest, bind_fun(Id, Type, Env)).
+
+-spec bind_type(name(), aeso_syntax:ann(), typedef(), env()) -> env().
+bind_type(X, Ann, Def, Env) ->
+    on_current_scope(Env, fun(Scope = #scope{ types = Types }) ->
+                            Scope#scope{ types = [{X, {Ann, Def}} | Types] }
+                          end).
+
+-spec bind_const(name(), aeso_syntax:ann(), type(), env()) -> env().
+bind_const(X, Ann, Type, Env) ->
+    case lookup_env(Env, term, Ann, [X]) of
+        false ->
+            on_current_scope(Env, fun(Scope = #scope{ consts = Consts }) ->
+                                    Scope#scope{ consts = [{X, {Ann, Type}} | Consts] }
+                                end);
+        _ ->
+            type_error({duplicate_definition, X, [Ann, aeso_syntax:get_ann(Type)]}),
+            Env
+    end.
+
+%% Bind state primitives
+-spec bind_state(env()) -> env().
+bind_state(Env) ->
+    Ann   = [{origin, system}],
+    Unit  = {tuple_t, Ann, []},
+    State =
+        case lookup_type(Env, {id, Ann, "state"}) of
+            {S, _} -> {qid, Ann, S};
+            false  -> Unit
+        end,
+    Env1 = bind_funs([{"state", State},
+                      {"put", {type_sig, [stateful | Ann], none, [], [State], Unit}}], Env),
+
+    case lookup_type(Env, {id, Ann, "event"}) of
+        {E, _} ->
+            %% We bind Chain.event in a local 'Chain' namespace.
+            Event = {qid, Ann, E},
+            pop_scope(
+              bind_fun("event", {fun_t, Ann, [], [Event], Unit},
+              push_scope(namespace, {con, Ann, "Chain"}, Env1)));
+        false  -> Env1
+    end.
+
+%-spec bind_fields_append(env(), #{ name() => aeso_syntax:decl() }, type(), [aeso_syntax:field_t()]) -> env().
+bind_fields_append(Env, _TypeMap, _, []) -> Env;
+bind_fields_append(Env, TypeMap, RecTy, [{field_t, Ann, Id, Type} | Fields]) ->
+    Env1 = bind_field_append(name(Id), #field_info{ ann = Ann, kind = record, field_t = Type, record_t = RecTy }, Env),
+    bind_fields_append(Env1, TypeMap, RecTy, Fields).
+
+-spec bind_field_append(name(), field_info(), env()) -> env().
+bind_field_append(X, Info, Env = #env{ fields = Fields }) ->
+    Fields1 = maps:update_with(X, fun(Infos) -> [Info | Infos] end, [Info], Fields),
+    Env#env{ fields = Fields1 }.
+
+-spec bind_field_update(name(), field_info(), env()) -> env().
+bind_field_update(X, Info, Env = #env{ fields = Fields }) ->
+    Fields1 = maps:update_with(X, fun([_ | Infos]) -> [Info | Infos]; ([]) -> [Info] end, [Info], Fields),
+    Env#env{ fields = Fields1 }.
+
+-spec bind_fields([{name(), field_info()}], typed | untyped, env()) -> env().
+bind_fields([], _Typing, Env) -> Env;
+bind_fields([{Id, Info} | Rest], Typing, Env) ->
+    NewEnv = case Typing of
+                 untyped -> bind_field_append(Id, Info, Env);
+                 typed   -> bind_field_update(Id, Info, Env)
+             end,
+    bind_fields(Rest, Typing, NewEnv).
+
+%% Contract entrypoints take three named arguments
+%%  gas       : int  = Call.gas_left()
+%%  value     : int  = 0
+%%  protected : bool = false
+contract_call_type({fun_t, Ann, [], Args, Ret}) ->
+    Id    = fun(X) -> {id, Ann, X} end,
+    Int   = Id("int"),
+    Typed = fun(E, T) -> {typed, Ann, E, T} end,
+    Named = fun(Name, Default = {typed, _, _, T}) -> {named_arg_t, Ann, Id(Name), T, Default} end,
+    {fun_t, Ann, [Named("gas",   Typed({app, Ann, Typed({qid, Ann, ["Call", "gas_left"]},
+                                                        {fun_t, Ann, [], [], Int}),
+                                        []}, Int)),
+                  Named("value", Typed({int, Ann, 0}, Int)),
+                  Named("protected", Typed({bool, Ann, false}, Id("bool")))],
+     Args, {if_t, Ann, Id("protected"), {app_t, Ann, {id, Ann, "option"}, [Ret]}, Ret}}.
+
+-spec bind_contract(typed | untyped, aeso_syntax:decl(), env()) -> env().
+bind_contract(Typing, {Contract, Ann, Id, _Impls, Contents}, Env)
+  when ?IS_CONTRACT_HEAD(Contract) ->
+    Key         = name(Id),
+    Sys         = [{origin, system}],
+    TypeOrFresh = fun({typed, _, _, Type}) -> Type; (_) -> fresh_uvar(Sys) end,
+    Fields      =
+        [ {field_t, AnnF, Entrypoint, contract_call_type(Type)}
+          || {fun_decl, AnnF, Entrypoint, Type = {fun_t, _, _, _, _}} <- Contents ] ++
+        [ {field_t, AnnF, Entrypoint,
+           contract_call_type(
+             {fun_t, AnnF, [], [TypeOrFresh(Arg) || Arg <- Args], TypeOrFresh(Ret)})
+          }
+          || {letfun, AnnF, Entrypoint = {id, _, Name}, Args, _Type, [{guarded, _, [], Ret}]} <- Contents,
+             Name =/= "init"
+        ] ++
+        %% Predefined fields
+        [ {field_t, Sys, {id, Sys, "address"}, {id, Sys, "address"}} ] ++
+        [ {field_t, Sys, {id, Sys, ?CONSTRUCTOR_MOCK_NAME},
+           contract_call_type(
+             case [ [TypeOrFresh(Arg) || Arg <- Args]
+                    || {letfun, AnnF, {id, _, "init"}, Args, _, _} <- Contents,
+                       aeso_syntax:get_ann(entrypoint, AnnF, false)]
+                 ++ [ Args
+                      || {fun_decl, AnnF, {id, _, "init"}, {fun_t, _, _, Args, _}} <- Contents,
+                         aeso_syntax:get_ann(entrypoint, AnnF, false)]
+                 ++ [ Args
+                      || {fun_decl, AnnF, {id, _, "init"}, {type_sig, _, _, _, Args, _}} <- Contents,
+                         aeso_syntax:get_ann(entrypoint, AnnF, false)]
+             of
+                 [] -> {fun_t, [stateful,payable|Sys], [], [], {id, Sys, "void"}};
+                 [Args] -> {fun_t, [stateful,payable|Sys], [], Args, {id, Sys, "void"}}
+             end
+            )
+          }
+        ],
+    FieldInfo = [ {Entrypoint, #field_info{ ann      = FieldAnn,
+                                            kind     = contract,
+                                            field_t  = Type,
+                                            record_t = Id }}
+                || {field_t, _, {id, FieldAnn, Entrypoint}, Type} <- Fields ],
+    bind_type(Key, Ann, {[], {contract_t, Fields}},
+        bind_fields(FieldInfo, Typing, Env)).
+
+%% What scopes could a given name come from?
+-spec possible_scopes(env(), qname()) -> [qname()].
+possible_scopes(#env{ namespace = Current, used_namespaces = UsedNamespaces }, Name) ->
+    Qual = lists:droplast(Name),
+    NewQuals = case lists:filter(fun(X) -> element(2, X) == Qual end, UsedNamespaces) of
+                   [] ->
+                       [Qual];
+                   Namespaces ->
+                       lists:map(fun(X) -> element(1, X) end, Namespaces)
+               end,
+    Ret1 = [ lists:sublist(Current, I) ++ Q || I <- lists:seq(0, length(Current)), Q <- NewQuals ],
+    Ret2 = [ Namespace ++ Q || {Namespace, none, _} <- UsedNamespaces, Q <- NewQuals ],
+    lists:usort(Ret1 ++ Ret2).
+
+-spec visible_in_used_namespaces(used_namespaces(), qname()) -> boolean().
+visible_in_used_namespaces(UsedNamespaces, QName) ->
+    Qual = lists:droplast(QName),
+    Name = lists:last(QName),
+    case lists:filter(fun({Ns, _, _}) -> Qual == Ns end, UsedNamespaces) of
+        [] ->
+            true;
+        Namespaces ->
+            IsVisible = fun(Namespace) ->
+                            case Namespace of
+                                {_, _, {for, Names}} ->
+                                    lists:member(Name, Names);
+                                {_, _, {hiding, Names}} ->
+                                    not lists:member(Name, Names);
+                                _ ->
+                                    true
+                            end
+                        end,
+            lists:any(IsVisible, Namespaces)
+    end.
+
+-spec lookup_type(env(), type_id()) -> false | {qname(), type_info()}.
+lookup_type(Env, Id) ->
+    lookup_env(Env, type, aeso_syntax:get_ann(Id), qname(Id)).
+
+-spec lookup_env(env(), term, aeso_syntax:ann(), qname()) -> false | {qname(), fun_info()};
+                (env(), type, aeso_syntax:ann(), qname()) -> false | {qname(), type_info()}.
+lookup_env(Env, Kind, Ann, Name) ->
+    Var = case Name of
+            [X] when Kind == term -> proplists:get_value(X, Env#env.vars, false);
+            _                     -> false
+          end,
+    case Var of
+        {Ann1, Type} -> {Name, {Ann1, Type}};
+        false ->
+            Names = [ Qual ++ [lists:last(Name)] || Qual <- possible_scopes(Env, Name) ],
+            case [ Res || QName <- Names, Res <- [lookup_env1(Env, Kind, Ann, QName)], Res /= false] of
+                []    -> false;
+                [Res = {_, {AnnR, _}}] ->
+                    when_warning(warn_unused_includes,
+                                 fun() ->
+                                         %% If a file is used from a different file, we
+                                         %% can then mark it as used
+                                         F1 = proplists:get_value(file, Ann, no_file),
+                                         F2 = proplists:get_value(file, AnnR, no_file),
+                                         if
+                                             F1 /= F2 ->
+                                                 used_include(AnnR);
+                                             true ->
+                                                 ok
+                                         end
+                                 end),
+                    Res;
+                Many  ->
+                    type_error({ambiguous_name, qid(Ann, Name), [{qid, A, Q} || {Q, {A, _}} <- Many]}),
+                    false
+            end
+    end.
+
+-spec lookup_env1(env(), type | term, aeso_syntax:ann(), qname()) -> false | {qname(), fun_info() | type_info()}.
+lookup_env1(#env{ namespace = Current, used_namespaces = UsedNamespaces, scopes = Scopes }, Kind, Ann, QName) ->
+    Qual = lists:droplast(QName),
+    Name = lists:last(QName),
+    QNameIsEvent = lists:suffix(["Chain", "event"], QName),
+    AllowPrivate = lists:prefix(Qual, Current),
+    %% Get the scope
+    case maps:get(Qual, Scopes, false) of
+        false -> false; %% TODO: return reason for not in scope
+        #scope{ funs = Funs, types = Types, consts = Consts, kind = ScopeKind } ->
+            Defs = case Kind of
+                     type -> Types;
+                     term -> Funs
+                   end,
+            %% Look up the unqualified name
+            case proplists:get_value(Name, Defs, false) of
+                false ->
+                    case proplists:get_value(Name, Consts, false) of
+                        false ->
+                            false;
+                        Const when AllowPrivate; ScopeKind == namespace ->
+                            {QName, Const};
+                        Const ->
+                            type_error({contract_treated_as_namespace_constant, Ann, QName}),
+                            {QName, Const}
+                    end;
+                {reserved_init, Ann1, Type} ->
+                    type_error({cannot_call_init_function, Ann}),
+                    {QName, {Ann1, Type}};  %% Return the type to avoid an extra not-in-scope error
+                {contract_fun, Ann1, Type} when AllowPrivate orelse QNameIsEvent ->
+                    {QName, {Ann1, Type}};
+                {contract_fun, Ann1, Type} ->
+                    type_error({contract_treated_as_namespace_entrypoint, Ann, QName}),
+                    {QName, {Ann1, Type}};
+                {Ann1, _} = E ->
+                    %% Check that it's not private (or we can see private funs)
+                    case not is_private(Ann1) orelse AllowPrivate of
+                        true  ->
+                            case visible_in_used_namespaces(UsedNamespaces, QName) of
+                                true -> {QName, E};
+                                false -> false
+                            end;
+                        false -> false
+                    end
+            end
+    end.
+
+-spec lookup_record_field(env(), name()) -> [field_info()].
+lookup_record_field(Env, FieldName) ->
+    maps:get(FieldName, Env#env.fields, []).
+
+%% For 'create' or 'update' constraints we don't consider contract types.
+-spec lookup_record_field(env(), name(), create | project | update) -> [field_info()].
+lookup_record_field(Env, FieldName, Kind) ->
+    [ Fld || Fld = #field_info{ kind = K } <- lookup_record_field(Env, FieldName),
+             Kind == project orelse K /= contract ].
+
+lookup_record_field_arity(Env, FieldName, Arity, Kind) ->
+    Fields = lookup_record_field(Env, FieldName, Kind),
+    [ Fld || Fld = #field_info{ field_t = FldType } <- Fields,
+             aeso_tc_type_utils:fun_arity(aeso_tc_type_utils:dereference_deep(FldType)) == Arity ].
+
+is_private(Ann) -> proplists:get_value(private, Ann, false).
+
+option_t(As, T) -> {app_t, As, {id, As, "option"}, [T]}.
+
+init_env() -> init_env([]).
+
+init_env(_Options) -> global_env().
+
+-spec empty_env() -> env().
+empty_env() -> #env{}.
+
+%% Environment containing language primitives
+-spec global_env() -> env().
+global_env() ->
+    Ann     = [{origin, system}],
+    Int     = {id, Ann, "int"},
+    Char    = {id, Ann, "char"},
+    Bool    = {id, Ann, "bool"},
+    String  = {id, Ann, "string"},
+    Address = {id, Ann, "address"},
+    Hash    = {id, Ann, "hash"},
+    Bits    = {id, Ann, "bits"},
+    Bytes   = fun(Len) -> {bytes_t, Ann, Len} end,
+    Oracle  = fun(Q, R) -> {app_t, Ann, {id, Ann, "oracle"}, [Q, R]} end,
+    Query   = fun(Q, R) -> {app_t, Ann, {id, Ann, "oracle_query"}, [Q, R]} end,
+    Unit    = {tuple_t, Ann, []},
+    List    = fun(T) -> {app_t, Ann, {id, Ann, "list"}, [T]} end,
+    Option  = fun(T) -> {app_t, Ann, {id, Ann, "option"}, [T]} end,
+    Map     = fun(A, B) -> {app_t, Ann, {id, Ann, "map"}, [A, B]} end,
+    Pair    = fun(A, B) -> {tuple_t, Ann, [A, B]} end,
+    FunC    = fun(C, Ts, T) -> {type_sig, Ann, C, [], Ts, T} end,
+    FunC1   = fun(C, S, T) -> {type_sig, Ann, C, [], [S], T} end,
+    Fun     = fun(Ts, T) -> FunC(none, Ts, T) end,
+    Fun1    = fun(S, T) -> Fun([S], T) end,
+    FunCN   = fun(C, Named, Normal, Ret) -> {type_sig, Ann, C, Named, Normal, Ret} end,
+    FunN    = fun(Named, Normal, Ret) -> FunCN(none, Named, Normal, Ret) end,
+    %% Lambda    = fun(Ts, T) -> {fun_t, Ann, [], Ts, T} end,
+    %% Lambda1   = fun(S, T) -> Lambda([S], T) end,
+    StateFun  = fun(Ts, T) -> {type_sig, [stateful|Ann], none, [], Ts, T} end,
+    TVar      = fun(X) -> {tvar, Ann, "'" ++ X} end,
+    SignId    = {id, Ann, "signature"},
+    SignDef   = {bytes, Ann, <<0:64/unit:8>>},
+    Signature = {named_arg_t, Ann, SignId, SignId, {typed, Ann, SignDef, SignId}},
+    SignFun   = fun(Ts, T) -> {type_sig, [stateful|Ann], none, [Signature], Ts, T} end,
+    TTL       = {qid, Ann, ["Chain", "ttl"]},
+    Pointee   = {qid, Ann, ["AENS", "pointee"]},
+    AENSName  = {qid, Ann, ["AENS", "name"]},
+    Fr        = {qid, Ann, ["MCL_BLS12_381", "fr"]},
+    Fp        = {qid, Ann, ["MCL_BLS12_381", "fp"]},
+    Fp2       = {tuple_t, Ann, [Fp, Fp]},
+    G1        = {tuple_t, Ann, [Fp, Fp, Fp]},
+    G2        = {tuple_t, Ann, [Fp2, Fp2, Fp2]},
+    GT        = {tuple_t, Ann, lists:duplicate(12, Fp)},
+    Tx        = {qid, Ann, ["Chain", "tx"]},
+    GAMetaTx  = {qid, Ann, ["Chain", "ga_meta_tx"]},
+    BaseTx    = {qid, Ann, ["Chain", "base_tx"]},
+    PayForTx  = {qid, Ann, ["Chain", "paying_for_tx"]},
+
+    FldT      = fun(Id, T) -> {field_t, Ann, {id, Ann, Id}, T} end,
+    TxFlds    = [{"paying_for", Option(PayForTx)}, {"ga_metas", List(GAMetaTx)},
+                 {"actor", Address}, {"fee", Int}, {"ttl", Int}, {"tx", BaseTx}],
+    TxType    = {record_t, [FldT(N, T) || {N, T} <- TxFlds ]},
+    Stateful  = fun(T) -> setelement(2, T, [stateful|element(2, T)]) end,
+
+    Fee       = Int,
+    [A, Q, R, K, V] = lists:map(TVar, ["a", "q", "r", "k", "v"]),
+
+    MkDefs = fun(Defs) -> [{X, {Ann, if is_integer(T) -> {builtin, T}; true -> T end}} || {X, T} <- Defs] end,
+
+    TopScope = #scope
+        { funs  = MkDefs(
+                     %% Option constructors
+                    [{"None", Option(A)},
+                     {"Some", Fun1(A, Option(A))},
+                     %% TTL constructors
+                     {"RelativeTTL", Fun1(Int, TTL)},
+                     {"FixedTTL",    Fun1(Int, TTL)},
+                     %% Abort/exit
+                     {"abort", Fun1(String, A)},
+                     {"exit", Fun1(String, A)},
+                     {"require", Fun([Bool, String], Unit)}])
+        , types = MkDefs(
+                    [{"int", 0}, {"bool", 0}, {"char", 0}, {"string", 0}, {"address", 0},
+                     {"void", 0},
+                     {"unit", {[], {alias_t, Unit}}},
+                     {"hash", {[], {alias_t, Bytes(32)}}},
+                     {"signature", {[], {alias_t, Bytes(64)}}},
+                     {"bits", 0},
+                     {"option", 1}, {"list", 1}, {"map", 2},
+                     {"oracle", 2}, {"oracle_query", 2}
+                     ]) },
+
+    ChainScope = #scope
+        { funs = MkDefs(
+                     %% Spend transaction.
+                    [{"spend",        StateFun([Address, Int], Unit)},
+                     %% Chain environment
+                     {"balance",      Fun1(Address, Int)},
+                     {"block_hash",   Fun1(Int, Option(Hash))},
+                     {"coinbase",     Address},
+                     {"timestamp",    Int},
+                     {"block_height", Int},
+                     {"difficulty",   Int},
+                     {"gas_limit",    Int},
+                     {"bytecode_hash",FunC1(bytecode_hash, A, Option(Hash))},
+                     {"create",       Stateful(
+                                        FunN([ {named_arg_t, Ann, {id, Ann, "value"}, Int, {typed, Ann, {int, Ann, 0}, Int}}
+                                             ], var_args, A))},
+                     {"clone",        Stateful(
+                                        FunN([ {named_arg_t, Ann, {id, Ann, "gas"}, Int,
+                                                {typed, Ann,
+                                                 {app, Ann,
+                                                  {typed, Ann, {qid, Ann, ["Call","gas_left"]},
+                                                   aeso_tc_type_utils:typesig_to_fun_t(Fun([], Int))
+                                                  },
+                                                  []}, Int
+                                                }}
+                                             , {named_arg_t, Ann, {id, Ann, "value"}, Int, {typed, Ann, {int, Ann, 0}, Int}}
+                                             , {named_arg_t, Ann, {id, Ann, "protected"}, Bool, {typed, Ann, {bool, Ann, false}, Bool}}
+                                             , {named_arg_t, Ann, {id, Ann, "ref"}, A, undefined}
+                                             ], var_args, A))},
+                     %% Tx constructors
+                     {"GAMetaTx",     Fun([Address, Int], GAMetaTx)},
+                     {"PayingForTx",  Fun([Address, Int], PayForTx)},
+                     {"SpendTx",      Fun([Address, Int, String], BaseTx)},
+                     {"OracleRegisterTx",       BaseTx},
+                     {"OracleQueryTx",          BaseTx},
+                     {"OracleResponseTx",       BaseTx},
+                     {"OracleExtendTx",         BaseTx},
+                     {"NamePreclaimTx",         BaseTx},
+                     {"NameClaimTx",            Fun([String], BaseTx)},
+                     {"NameUpdateTx",           Fun([Hash], BaseTx)},
+                     {"NameRevokeTx",           Fun([Hash], BaseTx)},
+                     {"NameTransferTx",         Fun([Address, Hash], BaseTx)},
+                     {"ChannelCreateTx",        Fun([Address], BaseTx)},
+                     {"ChannelDepositTx",       Fun([Address, Int], BaseTx)},
+                     {"ChannelWithdrawTx",      Fun([Address, Int], BaseTx)},
+                     {"ChannelForceProgressTx", Fun([Address], BaseTx)},
+                     {"ChannelCloseMutualTx",   Fun([Address], BaseTx)},
+                     {"ChannelCloseSoloTx",     Fun([Address], BaseTx)},
+                     {"ChannelSlashTx",         Fun([Address], BaseTx)},
+                     {"ChannelSettleTx",        Fun([Address], BaseTx)},
+                     {"ChannelSnapshotSoloTx",  Fun([Address], BaseTx)},
+                     {"ContractCreateTx",       Fun([Int], BaseTx)},
+                     {"ContractCallTx",         Fun([Address, Int], BaseTx)},
+                     {"GAAttachTx",             BaseTx}
+                    ])
+        , types = MkDefs([{"ttl", 0}, {"tx", {[], TxType}},
+                          {"base_tx", 0},
+                          {"paying_for_tx", 0}, {"ga_meta_tx", 0}]) },
+
+    ContractScope = #scope
+        { funs = MkDefs(
+                    [{"address", Address},
+                     {"creator", Address},
+                     {"balance", Int}]) },
+
+    CallScope = #scope
+        { funs = MkDefs(
+                    [{"origin",    Address},
+                     {"caller",    Address},
+                     {"value",     Int},
+                     {"gas_price", Int},
+                     {"fee",       Int},
+                     {"gas_left",  Fun([], Int)}])
+        },
+
+    OracleScope = #scope
+        { funs = MkDefs(
+                    [{"register",     SignFun([Address, Fee, TTL], Oracle(Q, R))},
+                     {"expiry",       Fun([Oracle(Q, R)], Fee)},
+                     {"query_fee",    Fun([Oracle(Q, R)], Fee)},
+                     {"query",        StateFun([Oracle(Q, R), Q, Fee, TTL, TTL], Query(Q, R))},
+                     {"get_question", Fun([Oracle(Q, R), Query(Q, R)], Q)},
+                     {"respond",      SignFun([Oracle(Q, R), Query(Q, R), R], Unit)},
+                     {"extend",       SignFun([Oracle(Q, R), TTL], Unit)},
+                     {"get_answer",   Fun([Oracle(Q, R), Query(Q, R)], option_t(Ann, R))},
+                     {"check",        Fun([Oracle(Q, R)], Bool)},
+                     {"check_query",  Fun([Oracle(Q,R), Query(Q, R)], Bool)}]) },
+
+    AENSScope = #scope
+        { funs = MkDefs(
+                     [{"resolve",  Fun([String, String], option_t(Ann, A))},
+                      {"preclaim", SignFun([Address, Hash], Unit)},
+                      {"claim",    SignFun([Address, String, Int, Int], Unit)},
+                      {"transfer", SignFun([Address, Address, String], Unit)},
+                      {"revoke",   SignFun([Address, String], Unit)},
+                      {"update",   SignFun([Address, String, Option(TTL), Option(Int), Option(Map(String, Pointee))], Unit)},
+                      {"lookup",   Fun([String], option_t(Ann, AENSName))},
+                      %% AENS pointee constructors
+                      {"AccountPt",  Fun1(Address, Pointee)},
+                      {"OraclePt",   Fun1(Address, Pointee)},
+                      {"ContractPt", Fun1(Address, Pointee)},
+                      {"ChannelPt",  Fun1(Address, Pointee)},
+                      %% Name object constructor
+                      {"Name",   Fun([Address, TTL, Map(String, Pointee)], AENSName)}
+                     ])
+        , types = MkDefs([{"pointee", 0}, {"name", 0}]) },
+
+    MapScope = #scope
+        { funs = MkDefs(
+                     [{"from_list",      Fun1(List(Pair(K, V)), Map(K, V))},
+                      {"to_list",        Fun1(Map(K, V), List(Pair(K, V)))},
+                      {"lookup",         Fun([K, Map(K, V)], Option(V))},
+                      {"lookup_default", Fun([K, Map(K, V), V], V)},
+                      {"delete",         Fun([K, Map(K, V)], Map(K, V))},
+                      {"member",         Fun([K, Map(K, V)], Bool)},
+                      {"size",           Fun1(Map(K, V), Int)}]) },
+
+    %% Crypto/Curve operations
+    CryptoScope = #scope
+        { funs = MkDefs(
+                     [{"verify_sig",           Fun([Hash, Address, SignId], Bool)},
+                      {"verify_sig_secp256k1", Fun([Hash, Bytes(64), SignId], Bool)},
+                      {"ecverify_secp256k1",   Fun([Hash, Bytes(20), Bytes(65)], Bool)},
+                      {"ecrecover_secp256k1",  Fun([Hash, Bytes(65)], Option(Bytes(20)))},
+                      {"sha3",     Fun1(A, Hash)},
+                      {"sha256",   Fun1(A, Hash)},
+                      {"blake2b",  Fun1(A, Hash)}]) },
+
+    %% Fancy BLS12-381 crypto operations
+    MCL_BLS12_381_Scope = #scope
+        { funs = MkDefs(
+                     [{"g1_neg",     Fun1(G1, G1)},
+                      {"g1_norm",    Fun1(G1, G1)},
+                      {"g1_valid",   Fun1(G1, Bool)},
+                      {"g1_is_zero", Fun1(G1, Bool)},
+                      {"g1_add",     Fun ([G1, G1], G1)},
+                      {"g1_mul",     Fun ([Fr, G1], G1)},
+
+                      {"g2_neg",     Fun1(G2, G2)},
+                      {"g2_norm",    Fun1(G2, G2)},
+                      {"g2_valid",   Fun1(G2, Bool)},
+                      {"g2_is_zero", Fun1(G2, Bool)},
+                      {"g2_add",     Fun ([G2, G2], G2)},
+                      {"g2_mul",     Fun ([Fr, G2], G2)},
+
+                      {"gt_inv",      Fun1(GT, GT)},
+                      {"gt_add",      Fun ([GT, GT], GT)},
+                      {"gt_mul",      Fun ([GT, GT], GT)},
+                      {"gt_pow",      Fun ([GT, Fr], GT)},
+                      {"gt_is_one",   Fun1(GT, Bool)},
+                      {"pairing",     Fun ([G1, G2], GT)},
+                      {"miller_loop", Fun ([G1, G2], GT)},
+                      {"final_exp",   Fun1(GT, GT)},
+
+                      {"int_to_fr", Fun1(Int, Fr)},
+                      {"int_to_fp", Fun1(Int, Fp)},
+                      {"fr_to_int", Fun1(Fr, Int)},
+                      {"fp_to_int", Fun1(Fp, Int)}
+                     ]),
+          types = MkDefs(
+                     [{"fr",  0}, {"fp",  0}]) },
+
+    %% Authentication
+    AuthScope = #scope
+        { funs = MkDefs(
+                     [{"tx_hash", Option(Hash)},
+                      {"tx",      Option(Tx)}  ]) },
+
+    %% Strings
+    StringScope = #scope
+        { funs = MkDefs(
+                     [{"length",    Fun1(String, Int)},
+                      {"concat",    Fun([String, String], String)},
+                      {"to_list",   Fun1(String, List(Char))},
+                      {"from_list", Fun1(List(Char), String)},
+                      {"to_upper",  Fun1(String, String)},
+                      {"to_lower",  Fun1(String, String)},
+                      {"sha3",      Fun1(String, Hash)},
+                      {"sha256",    Fun1(String, Hash)},
+                      {"blake2b",   Fun1(String, Hash)}
+                     ]) },
+
+    %% Chars
+    CharScope = #scope
+        { funs = MkDefs(
+                     [{"to_int",   Fun1(Char, Int)},
+                      {"from_int", Fun1(Int, Option(Char))}]) },
+
+    %% Bits
+    BitsScope = #scope
+        { funs = MkDefs(
+                     [{"set",          Fun([Bits, Int], Bits)},
+                      {"clear",        Fun([Bits, Int], Bits)},
+                      {"test",         Fun([Bits, Int], Bool)},
+                      {"sum",          Fun1(Bits, Int)},
+                      {"intersection", Fun([Bits, Bits], Bits)},
+                      {"union",        Fun([Bits, Bits], Bits)},
+                      {"difference",   Fun([Bits, Bits], Bits)},
+                      {"none",         Bits},
+                      {"all",          Bits}]) },
+
+    %% Bytes
+    BytesScope = #scope
+        { funs = MkDefs(
+                   [{"to_int", Fun1(Bytes(any), Int)},
+                    {"to_str", Fun1(Bytes(any), String)},
+                    {"concat", FunC(bytes_concat, [Bytes(any), Bytes(any)], Bytes(any))},
+                    {"split",  FunC(bytes_split, [Bytes(any)], Pair(Bytes(any), Bytes(any)))}
+                   ]) },
+
+    %% Conversion
+    IntScope     = #scope{ funs = MkDefs([{"to_str", Fun1(Int,     String)}]) },
+    AddressScope = #scope{ funs = MkDefs([{"to_str", Fun1(Address, String)},
+                                          {"to_contract", FunC(address_to_contract, [Address], A)},
+                                          {"is_oracle", Fun1(Address, Bool)},
+                                          {"is_contract", Fun1(Address, Bool)},
+                                          {"is_payable", Fun1(Address, Bool)}]) },
+
+
+    #env{ scopes =
+            #{ []           => TopScope
+             , ["Chain"]    => ChainScope
+             , ["Contract"] => ContractScope
+             , ["Call"]     => CallScope
+             , ["Oracle"]   => OracleScope
+             , ["AENS"]     => AENSScope
+             , ["Map"]      => MapScope
+             , ["Auth"]     => AuthScope
+             , ["Crypto"]   => CryptoScope
+             , ["MCL_BLS12_381"] => MCL_BLS12_381_Scope
+             , ["StringInternal"] => StringScope
+             , ["Char"]     => CharScope
+             , ["Bits"]     => BitsScope
+             , ["Bytes"]    => BytesScope
+             , ["Int"]      => IntScope
+             , ["Address"]  => AddressScope
+             }
+          , fields =
+             maps:from_list([{N, [#field_info{ ann = [], field_t = T, record_t = Tx, kind = record }]}
+                             || {N, T} <- TxFlds ])
+        }.
+
+destroy_and_report_type_errors(Env) ->
+    Errors0 = lists:reverse(aeso_tc_ets_manager:ets_tab2list(type_errors)),
+    %% io:format("Type errors now: ~p\n", [Errors0]),
+    aeso_tc_errors:destroy_type_errors(),
+    Errors  = [ aeso_tc_errors:mk_error(unqualify(Env, Err)) || Err <- Errors0 ],
+    aeso_errors:throw(Errors).  %% No-op if Errors == []
+
+%% Strip current namespace from error message for nicer printing.
+unqualify(Env, {qid, Ann, Xs}) ->
+    qid(Ann, unqualify1(aeso_tc_env:namespace(Env), Xs));
+unqualify(Env, {qcon, Ann, Xs}) ->
+    qcon(Ann, unqualify1(aeso_tc_env:namespace(Env), Xs));
+unqualify(Env, T) when is_tuple(T) ->
+    list_to_tuple(unqualify(Env, tuple_to_list(T)));
+unqualify(Env, [H | T]) -> [unqualify(Env, H) | unqualify(Env, T)];
+unqualify(_Env, X) -> X.
+
+unqualify1(NS, Xs) ->
+    try lists:split(length(NS), Xs) of
+        {NS, Ys} -> Ys;
+        _        -> Xs
+    catch _:_ -> Xs
+    end.

src/aeso_tc_errors.erl

@@ -0,0 +1,499 @@
+-module(aeso_tc_errors).
+
+-include("aeso_utils.hrl").
+
+-export([cannot_unify/4
+        , type_error/1
+        , create_type_errors/0
+        , destroy_type_errors/0
+        , mk_error/1
+        ]).
+
+%% -- Moved functions --------------------------------------------------------
+
+name(A) -> aeso_tc_name_manip:name(A).
+
+%% -------
+
+pos(A) -> aeso_tc_ann_manip:pos(A).
+pos(A, B) -> aeso_tc_ann_manip:pos(A, B).
+
+%% -------
+
+pp(A) -> aeso_tc_pp:pp(A).
+pp_type(A) -> aeso_tc_pp:pp_type(A).
+pp_type(A, B) -> aeso_tc_pp:pp_type(A, B).
+pp_typed(A, B, C) -> aeso_tc_pp:pp_typed(A, B, C).
+pp_expr(A) -> aeso_tc_pp:pp_expr(A).
+pp_why_record(A) -> aeso_tc_pp:pp_why_record(A).
+pp_when(A) -> aeso_tc_pp:pp_when(A).
+pp_loc(A) -> aeso_tc_pp:pp_loc(A).
+
+%% ---------------------------------------------------------------------------
+
+%% Save unification failures for error messages.
+cannot_unify(A, B, Cxt, When) ->
+    type_error({cannot_unify, A, B, Cxt, When}).
+
+type_error(Err) ->
+    aeso_tc_ets_manager:ets_insert(type_errors, Err).
+
+create_type_errors() ->
+    aeso_tc_ets_manager:ets_new(type_errors, [bag]).
+
+destroy_type_errors() ->
+    aeso_tc_ets_manager:ets_delete(type_errors).
+
+mk_t_err(Pos, Msg) ->
+    aeso_errors:new(type_error, Pos, lists:flatten(Msg)).
+mk_t_err(Pos, Msg, Ctxt) ->
+    aeso_errors:new(type_error, Pos, lists:flatten(Msg), lists:flatten(Ctxt)).
+
+mk_error({no_decls, File}) ->
+    Pos = aeso_errors:pos(File, 0, 0),
+    mk_t_err(Pos, "Empty contract");
+mk_error({mismatched_decl_in_funblock, Name, Decl}) ->
+    Msg = io_lib:format("Mismatch in the function block. Expected implementation/type declaration of ~s function", [Name]),
+    mk_t_err(pos(Decl), Msg);
+mk_error({higher_kinded_typevar, T}) ->
+    Msg = io_lib:format("Type `~s` is a higher kinded type variable "
+                        "(takes another type as an argument)", [pp(aeso_tc_type_utils:instantiate(T))]
+                       ),
+    mk_t_err(pos(T), Msg);
+mk_error({wrong_type_arguments, X, ArityGiven, ArityReal}) ->
+    Msg = io_lib:format("Arity for ~s doesn't match. Expected ~p, got ~p"
+                       , [pp(aeso_tc_type_utils:instantiate(X)), ArityReal, ArityGiven]
+                       ),
+    mk_t_err(pos(X), Msg);
+mk_error({unnamed_map_update_with_default, Upd}) ->
+    Msg = "Invalid map update with default",
+    mk_t_err(pos(Upd), Msg);
+mk_error({fundecl_must_have_funtype, _Ann, Id, Type}) ->
+    Msg = io_lib:format("`~s` was declared with an invalid type `~s`. "
+                       "Entrypoints and functions must have functional types"
+                       , [pp(Id), pp(aeso_tc_type_utils:instantiate(Type))]),
+    mk_t_err(pos(Id), Msg);
+mk_error({cannot_unify, A, B, Cxt, When}) ->
+    VarianceContext = case Cxt of
+                          none -> "";
+                          _    -> io_lib:format(" in a ~p context", [Cxt])
+                      end,
+    Msg = io_lib:format("Cannot unify `~s` and `~s`" ++ VarianceContext,
+                        [pp(aeso_tc_type_utils:instantiate(A)), pp(aeso_tc_type_utils:instantiate(B))]),
+    {Pos, Ctxt} = pp_when(When),
+    mk_t_err(Pos, Msg, Ctxt);
+mk_error({hole_found, Ann, Type}) ->
+    Msg = io_lib:format("Found a hole of type `~s`", [pp(aeso_tc_type_utils:instantiate(Type))]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({unbound_variable, Id}) ->
+    Msg = io_lib:format("Unbound variable `~s`", [pp(Id)]),
+    case Id of
+        {qid, _, ["Chain", "event"]} ->
+            Cxt = "Did you forget to define the event type?",
+            mk_t_err(pos(Id), Msg, Cxt);
+        _ -> mk_t_err(pos(Id), Msg)
+    end;
+mk_error({undefined_field, Id}) ->
+    Msg = io_lib:format("Unbound field ~s", [pp(Id)]),
+    mk_t_err(pos(Id), Msg);
+mk_error({not_a_record_type, Type, Why}) ->
+    Msg = io_lib:format("Not a record type: `~s`", [pp_type(Type)]),
+    {Pos, Ctxt} = pp_why_record(Why),
+    mk_t_err(Pos, Msg, Ctxt);
+mk_error({not_a_contract_type, Type, Cxt}) ->
+    Msg =
+        case Type of
+            {tvar, _, _} ->
+                "Unresolved contract type";
+            _ ->
+                io_lib:format("The type `~s` is not a contract type", [pp_type(Type)])
+        end,
+    {Pos, Cxt1} =
+        case Cxt of
+            {var_args, Ann, Fun} ->
+                {pos(Ann),
+                 io_lib:format("when calling variadic function `~s`", [pp_expr(Fun)])};
+            {contract_literal, Lit} ->
+                {pos(Lit),
+                 io_lib:format("when checking that the contract literal `~s` has the type `~s`",
+                               [pp_expr(Lit), pp_type(Type)])};
+            {address_to_contract, Ann} ->
+                {pos(Ann),
+                 io_lib:format("when checking that the call to `Address.to_contract` has the type `~s`",
+                               [pp_type(Type)])}
+        end,
+    mk_t_err(Pos, Msg, Cxt1);
+mk_error({non_linear_pattern, Pattern, Nonlinear}) ->
+    Msg = io_lib:format("Repeated name~s ~s in the pattern `~s`",
+                        [plural("", "s", Nonlinear),
+                         string:join(lists:map(fun(F) -> "`" ++ F ++ "`" end, Nonlinear), ", "),
+                         pp_expr(Pattern)]),
+    mk_t_err(pos(Pattern), Msg);
+mk_error({ambiguous_record, Fields = [{_, First} | _], Candidates}) ->
+    Msg = io_lib:format("Ambiguous record type with field~s ~s could be one of~s",
+                        [plural("", "s", Fields),
+                         string:join([ "`" ++ pp(F) ++ "`" || {_, F} <- Fields ], ", "),
+                         [ ["\n  - ", "`" ++ pp(C) ++ "`", " (at ", pp_loc(C), ")"] || C <- Candidates ]]),
+    mk_t_err(pos(First), Msg);
+mk_error({missing_field, Field, Rec}) ->
+    Msg = io_lib:format("Record type `~s` does not have field `~s`",
+                        [pp(Rec), pp(Field)]),
+    mk_t_err(pos(Field), Msg);
+mk_error({missing_fields, Ann, RecType, Fields}) ->
+    Msg = io_lib:format("The field~s ~s ~s missing when constructing an element of type `~s`",
+                        [plural("", "s", Fields),
+                         string:join(lists:map(fun(F) -> "`" ++ F ++ "`" end, Fields), ", "),
+                         plural("is", "are", Fields), pp(RecType)]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({no_records_with_all_fields, Fields = [{_, First} | _]}) ->
+    Msg = io_lib:format("No record type with field~s ~s",
+                        [plural("", "s", Fields),
+                         string:join([ "`" ++ pp(F) ++ "`" || {_, F} <- Fields ], ", ")]),
+    mk_t_err(pos(First), Msg);
+mk_error({recursive_types_not_implemented, Types}) ->
+    S = plural(" is", "s are mutually", Types),
+    Msg = io_lib:format("The following type~s recursive, which is not yet supported:~s",
+                        [S, [io_lib:format("\n  - `~s` (at ~s)", [pp(T), pp_loc(T)]) || T <- Types]]),
+    mk_t_err(pos(hd(Types)), Msg);
+mk_error({event_must_be_variant_type, Where}) ->
+    Msg = io_lib:format("The event type must be a variant type", []),
+    mk_t_err(pos(Where), Msg);
+mk_error({indexed_type_must_be_word, Type, Type}) ->
+    Msg = io_lib:format("The indexed type `~s` is not a word type",
+                        [pp_type(Type)]),
+    mk_t_err(pos(Type), Msg);
+mk_error({indexed_type_must_be_word, Type, Type1}) ->
+    Msg = io_lib:format("The indexed type `~s` equals `~s` which is not a word type",
+                        [pp_type(Type), pp_type(Type1)]),
+    mk_t_err(pos(Type), Msg);
+mk_error({event_0_to_3_indexed_values, Constr}) ->
+    Msg = io_lib:format("The event constructor `~s` has too many indexed values (max 3)",
+                        [name(Constr)]),
+    mk_t_err(pos(Constr), Msg);
+mk_error({event_0_to_1_string_values, Constr}) ->
+    Msg = io_lib:format("The event constructor `~s` has too many non-indexed values (max 1)",
+                        [name(Constr)]),
+    mk_t_err(pos(Constr), Msg);
+mk_error({repeated_constructor, Cs}) ->
+    Msg = io_lib:format("Variant types must have distinct constructor names~s",
+                        [[ io_lib:format("\n`~s`  (at ~s)", [pp_typed("  - ", C, T), pp_loc(C)]) || {C, T} <- Cs ]]),
+    mk_t_err(pos(element(1, hd(Cs))), Msg);
+mk_error({bad_named_argument, [], Name}) ->
+    Msg = io_lib:format("Named argument ~s supplied to function expecting no named arguments.",
+                        [pp(Name)]),
+    mk_t_err(pos(Name), Msg);
+mk_error({bad_named_argument, Args, Name}) ->
+    Msg = io_lib:format("Named argument `~s` is not one of the expected named arguments~s",
+                        [pp(Name),
+                        [ io_lib:format("\n  - `~s`", [pp_typed("", Arg, Type)])
+                          || {named_arg_t, _, Arg, Type, _} <- Args ]]),
+    mk_t_err(pos(Name), Msg);
+mk_error({unsolved_named_argument_constraint, Name, Type}) ->
+    Msg = io_lib:format("Named argument ~s supplied to function with unknown named arguments.",
+                        [pp_typed("", Name, Type)]),
+    mk_t_err(pos(Name), Msg);
+mk_error({reserved_entrypoint, Name, Def}) ->
+    Msg = io_lib:format("The name '~s' is reserved and cannot be used for a "
+                        "top-level contract function.", [Name]),
+    mk_t_err(pos(Def), Msg);
+mk_error({duplicate_definition, Name, Locs}) ->
+    Msg = io_lib:format("Duplicate definitions of `~s` at~s",
+                        [Name, [ ["\n  - ", pp_loc(L)] || L <- Locs ]]),
+    mk_t_err(pos(lists:last(Locs)), Msg);
+mk_error({duplicate_scope, Kind, Name, OtherKind, L}) ->
+    Msg = io_lib:format("The ~p `~s` has the same name as a ~p at ~s",
+                        [Kind, pp(Name), OtherKind, pp_loc(L)]),
+    mk_t_err(pos(Name), Msg);
+mk_error({include, _, {string, Pos, Name}}) ->
+    Msg = io_lib:format("Include of `~s` is not allowed, include only allowed at top level.",
+                        [binary_to_list(Name)]),
+    mk_t_err(pos(Pos), Msg);
+mk_error({namespace, _Pos, {con, Pos, Name}, _Def}) ->
+    Msg = io_lib:format("Nested namespaces are not allowed. Namespace `~s` is not defined at top level.",
+                        [Name]),
+    mk_t_err(pos(Pos), Msg);
+mk_error({Contract, _Pos, {con, Pos, Name}, _Impls, _Def}) when ?IS_CONTRACT_HEAD(Contract) ->
+    Msg = io_lib:format("Nested contracts are not allowed. Contract `~s` is not defined at top level.",
+                        [Name]),
+    mk_t_err(pos(Pos), Msg);
+mk_error({type_decl, _, {id, Pos, Name}, _}) ->
+    Msg = io_lib:format("Empty type declarations are not supported. Type `~s` lacks a definition",
+                        [Name]),
+    mk_t_err(pos(Pos), Msg);
+mk_error({stateful_not_allowed, Id, Fun}) ->
+    Msg = io_lib:format("Cannot reference stateful function `~s` in the definition of non-stateful function `~s`.",
+                        [pp(Id), pp(Fun)]),
+    mk_t_err(pos(Id), Msg);
+mk_error({stateful_not_allowed_in_guards, Id}) ->
+    Msg = io_lib:format("Cannot reference stateful function `~s` in a pattern guard.",
+                        [pp(Id)]),
+    mk_t_err(pos(Id), Msg);
+mk_error({value_arg_not_allowed, Value, Fun}) ->
+    Msg = io_lib:format("Cannot pass non-zero value argument `~s` in the definition of non-stateful function `~s`.",
+                        [pp_expr(Value), pp(Fun)]),
+    mk_t_err(pos(Value), Msg);
+mk_error({init_depends_on_state, Which, [_Init | Chain]}) ->
+    WhichCalls = fun("put") -> ""; ("state") -> ""; (_) -> ", which calls" end,
+    Msg = io_lib:format("The `init` function should return the initial state as its result and cannot ~s the state, but it calls~s",
+                        [if Which == put -> "write"; true -> "read" end,
+                         [ io_lib:format("\n  - `~s` (at ~s)~s", [Fun, pp_loc(Ann), WhichCalls(Fun)])
+                           || {[_, Fun], Ann} <- Chain]]),
+    mk_t_err(pos(element(2, hd(Chain))), Msg);
+mk_error({missing_body_for_let, Ann}) ->
+    Msg = io_lib:format("Let binding must be followed by an expression.", []),
+    mk_t_err(pos(Ann), Msg);
+mk_error({public_modifier_in_contract, Decl}) ->
+    Decl1 = mk_entrypoint(Decl),
+    Msg = io_lib:format("Use `entrypoint` instead of `function` for public function `~s`: `~s`",
+                        [pp_expr(element(3, Decl)),
+                         prettypr:format(aeso_pretty:decl(Decl1))]),
+    mk_t_err(pos(Decl), Msg);
+mk_error({init_must_be_an_entrypoint, Decl}) ->
+    Decl1 = mk_entrypoint(Decl),
+    Msg = io_lib:format("The init function must be an entrypoint: ~s",
+                        [prettypr:format(prettypr:nest(2, aeso_pretty:decl(Decl1)))]),
+    mk_t_err(pos(Decl), Msg);
+mk_error({init_must_not_be_payable, Decl}) ->
+    Msg = io_lib:format("The init function cannot be payable. "
+                        "You don't need the 'payable' annotation to be able to attach "
+                        "funds to the create contract transaction.",
+                        []),
+    mk_t_err(pos(Decl), Msg);
+mk_error({proto_must_be_entrypoint, Decl}) ->
+    Decl1 = mk_entrypoint(Decl),
+    Msg = io_lib:format("Use `entrypoint` for declaration of `~s`: `~s`",
+                        [pp_expr(element(3, Decl)),
+                         prettypr:format(aeso_pretty:decl(Decl1))]),
+    mk_t_err(pos(Decl), Msg);
+mk_error({proto_in_namespace, Decl}) ->
+    Msg = io_lib:format("Namespaces cannot contain function prototypes.", []),
+    mk_t_err(pos(Decl), Msg);
+mk_error({entrypoint_in_namespace, Decl}) ->
+    Msg = io_lib:format("Namespaces cannot contain entrypoints. Use `function` instead.", []),
+    mk_t_err(pos(Decl), Msg);
+mk_error({private_entrypoint, Decl}) ->
+    Msg = io_lib:format("The entrypoint `~s` cannot be private. Use `function` instead.",
+                        [pp_expr(element(3, Decl))]),
+    mk_t_err(pos(Decl), Msg);
+mk_error({private_and_public, Decl}) ->
+    Msg = io_lib:format("The function `~s` cannot be both public and private.",
+                        [pp_expr(element(3, Decl))]),
+    mk_t_err(pos(Decl), Msg);
+mk_error({contract_has_no_entrypoints, Con}) ->
+    Msg = io_lib:format("The contract `~s` has no entrypoints. Since Sophia version 3.2, public "
+                        "contract functions must be declared with the `entrypoint` keyword instead of "
+                        "`function`.", [pp_expr(Con)]),
+    mk_t_err(pos(Con), Msg);
+mk_error({definition_in_contract_interface, Ann, {id, _, Id}}) ->
+    Msg = "Contract interfaces cannot contain defined functions or entrypoints.",
+    Cxt = io_lib:format("Fix: replace the definition of `~s` by a type signature.", [Id]),
+    mk_t_err(pos(Ann), Msg, Cxt);
+mk_error({unbound_type, Type}) ->
+    Msg = io_lib:format("Unbound type ~s.", [pp_type(Type)]),
+    mk_t_err(pos(Type), Msg);
+mk_error({new_tuple_syntax, Ann, Ts}) ->
+    Msg = io_lib:format("Invalid type `~s`. The syntax of tuple types changed in Sophia version 4.0. Did you mean `~s`",
+                        [pp_type({args_t, Ann, Ts}), pp_type({tuple_t, Ann, Ts})]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({map_in_map_key, Ann, KeyType}) ->
+    Msg = io_lib:format("Invalid key type `~s`", [pp_type(KeyType)]),
+    Cxt = "Map keys cannot contain other maps.",
+    mk_t_err(pos(Ann), Msg, Cxt);
+mk_error({cannot_call_init_function, Ann}) ->
+    Msg = "The 'init' function is called exclusively by the create contract transaction "
+          "and cannot be called from the contract code.",
+    mk_t_err(pos(Ann), Msg);
+mk_error({contract_treated_as_namespace_entrypoint, Ann, [Con, Fun] = QName}) ->
+    Msg = io_lib:format("Invalid call to contract entrypoint `~s`.", [string:join(QName, ".")]),
+    Cxt = io_lib:format("It must be called as `c.~s` for some `c : ~s`.", [Fun, Con]),
+    mk_t_err(pos(Ann), Msg, Cxt);
+mk_error({contract_treated_as_namespace_constant, Ann, QName}) ->
+    Msg = io_lib:format("Invalid use of the contract constant `~s`.", [string:join(QName, ".")]),
+    Cxt = "Toplevel contract constants can only be used in the contracts where they are defined.",
+    mk_t_err(pos(Ann), Msg, Cxt);
+mk_error({bad_top_level_decl, Decl}) ->
+    What = case element(1, Decl) of
+               letval -> "function or entrypoint";
+               _      -> "contract or namespace"
+           end,
+    Id = element(3, Decl),
+    Msg = io_lib:format("The definition of '~s' must appear inside a ~s.",
+                        [pp_expr(Id), What]),
+    mk_t_err(pos(Decl), Msg);
+mk_error({unknown_byte_length, Type}) ->
+    Msg = io_lib:format("Cannot resolve length of byte array.", []),
+    mk_t_err(pos(Type), Msg);
+mk_error({unsolved_bytes_constraint, Ann, concat, A, B, C}) ->
+    Msg = io_lib:format("Failed to resolve byte array lengths in call to Bytes.concat with arguments of type\n"
+                        "~s  (at ~s)\n~s  (at ~s)\nand result type\n~s  (at ~s)",
+                        [pp_type("  - ", A), pp_loc(A), pp_type("  - ", B),
+                         pp_loc(B), pp_type("  - ", C), pp_loc(C)]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({unsolved_bytes_constraint, Ann, split, A, B, C}) ->
+    Msg = io_lib:format("Failed to resolve byte array lengths in call to Bytes.split with argument of type\n"
+                        "~s  (at ~s)\nand result types\n~s  (at ~s)\n~s  (at ~s)",
+                        [ pp_type("  - ", C), pp_loc(C), pp_type("  - ", A), pp_loc(A),
+                          pp_type("  - ", B), pp_loc(B)]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({failed_to_get_compiler_version, Err}) ->
+    Msg = io_lib:format("Failed to get compiler version. Error: ~p", [Err]),
+    mk_t_err(pos(0, 0), Msg);
+mk_error({compiler_version_mismatch, Ann, Version, Op, Bound}) ->
+    PrintV = fun(V) -> string:join([integer_to_list(N) || N <- V], ".") end,
+    Msg = io_lib:format("Cannot compile with this version of the compiler, "
+                        "because it does not satisfy the constraint"
+                        " ~s ~s ~s", [PrintV(Version), Op, PrintV(Bound)]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({empty_record_or_map_update, Expr}) ->
+    Msg = io_lib:format("Empty record/map update `~s`", [pp_expr(Expr)]),
+    mk_t_err(pos(Expr), Msg);
+mk_error({mixed_record_and_map, Expr}) ->
+    Msg = io_lib:format("Mixed record fields and map keys in `~s`", [pp_expr(Expr)]),
+    mk_t_err(pos(Expr), Msg);
+mk_error({named_argument_must_be_literal_bool, Name, Arg}) ->
+    Msg = io_lib:format("Invalid `~s` argument `~s`. "
+                        "It must be either `true` or `false`.",
+                        [Name, pp_expr(aeso_tc_type_utils:instantiate(Arg))]),
+    mk_t_err(pos(Arg), Msg);
+mk_error({conflicting_updates_for_field, Upd, Key}) ->
+    Msg = io_lib:format("Conflicting updates for field '~s'", [Key]),
+    mk_t_err(pos(Upd), Msg);
+mk_error({ambiguous_main_contract, Ann}) ->
+    Msg = "Could not deduce the main contract. You can point it out manually with the `main` keyword.",
+    mk_t_err(pos(Ann), Msg);
+mk_error({main_contract_undefined, Ann}) ->
+    Msg = "No contract defined.",
+    mk_t_err(pos(Ann), Msg);
+mk_error({multiple_main_contracts, Ann}) ->
+    Msg = "Only one main contract can be defined.",
+    mk_t_err(pos(Ann), Msg);
+mk_error({unify_varargs, When}) ->
+    Msg = "Cannot infer types for variable argument list.",
+    {Pos, Ctxt} = pp_when(When),
+    mk_t_err(Pos, Msg, Ctxt);
+mk_error({clone_no_contract, Ann}) ->
+    Msg = "Chain.clone requires `ref` named argument of contract type.",
+    mk_t_err(pos(Ann), Msg);
+mk_error({contract_lacks_definition, Type, When}) ->
+    Msg = io_lib:format(
+            "~s is not implemented.",
+            [pp_type(Type)]
+           ),
+    {Pos, Ctxt} = pp_when(When),
+    mk_t_err(Pos, Msg, Ctxt);
+mk_error({ambiguous_name, Name, QIds}) ->
+    Msg = io_lib:format("Ambiguous name `~s` could be one of~s",
+                        [pp(Name),
+                         [io_lib:format("\n  - `~s` (at ~s)", [pp(QId), pp_loc(QId)]) || QId <- QIds]]),
+    mk_t_err(pos(Name), Msg);
+mk_error({using_undefined_namespace, Ann, Namespace}) ->
+    Msg = io_lib:format("Cannot use undefined namespace ~s", [Namespace]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({using_undefined_namespace_parts, Ann, Namespace, Parts}) ->
+    PartsStr = lists:concat(lists:join(", ", Parts)),
+    Msg = io_lib:format("The namespace ~s does not define the following names: ~s", [Namespace, PartsStr]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({empty_record_definition, Ann, Name}) ->
+    Msg = io_lib:format("Empty record definitions are not allowed. Cannot define the record `~s`", [Name]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({unimplemented_interface_function, ConId, InterfaceName, FunName}) ->
+    Msg = io_lib:format("Unimplemented entrypoint `~s` from the interface `~s` in the contract `~s`", [FunName, InterfaceName, pp(ConId)]),
+    mk_t_err(pos(ConId), Msg);
+mk_error({referencing_undefined_interface, InterfaceId}) ->
+    Msg = io_lib:format("Trying to implement or extend an undefined interface `~s`", [pp(InterfaceId)]),
+    mk_t_err(pos(InterfaceId), Msg);
+mk_error({missing_definition, Id}) ->
+    Msg = io_lib:format("Missing definition of function `~s`", [name(Id)]),
+    mk_t_err(pos(Id), Msg);
+mk_error({parameterized_state, Ann}) ->
+    Msg = "The state type cannot be parameterized",
+    mk_t_err(pos(Ann), Msg);
+mk_error({parameterized_event, Ann}) ->
+    Msg = "The event type cannot be parameterized",
+    mk_t_err(pos(Ann), Msg);
+mk_error({missing_init_function, Con}) ->
+    Msg = io_lib:format("Missing `init` function for the contract `~s`.", [name(Con)]),
+    Cxt = "The `init` function can only be omitted if the state type is `unit`",
+    mk_t_err(pos(Con), Msg, Cxt);
+mk_error({higher_order_entrypoint, Ann, {id, _, Name}, Thing}) ->
+    What = "higher-order (contains function types)",
+    ThingS = case Thing of
+                 {argument, X, T} -> io_lib:format("argument\n~s`\n", [pp_typed("  `", X, T)]);
+                 {result, T}      -> io_lib:format("return type\n~s`\n", [pp_type("  `", T)])
+             end,
+    Bad = case Thing of
+              {argument, _, _} -> io_lib:format("has a ~s type", [What]);
+              {result, _}      -> io_lib:format("is ~s", [What])
+          end,
+    Msg = io_lib:format("The ~sof entrypoint `~s` ~s",
+                        [ThingS, Name, Bad]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({invalid_aens_resolve_type, Ann, T}) ->
+    Msg = io_lib:format("Invalid return type of `AENS.resolve`:\n"
+                        "~s`\n"
+                        "It must be a `string` or a pubkey type (`address`, `oracle`, etc)",
+                        [pp_type("  `", T)]),
+    mk_t_err(pos(Ann), Msg);
+mk_error({invalid_oracle_type, Why, What, Ann, Type}) ->
+    WhyS = case Why of higher_order -> "higher-order (contain function types)";
+                       polymorphic  -> "polymorphic (contain type variables)" end,
+    Msg = io_lib:format("Invalid oracle type\n~s`", [pp_type("  `", Type)]),
+    Cxt = io_lib:format("The ~s type must not be ~s", [What, WhyS]),
+    mk_t_err(pos(Ann), Msg, Cxt);
+mk_error({interface_implementation_conflict, Contract, I1, I2, Fun}) ->
+    Msg = io_lib:format("Both interfaces `~s` and `~s` implemented by "
+                        "the contract `~s` have a function called `~s`",
+                        [name(I1), name(I2), name(Contract), name(Fun)]),
+    mk_t_err(pos(Contract), Msg);
+mk_error({function_should_be_entrypoint, Impl, Base, Interface}) ->
+    Msg = io_lib:format("`~s` must be declared as an entrypoint instead of a function "
+                        "in order to implement the entrypoint `~s` from the interface `~s`",
+                        [name(Impl), name(Base), name(Interface)]),
+    mk_t_err(pos(Impl), Msg);
+mk_error({entrypoint_cannot_be_stateful, Impl, Base, Interface}) ->
+    Msg = io_lib:format("`~s` cannot be stateful because the entrypoint `~s` in the "
+                        "interface `~s` is not stateful",
+                        [name(Impl), name(Base), name(Interface)]),
+    mk_t_err(pos(Impl), Msg);
+mk_error({entrypoint_must_be_payable, Impl, Base, Interface}) ->
+    Msg = io_lib:format("`~s` must be payable because the entrypoint `~s` in the "
+                        "interface `~s` is payable",
+                        [name(Impl), name(Base), name(Interface)]),
+    mk_t_err(pos(Impl), Msg);
+mk_error({unpreserved_payablity, Kind, ContractCon, InterfaceCon}) ->
+    KindStr = case Kind of
+                  contract -> "contract";
+                  contract_interface -> "interface"
+              end,
+    Msg = io_lib:format("Non-payable ~s `~s` cannot implement payable interface `~s`",
+                        [KindStr, name(ContractCon), name(InterfaceCon)]),
+    mk_t_err(pos(ContractCon), Msg);
+mk_error({mutually_recursive_constants, Consts}) ->
+    Msg = [ "Mutual recursion detected between the constants",
+            [ io_lib:format("\n  - `~s` at ~s", [name(Id), pp_loc(Ann)])
+                || {letval, Ann, Id, _} <- Consts ] ],
+    [{letval, Ann, _, _} | _] = Consts,
+    mk_t_err(pos(Ann), Msg);
+mk_error({invalid_const_id, Ann}) ->
+    Msg = "The name of the compile-time constant cannot have pattern matching",
+    mk_t_err(pos(Ann), Msg);
+mk_error({invalid_const_expr, ConstId}) ->
+    Msg = io_lib:format("Invalid expression in the definition of the constant `~s`", [name(ConstId)]),
+    Cxt = "You can only use the following expressions as constants: "
+          "literals, lists, tuples, maps, and other constants",
+    mk_t_err(pos(aeso_syntax:get_ann(ConstId)), Msg, Cxt);
+mk_error({illegal_const_in_interface, Ann}) ->
+    Msg = "Cannot define toplevel constants inside a contract interface",
+    mk_t_err(pos(Ann), Msg);
+mk_error(Err) ->
+    Msg = io_lib:format("Unknown error: ~p", [Err]),
+    mk_t_err(pos(0, 0), Msg).
+
+mk_entrypoint(Decl) ->
+    Ann   = [entrypoint | lists:keydelete(public, 1,
+                          lists:keydelete(private, 1,
+                            aeso_syntax:get_ann(Decl))) -- [public, private]],
+    aeso_syntax:set_ann(Ann, Decl).
+
+plural(No, _Yes, [_]) -> No;
+plural(_No, Yes, _)   -> Yes.

src/aeso_tc_ets_manager.erl

@@ -0,0 +1,102 @@
+-module(aeso_tc_ets_manager).
+
+-export([ ets_init/0
+        , ets_new/2
+        , ets_lookup/2
+        , ets_insert/2
+        , ets_insert_new/2
+        , ets_insert_ordered/2
+        , ets_delete/1
+        , ets_delete/2
+        , ets_match_delete/2
+        , ets_tab2list/1
+        , ets_tab2list_ordered/1
+        , ets_tab_exists/1
+        , clean_up_ets/0
+        ]).
+
+%% Clean up all the ets tables (in case of an exception)
+
+ets_tables() ->
+    [options, type_vars, constraints, freshen_tvars, type_errors,
+     defined_contracts, warnings, function_calls, all_functions,
+     type_vars_variance, functions_to_implement].
+
+clean_up_ets() ->
+    [ catch ets_delete(Tab) || Tab <- ets_tables() ],
+    ok.
+
+%% Named interface to ETS tables implemented without names.
+%% The interface functions behave as the standard ETS interface.
+
+ets_init() ->
+    put(aeso_ast_infer_types, #{}).
+
+ets_tab_exists(Name) ->
+    Tabs = get(aeso_ast_infer_types),
+    case maps:find(Name, Tabs) of
+        {ok, _} -> true;
+        error   -> false
+    end.
+
+ets_tabid(Name) ->
+    #{Name := TabId} = get(aeso_ast_infer_types),
+    TabId.
+
+ets_new(Name, Opts) ->
+    %% Ensure the table is NOT named!
+    TabId = ets:new(Name, Opts -- [named_table]),
+    Tabs = get(aeso_ast_infer_types),
+    put(aeso_ast_infer_types, Tabs#{Name => TabId}),
+    Name.
+
+ets_delete(Name) ->
+    Tabs = get(aeso_ast_infer_types),
+    #{Name := TabId} = Tabs,
+    put(aeso_ast_infer_types, maps:remove(Name, Tabs)),
+    ets:delete(TabId).
+
+ets_delete(Name, Key) ->
+    TabId = ets_tabid(Name),
+    ets:delete(TabId, Key).
+
+ets_insert(Name, Object) ->
+    TabId = ets_tabid(Name),
+    ets:insert(TabId, Object).
+
+ets_insert_new(Name, Object) ->
+    TabId = ets_tabid(Name),
+    ets:insert_new(TabId, Object).
+
+ets_lookup(Name, Key) ->
+    TabId = ets_tabid(Name),
+    ets:lookup(TabId, Key).
+
+ets_match_delete(Name, Pattern) ->
+    TabId = ets_tabid(Name),
+    ets:match_delete(TabId, Pattern).
+
+ets_tab2list(Name) ->
+    TabId = ets_tabid(Name),
+    ets:tab2list(TabId).
+
+ets_insert_ordered(_, []) -> true;
+ets_insert_ordered(Name, [H|T]) ->
+    ets_insert_ordered(Name, H),
+    ets_insert_ordered(Name, T);
+ets_insert_ordered(Name, Object) ->
+    Count = next_count(),
+    TabId = ets_tabid(Name),
+    ets:insert(TabId, {Count, Object}).
+
+ets_tab2list_ordered(Name) ->
+    [E || {_, E} <- ets_tab2list(Name)].
+
+next_count() ->
+    V = case get(counter) of
+            undefined ->
+                0;
+            X -> X
+        end,
+    put(counter, V + 1),
+    V.

src/aeso_tc_name_manip.erl

@@ -0,0 +1,39 @@
+-module(aeso_tc_name_manip).
+
+-export([ name/1
+        , qname/1
+        , qid/2
+        , qcon/2
+        , set_qname/2
+        ]).
+
+%% TODO: types are duplicated
+-type name() :: string().
+-type qname() :: [string()].
+-type type_id() :: aeso_syntax:id() | aeso_syntax:qid() | aeso_syntax:con() | aeso_syntax:qcon().
+
+-spec qname(type_id()) -> qname().
+qname({id,   _, X})  -> [X];
+qname({qid,  _, Xs}) -> Xs;
+qname({con,  _, X})  -> [X];
+qname({qcon, _, Xs}) -> Xs.
+
+-spec name(Named | {typed, _, Named, _}) -> name() when
+      Named :: aeso_syntax:id() | aeso_syntax:con().
+name({typed, _, X, _}) -> name(X);
+name({id, _, X}) -> X;
+name({con, _, X}) -> X.
+
+-spec qid(aeso_syntax:ann(), qname()) -> aeso_syntax:id() | aeso_syntax:qid().
+qid(Ann, [X]) -> {id, Ann, X};
+qid(Ann, Xs)  -> {qid, Ann, Xs}.
+
+-spec qcon(aeso_syntax:ann(), qname()) -> aeso_syntax:con() | aeso_syntax:qcon().
+qcon(Ann, [X]) -> {con, Ann, X};
+qcon(Ann, Xs)  -> {qcon, Ann, Xs}.
+
+-spec set_qname(qname(), type_id()) -> type_id().
+set_qname(Xs, {id,   Ann, _}) -> qid(Ann, Xs);
+set_qname(Xs, {qid,  Ann, _}) -> qid(Ann, Xs);
+set_qname(Xs, {con,  Ann, _}) -> qcon(Ann, Xs);
+set_qname(Xs, {qcon, Ann, _}) -> qcon(Ann, Xs).

src/aeso_tc_options.erl

@@ -0,0 +1,48 @@
+-module(aeso_tc_options).
+
+-export([ create_options/1
+        , get_option/2
+        , when_option/2
+        , when_warning/2
+        ]).
+
+%% -- Moved functions --------------------------------------------------------
+
+all_warnings() -> aeso_tc_warnings:all_warnings().
+
+%% ---------------------------------------------------------------------------
+
+create_options(Options) ->
+    aeso_tc_ets_manager:ets_new(options, [set]),
+    Tup = fun(Opt) when is_atom(Opt) -> {Opt, true};
+             (Opt) when is_tuple(Opt) -> Opt end,
+    aeso_tc_ets_manager:ets_insert(options, lists:map(Tup, Options)).
+
+get_option(Key, Default) ->
+    case aeso_tc_ets_manager:ets_lookup(options, Key) of
+        [{_Key, Val}] -> Val;
+        _             -> Default
+    end.
+
+when_option(Opt, Do) ->
+    get_option(Opt, false) andalso Do().
+
+when_warning(Warn, Do) ->
+    case lists:member(Warn, all_warnings()) of
+        false ->
+            %% TODO: An error for passing invalid wanring name should be thrown here.
+            %%       Validation of compiler options might be done at an earlier stage.
+            ok;
+        true ->
+            case aeso_tc_ets_manager:ets_tab_exists(warnings) of
+                true ->
+                    IsEnabled = get_option(Warn, false),
+                    IsAll = get_option(warn_all, false) andalso lists:member(Warn, all_warnings()),
+                    if
+                        IsEnabled orelse IsAll -> Do();
+                        true -> ok
+                    end;
+                false ->
+                    ok
+            end
+    end.

src/aeso_tc_pp.erl

@@ -0,0 +1,248 @@
+-module(aeso_tc_pp).
+
+-export([ pp/1
+        , pp_type/1
+        , pp_type/2
+        , pp_typed/3
+        , pp_expr/1
+        , pp_why_record/1
+        , pp_loc/1
+        , pp_when/1
+        ]).
+
+%% -- Duplicated types -------------------------------------------------------
+
+-type why_record() :: aeso_syntax:field(aeso_syntax:expr())
+                    | {var_args, aeso_syntax:ann(), aeso_syntax:expr()}
+                    | {proj, aeso_syntax:ann(), aeso_syntax:expr(), aeso_syntax:id()}.
+
+%% -- Moved functions --------------------------------------------------------
+
+pos(A) -> aeso_tc_ann_manip:pos(A).
+pos(A, B) -> aeso_tc_ann_manip:pos(A, B).
+loc(A) -> aeso_tc_ann_manip:loc(A).
+
+%% ---------------------------------------------------------------------------
+
+-type pos() :: aeso_errors:pos().
+
+if_branches(If = {'if', Ann, _, Then, Else}) ->
+    case proplists:get_value(format, Ann) of
+        elif -> [Then | if_branches(Else)];
+        _    -> [If]
+    end;
+if_branches(E) -> [E].
+
+pp_when({todo, What}) -> {pos(0, 0), io_lib:format("[TODO] ~p", [What])};
+pp_when({at, Ann}) -> {pos(Ann), io_lib:format("at ~s", [pp_loc(Ann)])};
+pp_when({check_typesig, Name, Inferred, Given}) ->
+    {pos(Given),
+     io_lib:format("when checking the definition of `~s`\n"
+                   "  inferred type: `~s`\n"
+                   "  given type:    `~s`",
+         [Name, pp(aeso_tc_type_utils:instantiate(Inferred)), pp(aeso_tc_type_utils:instantiate(Given))])};
+pp_when({infer_app, Fun, NamedArgs, Args, Inferred0, ArgTypes0}) ->
+    Inferred = aeso_tc_type_utils:instantiate(Inferred0),
+    ArgTypes = aeso_tc_type_utils:instantiate(ArgTypes0),
+    {pos(Fun),
+     io_lib:format("when checking the application of\n"
+                   "  `~s`\n"
+                   "to arguments~s",
+                   [pp_typed("", Fun, Inferred),
+                    [ ["\n  ", "`" ++ pp_expr(NamedArg) ++ "`"] || NamedArg <- NamedArgs ] ++
+                    [ ["\n  ", "`" ++ pp_typed("", Arg, ArgT) ++ "`"]
+                       || {Arg, ArgT} <- lists:zip(Args, ArgTypes) ] ])};
+pp_when({field_constraint, FieldType0, InferredType0, Fld}) ->
+    FieldType    = aeso_tc_type_utils:instantiate(FieldType0),
+    InferredType = aeso_tc_type_utils:instantiate(InferredType0),
+    {pos(Fld),
+     case Fld of
+         {var_args, _Ann, _Fun} ->
+             io_lib:format("when checking contract construction of type\n~s (at ~s)\nagainst the expected type\n~s\n",
+                          [pp_type("  ", FieldType),
+                           pp_loc(Fld),
+                           pp_type("  ", InferredType)
+                          ]);
+         {field, _Ann, LV, Id, E} ->
+             io_lib:format("when checking the assignment of the field `~s` to the old value `~s` and the new value `~s`",
+                 [pp_typed("", {lvalue, [], LV}, FieldType),
+                  pp(Id),
+                  pp_typed("", E, InferredType)]);
+         {field, _Ann, LV, E} ->
+             io_lib:format("when checking the assignment of the field `~s` to the value `~s`",
+                 [pp_typed("", {lvalue, [], LV}, FieldType),
+                  pp_typed("", E, InferredType)]);
+         {proj, _Ann, _Rec, _Fld} ->
+             io_lib:format("when checking the record projection `~s` against the expected type `~s`",
+                 [pp_typed("  ", Fld, FieldType),
+                  pp_type("  ", InferredType)])
+     end};
+pp_when({record_constraint, RecType0, InferredType0, Fld}) ->
+    RecType      = aeso_tc_type_utils:instantiate(RecType0),
+    InferredType = aeso_tc_type_utils:instantiate(InferredType0),
+    {Pos, WhyRec} = pp_why_record(Fld),
+    case Fld of
+        {var_args, _Ann, _Fun} ->
+            {Pos,
+             io_lib:format("when checking that contract construction of type\n~s\n~s\n"
+                           "matches the expected type\n~s",
+                           [pp_type("  ", RecType), WhyRec, pp_type("  ", InferredType)]
+                          )
+            };
+        {field, _Ann, _LV, _Id, _E} ->
+            {Pos,
+             io_lib:format("when checking that the record type\n~s\n~s\n"
+                           "matches the expected type\n~s",
+                 [pp_type("  ", RecType), WhyRec, pp_type("  ", InferredType)])};
+        {field, _Ann, _LV, _E} ->
+            {Pos,
+             io_lib:format("when checking that the record type\n~s\n~s\n"
+                           "matches the expected type\n~s",
+                 [pp_type("  ", RecType), WhyRec, pp_type("  ", InferredType)])};
+        {proj, _Ann, Rec, _FldName} ->
+            {pos(Rec),
+             io_lib:format("when checking that the expression\n~s (at ~s)\nhas type\n~s\n~s",
+                 [pp_typed("  ", Rec, InferredType), pp_loc(Rec),
+                  pp_type("  ", RecType), WhyRec])}
+    end;
+pp_when({if_branches, Then, ThenType0, Else, ElseType0}) ->
+    {ThenType, ElseType} = aeso_tc_type_utils:instantiate({ThenType0, ElseType0}),
+    Branches = [ {Then, ThenType} | [ {B, ElseType} || B <- if_branches(Else) ] ],
+    {pos(element(1, hd(Branches))),
+     io_lib:format("when comparing the types of the if-branches\n"
+                   "~s", [ [ io_lib:format("~s (at ~s)\n", [pp_typed("  - ", B, BType), pp_loc(B)])
+                           || {B, BType} <- Branches ] ])};
+pp_when({case_pat, Pat, PatType0, ExprType0}) ->
+    {PatType, ExprType} = aeso_tc_type_utils:instantiate({PatType0, ExprType0}),
+    {pos(Pat),
+     io_lib:format("when checking the type of the pattern `~s` against the expected type `~s`",
+                   [pp_typed("", Pat, PatType),
+                    pp_type(ExprType)])};
+pp_when({check_expr, Expr, Inferred0, Expected0}) ->
+    {Inferred, Expected} = aeso_tc_type_utils:instantiate({Inferred0, Expected0}),
+    {pos(Expr),
+     io_lib:format("when checking the type of the expression `~s` against the expected type `~s`",
+                   [pp_typed("", Expr, Inferred), pp_type(Expected)])};
+pp_when({checking_init_type, Ann}) ->
+    {pos(Ann),
+     io_lib:format("when checking that `init` returns a value of type `state`", [])};
+pp_when({list_comp, BindExpr, Inferred0, Expected0}) ->
+    {Inferred, Expected} = aeso_tc_type_utils:instantiate({Inferred0, Expected0}),
+    {pos(BindExpr),
+     io_lib:format("when checking rvalue of list comprehension binding `~s` against type `~s`",
+                   [pp_typed("", BindExpr, Inferred), pp_type(Expected)])};
+pp_when({check_named_arg_constraint, CArgs, CName, CType}) ->
+    {id, _, Name} = Arg = CName,
+    [Type | _] = [ Type || {named_arg_t, _, {id, _, Name1}, Type, _} <- CArgs, Name1 == Name ],
+    Err = io_lib:format("when checking named argument `~s` against inferred type `~s`",
+                        [pp_typed("", Arg, Type), pp_type(CType)]),
+    {pos(Arg), Err};
+pp_when({checking_init_args, Ann, Con0, ArgTypes0}) ->
+    Con = aeso_tc_type_utils:instantiate(Con0),
+    ArgTypes = aeso_tc_type_utils:instantiate(ArgTypes0),
+    {pos(Ann),
+     io_lib:format("when checking arguments of `~s`'s init entrypoint to match\n(~s)",
+                   [pp_type(Con), string:join([pp_type(A) || A <- ArgTypes], ", ")])
+    };
+pp_when({return_contract, App, Con0}) ->
+    Con = aeso_tc_type_utils:instantiate(Con0),
+    {pos(App)
+    , io_lib:format("when checking that expression returns contract of type `~s`", [pp_type(Con)])
+    };
+pp_when({arg_name, Id1, Id2, When}) ->
+    {Pos, Ctx} = pp_when(When),
+    {Pos
+    , io_lib:format("when unifying names of named arguments: `~s` and `~s`\n~s", [pp_expr(Id1), pp_expr(Id2), Ctx])
+    };
+pp_when({var_args, Ann, Fun}) ->
+    {pos(Ann)
+    , io_lib:format("when resolving arguments of variadic function `~s`", [pp_expr(Fun)])
+    };
+pp_when(unknown) -> {pos(0,0), ""}.
+
+-spec pp_why_record(why_record()) -> {pos(), iolist()}.
+pp_why_record({var_args, Ann, Fun}) ->
+    {pos(Ann),
+     io_lib:format("arising from resolution of variadic function `~s`",
+                   [pp_expr(Fun)])};
+pp_why_record(Fld = {field, _Ann, LV, _E}) ->
+    {pos(Fld),
+     io_lib:format("arising from an assignment of the field `~s`",
+                   [pp_expr({lvalue, [], LV})])};
+pp_why_record(Fld = {field, _Ann, LV, _Alias, _E}) ->
+    {pos(Fld),
+     io_lib:format("arising from an assignment of the field `~s`",
+                   [pp_expr({lvalue, [], LV})])};
+pp_why_record({proj, _Ann, Rec, FldName}) ->
+    {pos(Rec),
+     io_lib:format("arising from the projection of the field `~s`",
+         [pp(FldName)])}.
+
+pp_typed(Label, E, T = {type_sig, _, _, _, _, _}) -> pp_typed(Label, E, aeso_tc_type_utils:typesig_to_fun_t(T));
+pp_typed(Label, {typed, _, Expr, _}, Type) ->
+    pp_typed(Label, Expr, Type);
+pp_typed(Label, Expr, Type) ->
+    pp_expr(Label, {typed, [], Expr, Type}).
+
+pp_expr(Expr) ->
+    pp_expr("", Expr).
+pp_expr(Label, Expr) ->
+    prettypr:format(prettypr:beside(prettypr:text(Label), aeso_pretty:expr(Expr, [show_generated])), 80, 80).
+
+pp_type(Type) ->
+    pp_type("", Type).
+pp_type(Label, Type) ->
+    prettypr:format(prettypr:beside(prettypr:text(Label), aeso_pretty:type(Type, [show_generated])), 80, 80).
+
+pp_loc(T) ->
+    {File, IncludeType, Line, Col} = loc(T),
+    case {Line, Col} of
+        {0, 0} -> "(builtin location)";
+        _      -> case IncludeType of
+                      none -> io_lib:format("line ~p, column ~p", [Line, Col]);
+                      _    -> io_lib:format("line ~p, column ~p in ~s", [Line, Col, File])
+                  end
+    end.
+
+pp(T = {type_sig, _, _, _, _, _}) ->
+    pp(aeso_tc_type_utils:typesig_to_fun_t(T));
+pp([]) ->
+    "";
+pp([T]) ->
+    pp(T);
+pp([T|Ts]) ->
+    [pp(T), ", "|pp(Ts)];
+pp({id, _, Name}) ->
+    Name;
+pp({qid, _, Name}) ->
+    string:join(Name, ".");
+pp({con, _, Name}) ->
+    Name;
+pp({qcon, _, Name}) ->
+    string:join(Name, ".");
+pp({uvar, _, Ref}) ->
+    %% Show some unique representation
+    ["?u" | integer_to_list(erlang:phash2(Ref, 16384)) ];
+pp({tvar, _, Name}) ->
+    Name;
+pp({if_t, _, Id, Then, Else}) ->
+    ["if(", pp([Id, Then, Else]), ")"];
+pp({tuple_t, _, []}) ->
+    "unit";
+pp({tuple_t, _, Cpts}) ->
+    ["(", string:join(lists:map(fun pp/1, Cpts), " * "), ")"];
+pp({bytes_t, _, any}) -> "bytes(_)";
+pp({bytes_t, _, Len}) ->
+    ["bytes(", integer_to_list(Len), ")"];
+pp({app_t, _, T, []}) ->
+    pp(T);
+pp({app_t, _, Type, Args}) ->
+    [pp(Type), "(", pp(Args), ")"];
+pp({named_arg_t, _, Name, Type, _Default}) ->
+    [pp(Name), " : ", pp(Type)];
+pp({fun_t, _, Named = {uvar, _, _}, As, B}) ->
+    ["(", pp(Named), " | ", pp(As), ") => ", pp(B)];
+pp({fun_t, _, Named, As, B}) when is_list(Named) ->
+    ["(", pp(Named ++ As), ") => ", pp(B)];
+pp(Other) ->
+    io_lib:format("~p", [Other]).

src/aeso_tc_type_unfolding.erl

@@ -0,0 +1,134 @@
+-module(aeso_tc_type_unfolding).
+
+-export([ unfold_types_in_type/2
+        , unfold_types_in_type/3
+        , unfold_record_types/2
+        ]).
+
+%% -- Duplicated macros ------------------------------------------------------
+
+-define(is_type_id(T), element(1, T) =:= id orelse
+                       element(1, T) =:= qid orelse
+                       element(1, T) =:= con orelse
+                       element(1, T) =:= qcon).
+
+%% -- Moved functions --------------------------------------------------------
+
+type_error(A) -> aeso_tc_errors:type_error(A).
+
+%% -------
+
+used_typedef(A, B) -> aeso_tc_warnings:used_typedef(A, B).
+
+%% -------
+
+when_warning(A, B) -> aeso_tc_options:when_warning(A, B).
+
+%% ---------------------------------------------------------------------------
+
+%% During type inference, record types are represented by their
+%% names. But, before we pass the typed program to the code generator,
+%% we replace record types annotating expressions with their
+%% definition. This enables the code generator to see the fields.
+unfold_record_types(Env, T) ->
+    unfold_types(Env, T, [unfold_record_types]).
+
+unfold_types(Env, {typed, Attr, E, Type}, Options) ->
+    Options1 = [{ann, Attr} | lists:keydelete(ann, 1, Options)],
+    {typed, Attr, unfold_types(Env, E, Options), unfold_types_in_type(Env, Type, Options1)};
+unfold_types(Env, {arg, Attr, Id, Type}, Options) ->
+    {arg, Attr, Id, unfold_types_in_type(Env, Type, Options)};
+unfold_types(Env, {type_sig, Ann, Constr, NamedArgs, Args, Ret}, Options) ->
+    {type_sig, Ann, Constr,
+               unfold_types_in_type(Env, NamedArgs, Options),
+               unfold_types_in_type(Env, Args, Options),
+               unfold_types_in_type(Env, Ret, Options)};
+unfold_types(Env, {type_def, Ann, Name, Args, Def}, Options) ->
+    {type_def, Ann, Name, Args, unfold_types_in_type(Env, Def, Options)};
+unfold_types(Env, {fun_decl, Ann, Name, Type}, Options) ->
+    {fun_decl, Ann, Name, unfold_types(Env, Type, Options)};
+unfold_types(Env, {letfun, Ann, Name, Args, Type, [{guarded, AnnG, [], Body}]}, Options) ->
+    {letfun, Ann, Name, unfold_types(Env, Args, Options), unfold_types_in_type(Env, Type, Options), [{guarded, AnnG, [], unfold_types(Env, Body, Options)}]};
+unfold_types(Env, T, Options) when is_tuple(T) ->
+    list_to_tuple(unfold_types(Env, tuple_to_list(T), Options));
+unfold_types(Env, [H|T], Options) ->
+    [unfold_types(Env, H, Options)|unfold_types(Env, T, Options)];
+unfold_types(_Env, X, _Options) ->
+    X.
+
+unfold_types_in_type(Env, T) ->
+    unfold_types_in_type(Env, T, []).
+
+unfold_types_in_type(Env, {app_t, Ann, Id = {id, _, "map"}, Args = [KeyType0, _]}, Options) ->
+    Args1 = [KeyType, _] = unfold_types_in_type(Env, Args, Options),
+    Ann1 = proplists:get_value(ann, Options, aeso_syntax:get_ann(KeyType0)),
+    [ type_error({map_in_map_key, Ann1, KeyType0}) || has_maps(KeyType) ],
+    {app_t, Ann, Id, Args1};
+unfold_types_in_type(Env, {app_t, Ann, Id, Args}, Options) when ?is_type_id(Id) ->
+    when_warning(warn_unused_typedefs, fun() -> used_typedef(Id, length(Args)) end),
+    UnfoldRecords  = proplists:get_value(unfold_record_types, Options, false),
+    UnfoldVariants = proplists:get_value(unfold_variant_types, Options, false),
+    case aeso_tc_env:lookup_type(Env, Id) of
+        {_, {_, {Formals, {record_t, Fields}}}} when UnfoldRecords, length(Formals) == length(Args) ->
+            {record_t,
+             unfold_types_in_type(Env,
+               subst_tvars(lists:zip(Formals, Args), Fields), Options)};
+        {_, {_, {Formals, {alias_t, Type}}}} when length(Formals) == length(Args) ->
+            unfold_types_in_type(Env, subst_tvars(lists:zip(Formals, Args), Type), Options);
+        {_, {_, {Formals, {variant_t, Constrs}}}} when UnfoldVariants, length(Formals) == length(Args) ->
+            %% TODO: unfolding variant types will not work well if we add recursive types!
+            {variant_t,
+             unfold_types_in_type(Env,
+                subst_tvars(lists:zip(Formals, Args), Constrs), Options)};
+        _ ->
+            %% Not a record type, or ill-formed record type.
+            {app_t, Ann, Id, unfold_types_in_type(Env, Args, Options)}
+    end;
+unfold_types_in_type(Env, Id, Options) when ?is_type_id(Id) ->
+    %% Like the case above, but for types without parameters.
+    when_warning(warn_unused_typedefs, fun() -> used_typedef(Id, 0) end),
+    UnfoldRecords = proplists:get_value(unfold_record_types, Options, false),
+    UnfoldVariants = proplists:get_value(unfold_variant_types, Options, false),
+    case aeso_tc_env:lookup_type(Env, Id) of
+        {_, {_, {[], {record_t, Fields}}}} when UnfoldRecords ->
+            {record_t, unfold_types_in_type(Env, Fields, Options)};
+        {_, {_, {[], {variant_t, Constrs}}}} when UnfoldVariants ->
+            {variant_t, unfold_types_in_type(Env, Constrs, Options)};
+        {_, {_, {[], {alias_t, Type1}}}} ->
+            unfold_types_in_type(Env, Type1, Options);
+        _ ->
+            %% Not a record type, or ill-formed record type
+            Id
+    end;
+unfold_types_in_type(Env, {field_t, Attr, Name, Type}, Options) ->
+    {field_t, Attr, Name, unfold_types_in_type(Env, Type, Options)};
+unfold_types_in_type(Env, {constr_t, Ann, Con, Types}, Options) ->
+    {constr_t, Ann, Con, unfold_types_in_type(Env, Types, Options)};
+unfold_types_in_type(Env, {named_arg_t, Ann, Con, Types, Default}, Options) ->
+    {named_arg_t, Ann, Con, unfold_types_in_type(Env, Types, Options), Default};
+unfold_types_in_type(Env, T, Options) when is_tuple(T) ->
+    list_to_tuple(unfold_types_in_type(Env, tuple_to_list(T), Options));
+unfold_types_in_type(Env, [H|T], Options) ->
+    [unfold_types_in_type(Env, H, Options)|unfold_types_in_type(Env, T, Options)];
+unfold_types_in_type(_Env, X, _Options) ->
+    X.
+
+has_maps({app_t, _, {id, _, "map"}, _}) ->
+    true;
+has_maps(L) when is_list(L) ->
+    lists:any(fun has_maps/1, L);
+has_maps(T) when is_tuple(T) ->
+    has_maps(tuple_to_list(T));
+has_maps(_) -> false.
+
+subst_tvars(Env, Type) ->
+    subst_tvars1([{V, T} || {{tvar, _, V}, T} <- Env], Type).
+
+subst_tvars1(Env, T={tvar, _, Name}) ->
+    proplists:get_value(Name, Env, T);
+subst_tvars1(Env, [H|T]) ->
+    [subst_tvars1(Env, H)|subst_tvars1(Env, T)];
+subst_tvars1(Env, Type) when is_tuple(Type) ->
+    list_to_tuple(subst_tvars1(Env, tuple_to_list(Type)));
+subst_tvars1(_Env, X) ->
+    X.

src/aeso_tc_type_utils.erl

@@ -0,0 +1,91 @@
+-module(aeso_tc_type_utils).
+
+-export([ fresh_uvar/1
+        , dereference/1
+        , dereference_deep/1
+        , instantiate/1
+        , typesig_to_fun_t/1
+        , fun_arity/1
+        , opposite_variance/1
+        , app_t/3
+        , is_first_order/1
+        , is_monomorphic/1
+        ]).
+
+%% TODO: Find a better place for this function
+fresh_uvar(Attrs) ->
+    {uvar, Attrs, make_ref()}.
+
+dereference(T = {uvar, _, R}) ->
+    case aeso_tc_ets_manager:ets_lookup(type_vars, R) of
+        [] ->
+            T;
+        [{R, Type}] ->
+            dereference(Type)
+    end;
+dereference(T) ->
+    T.
+
+dereference_deep(Type) ->
+    case dereference(Type) of
+        Tup when is_tuple(Tup) ->
+            list_to_tuple(dereference_deep(tuple_to_list(Tup)));
+        [H | T] -> [dereference_deep(H) | dereference_deep(T)];
+        T -> T
+    end.
+
+%% Dereferences all uvars and replaces the uninstantiated ones with a
+%% succession of tvars.
+instantiate(E) ->
+    instantiate1(dereference(E)).
+
+instantiate1({uvar, Attr, R}) ->
+    Next = proplists:get_value(next, aeso_tc_ets_manager:ets_lookup(type_vars, next), 0),
+    TVar = {tvar, Attr, "'" ++ integer_to_tvar(Next)},
+    aeso_tc_ets_manager:ets_insert(type_vars, [{next, Next + 1}, {R, TVar}]),
+    TVar;
+instantiate1({fun_t, Ann, Named, Args, Ret}) ->
+    case dereference(Named) of
+        {uvar, _, R} ->
+            %% Uninstantiated named args map to the empty list
+            NoNames = [],
+            aeso_tc_ets_manager:ets_insert(type_vars, [{R, NoNames}]),
+            {fun_t, Ann, NoNames, instantiate(Args), instantiate(Ret)};
+        Named1 ->
+            {fun_t, Ann, instantiate1(Named1), instantiate(Args), instantiate(Ret)}
+    end;
+instantiate1(T) when is_tuple(T) ->
+    list_to_tuple(instantiate1(tuple_to_list(T)));
+instantiate1([A|B]) ->
+    [instantiate(A)|instantiate(B)];
+instantiate1(X) ->
+    X.
+
+integer_to_tvar(X) when X < 26 ->
+    [$a + X];
+integer_to_tvar(X) ->
+    [integer_to_tvar(X div 26)] ++ [$a + (X rem 26)].
+
+fun_arity({fun_t, _, _, Args, _}) -> length(Args);
+fun_arity(_)                      -> none.
+
+is_monomorphic({tvar, _, _})           -> false;
+is_monomorphic(Ts) when is_list(Ts)    -> lists:all(fun is_monomorphic/1, Ts);
+is_monomorphic(Tup) when is_tuple(Tup) -> is_monomorphic(tuple_to_list(Tup));
+is_monomorphic(_)                      -> true.
+
+is_first_order({fun_t, _, _, _, _})    -> false;
+is_first_order(Ts) when is_list(Ts)    -> lists:all(fun is_first_order/1, Ts);
+is_first_order(Tup) when is_tuple(Tup) -> is_first_order(tuple_to_list(Tup));
+is_first_order(_)                      -> true.
+
+opposite_variance(invariant) -> invariant;
+opposite_variance(covariant) -> contravariant;
+opposite_variance(contravariant) -> covariant;
+opposite_variance(bivariant) -> bivariant.
+
+app_t(_Ann, Name, [])  -> Name;
+app_t(Ann, Name, Args) -> {app_t, Ann, Name, Args}.
+
+typesig_to_fun_t({type_sig, Ann, _Constr, Named, Args, Res}) ->
+    {fun_t, Ann, Named, Args, Res}.

src/aeso_tc_typedefs.erl

@@ -0,0 +1,20 @@
+-module(aeso_tc_typedefs).
+
+-export_type([utype/0, named_args_t/0, typesig/0]).
+
+-type uvar() :: {uvar, aeso_syntax:ann(), reference()}.
+
+-type named_args_t() :: uvar() | [{named_arg_t, aeso_syntax:ann(), aeso_syntax:id(), utype(), aeso_syntax:expr()}].
+
+-type utype() :: {fun_t, aeso_syntax:ann(), named_args_t(), [utype()] | var_args, utype()}
+               | {app_t, aeso_syntax:ann(), utype(), [utype()]}
+               | {tuple_t, aeso_syntax:ann(), [utype()]}
+               | aeso_syntax:id()  | aeso_syntax:qid()
+               | aeso_syntax:con() | aeso_syntax:qcon()  %% contracts
+               | aeso_syntax:tvar()
+               | {if_t, aeso_syntax:ann(), aeso_syntax:id(), utype(), utype()}  %% Can branch on named argument (protected)
+               | uvar().
+
+-type type_constraints() :: none | bytes_concat | bytes_split | address_to_contract | bytecode_hash.
+
+-type typesig() :: {type_sig, aeso_syntax:ann(), type_constraints(), [aeso_syntax:named_arg_t()], [aeso_syntax:type()], aeso_syntax:type()}.

src/aeso_tc_unify.erl

@@ -0,0 +1,190 @@
+-module(aeso_tc_unify).
+
+-export([unify/4]).
+
+
+%% -- Moved functions --------------------------------------------------------
+
+unfold_types_in_type(A, B, C) -> aeso_tc_type_unfolding:unfold_types_in_type(A, B, C).
+
+%% -------
+
+type_error(A) -> aeso_tc_errors:type_error(A).
+cannot_unify(A, B, C, D) -> aeso_tc_errors:cannot_unify(A, B, C, D).
+
+%% -------
+
+opposite_variance(A) -> aeso_tc_type_utils:opposite_variance(A).
+
+%% ---------------------------------------------------------------------------
+
+unify(Env, A, B, When) -> unify0(Env, A, B, covariant, When).
+
+unify0(_, {id, _, "_"}, _, _Variance, _When) -> true;
+unify0(_, _, {id, _, "_"}, _Variance, _When) -> true;
+unify0(Env, A, B, Variance, When) ->
+    Options =
+        case When of    %% Improve source location for map_in_map_key errors
+            {check_expr, E, _, _} -> [{ann, aeso_syntax:get_ann(E)}];
+            _                     -> []
+        end,
+    A1 = aeso_tc_type_utils:dereference(unfold_types_in_type(Env, A, Options)),
+    B1 = aeso_tc_type_utils:dereference(unfold_types_in_type(Env, B, Options)),
+    unify1(Env, A1, B1, Variance, When).
+
+unify1(_Env, {uvar, _, R}, {uvar, _, R}, _Variance, _When) ->
+    true;
+unify1(_Env, {uvar, _, _}, {fun_t, _, _, var_args, _}, _Variance, When) ->
+    type_error({unify_varargs, When});
+unify1(Env, {uvar, A, R}, T, _Variance, When) ->
+    case occurs_check(R, T) of
+        true ->
+            case aeso_tc_env:unify_throws(Env) of
+                true ->
+                    cannot_unify({uvar, A, R}, T, none, When);
+                false ->
+                    ok
+            end,
+            false;
+        false ->
+            aeso_tc_ets_manager:ets_insert(type_vars, {R, T}),
+            true
+    end;
+unify1(Env, T, {uvar, A, R}, Variance, When) ->
+    unify1(Env, {uvar, A, R}, T, Variance, When);
+unify1(_Env, {tvar, _, X}, {tvar, _, X}, _Variance, _When) -> true; %% Rigid type variables
+unify1(Env, [A|B], [C|D], [V|Variances], When) ->
+    unify0(Env, A, C, V, When) andalso unify0(Env, B, D, Variances, When);
+unify1(Env, [A|B], [C|D], Variance, When) ->
+    unify0(Env, A, C, Variance, When) andalso unify0(Env, B, D, Variance, When);
+unify1(_Env, X, X, _Variance, _When) ->
+    true;
+unify1(_Env, _A, {id, _, "void"}, Variance, _When)
+  when Variance == covariant orelse Variance == bivariant ->
+    true;
+unify1(_Env, {id, _, "void"}, _B, Variance, _When)
+  when Variance == contravariant orelse Variance == bivariant ->
+    true;
+unify1(_Env, {id, _, Name}, {id, _, Name}, _Variance, _When) ->
+    true;
+unify1(Env, A = {con, _, NameA}, B = {con, _, NameB}, Variance, When) ->
+    case is_subtype(Env, NameA, NameB, Variance) of
+        true -> true;
+        false ->
+            case aeso_tc_env:unify_throws(Env) of
+                true ->
+                    IsSubtype = is_subtype(Env, NameA, NameB, contravariant) orelse
+                                is_subtype(Env, NameA, NameB, covariant),
+                    Cxt = case IsSubtype of
+                              true  -> Variance;
+                              false -> none
+                          end,
+                    cannot_unify(A, B, Cxt, When);
+                false ->
+                    ok
+            end,
+            false
+    end;
+unify1(_Env, {qid, _, Name}, {qid, _, Name}, _Variance, _When) ->
+    true;
+unify1(_Env, {qcon, _, Name}, {qcon, _, Name}, _Variance, _When) ->
+    true;
+unify1(_Env, {bytes_t, _, Len}, {bytes_t, _, Len}, _Variance, _When) ->
+    true;
+unify1(Env, {if_t, _, {id, _, Id}, Then1, Else1}, {if_t, _, {id, _, Id}, Then2, Else2}, Variance, When) ->
+    unify0(Env, Then1, Then2, Variance, When) andalso
+    unify0(Env, Else1, Else2, Variance, When);
+
+unify1(_Env, {fun_t, _, _, _, _}, {fun_t, _, _, var_args, _}, _Variance, When) ->
+    type_error({unify_varargs, When});
+unify1(_Env, {fun_t, _, _, var_args, _}, {fun_t, _, _, _, _}, _Variance, When) ->
+    type_error({unify_varargs, When});
+unify1(Env, {fun_t, _, Named1, Args1, Result1}, {fun_t, _, Named2, Args2, Result2}, Variance, When)
+  when length(Args1) == length(Args2) ->
+    unify0(Env, Named1, Named2, opposite_variance(Variance), When) andalso
+    unify0(Env, Args1, Args2, opposite_variance(Variance), When) andalso
+    unify0(Env, Result1, Result2, Variance, When);
+unify1(Env, {app_t, _, {Tag, _, F}, Args1}, {app_t, _, {Tag, _, F}, Args2}, Variance, When)
+  when length(Args1) == length(Args2), Tag == id orelse Tag == qid ->
+    Variances = case aeso_tc_ets_manager:ets_lookup(type_vars_variance, F) of
+                    [{_, Vs}] ->
+                        case Variance of
+                            contravariant -> lists:map(fun opposite_variance/1, Vs);
+                            invariant     -> invariant;
+                            _             -> Vs
+                        end;
+                    _ -> invariant
+                end,
+    unify1(Env, Args1, Args2, Variances, When);
+unify1(Env, {tuple_t, _, As}, {tuple_t, _, Bs}, Variance, When)
+  when length(As) == length(Bs) ->
+    unify0(Env, As, Bs, Variance, When);
+unify1(Env, {named_arg_t, _, Id1, Type1, _}, {named_arg_t, _, Id2, Type2, _}, Variance, When) ->
+    unify1(Env, Id1, Id2, Variance, {arg_name, Id1, Id2, When}),
+    unify1(Env, Type1, Type2, Variance, When);
+%% The grammar is a bit inconsistent about whether types without
+%% arguments are represented as applications to an empty list of
+%% parameters or not. We therefore allow them to unify.
+unify1(Env, {app_t, _, T, []}, B, Variance, When) ->
+    unify0(Env, T, B, Variance, When);
+unify1(Env, A, {app_t, _, T, []}, Variance, When) ->
+    unify0(Env, A, T, Variance, When);
+unify1(Env, A, B, _Variance, When) ->
+    case aeso_tc_env:unify_throws(Env) of
+        true ->
+            cannot_unify(A, B, none, When);
+        false ->
+            ok
+    end,
+    false.
+
+is_subtype(_Env, NameA, NameB, invariant) ->
+    NameA == NameB;
+is_subtype(Env, NameA, NameB, covariant) ->
+    is_subtype(Env, NameA, NameB);
+is_subtype(Env, NameA, NameB, contravariant) ->
+    is_subtype(Env, NameB, NameA);
+is_subtype(Env, NameA, NameB, bivariant) ->
+    is_subtype(Env, NameA, NameB) orelse is_subtype(Env, NameB, NameA).
+
+is_subtype(Env, Child, Base) ->
+    Parents = maps:get(Child, aeso_tc_env:contract_parents(Env), []),
+    if
+        Child == Base ->
+            true;
+        Parents == [] ->
+            false;
+        true ->
+            case lists:member(Base, Parents) of
+                true -> true;
+                false -> lists:any(fun(Parent) -> is_subtype(Env, Parent, Base) end, Parents)
+            end
+    end.
+
+occurs_check(R, T) ->
+    occurs_check1(R, aeso_tc_type_utils:dereference(T)).
+
+occurs_check1(R, {uvar, _, R1}) -> R == R1;
+occurs_check1(_, {id, _, _}) -> false;
+occurs_check1(_, {con, _, _}) -> false;
+occurs_check1(_, {qid, _, _}) -> false;
+occurs_check1(_, {qcon, _, _}) -> false;
+occurs_check1(_, {tvar, _, _}) -> false;
+occurs_check1(_, {bytes_t, _, _}) -> false;
+occurs_check1(R, {fun_t, _, Named, Args, Res}) ->
+    occurs_check(R, [Res, Named | Args]);
+occurs_check1(R, {app_t, _, T, Ts}) ->
+    occurs_check(R, [T | Ts]);
+occurs_check1(R, {tuple_t, _, Ts}) ->
+    occurs_check(R, Ts);
+occurs_check1(R, {named_arg_t, _, _, T, _}) ->
+    occurs_check(R, T);
+occurs_check1(R, {record_t, Fields}) ->
+    occurs_check(R, Fields);
+occurs_check1(R, {field_t, _, _, T}) ->
+    occurs_check(R, T);
+occurs_check1(R, {if_t, _, _, Then, Else}) ->
+    occurs_check(R, [Then, Else]);
+occurs_check1(R, [H | T]) ->
+    occurs_check(R, H) orelse occurs_check(R, T);
+occurs_check1(_, []) -> false.

src/aeso_tc_warnings.erl

@@ -0,0 +1,231 @@
+-module(aeso_tc_warnings).
+
+-export([ warn_potential_shadowing/3
+        , used_include/1
+        , create_unused_functions/0
+        , destroy_and_report_unused_functions/0
+        , destroy_and_report_warnings_as_type_errors/0
+        , potential_unused_include/2
+        , potential_unused_typedefs/2
+        , potential_unused_constants/2
+        , potential_unused_stateful/2
+        , potential_unused_variables/3
+        , potential_unused_function/4
+        , mk_warning/1
+        , used_variable/3
+        , register_function_call/2
+        , used_constant/2
+        , used_stateful/1
+        , warn_potential_negative_spend/3
+        , warn_potential_division_by_zero/3
+        , potential_unused_return_value/1
+        , used_typedef/2
+        , all_warnings/0
+        ]).
+
+%% -- Moved functions --------------------------------------------------------
+
+name(A) -> aeso_tc_name_manip:name(A).
+qname(A) -> aeso_tc_name_manip:qname(A).
+
+%% -------
+
+pos(A) -> aeso_tc_ann_manip:pos(A).
+
+%% -------
+
+pp_loc(A) -> aeso_tc_pp:pp_loc(A).
+
+%% ---------------------------------------------------------------------------
+
+all_warnings() ->
+    [ warn_unused_includes
+    , warn_unused_stateful
+    , warn_unused_variables
+    , warn_unused_constants
+    , warn_unused_typedefs
+    , warn_unused_return_value
+    , warn_unused_functions
+    , warn_shadowing
+    , warn_division_by_zero
+    , warn_negative_spend ].
+
+%% Warnings (Unused includes)
+
+potential_unused_include(Ann, SrcFile) ->
+    IsIncluded = aeso_syntax:get_ann(include_type, Ann, none) =/= none,
+    case IsIncluded of
+        false -> ok;
+        true  ->
+            case aeso_syntax:get_ann(file, Ann, no_file) of
+                no_file -> ok;
+                File    -> aeso_tc_ets_manager:ets_insert(warnings, {unused_include, File, SrcFile})
+            end
+    end.
+
+used_include(Ann) ->
+    case aeso_syntax:get_ann(file, Ann, no_file) of
+        no_file -> ok;
+        File    -> aeso_tc_ets_manager:ets_match_delete(warnings, {unused_include, File, '_'})
+    end.
+
+%% Warnings (Unused stateful)
+
+potential_unused_stateful(Ann, Fun) ->
+    case aeso_syntax:get_ann(stateful, Ann, false) of
+        false -> ok;
+        true  -> aeso_tc_ets_manager:ets_insert(warnings, {unused_stateful, Ann, Fun})
+    end.
+
+used_stateful(Fun) ->
+    aeso_tc_ets_manager:ets_match_delete(warnings, {unused_stateful, '_', Fun}).
+
+%% Warnings (Unused type defs)
+
+potential_unused_typedefs(Namespace, TypeDefs) ->
+    lists:map(fun({type_def, Ann, Id, Args, _}) ->
+        aeso_tc_ets_manager:ets_insert(warnings, {unused_typedef, Ann, Namespace ++ qname(Id), length(Args)}) end, TypeDefs).
+
+used_typedef(TypeAliasId, Arity) ->
+    aeso_tc_ets_manager:ets_match_delete(warnings, {unused_typedef, '_', qname(TypeAliasId), Arity}).
+
+%% Warnings (Unused variables)
+
+potential_unused_variables(Namespace, Fun, Vars0) ->
+    Vars = [ Var || Var = {id, _, VarName} <- Vars0, VarName /= "_" ],
+    lists:map(fun({id, Ann, VarName}) ->
+        aeso_tc_ets_manager:ets_insert(warnings, {unused_variable, Ann, Namespace, Fun, VarName}) end, Vars).
+
+used_variable(Namespace, Fun, [VarName]) ->
+    aeso_tc_ets_manager:ets_match_delete(warnings, {unused_variable, '_', Namespace, Fun, VarName});
+used_variable(_, _, _) -> ok.
+
+%% Warnings (Unused constants)
+
+potential_unused_constants(Env, Consts) ->
+    case aeso_tc_env:what(Env) of
+        namespace -> [];
+        _ ->
+            [ aeso_tc_ets_manager:ets_insert(warnings, {unused_constant, Ann, aeso_tc_env:namespace(Env), Name}) || {letval, _, {id, Ann, Name}, _} <- Consts ]
+    end.
+
+used_constant(Namespace = [Contract], [Contract, ConstName]) ->
+    aeso_tc_ets_manager:ets_match_delete(warnings, {unused_constant, '_', Namespace, ConstName});
+used_constant(_, _) -> ok.
+
+%% Warnings (Unused return value)
+
+potential_unused_return_value({typed, Ann, {app, _, {typed, _, _, {fun_t, _, _, _, {id, _, Type}}}, _}, _}) when Type /= "unit" ->
+    aeso_tc_ets_manager:ets_insert(warnings, {unused_return_value, Ann});
+potential_unused_return_value(_) -> ok.
+
+%% Warnings (Unused functions)
+
+create_unused_functions() ->
+    aeso_tc_ets_manager:ets_new(function_calls, [bag]),
+    aeso_tc_ets_manager:ets_new(all_functions, [set]).
+
+register_function_call(Caller, Callee) ->
+    aeso_tc_ets_manager:ets_insert(function_calls, {Caller, Callee}).
+
+potential_unused_function(Env, Ann, FunQName, FunId) ->
+    case aeso_tc_env:what(Env) of
+        namespace ->
+            aeso_tc_ets_manager:ets_insert(all_functions, {Ann, FunQName, FunId, not aeso_syntax:get_ann(private, Ann, false)});
+        _ ->
+            aeso_tc_ets_manager:ets_insert(all_functions, {Ann, FunQName, FunId, aeso_syntax:get_ann(entrypoint, Ann, false)})
+    end.
+
+remove_used_funs(All) ->
+    {Used, Unused} = lists:partition(fun({_, _, _, IsUsed}) -> IsUsed end, All),
+    CallsByUsed = lists:flatmap(fun({_, F, _, _}) -> aeso_tc_ets_manager:ets_lookup(function_calls, F) end, Used),
+    CalledFuns = sets:from_list(lists:map(fun({_, Callee}) -> Callee end, CallsByUsed)),
+    MarkUsedFun = fun(Fun, Acc) ->
+                      case lists:keyfind(Fun, 2, Acc) of
+                          false -> Acc;
+                          T     -> lists:keyreplace(Fun, 2, Acc, setelement(4, T, true))
+                      end
+                  end,
+    NewUnused = sets:fold(MarkUsedFun, Unused, CalledFuns),
+    case lists:keyfind(true, 4, NewUnused) of
+        false -> NewUnused;
+        _     -> remove_used_funs(NewUnused)
+    end.
+
+destroy_and_report_unused_functions() ->
+    AllFuns = aeso_tc_ets_manager:ets_tab2list(all_functions),
+    lists:map(fun({Ann, _, FunId, _}) -> aeso_tc_ets_manager:ets_insert(warnings, {unused_function, Ann, name(FunId)}) end,
+              remove_used_funs(AllFuns)),
+    aeso_tc_ets_manager:ets_delete(all_functions),
+    aeso_tc_ets_manager:ets_delete(function_calls).
+
+%% Warnings (Shadowing)
+
+warn_potential_shadowing(_, _, "_") -> ok;
+warn_potential_shadowing(Env, Ann, Name) ->
+    Vars = aeso_tc_env:vars(Env),
+    Consts = aeso_tc_env:scope_consts(aeso_tc_env:get_current_scope(Env)),
+    case proplists:get_value(Name, Vars ++ Consts, false) of
+        false -> ok;
+        {AnnOld, _} -> aeso_tc_ets_manager:ets_insert(warnings, {shadowing, Ann, Name, AnnOld})
+    end.
+
+%% Warnings (Division by zero)
+
+warn_potential_division_by_zero(Ann, Op, Args) ->
+    case {Op, Args} of
+        {{'/', _}, [_, {int, _, 0}]} -> aeso_tc_ets_manager:ets_insert(warnings, {division_by_zero, Ann});
+        _ -> ok
+    end.
+
+%% Warnings (Negative spends)
+
+warn_potential_negative_spend(Ann, Fun, Args) ->
+    case {Fun, Args} of
+        { {typed, _, {qid, _, ["Chain", "spend"]}, _}
+        , [_, {typed, _, {app, _, {'-', _}, [{typed, _, {int, _, X}, _}]}, _}]} when X > 0 ->
+            aeso_tc_ets_manager:ets_insert(warnings, {negative_spend, Ann});
+        _ -> ok
+    end.
+
+destroy_and_report_warnings_as_type_errors() ->
+    Warnings = [ mk_warning(Warn) || Warn <- aeso_tc_ets_manager:ets_tab2list(warnings) ],
+    Errors = lists:map(fun mk_t_err_from_warn/1, Warnings),
+    aeso_errors:throw(Errors).  %% No-op if Warnings == []
+
+mk_t_err_from_warn(Warn) ->
+    aeso_warnings:warn_to_err(type_error, Warn).
+
+mk_warning({unused_include, FileName, SrcFile}) ->
+    Msg = io_lib:format("The file `~s` is included but not used.", [FileName]),
+    aeso_warnings:new(aeso_errors:pos(SrcFile, 0, 0), Msg);
+mk_warning({unused_stateful, Ann, FunName}) ->
+    Msg = io_lib:format("The function `~s` is unnecessarily marked as stateful.", [name(FunName)]),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({unused_variable, Ann, _Namespace, _Fun, VarName}) ->
+    Msg = io_lib:format("The variable `~s` is defined but never used.", [VarName]),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({unused_constant, Ann, _Namespace, ConstName}) ->
+    Msg = io_lib:format("The constant `~s` is defined but never used.", [ConstName]),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({unused_typedef, Ann, QName, _Arity}) ->
+    Msg = io_lib:format("The type `~s` is defined but never used.", [lists:last(QName)]),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({unused_return_value, Ann}) ->
+    Msg = io_lib:format("Unused return value.", []),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({unused_function, Ann, FunName}) ->
+    Msg = io_lib:format("The function `~s` is defined but never used.", [FunName]),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({shadowing, Ann, VarName, AnnOld}) ->
+    Msg = io_lib:format("The definition of `~s` shadows an older definition at ~s.", [VarName, pp_loc(AnnOld)]),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({division_by_zero, Ann}) ->
+    Msg = io_lib:format("Division by zero.", []),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning({negative_spend, Ann}) ->
+    Msg = io_lib:format("Negative spend.", []),
+    aeso_warnings:new(pos(Ann), Msg);
+mk_warning(Warn) ->
+    Msg = io_lib:format("Unknown warning: ~p", [Warn]),
+    aeso_warnings:new(Msg).

src/aeso_utils.erl

@@ -1,29 +1,15 @@
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2018, Aeternity Anstalt
 %%% @doc
 %%%     Sophia utility functions.
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_utils).
--vsn("9.0.0").
+-module(aeso_utils).
 
--export([scc/1, canonical_dir/1]).
+-export([scc/1]).
 
 -export_type([graph/1]).
 
-%% -- Simplistic canonical directory
-%% Note: no attempts to be 100% complete
-
-canonical_dir(Dir) ->
-    {ok, Cwd} = file:get_cwd(),
-    AbsName = filename:absname(Dir),
-    RelAbsName = filename:join(tl(filename:split(AbsName))),
-    case filelib:safe_relative_path(RelAbsName, Cwd) of
-        unsafe -> AbsName;
-        Simplified -> filename:absname(Simplified, "")
-    end.
-
 %% -- Topological sort
 
 -type graph(Node) :: #{Node => [Node]}. %% List of incoming edges (dependencies).

src/aeso_vm_decode.erl

@@ -1,24 +1,20 @@
 %%%-------------------------------------------------------------------
-%%% @copyright (C) 2025, QPQ AG
 %%% @copyright (C) 2017, Aeternity Anstalt
 %%% @doc Decoding fate data to AST
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_vm_decode).
--vsn("9.0.0").
+-module(aeso_vm_decode).
 
 -export([ from_fate/2 ]).
 
--include_lib("gmbytecode/include/gmb_fate_data.hrl").
+-include_lib("aebytecode/include/aeb_fate_data.hrl").
 
--spec from_fate(so_syntax:type(), gmb_fate_data:fate_type()) -> so_syntax:expr().
+-spec from_fate(aeso_syntax:type(), aeb_fate_data:fate_type()) -> aeso_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};
-from_fate({id, _, "unit"}, ?FATE_UNIT) -> {tuple, [], []};
+from_fate({app_t, _, {id, _, "oracle"}, _}, ?FATE_ORACLE(Bin)) -> {oracle_pubkey, [], Bin};
+from_fate({app_t, _, {id, _, "oracle_query"}, _}, ?FATE_ORACLE_Q(Bin)) -> {oracle_query_id, [], Bin};
 from_fate({con, _, _Name},  ?FATE_CONTRACT(Bin)) -> {contract_pubkey, [], Bin};
-from_fate({bytes_t, _, any}, ?FATE_BYTES(Bin)) -> make_any_bytes(Bin);
 from_fate({bytes_t, _, N},  ?FATE_BYTES(Bin)) when byte_size(Bin) == N -> {bytes, [], Bin};
 from_fate({id, _, "bits"},  ?FATE_BITS(N)) -> make_bits(N);
 from_fate({id, _, "int"},     N) when is_integer(N) ->
@@ -82,7 +78,6 @@ from_fate_builtin(QType, Val) ->
     Hsh = {bytes_t, [], 32},
     I32 = {bytes_t, [], 32},
     I48 = {bytes_t, [], 48},
-    Bts = {bytes_t, [], any},
     Qid = fun(Name) -> {qid, [], Name} end,
     Map = fun(KT, VT) -> {app_t, [], {id, [], "map"}, [KT, VT]} end,
     ChainTxArities = [3, 0, 0, 0, 0, 0, 1, 1, 1, 2, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 0],
@@ -93,7 +88,7 @@ from_fate_builtin(QType, Val) ->
 
         {["AENS", "name"], {variant, [3], 0, {Addr, TTL, Ptrs}}} ->
             App(["AENS","Name"], [Chk(Adr, Addr), Chk(Qid(["Chain", "ttl"]), TTL),
-                                  Chk(Map(Str, Qid(["AENS", "pointee"])), Ptrs)]);
+                              Chk(Map(Str, Qid(["AENS", "pointee"])), Ptrs)]);
 
         {["AENS", "pointee"], {variant, [1, 1, 1, 1], 0, {Addr}}} ->
             App(["AENS","AccountPt"], [Chk(Adr, Addr)]);
@@ -104,21 +99,6 @@ from_fate_builtin(QType, Val) ->
         {["AENS", "pointee"], {variant, [1, 1, 1, 1], 3, {Addr}}} ->
             App(["AENS","ChannelPt"], [Chk(Adr, Addr)]);
 
-        {["AENSv2", "name"], {variant, [3], 0, {Addr, TTL, Ptrs}}} ->
-            App(["AENSv2","Name"], [Chk(Adr, Addr), Chk(Qid(["Chain", "ttl"]), TTL),
-                                    Chk(Map(Str, Qid(["AENSv2", "pointee"])), Ptrs)]);
-
-        {["AENSv2", "pointee"], {variant, [1, 1, 1, 1, 1], 0, {Value}}} ->
-            App(["AENSv2","AccountPt"], [Chk(Adr, Value)]);
-        {["AENSv2", "pointee"], {variant, [1, 1, 1, 1, 1], 1, {Value}}} ->
-            App(["AENSv2","OraclePt"], [Chk(Adr, Value)]);
-        {["AENSv2", "pointee"], {variant, [1, 1, 1, 1, 1], 2, {Value}}} ->
-            App(["AENSv2","ContractPt"], [Chk(Adr, Value)]);
-        {["AENSv2", "pointee"], {variant, [1, 1, 1, 1, 1], 3, {Value}}} ->
-            App(["AENSv2","ChannelPt"], [Chk(Adr, Value)]);
-        {["AENSv2", "pointee"], {variant, [1, 1, 1, 1, 1], 4, {Value}}} ->
-            App(["AENSv2","DataPt"], [Chk(Bts, Value)]);
-
         {["Chain", "ga_meta_tx"], {variant, [2], 0, {Addr, X}}} ->
             App(["Chain","GAMetaTx"], [Chk(Adr, Addr), Chk(Int, X)]);
 
@@ -190,5 +170,3 @@ make_bits(Set, Zero, I, N) when 0 == N rem 2 ->
 make_bits(Set, Zero, I, N) ->
     {app, [], Set, [make_bits(Set, Zero, I + 1, N div 2), {int, [], I}]}.
 
-make_any_bytes(Bin) ->
-  {app, [], {qid, [], ["Bytes", "to_any_size"]}, [{bytes, [], Bin}]}.

src/aeso_warnings.erl

@@ -1,7 +1,6 @@
--module(so_warnings).
--vsn("9.0.0").
+-module(aeso_warnings).
 
--record(warn, { pos     :: so_errors:pos()
+-record(warn, { pos     :: aeso_errors:pos()
               , message :: iolist()
               }).
 
@@ -17,16 +16,16 @@
         ]).
 
 new(Msg) ->
-    new(so_errors:pos(0, 0), Msg).
+    new(aeso_errors:pos(0, 0), Msg).
 
 new(Pos, Msg) ->
     #warn{ pos = Pos, message = Msg }.
 
 warn_to_err(Kind, #warn{ pos = Pos, message = Msg }) ->
-    so_errors:new(Kind, Pos, lists:flatten(Msg)).
+    aeso_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", [so_errors:pp_pos(Pos), Msg])).
+    lists:flatten(io_lib:format("Warning~s:\n~s", [aeso_errors:pp_pos(Pos), Msg])).

src/aesophia.app.src

@@ -1,13 +1,14 @@
-{application, sophia,
- [{description, "Compiler for Sophia language"},
-  {vsn, "9.0.0"},
+{application, aesophia,
+ [{description, "Compiler for Aeternity Sophia language"},
+  {vsn, "7.1.0"},
   {registered, []},
   {applications,
    [kernel,
     stdlib,
     jsx,
     syntax_tools,
-    gmbytecode,
+    getopt,
+    aebytecode,
     eblake2
    ]},
   {env,[]},

src/so_ast.erl

@@ -1,28 +0,0 @@
--module(so_ast).
--vsn("9.0.0").
-
--export([int/2,
-         line/1,
-         pp/1,
-         pp_typed/1,
-         symbol/2,
-         symbol_name/1
-        ]).
-
-
-symbol(Line, Chars) -> {symbol, Line, Chars}.
-int(Line, Int) -> {'Int', Line, Int}.
-
-line({symbol, Line, _}) -> Line.
-
-symbol_name({symbol, _, Name}) -> Name.
-
-pp(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(so_pretty:decls(TypedAst, [show_generated])),
-    io:format("Type ast:\n~s\n",[String]).
-

test/aeso_abi_tests.erl

@@ -1,4 +1,4 @@
--module(so_abi_tests).
+-module(aeso_abi_tests).
 
 -include_lib("eunit/include/eunit.hrl").
 -compile([export_all, nowarn_export_all]).
@@ -65,15 +65,15 @@ to_sophia_value_mcl_bls12_381_test() ->
 
     Opts = [{backend, fate}],
 
-    CallValue32 = gmb_fate_encoding:serialize({bytes, <<20:256>>}),
-    CallValue48 = gmb_fate_encoding:serialize({bytes, <<55:384>>}),
-    CallValueTp = gmb_fate_encoding:serialize({tuple, {{bytes, <<15:256>>}, {bytes, <<160:256>>}, {bytes, <<1234:256>>}}}),
+    CallValue32 = aeb_fate_encoding:serialize({bytes, <<20:256>>}),
+    CallValue48 = aeb_fate_encoding:serialize({bytes, <<55:384>>}),
+    CallValueTp = aeb_fate_encoding:serialize({tuple, {{bytes, <<15:256>>}, {bytes, <<160:256>>}, {bytes, <<1234:256>>}}}),
 
-    {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,     _} = 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.
 
@@ -81,11 +81,11 @@ to_sophia_value_neg_test() ->
     Code = [ "contract Foo =\n"
              "  entrypoint f(x : int) : string = \"hello\"\n" ],
 
-    {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, [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, [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)),
+    {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)),
     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]} = so_compiler:create_calldata(Code, "f", ["true"]),
-    ?assertEqual(ExpErr1, so_errors:pp(Err1)),
+    {error, [Err1]} = aeso_compiler:create_calldata(Code, "f", ["true"]),
+    ?assertEqual(ExpErr1, aeso_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} = so_compiler:create_calldata(Code1, "f", ["42"]),
+    {ok, CallDataFATE} = aeso_compiler:create_calldata(Code1, "f", ["42"]),
 
-    {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, [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, [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)),
+    {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)),
     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 so_compiler:check_call(lists:flatten(Code), "foo", [String], [no_code]) of
+    case aeso_compiler:check_call(lists:flatten(Code), "foo", [String], [no_code]) of
         {ok, _, [Arg]} ->
             Data = encode(Arg),
-            case so_compiler:to_sophia_value(Code, "foo", ok, Data, [no_code]) of
+            case aeso_compiler:to_sophia_value(Code, "foo", ok, Data, [no_code]) of
                 {ok, Sophia} ->
-                    lists:flatten(io_lib:format("~s", [prettypr:format(so_pretty:expr(Sophia))]));
+                    lists:flatten(io_lib:format("~s", [prettypr:format(aeso_pretty:expr(Sophia))]));
                 {error, Err} ->
                     io:format("~s\n", [Err]),
                     {error, Err}
@@ -194,18 +194,40 @@ 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} = so_compiler:create_calldata(Code, FunName, Args, []),
-    {ok, _, _} = so_compiler:check_call(Code, FunName, Args, [no_code]),
+    {ok, Calldata} = aeso_compiler:create_calldata(Code, FunName, Args, []),
+    {ok, _, _} = aeso_compiler:check_call(Code, FunName, Args, [no_code]),
     case FunName of
         "init" ->
             [];
         _ ->
-            {ok, FateArgs} = gmb_fate_abi:decode_calldata(FunName, Calldata),
+            {ok, FateArgs} = aeb_fate_abi:decode_calldata(FunName, Calldata),
             FateArgs
     end.
 
@@ -214,7 +236,7 @@ encode_decode(D) ->
     D.
 
 encode(D) ->
-    gmb_fate_encoding:serialize(D).
+    aeb_fate_encoding:serialize(D).
 
 decode(B) ->
-    gmb_fate_encoding:deserialize(B).
+    aeb_fate_encoding:deserialize(B).

test/aeso_aci_tests.erl

@@ -1,4 +1,4 @@
--module(so_aci_tests).
+-module(aeso_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} = so_aci:contract_interface(json, Contract),
+    {ok,JSON} = aeso_aci:contract_interface(json, Contract),
     ?assertEqual([MapACI], JSON),
-    ?assertEqual({ok, DecACI}, so_aci:render_aci_json(JSON)),
+    ?assertEqual({ok, DecACI}, aeso_aci:render_aci_json(JSON)),
     %% Check if the compiler provides correct aci
-    {ok,#{aci := JSON2}} = so_compiler:from_string(Contract, [{aci, json}]),
+    {ok,#{aci := JSON2}} = aeso_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() -> so_compiler_tests:compilable_contracts().
+all_contracts() -> aeso_compiler_tests:compilable_contracts().
 
 aci_test_contract(Name) ->
-    String = so_test_utils:read_contract(Name),
-    Opts   = case lists:member(Name, so_compiler_tests:debug_mode_contracts()) of
+    String = aeso_test_utils:read_contract(Name),
+    Opts   = case lists:member(Name, aeso_compiler_tests:debug_mode_contracts()) of
                  true  -> [debug_mode];
                  false -> []
-             end ++ [{include, {file_system, [so_test_utils:contract_path()]}}],
-    JSON = case so_aci:contract_interface(json, String, Opts) of
+             end ++ [{include, {file_system, [aeso_test_utils:contract_path()]}}],
+    JSON = case aeso_aci:contract_interface(json, String, Opts) of
                {ok, J} -> J;
                {error, ErrorStringJ} when is_binary(ErrorStringJ) -> error(ErrorStringJ);
-               {error, ErrorJ} -> so_compiler_tests:print_and_throw(ErrorJ)
+               {error, ErrorJ} -> aeso_compiler_tests:print_and_throw(ErrorJ)
            end,
-    case so_compiler:from_string(String, [{aci, json} | Opts]) of
+    case aeso_compiler:from_string(String, [{aci, json} | Opts]) of
         {ok, #{aci := JSON1}} ->
             ?assertEqual(JSON, JSON1),
             io:format("JSON:\n~p\n", [JSON]),
-            {ok, ContractStub} = so_aci:render_aci_json(JSON),
+            {ok, ContractStub} = aeso_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} -> so_compiler_tests:print_and_throw(Error)
+        {error, Error} -> aeso_compiler_tests:print_and_throw(Error)
     end.
 
 check_stub(Stub, Options) ->
-    try so_parser:string(binary_to_list(Stub), Options) of
+    try aeso_parser:string(binary_to_list(Stub), Options) of
         Ast ->
             try
                 %% io:format("AST: ~120p\n", [Ast]),
-                so_ast_infer_types:infer(Ast, [no_code])
+                aeso_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", [so_errors:pp(E)]) || E <- Errs ],
+        _ = [ io:format("~s\n", [aeso_errors:pp(E)]) || E <- Errs ],
         error({parse_errors, Errs})
     end.

test/aeso_calldata_tests.erl

@@ -6,7 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_calldata_tests).
+-module(aeso_calldata_tests).
 
 -compile([export_all, nowarn_export_all]).
 
@@ -18,7 +18,7 @@
 calldata_test_() ->
      [ {"Testing " ++ ContractName ++ " contract calling " ++ Fun,
         fun() ->
-           ContractString = so_test_utils:read_contract(ContractName),
+           ContractString = aeso_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       = so_test_utils:read_contract(ContractName),
-           {ok, ContractACIBin} = so_aci:contract_interface(string, ContractString, [no_code]),
+           ContractString       = aeso_test_utils:read_contract(ContractName),
+           {ok, ContractACIBin} = aeso_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}}]}]}] =
-        so_parser:string("main contract Temp = function foo() = " ++ Fun ++ "(" ++ string:join(Args, ", ") ++ ")"),
+        aeso_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 so_compiler:create_calldata(ContractString, Fun, Args, Opts)),
-    {ok, _Types, Exprs} = (catch so_compiler:decode_calldata(ContractString, Fun, Data, Opts)),
+    {ok, Data} = (catch aeso_compiler:create_calldata(ContractString, Fun, Args, Opts)),
+    {ok, _Types, Exprs} = (catch aeso_compiler:decode_calldata(ContractString, Fun, Data, Opts)),
     ?assert(is_list(Exprs)),
     strip_ann(Exprs).
 
@@ -85,11 +85,12 @@ compilable_contracts() ->
      {"funargs", "bitsum", ["Bits.clear(Bits.clear(Bits.all, 4), 2)"]}, %% Order matters for test
      {"funargs", "bitsum", ["Bits.set(Bits.set(Bits.none, 4), 2)"]},
      {"funargs", "read", ["{label = \"question 1\", result = 4}"]},
-     {"funargs", "any_bytes", ["Bytes.to_any_size(#0011AA)"]},
      {"funargs", "sjutton", ["#0011012003100011012003100011012003"]},
      {"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", ["()"]},
@@ -115,7 +116,6 @@ compilable_contracts() ->
      {"funargs", "chain_base_tx", ["Chain.NameRevokeTx(#ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
      {"funargs", "chain_base_tx", ["Chain.NameTransferTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, #ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
      {"funargs", "chain_base_tx", ["Chain.GAAttachTx"]},
-     {"funargs", "sig", ["sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj"]},
      {"variant_types", "init", []},
      {"basic_auth", "init", []},
      {"address_literals", "init", []},

test/aeso_compiler_tests.erl

@@ -6,7 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_compiler_tests).
+-module(aeso_compiler_tests).
 
 -compile([export_all, nowarn_export_all]).
 
@@ -28,14 +28,14 @@ simple_compile_test_() ->
        fun() ->
            case compile(ContractName) of
                #{fate_code := Code} ->
-                   Code1 = gmb_fate_code:deserialize(gmb_fate_code:serialize(Code)),
+                   Code1 = aeb_fate_code:deserialize(aeb_fate_code:serialize(Code)),
                    ?assertMatch({X, X}, {Code1, Code});
                Error -> io:format("\n\n~p\n\n", [Error]), print_and_throw(Error)
            end
        end} || ContractName <- compilable_contracts()] ++
     [ {"Test file not found error",
        fun() ->
-           {error, Errors} = so_compiler:file("does_not_exist.aes"),
+           {error, Errors} = aeso_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([so_test_utils:contract_path(), File])),
+                   {ok, Bin} = file:read_file(filename:join([aeso_test_utils:contract_path(), File])),
                    {File, Bin}
                  end || File <- ["included.aes", "../contracts/included2.aes"] ]),
            #{byte_code := Code1} = compile("include", [{include, {explicit_files, FileSystem}}]),
@@ -70,21 +70,20 @@ simple_compile_test_() ->
        fun() ->
            #{ warnings := Warnings } = compile("warnings", [warn_all]),
            #{ warnings := [] } = compile("warning_unused_include_no_include", [warn_all]),
-           #{ warnings := [] } = compile("warning_used_record_typedef", [warn_all]),
            check_warnings(warnings(), Warnings)
        end} ] ++
     [].
 
 %% Check if all modules in the standard library compile
 stdlib_test_() ->
-    {ok, Files} = file:list_dir(so_stdlib:stdlib_include_path()),
+    {ok, Files} = file:list_dir(aeso_stdlib:stdlib_include_path()),
     [ { "Testing " ++ File ++ " from the stdlib",
       fun() ->
           String = "include \"" ++ File ++ "\"\nmain contract Test =\n  entrypoint f(x) = x",
           Options = [{src_file, File}],
-          case so_compiler:from_string(String, Options) of
+          case aeso_compiler:from_string(String, Options) of
               {ok, #{fate_code := Code}} ->
-                  Code1 = gmb_fate_code:deserialize(gmb_fate_code:serialize(Code)),
+                  Code1 = aeb_fate_code:deserialize(aeb_fate_code:serialize(Code)),
                   ?assertMatch({X, X}, {Code1, Code});
               {error, Error} -> io:format("\n\n~p\n\n", [Error]), print_and_throw(Error)
           end
@@ -97,7 +96,7 @@ check_errors(Expect, #{}) ->
     ?assertEqual({error, Expect}, ok);
 check_errors(Expect0, Actual0) ->
     Expect = lists:sort(Expect0),
-    Actual = [ list_to_binary(string:trim(so_errors:pp(Err))) || Err <- Actual0 ],
+    Actual = [ list_to_binary(string:trim(aeso_errors:pp(Err))) || Err <- Actual0 ],
     case {Expect -- Actual, Actual -- Expect} of
         {[], Extra}   -> ?assertMatch({unexpected, []}, {unexpected, Extra});
         {Missing, []} -> ?assertMatch({missing, []}, {missing, Missing});
@@ -106,7 +105,7 @@ check_errors(Expect0, Actual0) ->
 
 check_warnings(Expect0, Actual0) ->
     Expect = lists:sort(Expect0),
-    Actual = [ list_to_binary(string:trim(so_warnings:pp(Warn))) || Warn <- Actual0 ],
+    Actual = [ list_to_binary(string:trim(aeso_warnings:pp(Warn))) || Warn <- Actual0 ],
     case {Expect -- Actual, Actual -- Expect} of
         {[], Extra}   -> ?assertMatch({unexpected, []}, {unexpected, Extra});
         {Missing, []} -> ?assertMatch({missing, []}, {missing, Missing});
@@ -114,19 +113,19 @@ check_warnings(Expect0, Actual0) ->
     end.
 
 compile(Name) ->
-    compile( Name, [{include, {file_system, [so_test_utils:contract_path()]}}]).
+    compile( Name, [{include, {file_system, [aeso_test_utils:contract_path()]}}]).
 
 compile(Name, Options) ->
-    String = so_test_utils:read_contract(Name),
+    String = aeso_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, [so_test_utils:contract_path()]}}
+        , {include, {file_system, [aeso_test_utils:contract_path()]}}
         ] ++ Options,
-    case so_compiler:from_string(String, Options1) of
+    case aeso_compiler:from_string(String, Options1) of
         {ok, Map}                                        -> Map;
         {error, ErrorString} when is_binary(ErrorString) -> ErrorString;
         {error, Errors}                                  -> Errors
@@ -145,6 +144,7 @@ compilable_contracts() ->
      "fundme",
      "identity",
      "maps",
+     "oracles",
      "remote_call",
      "remote_call_ambiguous_record",
      "simple",
@@ -161,7 +161,6 @@ compilable_contracts() ->
      "state_handling",
      "events",
      "include",
-     "relative_include",
      "basic_auth",
      "basic_auth_tx",
      "bitcoin_auth",
@@ -171,7 +170,6 @@ compilable_contracts() ->
      "namespace_bug",
      "bytes_to_x",
      "bytes_concat",
-     "bytes_misc",
      "aens",
      "aens_update",
      "tuple_match",
@@ -222,9 +220,9 @@ compilable_contracts() ->
      "polymorphic_entrypoint_return",
      "polymorphic_map_keys",
      "unapplied_contract_call",
+     "unapplied_named_arg_builtin",
      "resolve_field_constraint_by_arity",
      "toplevel_constants",
-     "ceres",
      "test" % Custom general-purpose test file. Keep it last on the list.
     ].
 
@@ -297,7 +295,7 @@ warnings() ->
      ]).
 
 failing_contracts() ->
-    {ok, V} = so_compiler:numeric_version(),
+    {ok, V} = aeso_compiler:numeric_version(),
     Version = list_to_binary(string:join([integer_to_list(N) || N <- V], ".")),
     %% Parse errors
     [ ?PARSE_ERROR(field_parse_error,
@@ -449,10 +447,6 @@ failing_contracts() ->
         [<<?Pos(12, 42)
            "Cannot unify `int` and `string`\n"
            "when checking the type of the expression `r.foo() : map(int, string)` "
-           "against the expected type `map(string, int)`">>,
-         <<?Pos(12, 42)
-           "Cannot unify `string` and `int`\n"
-           "when checking the type of the expression `r.foo() : map(int, string)` "
            "against the expected type `map(string, int)`">>])
     , ?TYPE_ERROR(not_toplevel_include,
                   [<<?Pos(2, 11)
@@ -464,7 +458,11 @@ failing_contracts() ->
         [<<?Pos(2, 12)
            "Nested contracts are not allowed. Contract `Con` is not defined at top level.">>])
     , ?TYPE_ERROR(bad_address_literals,
-        [<<?Pos(9, 5)
+        [<<?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` "
            "against the expected type `Remote`">>,
@@ -472,17 +470,52 @@ 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(12, 5)
+         <<?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)
            "The type `address` is not a contract type\n"
            "when checking that the contract literal "
            "`ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ` "
            "has the type `address`">>,
-         <<?Pos(14, 5)
+         <<?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)
            "The type `bytes(32)` is not a contract type\n"
            "when checking that the contract literal "
            "`ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ` "
            "has the type `bytes(32)`">>,
-         <<?Pos(16, 5),
+         <<?Pos(34, 5),
            "The type `address` is not a contract type\n"
            "when checking that the call to `Address.to_contract` "
            "has the type `address`">>])
@@ -571,21 +604,6 @@ failing_contracts() ->
         [<<?Pos(3, 5)
            "Unbound variable `Chain.event`\n"
            "Did you forget to define the event type?">>])
-    , ?TYPE_ERROR(bad_bytes_to_x,
-        [<<?Pos(3, 35)
-           "Cannot resolve length of byte array in\n"
-           "  the result of a call to Bytes.to_fixed_size">>,
-         <<?Pos(4, 36)
-           "Cannot unify `bytes()` and `bytes(4)`\nwhen checking the application of\n"
-           "  `Bytes.to_fixed_size : (bytes()) => option('a)`\n"
-           "to arguments\n"
-           "  `b : bytes(4)`">>,
-         <<?Pos(4, 36)
-           "Cannot resolve length of byte array in\n"
-           "  the result of a call to Bytes.to_fixed_size">>,
-         <<?Pos(5, 35)
-           "Cannot resolve length of byte array in\n"
-           "  the first argument of a call to Bytes.to_any_size">>])
     , ?TYPE_ERROR(bad_bytes_concat,
         [<<?Pos(12, 40)
            "Failed to resolve byte array lengths in call to Bytes.concat with arguments of type\n"
@@ -610,8 +628,7 @@ failing_contracts() ->
            "and result type\n"
            "  - 'c  (at line 16, column 39)">>,
          <<?Pos(19, 25)
-           "Cannot resolve type of byte array in\n"
-           "  the first argument of a call to Bytes.to_str">>])
+           "Cannot resolve length of byte array.">>])
     , ?TYPE_ERROR(bad_bytes_split,
          [<<?Pos(13, 5)
             "Failed to resolve byte array lengths in call to Bytes.split with argument of type\n"
@@ -854,10 +871,10 @@ failing_contracts() ->
                      "Trying to implement or extend an undefined interface `Z`">>
                   ])
     , ?TYPE_ERROR(polymorphism_contract_interface_same_name_different_type,
-                  [<<?Pos(5,5)
-                     "Cannot unify `char` and `int`\n"
-                     "when implementing the entrypoint `f` from the interface `I1`">>
-                  ])
+                  [<<?Pos(9,5)
+                     "Duplicate definitions of `f` at\n"
+                     "  - line 8, column 5\n"
+                     "  - line 9, column 5">>])
     , ?TYPE_ERROR(polymorphism_contract_missing_implementation,
                   [<<?Pos(4,20)
                      "Unimplemented entrypoint `f` from the interface `I1` in the contract `I2`">>
@@ -911,9 +928,6 @@ failing_contracts() ->
                    <<?Pos(67,36)
                      "Cannot unify `Cat` and `Animal` in a contravariant context\n"
                      "when checking the application of\n  `DT_INV : ((Cat) => Cat) => dt_inv(Cat)`\nto arguments\n  `f_c_to_a : (Cat) => Animal`">>,
-                   <<?Pos(67,36)
-                     "Cannot unify `Cat` and `Animal` in a invariant context\n"
-                     "when checking the type of the expression `DT_INV(f_c_to_a) : dt_inv(Cat)` against the expected type `dt_inv(Animal)`">>,
                    <<?Pos(68,36)
                      "Cannot unify `Cat` and `Animal` in a invariant context\n"
                      "when checking the type of the expression `DT_INV(f_c_to_c) : dt_inv(Cat)` against the expected type `dt_inv(Animal)`">>,
@@ -962,9 +976,6 @@ failing_contracts() ->
                    <<?Pos(116,59)
                      "Cannot unify `Cat` and `Animal` in a contravariant context\n"
                      "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u) : dt_a_contra_b_contra(Cat, Cat)` against the expected type `dt_a_contra_b_contra(Animal, Animal)`">>,
-                   <<?Pos(116,59)
-                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
-                     "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_c_to_u) : dt_a_contra_b_contra(Cat, Cat)` against the expected type `dt_a_contra_b_contra(Animal, Animal)`">>,
                    <<?Pos(119,59)
                      "Cannot unify `Cat` and `Animal` in a contravariant context\n"
                      "when checking the type of the expression `DT_A_CONTRA_B_CONTRA(f_c_to_a_to_u) : dt_a_contra_b_contra(Cat, Animal)` against the expected type `dt_a_contra_b_contra(Animal, Cat)`">>,
@@ -995,6 +1006,50 @@ 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(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(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"
@@ -1049,22 +1104,50 @@ failing_contracts() ->
                   ])
     , ?TYPE_ERROR(polymorphic_aens_resolve,
                   [<<?Pos(4,5)
-                     "Invalid return type of `AENSv2.resolve`:\n"
+                     "Invalid return type of `AENS.resolve`:\n"
                      "  `'a`\n"
                      "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
                   ])
     , ?TYPE_ERROR(bad_aens_resolve,
                   [<<?Pos(6,5)
-                     "Invalid return type of `AENSv2.resolve`:\n"
+                     "Invalid return type of `AENS.resolve`:\n"
                      "  `list(int)`\n"
                      "It must be a `string` or a pubkey type (`address`, `oracle`, etc)">>
                   ])
     , ?TYPE_ERROR(bad_aens_resolve_using,
                   [<<?Pos(7,5)
-                     "Invalid return type of `AENSv2.resolve`:\n"
+                     "Invalid return type of `AENS.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)">>
+                  ])
     , ?TYPE_ERROR(var_args_unify_let,
                   [<<?Pos(3,9)
                      "Cannot infer types for variable argument list.\n"
@@ -1183,10 +1266,6 @@ failing_contracts() ->
                    <<?Pos(3,9)
                      "The name of the compile-time constant cannot have pattern matching">>
                   ])
-    , ?TYPE_ERROR(too_many_tvars,
-                  [<<?Pos(2,3)
-                     "Too many type variables (max 256) in definition of `too_many`">>
-                  ])
     ].
 
 validation_test_() ->
@@ -1226,17 +1305,15 @@ validation_fails() ->
 validate(Contract1, Contract2) ->
     case compile(Contract1) of
         ByteCode = #{ fate_code := FCode } ->
-            FCode1   = gmb_fate_code:serialize(gmb_fate_code:strip_init_function(FCode)),
-            Source   = so_test_utils:read_contract(Contract2),
-            so_compiler:validate_byte_code(
+            FCode1   = aeb_fate_code:serialize(aeb_fate_code:strip_init_function(FCode)),
+            Source   = aeso_test_utils:read_contract(Contract2),
+            aeso_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, [so_test_utils:contract_path()]}}
-                  ]);
+                  [{include, {file_system, [aeso_test_utils:contract_path()]}}]);
         Error -> print_and_throw(Error)
     end.
 
@@ -1246,6 +1323,6 @@ print_and_throw(Err) ->
             io:format("\n~s", [ErrBin]),
             error(ErrBin);
         Errors ->
-            io:format("Compilation error:\n~s", [string:join([so_errors:pp(E) || E <- Errors], "\n\n")]),
+            io:format("Compilation error:\n~s", [string:join([aeso_errors:pp(E) || E <- Errors], "\n\n")]),
             error(compilation_error)
     end.

test/aeso_eunit_SUITE.erl

@@ -0,0 +1,22 @@
+-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).

test/aeso_parser_tests.erl

@@ -1,4 +1,4 @@
--module(so_parser_tests).
+-module(aeso_parser_tests).
 
 -export([parse_contract/1]).
 
@@ -53,7 +53,7 @@ simple_contracts_test_() ->
             %% associativity
             [ RightAssoc(Op) || Op <- ["||", "&&", "::", "++"] ],
             [ NonAssoc(Op)   || Op <- ["==", "!=", "<", ">", "=<", ">="] ],
-            [ LeftAssoc(Op)  || Op <- ["+", "-", "*", "/", "mod", "band", "bor", "bxor", "<<", ">>"] ],
+            [ LeftAssoc(Op)  || Op <- ["+", "-", "*", "/", "mod"] ],
 
             %% precedence
             [ Stronger(Op2, Op1) || [T1 , T2 | _] <- tails(Tiers), Op1 <- T1, Op2 <- T2 ],
@@ -68,15 +68,15 @@ simple_contracts_test_() ->
     }.
 
 parse_contract(Name) ->
-    parse_string(so_test_utils:read_contract(Name)).
+    parse_string(aeso_test_utils:read_contract(Name)).
 
 roundtrip_contract(Name) ->
-    round_trip(so_test_utils:read_contract(Name)).
+    round_trip(aeso_test_utils:read_contract(Name)).
 
 parse_string(Text) -> parse_string(Text, []).
 
 parse_string(Text, Opts) ->
-    so_parser:string(Text, Opts).
+    aeso_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(so_pretty:decls(strip_stdlib(Contract))),
-    Contract1 = parse_string(so_scan:utf8_encode(Text1)),
+    Text1     = prettypr:format(aeso_pretty:decls(strip_stdlib(Contract))),
+    Contract1 = parse_string(aeso_scan:utf8_encode(Text1)),
     NoSrcLoc  = remove_line_numbers(Contract),
     NoSrcLoc1 = remove_line_numbers(Contract1),
     ?assertMatch(NoSrcLoc, diff(NoSrcLoc, NoSrcLoc1)).

test/aeso_scan_tests.erl

@@ -1,4 +1,4 @@
--module(so_scan_tests).
+-module(aeso_scan_tests).
 
 -include_lib("eunit/include/eunit.hrl").
 
@@ -13,7 +13,7 @@ empty_contract_test_() ->
      [{"Scan an empty contract.",
        fun() ->
                Text = " ",
-               {ok, []} = so_scan:scan(Text),
+               {ok, []} = aeso_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} = so_scan:scan(Text),
+            {ok, Tokens1} = aeso_scan:scan(Text),
             true = compare_tokens(Tokens, Tokens1),
             ok
         end}
@@ -39,8 +39,7 @@ all_tokens() ->
     %% Symbols
     lists:map(Lit, [',', '.', ';', '|', ':', '(', ')', '[', ']', '{', '}']) ++
     %% Operators
-    lists:map(Lit, ['=', '==', '!=', '>', '<', '>=', '=<', '-', '+', '++', '*', '/', mod,
-                    ':', '::', '->', '=>', '||', '&&', '!', 'band', 'bor', 'bxor', 'bnot' ,'<<', '>>']) ++
+    lists:map(Lit, ['=', '==', '!=', '>', '<', '>=', '=<', '-', '+', '++', '*', '/', mod, ':', '::', '->', '=>', '||', '&&', '!']) ++
     %% Keywords
     lists:map(Lit, [contract, type, 'let', switch]) ++
     %% Comment token (not an actual token), just for tests

test/aeso_test_utils.erl

@@ -6,12 +6,12 @@
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_test_utils).
+-module(aeso_test_utils).
 
 -export([read_contract/1, contract_path/0]).
 
 contract_path() ->
-    filename:join(code:lib_dir(sophia, test), "contracts").
+    filename:join(code:lib_dir(aesophia, test), "contracts").
 
 %% Read a contract file from the test/contracts directory.
 -spec read_contract(string() | atom()) -> string().

test/contracts/address_chain.aes

@@ -2,12 +2,27 @@ 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)
 

test/contracts/address_literals.aes

@@ -5,6 +5,10 @@ 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 =

test/contracts/aens.aes

@@ -6,71 +6,77 @@ main contract AENSTest =
   // Name resolution
 
   stateful entrypoint resolve_word(name : string, key : string) : option(address) =
-    AENSv2.resolve(name, key)
+    AENS.resolve(name, key)
 
   stateful entrypoint resolve_string(name : string, key : string) : option(string) =
-    AENSv2.resolve(name, key)
+    AENS.resolve(name, key)
 
   stateful entrypoint resolve_contract(name : string, key : string) : option(C) =
-    AENSv2.resolve(name, key)
+    AENS.resolve(name, key)
+
+  stateful entrypoint resolve_oracle(name : string, key : string) : option(oracle(int, int)) =
+    AENS.resolve(name, key)
+
+  stateful entrypoint resolve_oracle_query(name : string, key : string) : option(oracle_query(int, int)) =
+    AENS.resolve(name, key)
 
   // Transactions
 
   stateful entrypoint preclaim(addr  : address,     // Claim on behalf of this account (can be Contract.address)
                                chash : hash) : unit = // Commitment hash
-    AENSv2.preclaim(addr, chash)
+    AENS.preclaim(addr, chash)
 
   stateful entrypoint signedPreclaim(addr  : address, // Claim on behalf of this account (can be Contract.address)
                                    chash : hash,             // Commitment hash
                                    sign  : signature) : unit = // Signed by addr (if not Contract.address)
-    AENSv2.preclaim(addr, chash, signature = sign)
+    AENS.preclaim(addr, chash, signature = sign)
 
   stateful entrypoint claim(addr : address,
                           name : string,
                           salt : int,
                           name_fee : int) : unit =
-    AENSv2.claim(addr, name, salt, name_fee)
+    AENS.claim(addr, name, salt, name_fee)
 
   stateful entrypoint signedClaim(addr : address,
                                 name : string,
                                 salt : int,
                                 name_fee : int,
                                 sign : signature) : unit =
-    AENSv2.claim(addr, name, salt, name_fee, signature = sign)
+    AENS.claim(addr, name, salt, name_fee, signature = sign)
 
 
   stateful entrypoint update(owner      : address,
                              name       : string,
                              ttl        : option(Chain.ttl),
                              client_ttl : option(int),
-                             pointers   : option(map(string, AENSv2.pointee))) : unit =
-    AENSv2.update(owner, name, ttl, client_ttl, pointers)
+                             pointers   : option(map(string, AENS.pointee))) : unit =
+    AENS.update(owner, name, ttl, client_ttl, pointers)
 
   stateful entrypoint signedUpdate(owner      : address,
                                    name       : string,
                                    ttl        : option(Chain.ttl),
                                    client_ttl : option(int),
-                                   pointers   : option(map(string, AENSv2.pointee)),
+                                   pointers   : option(map(string, AENS.pointee)),
                                    sign       : signature) : unit =
-    AENSv2.update(owner, name, ttl, client_ttl, pointers, signature = sign)
+    AENS.update(owner, name, ttl, client_ttl, pointers, signature = sign)
 
 
   stateful entrypoint transfer(owner     : address,
                              new_owner : address,
                              name      : string) : unit =
-    AENSv2.transfer(owner, new_owner, name)
+    AENS.transfer(owner, new_owner, name)
 
   stateful entrypoint signedTransfer(owner     : address,
                                      new_owner : address,
                                      name      : string,
                                      sign      : signature) : unit =
-    AENSv2.transfer(owner, new_owner, name, signature = sign)
+    AENS.transfer(owner, new_owner, name, signature = sign)
 
   stateful entrypoint revoke(owner     : address,
                            name      : string) : unit =
-    AENSv2.revoke(owner, name)
+    AENS.revoke(owner, name)
 
   stateful entrypoint signedRevoke(owner     : address,
                                    name      : string,
                                    sign      : signature) : unit =
-    AENSv2.revoke(owner, name, signature = sign)
+    AENS.revoke(owner, name, signature = sign)

test/contracts/aens_update.aes

@@ -1,29 +1,17 @@
-include "Option.aes"
-include "String.aes"
-include "AENSCompat.aes"
-contract interface OldAENSContract =
-  entrypoint set : (string, string, AENS.pointee) => unit
-  entrypoint lookup : (string, string) => AENS.pointee
-
-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))
-    AENSv2.update(owner, name, None, None,
-                  Some({ ["account_pubkey"] = p1,
-                         ["contract_pubkey"] = p3, ["misc"] = p4, ["data"] = p5, ["data2"] = p6 }))
-
-  stateful entrypoint old_interaction(c : OldAENSContract, owner : address, name : string) =
-    let p : AENS.pointee = c.lookup(name, "key1")
-    AENSv2.update(owner, name, None, None, Some({ ["key1"] = AENSCompat.pointee_to_V2(p) }))
-    switch(AENSv2.lookup(name))
-      Some(AENSv2.Name(_, _, pt_map)) =>
-        c.set(name, "key2", Option.force(AENSCompat.pointee_from_V2(pt_map["key1"])))
+contract AENSUpdate =
+  stateful entrypoint update_name(owner : address, name : string) =
+    let p1 : AENS.pointee = AENS.AccountPt(Call.caller)
+    let p2 : AENS.pointee = AENS.OraclePt(Call.caller)
+    let p3 : AENS.pointee = AENS.ContractPt(Call.caller)
+    let p4 : AENS.pointee = AENS.ChannelPt(Call.caller)
+    AENS.update(owner, name, None, None,
+                Some({ ["account_pubkey"] = p1, ["oracle_pubkey"] = p2,
+                       ["contract_pubkey"] = p3, ["misc"] = p4 }))
 
   entrypoint get_ttl(name : string) =
-    switch(AENSv2.lookup(name))
-     Some(AENSv2.Name(_, FixedTTL(ttl), _)) => ttl
+    switch(AENS.lookup(name))
+     Some(AENS.Name(_, FixedTTL(ttl), _)) => ttl
+
+  entrypoint expiry(o : oracle(int, int)) : int =
+    Oracle.expiry(o)
+

test/contracts/bad_address_literals.aes

@@ -7,9 +7,27 @@ 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 =

test/contracts/bad_aens_resolve.aes

@@ -3,7 +3,7 @@ contract BadAENSresolve =
   type t('a) = option(list('a))
 
   function fail() : t(int) =
-    AENSv2.resolve("foo.aet", "whatever")
+    AENS.resolve("foo.aet", "whatever")
 
   entrypoint main_fun() = ()
 

test/contracts/bad_aens_resolve_using.aes

@@ -1,9 +1,9 @@
 contract BadAENSresolve =
-  using AENSv2
+  using AENS
 
   type t('a) = option(list('a))
 
   function fail() : t(int) =
     resolve("foo.aet", "whatever")
 
-  entrypoint main_fun() = ()
+  entrypoint main_fun() = ()

test/contracts/bad_bytes_to_x.aes

@@ -1,5 +0,0 @@
-// include "String.aes"
-contract BytesToX =
-  entrypoint fail1(b : bytes()) = Bytes.to_fixed_size(b)
-  entrypoint fail2(b : bytes(4)) = Bytes.to_fixed_size(b)
-  entrypoint fail3(b : bytes()) = Bytes.to_any_size(b)

test/contracts/bytes_misc.aes

@@ -1,27 +0,0 @@
-include "String.aes"
-contract BytesMisc =
-  entrypoint sizeFixed(b : bytes(4)) : int = Bytes.size(b)
-  entrypoint sizeAny(b : bytes()) : int = Bytes.size(b)
-  entrypoint int_to_bytes(i : int) : bytes() = Int.to_bytes(i, 16)
-
-  entrypoint test(b3 : bytes(3), b7 : bytes(7), bX : bytes, i : int, s : string) =
-    let bi = Int.to_bytes(i, 8)
-    let bs = String.to_bytes(s)
-
-    let b10 = Bytes.concat(b3, b7)
-
-    let (b4, b6 : bytes(6)) = Bytes.split(b10)
-
-    let Some((b8, b2)) = Bytes.split_any(bX, 8)
-
-    let bX7 = Bytes.concat(bX, b7)
-
-    let Some((b5, bX2)) = Bytes.split_any(bX7, 5)
-
-    let Some((b7b, b0)) = Bytes.split_any(bX, Bytes.size(b7))
-
-    let Some(b5b : bytes(5)) = Bytes.to_fixed_size(b5)
-
-    let (b1 : bytes(1), _) = Bytes.split(b5b)
-
-    [bi, bs, b0, Bytes.to_any_size(b1), b2, Bytes.to_any_size(b4), Bytes.to_any_size(b6), b7b, b8, bX2]

test/contracts/bytes_to_x.aes

@@ -6,5 +6,3 @@ contract BytesToX =
     String.concat(Bytes.to_str(b), Bytes.to_str(#ffff))
   entrypoint to_str_big(b : bytes(65)) : string =
     Bytes.to_str(b)
-  entrypoint to_fixed(b : bytes()) : option(bytes(4)) = Bytes.to_fixed_size(b)
-  entrypoint to_any(b : bytes(4)) = Bytes.to_any_size(b)

test/contracts/ceres.aes

@@ -1,15 +0,0 @@
-contract C =
-  entrypoint test() =
-    let a : int = 23
-    let b : int = 52
-    let c = a bor b
-    let d = c bxor b
-    let e = d band b
-    let f = bnot a
-    let g = f << 2
-    let h = g >> 2
-    let i = Int.mulmod(a, b, h)
-    let j = Crypto.poseidon(i, a)
-    let k : bytes(32) = Address.to_bytes(Call.origin)
-    let l = sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj
-    (a bor b band c bxor a << bnot b >> a, k, l)

test/contracts/chain.aes

@@ -2,8 +2,7 @@
 
 contract ChainTest =
 
-  record state = { last_bf : address
-                 , nw_id   : string }
+  record state = { last_bf : address }
 
   function init() : state =
     {last_bf = Contract.address}
@@ -12,6 +11,3 @@ contract ChainTest =
 
   function save_coinbase() =
     put(state{last_bf = Chain.coinbase})
-
-  function save_network_id() =
-    put(state{nw_id = Chain.network_id})

test/contracts/dir1/bar.aes

@@ -1,4 +0,0 @@
-include "../dir2/baz.aes"
-namespace D =
-  function g() = E.h()
-

test/contracts/dir2/baz.aes

@@ -1,3 +0,0 @@
-namespace E =
-  function h() = 42
-

test/contracts/events.aes

@@ -11,6 +11,8 @@ 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
@@ -24,6 +26,7 @@ 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)
@@ -32,5 +35,6 @@ 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))
 

test/contracts/funargs.aes

@@ -20,8 +20,6 @@ contract FunctionArguments =
   entrypoint read(a : answer(int)) =
      a.result
 
-  entrypoint any_bytes(b : bytes()) = b
-
   entrypoint sjutton(b : bytes(17)) =
      b
 
@@ -31,6 +29,12 @@ 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) =
@@ -53,5 +57,3 @@ contract FunctionArguments =
   entrypoint chain_ga_meta_tx(tx : Chain.ga_meta_tx) = true
   entrypoint chain_paying_for_tx(tx : Chain.paying_for_tx) = true
   entrypoint chain_base_tx(tx : Chain.base_tx) = true
-
-  entrypoint sig(sg : signature) = true

test/contracts/higher_order_query_type.aes

@@ -0,0 +1,5 @@
+contract HigherOrderQueryType =
+  stateful function foo(o) : oracle_query(_, string ) =
+    Oracle.query(o, (x) => x + 1, 100, RelativeTTL(100), RelativeTTL(100))
+
+  entrypoint main_fun() = ()

test/contracts/higher_order_response_type.aes

@@ -0,0 +1,5 @@
+contract HigherOrderResponseType =
+  stateful function foo(o, q : oracle_query(string, _)) =
+    Oracle.respond(o, q, (x) => x + 1)
+
+  entrypoint main_fun() = ()

test/contracts/oracles.aes

@@ -0,0 +1,110 @@
+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)
+

test/contracts/polymorphic_aens_resolve.aes

@@ -1,7 +1,7 @@
 contract PolymorphicAENSresolve =
 
   function fail() : option('a) =
-    AENSv2.resolve("foo.aet", "whatever")
+    AENS.resolve("foo.aet", "whatever")
 
   entrypoint main_fun() = ()
 

test/contracts/polymorphic_query_type.aes

@@ -0,0 +1,5 @@
+contract PolymorphicQueryType =
+  stateful function is_oracle(o) =
+    Oracle.check(o)
+
+  entrypoint main_fun() = ()

test/contracts/polymorphic_response_type.aes

@@ -0,0 +1,5 @@
+contract PolymorphicResponseType =
+  function is_oracle(o : oracle(string, 'r)) =
+    Oracle.check(o)
+
+  entrypoint main_fun(o : oracle(string, int)) = is_oracle(o)

test/contracts/polymorphism_variance_switching_oracles.aes

@@ -0,0 +1,47 @@
+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
+
+        ()

test/contracts/relative_include.aes

@@ -1,3 +0,0 @@
-include "./dir1/bar.aes"
-contract C =
-  entrypoint f() = D.g()

test/contracts/test.aes

@@ -1,5 +1,5 @@
 // This is a custom test file if you need to run a compiler without
-// changing so_compiler_tests.erl
+// changing aeso_compiler_tests.erl
 
 include "List.aes"
 

test/contracts/too_many_tvars.aes

@@ -1,60 +0,0 @@
-contract C =
-  entrypoint too_many(
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _)) = 0
-
-  entrypoint not_too_many(
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _, _, _, _, _),
-      (_, _, _, _, _, _)) = 0

test/contracts/toplevel_constants.aes

@@ -28,6 +28,8 @@ 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
@@ -52,6 +54,8 @@ contract C =
     entrypoint f16() = c16
     entrypoint f17() = c17
     entrypoint f18() = c18
+    entrypoint f19() = c19
+    entrypoint f20() = c20
     entrypoint f21() = c21
     entrypoint f22() = c22
     entrypoint f23() = c23

test/contracts/unapplied_builtins.aes

@@ -1,12 +1,16 @@
 // Builtins without named arguments can appear unapplied.
 // Named argument builtins are:
-//    AENSv2.preclaim
-//    AENSv2.claim
-//    AENSv2.transfer
-//    AENSv2.revoke
+//    Oracle.register
+//    Oracle.respond
+//    AENS.preclaim
+//    AENS.claim
+//    AENS.transfer
+//    AENS.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)
@@ -17,7 +21,14 @@ contract UnappliedBuiltins =
   function call_gas_left()               = Call.gas_left
   function b_abort()                     = abort
   function b_require()                   = require
-  function aens_resolve()                = AENSv2.resolve      : (_, _) => option(string)
+  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()                = AENS.resolve        : (_, _) => option(string)
   function map_lookup()                  = Map.lookup          : (_, m) => _
   function map_lookup_default()          = Map.lookup_default  : (_, m, _) => _
   function map_member()                  = Map.member          : (_, m) => _
@@ -25,7 +36,7 @@ contract UnappliedBuiltins =
   function map_delete()                  = Map.delete : (_, m) => _
   function map_from_list()               = Map.from_list : _ => m
   function map_to_list()                 = Map.to_list : m => _
-  function crypto_verify_sig()           = Crypto.verify_sig : (bytes(), _, _) => _
+  function crypto_verify_sig()           = Crypto.verify_sig
   function crypto_verify_sig_secp256k1() = Crypto.verify_sig_secp256k1
   function crypto_ecverify_secp256k1()   = Crypto.ecverify_secp256k1
   function crypto_ecrecover_secp256k1()  = Crypto.ecrecover_secp256k1
@@ -46,6 +57,7 @@ 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

test/contracts/unapplied_named_arg_builtin.aes

@@ -0,0 +1,4 @@
+contract UnappliedNamedArgBuiltin =
+  stateful entrypoint main_fun(s) =
+    let reg = Oracle.register
+    reg(signature = s, Contract.address, 100, RelativeTTL(100)) : oracle(int, int)

test/contracts/warning_used_record_typedef.aes

@@ -1,5 +0,0 @@
-contract Test =
-    type option_int = option(int)
-    record option_point = {x: int, y: option_int}
-
-    entrypoint test_option_record(a: option_point) = a

test/so_encode_decode_tests.erl

@@ -1,40 +0,0 @@
--module(so_encode_decode_tests).
-
--compile([export_all, nowarn_export_all]).
-
--include_lib("eunit/include/eunit.hrl").
-
--define(EMPTY, "contract C =\n  entrypoint f() = true").
-
-encode_decode_test_() ->
-    [ {lists:flatten(io_lib:format("Testing encode-decode roundtrip for ~p : ~p", [Value, {EType, DType}])),
-       fun() ->
-           {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() ].
-
-test_data() ->
-    lists:map(fun({V, T}) -> {V, T, T};
-                 ({V, T1, T2}) -> {V, T1, T2} end, data()).
-
-data() ->
-    [ {"42", "int"}
-    , {"- 42", "int"}
-    , {"true", "bool"}
-    , {"ak_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ", "address"}
-    , {"ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ", "C"}
-    , {"Some(42)", "option(int)"}
-    , {"None", "option(int)"}
-    , {"(true, 42)", "bool * int"}
-    , {"{[1] = true, [3] = false}", "map(int, bool)"}
-    , {"()", "unit"}
-    , {"#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f", "hash"}
-    , {"#000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f", "bytes(32)"}
-    , {"sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj", "signature"}
-    , {"sg_MhibzTP1wWzGCTjtPFr1TiPqRJrrJqw7auvEuF5i3FdoALWqXLBDY6xxRRNUSPHK3EQTnTzF12EyspkxrSMxVHKsZeSMj", "bytes(64)", "signature"}
-    , {"#0102030405060708090a0b0c0d0e0f101718192021222324252627282930313233343536373839401a1b1c1d1e1f202122232425262728293031323334353637", "bytes(64)"}
-    , {"#0102030405060708090a0b0c0d0e0f101718192021222324252627282930313233343536373839401a1b1c1d1e1f202122232425262728293031323334353637", "signature", "bytes(64)"}
-    ].
-

test/so_eunit_SUITE.erl

@@ -1,22 +0,0 @@
--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).