[Ceres] Raw pointers as bytes (#493)

* DataPt should contain bytes() now that we have it

* Fix missing negation in docs

.github/workflows/requirements.txt

@@ -2,4 +2,4 @@ mkdocs==1.4.2
 mkdocs-simple-hooks==0.1.5
 mkdocs-material==9.0.9
 mike==1.1.2
-pygments==2.17.2
+pygments==2.14.0

.gitignore

@@ -24,4 +24,3 @@ current_counterexample.eqc
 test/contracts/test.aes
 __pycache__
 .docssite/docs/*.md
-.vscode

CHANGELOG.md

@@ -4,18 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [CERES 8.0.0]
-### 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
-
-## [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.
@@ -23,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `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.pointee`, where the latter now has a constructor `DataPt(string)`. 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
@@ -34,33 +23,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   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]
+## [Unreleased]
+### Added
 ### Changed
-- Improve how includes with relative paths are resolved during parsing/compilation. Relative
+### Removed
-  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
@@ -456,11 +429,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
+[Unreleased]: https://github.com/aeternity/aesophia/compare/v7.3.0...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

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"
@@ -295,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
@@ -498,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
@@ -563,7 +540,6 @@ Sophia has the following types:
 ## Literals
 | Type                 | Constant/Literal example(s)                                                                                                         |
 | ----------           | -------------------------------                                                                                                     |
-| unit                 | ()                                                                                                                                  |
 | int                  | `-1`, `2425`, `4598275923475723498573485768`                                                                                        |
 | address              | `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt`                                                                             |
 | bool                 | `true`, `false`                                                                                                                     |
@@ -578,7 +554,7 @@ 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`                                                                             |
@@ -634,7 +610,7 @@ 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.
 
@@ -646,16 +622,10 @@ Sophia arbitrary-sized integers (FATE) also supports the following bitwise opera
 - 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
+Sophia integers do not support bit arithmetic. Instead there is a separate
-separate type `bits` (see the standard library
+type `bits`. See the standard library [documentation](sophia_stdlib.md#bits).
-[documentation](sophia_stdlib.md#bits)) - it is still provided as an
-alternative to bit arithmetic.
 
 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).
@@ -960,18 +930,16 @@ functions are provided.
 
 ## AENS interface
 
-Contracts can interact with the [æternity naming
+Contracts can interact with the
-system](https://github.com/aeternity/protocol/blob/master/AENS.md). For this
+[æternity naming system](https://github.com/aeternity/protocol/blob/master/AENS.md).
-purpose the [AENS](sophia_stdlib.md#aens) and later the
+For this purpose the [AENS](sophia_stdlib.md#aens) library was exposed.
-[AENSv2](sophia_stdlib.md#aensv2) 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
+`name` the account holder needs to create a
-signature](#delegation-signature) `sig` from the name owner address `addr`, the
+[signature](#delegation-signature) `sig` of `addr | name.hash | ct.address`.
-name hash and the contract address.
 
 Armed with this information we can for example write a function that extends
 the name if it expires within 1000 blocks:
@@ -1113,34 +1081,8 @@ however is in the gas consumption — while `abort` returns unused gas, a call t
 
 ## Delegation signature
 
-Some chain operations (`Oracle.<operation>` and `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.
+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
-### From Ceres
+the signature data with the `network_id` (`ae_mainnet` for the æternity mainnet, etc.).
-
-From the Ceres protocol version the delegation signatures have more structure,
-including a unique tag, `network_id` and identifiers; 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`
- - `ORACLE_REGISTER, ORACLE_EXTEND` - the user signs: `owner account + contract`
- - `ORACLE_RESPOND` - the user signs: `query id + contract`
-
-See [Serialized signature
-data](https://github.com/aeternity/protocol/blob/master/contracts/fate.md#from-ceres-serialized-signature-data)
-for the exact structure used.
-
-### Before ceres
-
-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.).
-
-There are four different delegation signatures:
- - `AENS_PRECLAIM` - the user signs: owner `network_id + account + contract`
- - `AENS_CLAIM, AENS_UPDATE, AENS_TRANSFER, AENS_REVOKE` - the user signs: `network_id + owner account + name hash + contract`
- - `ORACLE_REGISTER, ORACLE_EXTEND` - the user signs: `network_id + owner account + contract`
- - `ORACLE_RESPOND` - the user signs: `network_id + query id + contract`

docs/sophia_stdlib.md

@@ -146,7 +146,7 @@ datatype pointee = AccountPt(address) | OraclePt(address)
 ```
 
 Note: on-chain there is a maximum length enforced for `DataPt`, it is 1024 bytes.
-Sophia itself does _not_ check for this.
+Sophia itself does _not_ enforce this.
 
 #### Functions
 
@@ -181,14 +181,14 @@ Note: Changed to produce `AENSv2.name` in v8.0 (Ceres protocol upgrade).
 AENSv2.preclaim(owner : address, commitment_hash : hash, <signature : signature>) : unit
 ```
 
-The [signature](./sophia_features.md#delegation-signature) should be a
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `Contract.address` (concatenated as byte arrays).
-`Contract.address`.
 
 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`, `Contract.address`.
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
+`Contract.address`.
 
 
 ##### claim
@@ -196,14 +196,14 @@ signature), i.e. containing `network id`, `owner address`, `Contract.address`.
 AENSv2.claim(owner : address, name : string, salt : int, name_fee : int, <signature : signature>) : unit
 ```
 
-The [signature](./sophia_features.md#delegation-signature) should be a
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `name_hash` + `Contract.address` (concatenated
-`Contract.address`. Using the private key of `owner address` for signing.
+as byte arrays) using the private key of the `owner` account 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
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
 `Contract.address`.
 
 
@@ -214,14 +214,15 @@ AENSv2.transfer(owner : address, new_owner : address, name : string, <signature
 
 Transfers name to the new owner.
 
-The [signature](./sophia_features.md#delegation-signature) should be a
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `name_hash` + `Contract.address`
-`Contract.address`. Using the private key of `owner address` for signing.
+(concatenated as byte arrays)
+using the private key of the `owner` account 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
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
 `Contract.address`.
 
 
@@ -232,14 +233,15 @@ AENSv2.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
+The [signature](./sophia_features.md#delegation-signature) should be over
-serialized structure containing `network id`, `owner address`, and
+`network id` + `owner address` + `name_hash` + `Contract.address`
-`Contract.address`. Using the private key of `owner address` for signing.
+(concatenated as byte arrays)
+using the private key of the `owner` account 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
+signature), i.e. over `network id` + `owner address` + `string "AENS"` +
 `Contract.address`.
 
 
@@ -255,16 +257,6 @@ 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
 
 
@@ -614,6 +606,14 @@ 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.
 
+#### 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.
+
 The type `'c` must be instantiated with a contract.
 
 
@@ -679,8 +679,8 @@ Example usage:
 ```
 payable contract interface Auction =
   entrypoint init : (int, string) => void
-  stateful payable entrypoint buy : (int) => unit
+  stateful payable entrypoint buy : (int) => ()
-  stateful entrypoint sell : (int) => unit
+  stateful entrypoint sell : (int) => ()
 
 main contract Market =
   type state = list(Auction)
@@ -740,15 +740,6 @@ 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
@@ -894,8 +885,7 @@ 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
+necessary).
-single byte that will be indistinguishable from `127`.
 
 
 ### Map
@@ -954,11 +944,11 @@ Oracle.register(<signature : bytes(64)>, acct : address, qfee : int, ttl : Chain
 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).
-* The [signature](./sophia_features.md#delegation-signature) should be a
+* `signature` is a signature proving that the contract is allowed to register the account -
-  serialized structure containing `network id`, `account address`, and
+  the `network id` + `account address` + `contract address` (concatenated as byte arrays) is
-  `contract address`. Using the private key of `account address` for signing.
+  [signed](./sophia_features.md#delegation-signature) with the
-  Proving you have the private key of the oracle to be. If the address is the same
+  private key of the account, proving you have the private key of the oracle to be. If the
-  as the contract `sign` is ignored and can be left out entirely.
+  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)`).
@@ -972,7 +962,7 @@ Examples:
 ```
 
 
-#### get\_question
+#### get_question
 ```
 Oracle.get_question(o : oracle('a, 'b), q : oracle_query('a, 'b)) : 'a
 ```
@@ -985,11 +975,12 @@ Checks what was the question of query `q` on oracle `o`
 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
+Responds to the question `q` on `o`.
-as the oracle address the `signature` (which is an optional, named argument)
+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) should be a serialized
+[signing](./sophia_features.md#delegation-signature)
-structure containing `network id`, `oracle query id`, and `contract address`.
+the `network id` + `oracle query id` + `contract address`
 
 
 #### extend
@@ -1002,7 +993,7 @@ Extends TTL of an oracle.
 * `o` is the oracle being extended
 * `ttl` must be `RelativeTTL`. The time to live of `o` will be extended by this value.
 
-#### query\_fee
+#### query_fee
 ```
 Oracle.query_fee(o : oracle('a, 'b)) : int
 ```
@@ -1023,7 +1014,7 @@ Asks the oracle a question.
 The call fails if the oracle could expire before an answer.
 
 
-#### get\_answer
+#### get_answer
 ```
 Oracle.get_answer(o : oracle('a, 'b), q : oracle_query('a, 'b)) : option('b)
 ```
@@ -2476,9 +2467,7 @@ an integer. If the string doesn't contain a valid number `None` is returned.
 to_bytes(s : string) : bytes()
 ```
 
-Converts string into byte array. String is UTF-8 encoded. I.e.
+Converts string into byte array.
-`String.length(s)` is not guaranteed to be equal to
-`Bytes.size(String.to_bytes(s))`.
 
 #### sha3
 ```

docs/sophia_syntax.md

@@ -30,7 +30,6 @@ interface main using as for hiding
 - `ContractAddress` base58-encoded 32 byte contract address with `ct_` prefix
 - `OracleAddress` base58-encoded 32 byte oracle address with `ok_` prefix
 - `OracleQueryId` base58-encoded 32 byte oracle query id with `oq_` prefix
-- `Signature` base58-encoded 64 byte cryptographic signature with `sg_` prefix
 
 Valid string escape codes are
 
@@ -240,7 +239,6 @@ Expr ::= '(' LamArgs ')' '=>' Block(Stmt)   // Anonymous function    (x) => x +
        | Int | Bytes | String | Char        // Literals              123, 0xff, #00abc123, "foo", '%'
        | AccountAddress | ContractAddress   // Chain identifiers
        | OracleAddress | OracleQueryId      // Chain identifiers
-       | Signature                          // Signature
        | '???'                              // Hole expression       1 + ???
 
 Generator ::= Pattern '<-' Expr   // Generator
@@ -267,11 +265,11 @@ UnOp  ::= '-' | '!' | 'bnot'
 | Operators | Type
 | --- | ---
 | `-` `+` `*` `/` `mod` `^` | arithmetic operators
-| `!` `&&` `\|\|` | logical operators
+| `!` `&&` `||` | logical operators
 | `band` `bor` `bxor` `bnot` `<<` `>>` | bitwise operators
 | `==` `!=` `<` `>` `=<` `>=` | comparison operators
 | `::` `++` | list operators
-| `\|>` | functional operators
+| `|>` | functional operators
 
 ## Operator precedence
 
@@ -291,5 +289,5 @@ In order of highest to lowest precedence.
 | `bxor` | left
 | `bor` | left
 | `&&` | right
-| `\|\|` | right
+| `||` | right
-| `\|>` | left
+| `|>` | left

priv/stdlib/AENSCompat.aes

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

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
    */

rebar.config

@@ -2,7 +2,7 @@
 
 {erl_opts, [debug_info]}.
 
-{deps, [ {gmbytecode, {git, "https://git.qpq.swiss/QPQ-AG/gmbytecode.git", {ref, "cc4fd04019"}}}
+{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.4.0"}}}
        , {eblake2, "1.0.0"}
        , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}
        ]}.
@@ -13,8 +13,8 @@
             {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
            ]}.
 
-{relx, [{release, {sophia, "8.0.1"},
+{relx, [{release, {aesophia, "8.0.0"},
-         [sophia, gmbytecode]},
+         [aesophia, aebytecode]},
 
         {dev_mode, true},
         {include_erts, false},

rebar.lock

@@ -1,22 +1,22 @@
 {"1.2.0",
-[{<<"base58">>,
+[{<<"aebytecode">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/erl-base58.git",
+  {git,"https://github.com/aeternity/aebytecode.git",
-       {ref,"e6aa62eeae3d4388311401f06e4b939bf4e94b9c"}},
+       {ref,"009e0361922037f978f9c0ef357d4d1be8559928"}},
+  0},
+ {<<"aeserialization">>,
+  {git,"https://github.com/aeternity/aeserialization.git",
+       {ref,"177bf604b2a05e940f92cf00e96e6e269e708245"}},
+  1},
+ {<<"base58">>,
+  {git,"https://github.com/aeternity/erl-base58.git",
+       {ref,"60a335668a60328a29f9731b67c4a0e9e3d50ab6"}},
   2},
  {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0},
  {<<"enacl">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/enacl.git",
+  {git,"https://github.com/aeternity/enacl.git",
-       {ref,"4eb7ec70084ba7c87b1af8797c4c4e90c84f95a2"}},
+       {ref,"793ddb502f7fe081302e1c42227dca70b09f8e17"}},
   2},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},1},
- {<<"gmbytecode">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/gmbytecode.git",
-       {ref,"cc4fd0401903e9ce902a99160ac200e64040217f"}},
-  0},
- {<<"gmserialization">>,
-  {git,"https://git.qpq.swiss/QPQ-AG/gmserialization.git",
-       {ref,"9d2ecc00d32ea295309563e54a81636ecb597e96"}},
-  1},
  {<<"jsx">>,
   {git,"https://github.com/talentdeficit/jsx.git",
        {ref,"3074d4865b3385a050badf7828ad31490d860df5"}},

src/aeso_aci.erl

@@ -7,7 +7,7 @@
 %%% Created : 12 Jan 2019
 %%%-------------------------------------------------------------------
 
--module(so_aci).
+-module(aeso_aci).
 
 -export([ file/2
         , file/3
@@ -21,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().
@@ -35,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);
@@ -56,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).
 
@@ -69,8 +69,8 @@ do_contract_interface(Type, Contract, Options) when is_binary(Contract) ->
     do_contract_interface(Type, binary_to_list(Contract), Options);
 do_contract_interface(Type, ContractString, Options) ->
     try
-        Ast = so_compiler:parse(ContractString, Options),
+        Ast = aeso_compiler:parse(ContractString, Options),
-        {TypedAst, _, _} = so_ast_infer_types:infer(Ast, [dont_unfold | Options]),
+        {TypedAst, _, _} = aeso_ast_infer_types:infer(Ast, [dont_unfold | Options]),
         from_typed_ast(Type, TypedAst)
     catch
         throw:{error, Errors} -> {error, Errors}
@@ -198,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 == contract_pubkey; Lit == account_pubkey ->
-                              Lit == signature ->
+    aeser_api_encoder:encode(Lit, L);
-    gmser_api_encoder:encode(Lit, L);
 encode_expr({app, _, {'-', _}, [{int, _, N}]}) ->
   encode_expr({int, [], -N});
 encode_expr({app, _, F, As}) ->
@@ -361,14 +360,14 @@ is_type(_)                      -> false.
 
 sort_decls(Ds) ->
     Sort = fun (D1, D2) ->
-                   so_syntax:get_ann(line, D1, 0) =<
+                   aeso_syntax:get_ann(line, D1, 0) =<
-                       so_syntax:get_ann(line, D2, 0)
+                       aeso_syntax:get_ann(line, D2, 0)
            end,
     lists:sort(Sort, Ds).
 
-is_entrypoint(Node) -> so_syntax:get_ann(entrypoint, Node, false).
+is_entrypoint(Node) -> aeso_syntax:get_ann(entrypoint, Node, false).
-is_stateful(Node) -> so_syntax:get_ann(stateful, Node, false).
+is_stateful(Node) -> aeso_syntax:get_ann(stateful, Node, false).
-is_payable(Node) -> so_syntax:get_ann(payable, Node, false).
+is_payable(Node) -> aeso_syntax:get_ann(payable, Node, false).
 
 typedef_name({type_def, _, {id, _, Name}, _, _}) -> Name.
 

src/aeso_ast.erl

@@ -1,4 +1,4 @@
--module(so_ast).
+-module(aeso_ast).
 
 -export([int/2,
          line/1,
@@ -17,11 +17,11 @@ line({symbol, Line, _}) -> Line.
 symbol_name({symbol, _, Name}) -> Name.
 
 pp(Ast) ->
-    String = prettypr:format(so_pretty:decls(Ast, [])),
+    String = prettypr:format(aeso_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])),
+    String = prettypr:format(aeso_pretty:decls(TypedAst, [show_generated])),
     io:format("Type ast:\n~s\n",[String]).
 

src/aeso_ast_to_fcode.erl

@@ -7,12 +7,12 @@
 %%% Created : 26 Mar 2019
 %%%
 %%%-------------------------------------------------------------------
--module(so_ast_to_fcode).
+-module(aeso_ast_to_fcode).
 
 -export([ast_to_fcode/2, format_fexpr/1]).
 -export_type([fcode/0, fexpr/0, fun_def/0]).
 
--include("so_utils.hrl").
+-include("aeso_utils.hrl").
 
 %% -- Type definitions -------------------------------------------------------
 
@@ -55,15 +55,11 @@
               | {contract_pubkey, binary()}
               | {oracle_pubkey, binary()}
               | {oracle_query_id, binary()}
-              | {signature, binary()}
               | {bool, false | true}
               | {contract_code, string()} %% for CREATE, by name
               | {typerep, ftype()}.
 
--type fann() :: [ {file, so_syntax:ann_file()} |
+-type fann() :: [ {file, aeso_syntax:ann_file()} | {line, aeso_syntax:ann_line()} ].
-                  {line, so_syntax:ann_line()} |
-                  {col, so_syntax:ann_col()}
-                ].
 
 -type fexpr() :: {lit, fann(), flit()}
                | {nil, fann()}
@@ -166,7 +162,7 @@
                   fun_env           := fun_env(),
                   con_env           := con_env(),
                   child_con_env     := child_con_env(),
-                  event_type        => so_syntax:typedef(),
+                  event_type        => aeso_syntax:typedef(),
                   builtins          := builtins(),
                   options           := [option()],
                   state_layout      => state_layout(),
@@ -181,9 +177,9 @@
 
 %% -- Entrypoint -------------------------------------------------------------
 
-%% Main entrypoint. Takes typed syntax produced by so_ast_infer_types:infer/1,2
+%% Main entrypoint. Takes typed syntax produced by aeso_ast_infer_types:infer/1,2
 %% and produces Fate intermediate code.
--spec ast_to_fcode(so_syntax:ast(), [option()]) -> {env(), fcode()}.
+-spec ast_to_fcode(aeso_syntax:ast(), [option()]) -> {env(), fcode()}.
 ast_to_fcode(Code, Options) ->
     init_fresh_names(Options),
     {Env1, FCode1} = to_fcode(init_env(Options), Code),
@@ -364,7 +360,7 @@ get_option(Opt, Env, Default) ->
 
 %% -- Compilation ------------------------------------------------------------
 
--spec to_fcode(env(), so_syntax:ast()) -> {env(), fcode()}.
+-spec to_fcode(env(), aeso_syntax:ast()) -> {env(), fcode()}.
 to_fcode(Env, [{Contract, Attrs, {con, _, Name}, _Impls, Decls}|Rest])
   when ?IS_CONTRACT_HEAD(Contract) ->
     case Contract =:= contract_interface of
@@ -405,28 +401,16 @@ to_fcode(Env, [{namespace, _, {con, _, Con}, Decls} | Code]) ->
     Env1 = decls_to_fcode(Env#{ context => {namespace, Con} }, Decls),
     to_fcode(Env1, Code).
 
--spec ann_loc(so_syntax:ann() | fann()) -> {File, Line, Column} when
+-spec to_fann(aeso_syntax:ann()) -> fann().
-      File   :: string() | none,
-      Line   :: non_neg_integer() | none,
-      Column :: non_neg_integer() | none.
-ann_loc(Ann) ->
-    File = proplists:get_value(file, Ann, none),
-    Line = proplists:get_value(line, Ann, none),
-    Col  = proplists:get_value(col, Ann, none),
-    {File, Line, Col}.
-
--spec to_fann(so_syntax:ann()) -> fann().
 to_fann(Ann) ->
-    {File, Line, Col} = ann_loc(Ann),
+    File = proplists:lookup(file, Ann),
-    [ {Tag, X} ||
+    Line = proplists:lookup(line, Ann),
-        {Tag, X} <- [{file, File}, {line, Line}, {col, Col}],
+    [ X || X <- [File, Line], X =/= none ].
-        X =/= none, X =/= no_file
-    ].
 
 -spec get_fann(fexpr()) -> fann().
 get_fann(FExpr) -> element(2, FExpr).
 
--spec decls_to_fcode(env(), [so_syntax:decl()]) -> env().
+-spec decls_to_fcode(env(), [aeso_syntax:decl()]) -> env().
 decls_to_fcode(Env, Decls) ->
     %% First compute mapping from Sophia names to fun_names and add it to the
     %% environment.
@@ -434,7 +418,7 @@ decls_to_fcode(Env, Decls) ->
     lists:foldl(fun(D, E) -> decl_to_fcode(E, D)
                 end, Env1, Decls).
 
--spec decl_to_fcode(env(), so_syntax:decl()) -> env().
+-spec decl_to_fcode(env(), aeso_syntax:decl()) -> env().
 decl_to_fcode(Env, {fun_decl, _, _, _})  -> Env;
 decl_to_fcode(Env, {type_def, _Ann, Name, Args, Def}) ->
     typedef_to_fcode(Env, Name, Args, Def);
@@ -458,7 +442,7 @@ decl_to_fcode(Env = #{ consts := Consts }, {letval, _, {typed, _, {id, _, X}, _}
     NewConsts = Consts#{ qname(Env, X) => FVal },
     Env#{ consts := NewConsts }.
 
--spec typedef_to_fcode(env(), so_syntax:id(), [so_syntax:tvar()], so_syntax:typedef()) -> env().
+-spec typedef_to_fcode(env(), aeso_syntax:id(), [aeso_syntax:tvar()], aeso_syntax:typedef()) -> env().
 typedef_to_fcode(Env, {id, _, Name}, Xs, Def) ->
     Q = qname(Env, Name),
     FDef = fun(Args) when length(Args) == length(Xs) ->
@@ -525,11 +509,11 @@ compute_state_layout(R, [H | T]) ->
 compute_state_layout(R, _) ->
     {R + 1, {reg, R}}.
 
--spec type_to_fcode(env(), so_syntax:type()) -> ftype().
+-spec type_to_fcode(env(), aeso_syntax:type()) -> ftype().
 type_to_fcode(Env, Type) ->
     type_to_fcode(Env, #{}, Type).
 
--spec type_to_fcode(env(), #{var_name() => ftype()}, so_syntax:type()) -> ftype().
+-spec type_to_fcode(env(), #{var_name() => ftype()}, aeso_syntax:type()) -> ftype().
 type_to_fcode(_Env, _Sub, {con, _, _}) -> contract;
 type_to_fcode(Env, Sub, {app_t, _, T = {Id, _, _}, Types}) when Id == id; Id == qid ->
     lookup_type(Env, T, [type_to_fcode(Env, Sub, Type) || Type <- Types]);
@@ -555,7 +539,7 @@ type_to_fcode(Env, Sub, {if_t, _, _, _, Else}) ->
 type_to_fcode(_Env, _Sub, Type) ->
     error({todo, Type}).
 
--spec args_to_fcode(env(), [so_syntax:pat()]) -> [{var_name(), ftype()}].
+-spec args_to_fcode(env(), [aeso_syntax:pat()]) -> [{var_name(), ftype()}].
 args_to_fcode(Env, Args) ->
     [ case Arg of
           {id, _, Name} -> {Name, type_to_fcode(Env, Type)};
@@ -586,13 +570,13 @@ let_bind(Binds, Body) ->
     lists:foldr(fun({X, E}, Rest) -> let_bind(X, E, Rest) end,
                 Body, Binds).
 
--spec expr_to_fcode(env(), so_syntax:expr()) -> fexpr().
+-spec expr_to_fcode(env(), aeso_syntax:expr()) -> fexpr().
 expr_to_fcode(Env, {typed, _, Expr, Type}) ->
     expr_to_fcode(Env, Type, Expr);
 expr_to_fcode(Env, Expr) ->
     expr_to_fcode(Env, no_type, Expr).
 
--spec expr_to_fcode(env(), so_syntax:type() | no_type, so_syntax:expr()) -> fexpr().
+-spec expr_to_fcode(env(), aeso_syntax:type() | no_type, aeso_syntax:expr()) -> fexpr().
 
 %% Literals
 expr_to_fcode(_Env, _Type, {int,             Ann, N}) -> {lit, to_fann(Ann), {int, N}};
@@ -600,7 +584,6 @@ expr_to_fcode(_Env, _Type, {char,            Ann, N}) -> {lit, to_fann(Ann), {in
 expr_to_fcode(_Env, _Type, {bool,            Ann, B}) -> {lit, to_fann(Ann), {bool, B}};
 expr_to_fcode(_Env, _Type, {string,          Ann, S}) -> {lit, to_fann(Ann), {string, S}};
 expr_to_fcode(_Env, _Type, {account_pubkey,  Ann, K}) -> {lit, to_fann(Ann), {account_pubkey, K}};
-expr_to_fcode(_Env, _Type, {signature,       Ann, K}) -> {lit, to_fann(Ann), {signature, K}};
 expr_to_fcode(_Env, _Type, {contract_pubkey, Ann, K}) -> {lit, to_fann(Ann), {contract_pubkey, K}};
 expr_to_fcode(_Env, _Type, {oracle_pubkey,   Ann, K}) -> {lit, to_fann(Ann), {oracle_pubkey, K}};
 expr_to_fcode(_Env, _Type, {oracle_query_id, Ann, K}) -> {lit, to_fann(Ann), {oracle_query_id, K}};
@@ -705,7 +688,7 @@ expr_to_fcode(Env, {record_t, FieldTypes}, {record, Ann, Rec, Fields}) ->
 
 %% Lists
 expr_to_fcode(Env, _Type, {list, Ann, Es}) ->
-    lists:foldr(fun(E, L) -> {op, to_fann(so_syntax:get_ann(E)), '::', [expr_to_fcode(Env, E), L]} end,
+    lists:foldr(fun(E, L) -> {op, to_fann(aeso_syntax:get_ann(E)), '::', [expr_to_fcode(Env, E), L]} end,
                 {nil, to_fann(Ann)}, Es);
 
 expr_to_fcode(Env, _Type, {app, As, {'..', _}, [A, B]}) ->
@@ -783,15 +766,15 @@ expr_to_fcode(Env, _, {app, _, Fun = {typed, Ann, FunE, {fun_t, _, NamedArgsT, A
                 var_args -> fcode_error({var_args_not_set, FunE});
                 _ ->
                     %% Here we little cheat on the typechecker, but this inconsistency
-                    %% is to be solved in `so_fcode_to_fate:type_to_scode/1`
+                    %% is to be solved in `aeso_fcode_to_fate:type_to_scode/1`
-                    FInitArgsT = gmb_fate_data:make_typerep([type_to_fcode(Env, T) || T <- ArgsT]),
+                    FInitArgsT = aeb_fate_data:make_typerep([type_to_fcode(Env, T) || T <- ArgsT]),
                     builtin_to_fcode(state_layout(Env), FAnn, chain_clone, [{lit, FAnn, FInitArgsT}|FArgs])
             end;
         {builtin_u, FAnn, chain_create, _Ar} ->
             case {ArgsT, Type} of
                 {var_args, _} -> fcode_error({var_args_not_set, FunE});
                 {_, {con, _, Contract}} ->
-                    FInitArgsT = gmb_fate_data:make_typerep([type_to_fcode(Env, T) || T <- ArgsT]),
+                    FInitArgsT = aeb_fate_data:make_typerep([type_to_fcode(Env, T) || T <- ArgsT]),
                     builtin_to_fcode(state_layout(Env), FAnn, chain_create, [{lit, FAnn, {contract_code, Contract}}, {lit, FAnn, FInitArgsT}|FArgs]);
                 {_, _} -> fcode_error({not_a_contract_type, Type})
             end;
@@ -886,8 +869,8 @@ strip_singleton_tuples(T) -> T.
 
 -spec get_oracle_type(OracleFun, FunT) -> OracleType when
       OracleFun :: atom(),
-      FunT :: so_syntax:type(),
+      FunT :: aeso_syntax:type(),
-      OracleType :: so_syntax:type().
+      OracleType :: aeso_syntax:type().
 get_oracle_type(oracle_register,     {fun_t, _, _, _, OType})       -> OType;
 get_oracle_type(oracle_query,        {fun_t, _, _, [OType | _], _}) -> OType;
 get_oracle_type(oracle_get_question, {fun_t, _, _, [OType | _], _}) -> OType;
@@ -898,7 +881,7 @@ get_oracle_type(oracle_respond,      {fun_t, _, _, [OType | _], _}) -> OType.
 
 %% -- Pattern matching --
 
--spec alts_to_fcode(env(), ftype(), var_name(), [so_syntax:alt()], so_syntax:expr()) -> fsplit().
+-spec alts_to_fcode(env(), ftype(), var_name(), [aeso_syntax:alt()], aeso_syntax:expr()) -> fsplit().
 alts_to_fcode(Env, Type, X, Alts, Switch) ->
     FAlts = remove_guards(Env, Alts, Switch),
     split_tree(Env, [{X, Type}], FAlts).
@@ -915,7 +898,7 @@ alts_to_fcode(Env, Type, X, Alts, Switch) ->
               | {con, arities(), tag(), [fpat()]}
               | {assign, fpat(), fpat()}.
 
--spec remove_guards(env(), [so_syntax:alt()], so_syntax:expr()) -> [falt()].
+-spec remove_guards(env(), [aeso_syntax:alt()], aeso_syntax:expr()) -> [falt()].
 remove_guards(_Env, [], _Switch) ->
     [];
 remove_guards(Env, [Alt = {'case', _, _, [{guarded, _, [], _Expr}]} | Rest], Switch) ->
@@ -1080,19 +1063,19 @@ next_split(Pats) ->
         [I | _] -> I
     end.
 
--spec alt_to_fcode(env(), so_syntax:alt()) -> falt().
+-spec alt_to_fcode(env(), aeso_syntax:alt()) -> falt().
 alt_to_fcode(Env, {'case', _, Pat, [{guarded, _, [], Expr}]}) ->
     FPat  = pat_to_fcode(Env, Pat),
     FExpr = expr_to_fcode(bind_vars(Env, pat_vars(FPat)), Expr),
     {'case', [FPat], FExpr}.
 
--spec pat_to_fcode(env(), so_syntax:pat()) -> fpat().
+-spec pat_to_fcode(env(), aeso_syntax:pat()) -> fpat().
 pat_to_fcode(Env, {typed, _, Pat, Type}) ->
     pat_to_fcode(Env, Type, Pat);
 pat_to_fcode(Env, Pat) ->
     pat_to_fcode(Env, no_type, Pat).
 
--spec pat_to_fcode(env(), so_syntax:type() | no_type, so_syntax:pat()) -> fpat().
+-spec pat_to_fcode(env(), aeso_syntax:type() | no_type, aeso_syntax:pat()) -> fpat().
 pat_to_fcode(_Env, _Type, {id, _, X}) -> {var, X};
 pat_to_fcode(Env, _Type, {C, _, _} = Con) when C == con; C == qcon ->
     #con_tag{tag = I, arities = As} = lookup_con(Env, Con),
@@ -1134,7 +1117,7 @@ pat_to_fcode(_Env, Type, Pat) ->
                        | {atom, fexpr()}
                        | {'if', fexpr(), decision_tree(), decision_tree()}.
 
--spec decision_op(so_syntax:op(), decision_tree(), decision_tree()) -> decision_tree().
+-spec decision_op(aeso_syntax:op(), decision_tree(), decision_tree()) -> decision_tree().
 decision_op('&&', {atom, A}, B) -> {'if', A, B, false};
 decision_op('&&', false, _)     -> false;
 decision_op('&&', true,  B)     -> B;
@@ -1144,7 +1127,7 @@ decision_op('||', true,  _)     -> true;
 decision_op(Op, {'if', A, Then, Else}, B) ->
     {'if', A, decision_op(Op, Then, B), decision_op(Op, Else, B)}.
 
--spec expr_to_decision_tree(env(), so_syntax:expr()) -> decision_tree().
+-spec expr_to_decision_tree(env(), aeso_syntax:expr()) -> decision_tree().
 expr_to_decision_tree(Env, {app, _Ann, {Op, _}, [A, B]}) when Op == '&&'; Op == '||' ->
     decision_op(Op, expr_to_decision_tree(Env, A), expr_to_decision_tree(Env, B));
 expr_to_decision_tree(Env, {typed, _, Expr, _}) -> expr_to_decision_tree(Env, Expr);
@@ -1163,7 +1146,7 @@ decision_tree_to_fcode({'if', A, Then, Else}) ->
 
 %% -- Statements --
 
--spec stmts_to_fcode(env(), [so_syntax:stmt()]) -> fexpr().
+-spec stmts_to_fcode(env(), [aeso_syntax:stmt()]) -> fexpr().
 stmts_to_fcode(Env, [{letval, Ann, {typed, _, {id, _, X}, _}, Expr} | Stmts]) ->
     {'let', to_fann(Ann), X, expr_to_fcode(Env, Expr), stmts_to_fcode(bind_var(Env, X), Stmts)};
 stmts_to_fcode(Env, [{letval, Ann, Pat, Expr} | Stmts]) ->
@@ -1178,7 +1161,7 @@ stmts_to_fcode(Env, [{letfun, Ann, {id, _, X}, Args, _Type, [{guarded, _, [], Ex
 stmts_to_fcode(Env, [Expr]) ->
     expr_to_fcode(Env, Expr);
 stmts_to_fcode(Env, [Expr | Stmts]) ->
-    {'let', to_fann(so_syntax:get_ann(Expr)), "_", expr_to_fcode(Env, Expr), stmts_to_fcode(Env, Stmts)}.
+    {'let', to_fann(aeso_syntax:get_ann(Expr)), "_", expr_to_fcode(Env, Expr), stmts_to_fcode(Env, Stmts)}.
 
 %% -- Builtins --
 
@@ -1311,13 +1294,10 @@ event_function(_Env = #{event_type := {variant_t, EventCons}}, EventType = {vari
 
 -spec lambda_lift(fcode()) -> fcode().
 lambda_lift(FCode = #{ functions := Funs, state_layout := StateLayout }) ->
-    NewFuns =
+    init_lambda_funs(),
-        [ {FunName, FunDef}
+    Funs1   = maps:map(fun(_, Body) -> lambda_lift_fun(StateLayout, Body) end, Funs),
-          || {ParentName, ParentDef} <- maps:to_list(Funs),
+    NewFuns = get_lambda_funs(),
-             {NewParentDef, Lambdas} <- [lambda_lift_fun(StateLayout, ParentName, ParentDef)],
+    FCode#{ functions := maps:merge(Funs1, NewFuns) }.
-             {FunName, FunDef} <- [{ParentName, NewParentDef} | maps:to_list(Lambdas)]
-        ],
-    FCode#{ functions := maps:from_list(NewFuns) }.
 
 -define(lambda_key, '%lambdalifted').
 
@@ -1325,42 +1305,18 @@ lambda_lift(FCode = #{ functions := Funs, state_layout := StateLayout }) ->
 init_lambda_funs() -> put(?lambda_key, #{}).
 
 -spec get_lambda_funs() -> term().
-get_lambda_funs()  ->
+get_lambda_funs()  -> erase(?lambda_key).
-    Lambdas = erase(?lambda_key),
-    %% Remove name feed entries and leave only actual functions
-    maps:filter(fun({fresh, _}, _) -> false;
-                   (_, _) -> true
-                end, Lambdas).
 
--spec add_lambda_fun(fun_name(), fann(), fun_def()) -> fun_name().
+-spec add_lambda_fun(fun_def()) -> fun_name().
-add_lambda_fun(Parent, FAnn, Def) ->
+add_lambda_fun(Def) ->
+    Name = fresh_fun(),
     Funs = get(?lambda_key),
-    LambdaId = maps:get({fresh, Parent}, Funs, 0),
+    put(?lambda_key, Funs#{ Name => Def }),
-    Name = lambda_name(FAnn, LambdaId, Parent),
-    put(?lambda_key, Funs#{ Name => Def, {fresh, Parent} => LambdaId + 1}),
     Name.
 
--spec lambda_name(fann(), non_neg_integer(), fun_name()) -> fun_name().
+-spec lambda_lift_fun(state_layout(), fun_def()) -> fun_def().
-lambda_name(FAnn, Id, PName) ->
+lambda_lift_fun(Layout, Def = #{ body := Body }) ->
-    PSName = case PName of
+    Def#{ body := lambda_lift_expr(Layout, Body) }.
-                 {entrypoint, N} -> [binary_to_list(N)];
-                 {local_fun, Ns} -> Ns
-             end,
-    {_File, Line, Col} = ann_loc(FAnn),
-    Name = PSName ++
-           [ "%lambda"
-           , if is_integer(Line) -> integer_to_list(Line); true -> "" end
-           , if is_integer(Col) -> integer_to_list(Col); true -> "" end
-           , integer_to_list(Id)],
-    {local_fun, Name}.
-
--spec lambda_lift_fun(state_layout(), fun_name(), fun_def()) -> {fun_def(), #{var_name() => term()}}.
-lambda_lift_fun(Layout, Name, Def = #{ body := Body }) ->
-    %% Not thread safe! We initialize state per functions not to depend on the order in which
-    %% functions are processed.
-    init_lambda_funs(),
-    NewDef = Def#{ body := lambda_lift_expr(Layout, Name, Body) },
-    {NewDef, get_lambda_funs()}.
 
 -spec lifted_fun([var_name()], [var_name()], fexpr()) -> fun_def().
 lifted_fun([Z], Xs, Body) ->
@@ -1378,20 +1334,21 @@ lifted_fun(FVs, Xs, Body) ->
        body   => lists:foldr(Proj, Body, indexed(FVs))
      }.
 
--spec make_closure(fun_name(), fann(), [var_name()], [var_name()], fexpr()) -> Closure when
+-spec make_closure([var_name()], [var_name()], fexpr()) -> Closure when
       Closure :: fexpr().
-make_closure(ParentName, FAnn, FVs, Xs, Body) ->
+make_closure(FVs, Xs, Body) ->
-    Name  = add_lambda_fun(ParentName, FAnn, lifted_fun(FVs, Xs, Body)),
+    Fun   = add_lambda_fun(lifted_fun(FVs, Xs, Body)),
+    FAnn  = get_fann(Body),
     Tup = fun([Y]) -> Y; (Ys) -> {tuple, FAnn, Ys} end,
-    {closure, FAnn, Name, Tup([{var, FAnn, Y} || Y <- FVs])}.
+    {closure, FAnn, Fun, Tup([{var, FAnn, Y} || Y <- FVs])}.
 
--spec lambda_lift_expr(state_layout(), fun_name(), fexpr()) -> Closure when
+-spec lambda_lift_expr(state_layout(), fexpr()) -> Closure when
       Closure :: fexpr().
-lambda_lift_expr(Layout, Name, L = {lam, FAnn, Xs, Body}) ->
+lambda_lift_expr(Layout, L = {lam, _, Xs, Body}) ->
     FVs   = free_vars(L),
-    make_closure(Name, FAnn, FVs, Xs, lambda_lift_expr(Layout, Name, Body));
+    make_closure(FVs, Xs, lambda_lift_expr(Layout, Body));
-lambda_lift_expr(Layout, Name, UExpr) when element(1, UExpr) == def_u; element(1, UExpr) == builtin_u ->
+lambda_lift_expr(Layout, UExpr) when element(1, UExpr) == def_u; element(1, UExpr) == builtin_u ->
-    [Tag, FAnn, F, Ar | _] = tuple_to_list(UExpr),
+    [Tag, _, F, Ar | _] = tuple_to_list(UExpr),
     ExtraArgs = case UExpr of
                     {builtin_u, _, _, _, TypeArgs} -> TypeArgs;
                     _                              -> []
@@ -1402,41 +1359,41 @@ lambda_lift_expr(Layout, Name, UExpr) when element(1, UExpr) == def_u; element(1
                builtin_u -> builtin_to_fcode(Layout, get_fann(UExpr), F, Args);
                def_u     -> {def, get_fann(UExpr), F, Args}
            end,
-    make_closure(Name, FAnn, [], Xs, Body);
+    make_closure([], Xs, Body);
-lambda_lift_expr(Layout, Name, {remote_u, FAnn, ArgsT, RetT, Ct, F}) ->
+lambda_lift_expr(Layout, {remote_u, FAnn, ArgsT, RetT, Ct, F}) ->
     FVs  = free_vars(Ct),
-    Ct1  = lambda_lift_expr(Layout, Name, Ct),
+    Ct1  = lambda_lift_expr(Layout, Ct),
     NamedArgCount = 3,
     Xs   = [ lists:concat(["arg", I]) || I <- lists:seq(1, length(ArgsT) + NamedArgCount) ],
     Args = [{var, [], X} || X <- Xs],
-    make_closure(Name, FAnn, FVs, Xs, {remote, FAnn, ArgsT, RetT, Ct1, F, Args});
+    make_closure(FVs, Xs, {remote, FAnn, ArgsT, RetT, Ct1, F, Args});
-lambda_lift_expr(Layout, Name, Expr) ->
+lambda_lift_expr(Layout, Expr) ->
     case Expr of
         {lit, _, _}               -> Expr;
         {nil, _}                  -> Expr;
         {var, _, _}               -> Expr;
         {closure, _, _, _}        -> Expr;
-        {def, FAnn, D, As}        -> {def, FAnn, D, lambda_lift_exprs(Layout, Name, As)};
+        {def, FAnn, D, As}        -> {def, FAnn, D, lambda_lift_exprs(Layout, As)};
-        {builtin, FAnn, B, As}    -> {builtin, FAnn, B, lambda_lift_exprs(Layout, Name, As)};
+        {builtin, FAnn, B, As}    -> {builtin, FAnn, B, lambda_lift_exprs(Layout, As)};
-        {remote, FAnn, ArgsT, RetT, Ct, F, As} -> {remote, FAnn, ArgsT, RetT, lambda_lift_expr(Layout, Name, Ct), F, lambda_lift_exprs(Layout, Name, As)};
+        {remote, FAnn, ArgsT, RetT, Ct, F, As} -> {remote, FAnn, ArgsT, RetT, lambda_lift_expr(Layout, Ct), F, lambda_lift_exprs(Layout, As)};
-        {con, FAnn, Ar, C, As}    -> {con, FAnn, Ar, C, lambda_lift_exprs(Layout, Name, As)};
+        {con, FAnn, Ar, C, As}    -> {con, FAnn, Ar, C, lambda_lift_exprs(Layout, As)};
-        {tuple, FAnn, As}         -> {tuple, FAnn, lambda_lift_exprs(Layout, Name, As)};
+        {tuple, FAnn, As}         -> {tuple, FAnn, lambda_lift_exprs(Layout, As)};
-        {proj, FAnn, A, I}        -> {proj, FAnn, lambda_lift_expr(Layout, Name, A), I};
+        {proj, FAnn, A, I}        -> {proj, FAnn, lambda_lift_expr(Layout, A), I};
-        {set_proj, FAnn, A, I, B} -> {set_proj, FAnn, lambda_lift_expr(Layout, Name, A), I, lambda_lift_expr(Layout, Name, B)};
+        {set_proj, FAnn, A, I, B} -> {set_proj, FAnn, lambda_lift_expr(Layout, A), I, lambda_lift_expr(Layout, B)};
-        {op, FAnn, Op, As}        -> {op, FAnn, Op, lambda_lift_exprs(Layout, Name, As)};
+        {op, FAnn, Op, As}        -> {op, FAnn, Op, lambda_lift_exprs(Layout, As)};
-        {'let', FAnn, X, A, B}    -> {'let', FAnn, X, lambda_lift_expr(Layout, Name, A), lambda_lift_expr(Layout, Name, B)};
+        {'let', FAnn, X, A, B}    -> {'let', FAnn, X, lambda_lift_expr(Layout, A), lambda_lift_expr(Layout, B)};
-        {funcall, FAnn, A, Bs}    -> {funcall, FAnn, lambda_lift_expr(Layout, Name, A), lambda_lift_exprs(Layout, Name, Bs)};
+        {funcall, FAnn, A, Bs}    -> {funcall, FAnn, lambda_lift_expr(Layout, A), lambda_lift_exprs(Layout, Bs)};
-        {set_state, FAnn, R, A}   -> {set_state, FAnn, R, lambda_lift_expr(Layout, Name, A)};
+        {set_state, FAnn, R, A}   -> {set_state, FAnn, R, lambda_lift_expr(Layout, A)};
         {get_state, _, _}         -> Expr;
-        {switch, FAnn, S}         -> {switch, FAnn, lambda_lift_expr(Layout, Name, S)};
+        {switch, FAnn, S}         -> {switch, FAnn, lambda_lift_expr(Layout, S)};
-        {split, Type, X, Alts}    -> {split, Type, X, lambda_lift_exprs(Layout, Name, Alts)};
+        {split, Type, X, Alts}    -> {split, Type, X, lambda_lift_exprs(Layout, Alts)};
-        {nosplit, Rens, A}        -> {nosplit, Rens, lambda_lift_expr(Layout, Name, A)};
+        {nosplit, Rens, A}        -> {nosplit, Rens, lambda_lift_expr(Layout, A)};
-        {'case', P, S}            -> {'case', P, lambda_lift_expr(Layout, Name, S)}
+        {'case', P, S}            -> {'case', P, lambda_lift_expr(Layout, S)}
     end.
 
--spec lambda_lift_exprs(state_layout(), fun_name(), [fexpr()]) -> [Closure] when
+-spec lambda_lift_exprs(state_layout(), [fexpr()]) -> [Closure] when
       Closure :: fexpr().
-lambda_lift_exprs(Layout, Name, As) -> [lambda_lift_expr(Layout, Name, A) || A <- As].
+lambda_lift_exprs(Layout, As) -> [lambda_lift_expr(Layout, A) || A <- As].
 
 %% -- Optimisations ----------------------------------------------------------
 
@@ -1810,7 +1767,7 @@ used_functions(Used, [Name | Rest], Defs) ->
 
 %% -- Types --
 
--spec lookup_type(env(), so_syntax:id() | so_syntax:qid() | sophia_name(), [ftype()]) -> ftype().
+-spec lookup_type(env(), aeso_syntax:id() | aeso_syntax:qid() | sophia_name(), [ftype()]) -> ftype().
 lookup_type(Env, {id, _, Name}, Args) ->
     lookup_type(Env, [Name], Args);
 lookup_type(Env, {qid, _, Name}, Args) ->
@@ -1842,7 +1799,7 @@ bind_constructors(Env = #{ con_env := ConEnv }, NewCons) ->
 add_child_con(Env = #{child_con_env := CEnv}, Name, Fcode) ->
     Env#{ child_con_env := CEnv#{Name => Fcode} }.
 
--spec add_fun_env(env(), [so_syntax:decl()]) -> env().
+-spec add_fun_env(env(), [aeso_syntax:decl()]) -> env().
 add_fun_env(Env = #{ context := {abstract_contract, _} }, _) -> Env;  %% no functions from abstract contracts
 add_fun_env(Env = #{ fun_env := FunEnv }, Decls) ->
     Entry = fun({letfun, Ann, {id, _, Name}, Args, _, _}) ->
@@ -1853,7 +1810,7 @@ add_fun_env(Env = #{ fun_env := FunEnv }, Decls) ->
     FunEnv1 = maps:from_list(lists:flatmap(Entry, Decls)),
     Env#{ fun_env := maps:merge(FunEnv, FunEnv1) }.
 
--spec make_fun_name(env(), so_syntax:ann(), so_syntax:name()) -> fun_name().
+-spec make_fun_name(env(), aeso_syntax:ann(), aeso_syntax:name()) -> fun_name().
 make_fun_name(#{ context := Context }, Ann, Name) ->
     Entrypoint = proplists:get_value(entrypoint, Ann, false),
     case Context of
@@ -1884,7 +1841,7 @@ lookup_fun(#{ fun_env := FunEnv }, Name) ->
         {FName, _} -> FName
     end.
 
--spec lookup_con(env(), so_syntax:con() | so_syntax:qcon() | sophia_name()) -> con_tag().
+-spec lookup_con(env(), aeso_syntax:con() | aeso_syntax:qcon() | sophia_name()) -> con_tag().
 lookup_con(Env, {con, _, Con})  -> lookup_con(Env, [Con]);
 lookup_con(Env, {qcon, _, Con}) -> lookup_con(Env, Con);
 lookup_con(#{ con_env := ConEnv }, Con) ->
@@ -1900,7 +1857,7 @@ bind_vars(Env, Xs) ->
 -spec bind_var(env(), var_name()) -> env().
 bind_var(Env = #{ vars := Vars }, X) -> Env#{ vars := [X | Vars] }.
 
--spec resolve_var(env(), so_syntax:ann(), [so_syntax:name()]) -> fexpr().
+-spec resolve_var(env(), aeso_syntax:ann(), [aeso_syntax:name()]) -> fexpr().
 resolve_var(#{ vars := Vars } = Env, Ann, [X]) ->
     case lists:member(X, Vars) of
         true  -> {var, to_fann(Ann), X};
@@ -1922,7 +1879,7 @@ resolve_const(#{ consts := Consts }, Q) ->
         Val       -> Val
     end.
 
--spec resolve_fun(env(), so_syntax:ann(), [so_syntax:name()]) -> fexpr().
+-spec resolve_fun(env(), aeso_syntax:ann(), [aeso_syntax:name()]) -> fexpr().
 resolve_fun(#{ fun_env := Funs, builtins := Builtin } = Env, Ann, Q) ->
     case {maps:get(Q, Funs, not_found), maps:get(Q, Builtin, not_found)} of
         {not_found, not_found} -> internal_error({unbound_variable, Q});
@@ -1961,6 +1918,9 @@ fresh_name_save(Name) ->
 -spec fresh_name() -> var_name().
 fresh_name() -> fresh_name("%").
 
+-spec fresh_fun() -> fun_name().
+fresh_fun() -> {local_fun, [fresh_name("^")]}.
+
 -spec fresh_name(string()) -> var_name().
 fresh_name(Prefix) ->
     N = get('%fresh'),
@@ -2102,7 +2062,7 @@ bottom_up(F, Env, Expr) ->
         {'case', Pat, Split}             -> {'case', Pat, bottom_up(F, Env, Split)}
     end).
 
--spec get_named_args([so_syntax:named_arg_t()], [so_syntax:arg_expr()]) -> [so_syntax:expr()].
+-spec get_named_args([aeso_syntax:named_arg_t()], [aeso_syntax:arg_expr()]) -> [aeso_syntax:expr()].
 get_named_args(NamedArgsT, Args) ->
     IsNamed = fun({named_arg, _, _, _}) -> true;
                  (_) -> false end,
@@ -2110,7 +2070,7 @@ get_named_args(NamedArgsT, Args) ->
     NamedArgs = [get_named_arg(NamedArg, Named) || NamedArg <- NamedArgsT],
     NamedArgs ++ NotNamed.
 
--spec get_named_arg(so_syntax:named_arg_t(), [so_syntax:arg_expr()]) -> so_syntax:expr().
+-spec get_named_arg(aeso_syntax:named_arg_t(), [aeso_syntax:arg_expr()]) -> aeso_syntax:expr().
 get_named_arg({named_arg_t, _, {id, _, Name}, _, Default}, Args) ->
     case [ Val || {named_arg, _, {id, _, X}, Val} <- Args, X == Name ] of
         [Val] -> Val;
@@ -2236,15 +2196,15 @@ update_rename(OldRen, NewRen) ->
 
 %% -- Records --
 
--spec field_index(so_syntax:typedef(), so_syntax:name()) -> integer().
+-spec field_index(aeso_syntax:typedef(), aeso_syntax:name()) -> integer().
 field_index({record_t, Fields}, X) ->
     IsX = fun({field_t, _, {id, _, Y}, _}) -> X == Y end,
     [I] = [ I || {I, Field} <- indexed(Fields), IsX(Field) ],
     I - 1.  %% Tuples are 0-indexed
 
--spec field_value(so_syntax:field_t(), [so_syntax:field(so_syntax:pat())]) -> Res when
+-spec field_value(aeso_syntax:field_t(), [aeso_syntax:field(aeso_syntax:pat())]) -> Res when
-      Res :: {upd, so_syntax:name(), Expr} | {set, Expr} | false,
+      Res :: {upd, aeso_syntax:name(), Expr} | {set, Expr} | false,
-      Expr :: so_syntax:expr().
+      Expr :: aeso_syntax:expr().
 field_value({field_t, _, {id, _, X}, _}, Fields) ->
     View = fun({field, _, [{proj, _, {id, _, Y}}], E})    -> {Y, {set, E}};
               ({field_upd, _, [{proj, _, {id, _, Y}}],
@@ -2256,13 +2216,13 @@ field_value({field_t, _, {id, _, X}, _}, Fields) ->
 
 %% -- Attributes --
 
--spec get_attributes(so_syntax:ann()) -> [stateful | payable | private].
+-spec get_attributes(aeso_syntax:ann()) -> [stateful | payable | private].
 get_attributes(Ann) ->
     [stateful || proplists:get_value(stateful, Ann, false)] ++
     [payable  || proplists:get_value(payable, Ann, false)] ++
     [private  || not proplists:get_value(entrypoint, Ann, false)].
 
--spec get_attributes_debug(so_syntax:ann()) -> [stateful | payable | private | fann()].
+-spec get_attributes_debug(aeso_syntax:ann()) -> [stateful | payable | private | fann()].
 get_attributes_debug(Ann) ->
     get_attributes(Ann) ++ to_fann(Ann).
 
@@ -2283,14 +2243,14 @@ setnth(I, X, Xs) ->
 
 -spec fcode_error(string()) -> no_return().
 fcode_error(Error) ->
-    Pos = so_errors:pos(0, 0),
+    Pos = aeso_errors:pos(0, 0),
     Msg = lists:flatten(io_lib:format("Unknown error: ~p\n", [Error])),
-    so_errors:throw(so_errors:new(code_error, Pos, Msg)).
+    aeso_errors:throw(aeso_errors:new(code_error, Pos, Msg)).
 
 -spec internal_error(string()) -> no_return().
 internal_error(Error) ->
     Msg = lists:flatten(io_lib:format("~p\n", [Error])),
-    so_errors:throw(so_errors:new(internal_error, so_errors:pos(0, 0), Msg)).
+    aeso_errors:throw(aeso_errors:new(internal_error, aeso_errors:pos(0, 0), Msg)).
 
 %% -- Pretty printing --------------------------------------------------------
 
@@ -2367,7 +2327,7 @@ pp_fexpr({lit, _, {typerep, T}}) ->
 pp_fexpr({lit, _, {contract_code, Contract}}) ->
     pp_beside(pp_text("contract "), pp_text(Contract));
 pp_fexpr({lit, _, {Tag, Lit}}) ->
-    so_pretty:expr({Tag, [], Lit});
+    aeso_pretty:expr({Tag, [], Lit});
 pp_fexpr({nil, _}) ->
     pp_text("[]");
 pp_fexpr({var, _, X}) -> pp_text(X);

src/aeso_compiler.erl

@@ -6,7 +6,7 @@
 %%% @end
 %%% Created : 12 Dec 2017
 %%%-------------------------------------------------------------------
--module(so_compiler).
+-module(aeso_compiler).
 
 -export([ file/1
         , file/2
@@ -27,8 +27,8 @@
         , validate_byte_code/3
         ]).
 
--include_lib("gmbytecode/include/gmb_opcodes.hrl").
+-include_lib("aebytecode/include/aeb_opcodes.hrl").
--include("so_utils.hrl").
+-include("aeso_utils.hrl").
 
 
 -type option() :: pp_sophia_code
@@ -42,8 +42,7 @@
                 | {include, {file_system, [string()]} |
                             {explicit_files, #{string() => binary()}}}
                 | {src_file, string()}
-                | {src_dir, string()}
+                | {aci, aeso_aci:aci_type()}.
-                | {aci, so_aci:aci_type()}.
 -type options() :: [option()].
 
 -export_type([ option/0
@@ -52,15 +51,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
@@ -80,20 +79,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} ->
+        {ok, Bin} -> from_string(Bin, [{src_file, File} | Options]);
-            SrcDir = so_utils:canonical_dir(filename:dirname(File)),
-            from_string(Bin, [{src_file, File}, {src_dir, SrcDir} | Options]);
         {error, Error} ->
             Msg = lists:flatten([File,": ",file:format_error(Error)]),
-            {error, [so_errors:new(file_error, Msg)]}
+            {error, [aeso_errors:new(file_error, Msg)]}
     end.
 
 add_include_path(File, Options) ->
@@ -102,10 +99,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) ->
@@ -122,16 +119,16 @@ 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 = 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
            },
@@ -142,7 +139,7 @@ maybe_generate_aci(Result, FoldedTypedAst, Options) ->
         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.
 
@@ -151,9 +148,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
@@ -171,7 +168,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 == [] ->
@@ -190,7 +187,7 @@ check_call1(ContractString0, FunName, Args, Options) ->
     case add_extra_call(ContractString0, {call, FunName, Args}, Options) of
         {ok, CallName, Code} ->
             {def, _, _, FcodeArgs} = get_call_body(CallName, Code),
-            {ok, FunName, [ so_fcode_to_fate:term_to_fate(A) || A <- FcodeArgs ]};
+            {ok, FunName, [ aeso_fcode_to_fate:term_to_fate(A) || A <- FcodeArgs ]};
         Err = {error, _} ->
             Err
     end.
@@ -201,9 +198,9 @@ add_extra_call(Contract0, Call, Options) ->
         #{fcode := OrgFcode
         , fcode_env := #{child_con_env := ChildContracts}
         , ast := Ast} = string_to_code(Contract0, Options),
-        FateCode = so_fcode_to_fate:compile(ChildContracts, OrgFcode, #{}, []),
+        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),
@@ -220,7 +217,7 @@ encode_value(Contract0, Type, Value, Options) ->
     case add_extra_call(Contract0, {value, Type, Value}, Options) of
         {ok, CallName, Code} ->
             Body = get_call_body(CallName, Code),
-            {ok, gmb_fate_encoding:serialize(so_fcode_to_fate:term_to_fate(Body))};
+            {ok, aeb_fate_encoding:serialize(aeso_fcode_to_fate:term_to_fate(Body))};
         Err = {error, _} ->
             Err
     end.
@@ -228,13 +225,10 @@ encode_value(Contract0, Type, Value, Options) ->
 decode_value(Contract0, Type, FateValue, Options) ->
     case add_extra_call(Contract0, {type, Type}, Options) of
         {ok, CallName, Code} ->
-            #{ folded_typed_ast := TypedAst
+            #{ unfolded_typed_ast := TypedAst
-             , type_env         := TypeEnv} = Code,
+             , type_env           := TypeEnv} = Code,
             {ok, _, Type0} = get_decode_type(CallName, TypedAst),
-            Type1 = so_ast_infer_types:unfold_types_in_type(TypeEnv, Type0,
+            Type1 = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
-                                                              [ unfold_record_types
-                                                              , unfold_variant_types
-                                                              , not_unfold_system_alias_types ]),
             fate_data_to_sophia_value(Type0, Type1, FateValue);
         Err = {error, _} ->
             Err
@@ -243,7 +237,7 @@ decode_value(Contract0, Type, FateValue, Options) ->
 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 ->
@@ -251,7 +245,7 @@ first_none_match(CallName, Hashes, [Char|Chars]) ->
     end.
 
 %% Add the __call function to a contract.
--spec insert_call_function(so_syntax:ast(), string(), string(),
+-spec insert_call_function(aeso_syntax:ast(), string(), string(),
                            {call, string(), [string()]} | {value, string(), string()} | {type, string()}) -> string().
 insert_call_function(Ast, Code, Call, {call, FunName, Args}) ->
     Ind = last_contract_indent(Ast),
@@ -275,7 +269,7 @@ insert_call_function(Ast, Code, Call, {type, Type}) ->
         [ Code,
           "\n\n",
           lists:duplicate(Ind, " "),
-          "entrypoint ", Call, "(val : ", Type, ") : ", Type, " = val\n"
+          "entrypoint ", Call, "(val : ", Type, ") = val\n"
         ]).
 
 -spec insert_init_function(string(), options()) -> string().
@@ -290,36 +284,33 @@ 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,
+        Type   = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
-                                                         [ unfold_record_types
-                                                         , unfold_variant_types
-                                                         , not_unfold_system_alias_types]),
 
         fate_data_to_sophia_value(Type0, Type, Data)
     catch
@@ -328,71 +319,68 @@ to_sophia_value(ContractString, FunName, ok, Data, Options0) ->
 
 fate_data_to_sophia_value(Type, UnfoldedType, FateData) ->
     try
-        {ok, so_vm_decode:from_fate(UnfoldedType, gmb_fate_encoding:deserialize(FateData))}
+        {ok, aeso_vm_decode:from_fate(UnfoldedType, aeb_fate_encoding:deserialize(FateData))}
     catch throw:cannot_translate_to_sophia ->
-            Type1 = prettypr:format(so_pretty:type(Type)),
+            Type1 = prettypr:format(aeso_pretty:type(Type)),
             Msg = io_lib:format("Cannot translate FATE value ~p\n  of Sophia type ~s",
-                                [gmb_fate_encoding:deserialize(FateData), Type1]),
+                                [aeb_fate_encoding:deserialize(FateData), Type1]),
-            {error, [so_errors:new(data_error, Msg)]};
+            {error, [aeso_errors:new(data_error, Msg)]};
           _:_ ->
-            Type1 = prettypr:format(so_pretty:type(Type)),
+            Type1 = prettypr:format(aeso_pretty:type(Type)),
             Msg = io_lib:format("Failed to decode binary as type ~s", [Type1]),
-            {error, [so_errors:new(data_error, Msg)]}
+            {error, [aeso_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()]}
+          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
-        | {error, [so_errors:error()]}.
+        | {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()]}
+          {ok, [aeso_syntax:type()], [aeso_syntax:expr()]}
-        | {error, [so_errors:error()]}.
+        | {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,
+        Type          = aeso_ast_infer_types:unfold_types_in_type(TypeEnv, Type0, [unfold_record_types, unfold_variant_types]),
-                                                                  [ unfold_record_types
+        case aeb_fate_abi:decode_calldata(FunName, Calldata) of
-                                                                  , unfold_variant_types
-                                                                  , not_unfold_system_alias_types]),
-        case gmb_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}
@@ -410,8 +398,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),
+                    Pos = aeso_errors:pos(Ann),
-                    so_errors:throw(so_errors:new(data_error, Pos, Msg))
+                    aeso_errors:throw(aeso_errors:new(data_error, Pos, Msg))
             end
     end;
 get_decode_type(FunName, [_ | Contracts]) ->
@@ -419,12 +407,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_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 so_ast:pp_typed/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
@@ -438,18 +426,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),
+                         FCode = aeb_fate_code:deserialize(SrcByteCode),
-                         {gmb_fate_code:strip_init_function(FCode), SrcPayable}
+                         {aeb_fate_code:strip_init_function(FCode), SrcPayable}
                      end),
         case compare_fate_code(FCode1, FCode2) of
             ok when SrcPayable /= Payable ->
@@ -465,10 +453,10 @@ validate_byte_code(#{ byte_code := ByteCode, payable := Payable }, Source, Optio
     end.
 
 compare_fate_code(FCode1, FCode2) ->
-    Funs1 = gmb_fate_code:functions(FCode1),
+    Funs1 = aeb_fate_code:functions(FCode1),
-    Funs2 = gmb_fate_code:functions(FCode2),
+    Funs2 = aeb_fate_code:functions(FCode2),
-    Syms1 = gmb_fate_code:symbols(FCode1),
+    Syms1 = aeb_fate_code:symbols(FCode1),
-    Syms2 = gmb_fate_code:symbols(FCode2),
+    Syms2 = aeb_fate_code:symbols(FCode2),
     FunHashes1 = maps:keys(Funs1),
     FunHashes2 = maps:keys(Funs2),
     case FunHashes1 == FunHashes2 of
@@ -513,13 +501,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

@@ -5,7 +5,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_errors).
+-module(aeso_errors).
 
 -type src_file()   :: no_file | iolist().
 
@@ -55,9 +55,9 @@ new(Type, Pos, Msg, Ctxt) ->
     #err{ type = Type, pos = Pos, message = Msg, context = Ctxt }.
 
 pos(Ann) ->
-    File = so_syntax:get_ann(file, Ann, no_file),
+    File = aeso_syntax:get_ann(file, Ann, no_file),
-    Line = so_syntax:get_ann(line, Ann, 0),
+    Line = aeso_syntax:get_ann(line, Ann, 0),
-    Col  = so_syntax:get_ann(col, Ann, 0),
+    Col  = aeso_syntax:get_ann(col, Ann, 0),
     pos(File, Line, Col).
 
 pos(Line, Col) ->

src/aeso_fcode_to_fate.erl

@@ -7,7 +7,7 @@
 %%% Created : 11 Jan 2019
 %%%
 %%%-------------------------------------------------------------------
--module(so_fcode_to_fate).
+-module(aeso_fcode_to_fate).
 
 -export([compile/3, compile/4, term_to_fate/1, term_to_fate/2]).
 
@@ -23,7 +23,7 @@
                 | loop
                 | tuple() | atom().    %% FATE instruction
 
--type arg() :: tuple(). %% Not exported: gmb_fate_ops:fate_arg().
+-type arg() :: tuple(). %% Not exported: aeb_fate_ops:fate_arg().
 
 %% Annotated scode
 -type scode_a()  :: [sinstr_a()].
@@ -72,9 +72,9 @@ debug(Tag, Options, Fun) ->
 
 -dialyzer({nowarn_function, [code_error/1]}).
 code_error(Err) ->
-    Pos = so_errors:pos(0, 0),
+    Pos = aeso_errors:pos(0, 0),
     Msg = lists:flatten(io_lib:format("Unknown error: ~p\n", [Err])),
-    so_errors:throw(so_errors:new(code_error, Pos, Msg)).
+    aeso_errors:throw(aeso_errors:new(code_error, Pos, Msg)).
 
 %% -- Main -------------------------------------------------------------------
 
@@ -87,14 +87,14 @@ compile(ChildContracts, FCode, SavedFreshNames, Options) ->
     SFuns  = functions_to_scode(ChildContracts, ContractName, Functions, SavedFreshNames, Options),
     SFuns1 = optimize_scode(SFuns, Options),
     FateCode = to_basic_blocks(SFuns1),
-    ?debug(compile, Options, "~s\n", [gmb_fate_asm:pp(FateCode)]),
+    ?debug(compile, Options, "~s\n", [aeb_fate_asm:pp(FateCode)]),
     case proplists:get_value(include_child_contract_symbols, Options, false) of
         false -> FateCode;
         true  -> add_child_symbols(ChildContracts, FateCode)
     end.
 
 make_function_id(X) ->
-    gmb_fate_code:symbol_identifier(make_function_name(X)).
+    aeb_fate_code:symbol_identifier(make_function_name(X)).
 
 make_function_name(event)              -> <<"Chain.event">>;
 make_function_name({entrypoint, Name}) -> Name;
@@ -103,7 +103,7 @@ make_function_name({local_fun, Xs})    -> list_to_binary("." ++ string:join(Xs,
 add_child_symbols(ChildContracts, FateCode) ->
     Funs = lists:flatten([ maps:keys(ChildFuns) || {_, #{functions := ChildFuns}} <- maps:to_list(ChildContracts) ]),
     Symbols = maps:from_list([ {make_function_id(FName), make_function_name(FName)} || FName <- Funs ]),
-    gmb_fate_code:update_symbols(FateCode, Symbols).
+    aeb_fate_code:update_symbols(FateCode, Symbols).
 
 functions_to_scode(ChildContracts, ContractName, Functions, SavedFreshNames, Options) ->
     FunNames = maps:keys(Functions),
@@ -212,17 +212,17 @@ serialize_contract_code(Env, C) ->
             SavedFreshNames = Env#env.saved_fresh_names,
             FCode = maps:get(C, Env#env.child_contracts),
             FateCode = compile(Env#env.child_contracts, FCode, SavedFreshNames, Options),
-            ByteCode = gmb_fate_code:serialize(FateCode, []),
+            ByteCode = aeb_fate_code:serialize(FateCode, []),
-            {ok, Version} = so_compiler:version(),
+            {ok, Version} = aeso_compiler:version(),
             OriginalSourceCode = proplists:get_value(original_src, Options, ""),
             Code = #{byte_code => ByteCode,
                      compiler_version => Version,
                      source_hash => crypto:hash(sha256, OriginalSourceCode ++ [0] ++ C),
                      type_info => [],
-                     abi_version => gmb_fate_abi:abi_version(),
+                     abi_version => aeb_fate_abi:abi_version(),
                      payable => maps:get(payable, FCode)
                    },
-            Serialized = gmser_contract_code:serialize(Code),
+            Serialized = aeser_contract_code:serialize(Code),
             put(contract_code_cache, maps:put(C, Serialized, Cache)),
             Serialized;
         Serialized -> Serialized
@@ -230,17 +230,16 @@ serialize_contract_code(Env, C) ->
 
 lit_to_fate(Env, L) ->
     case L of
-        {int, N}             -> gmb_fate_data:make_integer(N);
+        {int, N}             -> aeb_fate_data:make_integer(N);
-        {string, S}          -> gmb_fate_data:make_string(S);
+        {string, S}          -> aeb_fate_data:make_string(S);
-        {bytes, B}           -> gmb_fate_data:make_bytes(B);
+        {bytes, B}           -> aeb_fate_data:make_bytes(B);
-        {bool, B}            -> gmb_fate_data:make_boolean(B);
+        {bool, B}            -> aeb_fate_data:make_boolean(B);
-        {account_pubkey, K}  -> gmb_fate_data:make_address(K);
+        {account_pubkey, K}  -> aeb_fate_data:make_address(K);
-        {signature, S}       -> gmb_fate_data:make_bytes(S);
+        {contract_pubkey, K} -> aeb_fate_data:make_contract(K);
-        {contract_pubkey, K} -> gmb_fate_data:make_contract(K);
+        {oracle_pubkey, K}   -> aeb_fate_data:make_oracle(K);
-        {oracle_pubkey, K}   -> gmb_fate_data:make_oracle(K);
+        {oracle_query_id, H} -> aeb_fate_data:make_oracle_query(H);
-        {oracle_query_id, H} -> gmb_fate_data:make_oracle_query(H);
+        {contract_code, C}   -> aeb_fate_data:make_contract_bytearray(serialize_contract_code(Env, C));
-        {contract_code, C}   -> gmb_fate_data:make_contract_bytearray(serialize_contract_code(Env, C));
+        {typerep, T}         -> aeb_fate_data:make_typerep(type_to_scode(T))
-        {typerep, T}         -> gmb_fate_data:make_typerep(type_to_scode(T))
      end.
 
 term_to_fate(E) -> term_to_fate(#env{}, #{}, E).
@@ -250,21 +249,21 @@ term_to_fate(GlobEnv, _Env, {lit, _, L}) ->
     lit_to_fate(GlobEnv, L);
 %% negative literals are parsed as 0 - N
 term_to_fate(_GlobEnv, _Env, {op, _, '-', [{lit, _, {int, 0}}, {lit, _, {int, N}}]}) ->
-    gmb_fate_data:make_integer(-N);
+    aeb_fate_data:make_integer(-N);
 term_to_fate(_GlobEnv, _Env, {nil, _}) ->
-    gmb_fate_data:make_list([]);
+    aeb_fate_data:make_list([]);
 term_to_fate(GlobEnv, Env, {op, _, '::', [Hd, Tl]}) ->
     %% The Tl will translate into a list, because FATE lists are just lists
     [term_to_fate(GlobEnv, Env, Hd) | term_to_fate(GlobEnv, Env, Tl)];
 term_to_fate(GlobEnv, Env, {tuple, _, As}) ->
-    gmb_fate_data:make_tuple(list_to_tuple([ term_to_fate(GlobEnv, Env, A) || A<-As]));
+    aeb_fate_data:make_tuple(list_to_tuple([ term_to_fate(GlobEnv, Env, A) || A<-As]));
 term_to_fate(GlobEnv, Env, {con, _, Ar, I, As}) ->
     FateAs = [ term_to_fate(GlobEnv, Env, A) || A <- As ],
-    gmb_fate_data:make_variant(Ar, I, list_to_tuple(FateAs));
+    aeb_fate_data:make_variant(Ar, I, list_to_tuple(FateAs));
 term_to_fate(_GlobEnv, _Env, {builtin, _, bits_all, []}) ->
-    gmb_fate_data:make_bits(-1);
+    aeb_fate_data:make_bits(-1);
 term_to_fate(_GlobEnv, _Env, {builtin, _, bits_none, []}) ->
-    gmb_fate_data:make_bits(0);
+    aeb_fate_data:make_bits(0);
 term_to_fate(GlobEnv, _Env, {op, _, bits_set, [B, I]}) ->
     {bits, N} = term_to_fate(GlobEnv, B),
     J         = term_to_fate(GlobEnv, I),
@@ -282,12 +281,10 @@ term_to_fate(_GlobEnv, Env, {var, _, X}) ->
         V         -> V
     end;
 term_to_fate(_GlobEnv, _Env, {builtin, _, map_empty, []}) ->
-    gmb_fate_data:make_map(#{});
+    aeb_fate_data:make_map(#{});
 term_to_fate(GlobEnv, Env, {op, _, map_set, [M, K, V]}) ->
     Map = term_to_fate(GlobEnv, Env, M),
     Map#{term_to_fate(GlobEnv, Env, K) => term_to_fate(GlobEnv, Env, V)};
-term_to_fate(GlobEnv, Env, {builtin, _, bytes_to_any_size, [Bs]}) ->
-    term_to_fate(GlobEnv, Env, Bs);
 term_to_fate(_GlobEnv, _Env, _) ->
     throw(not_a_fate_value).
 
@@ -304,7 +301,7 @@ to_scode1(Env, {lit, Ann, L}) ->
     [ dbg_loc(Env, Ann), push(?i(lit_to_fate(Env, L))) ];
 
 to_scode1(Env, {nil, Ann}) ->
-    [ dbg_loc(Env, Ann), gmb_fate_ops:nil(?a) ];
+    [ dbg_loc(Env, Ann), aeb_fate_ops:nil(?a) ];
 
 to_scode1(Env, {var, Ann, X}) ->
     [ dbg_loc(Env, Ann), push(lookup_var(Env, X)) ];
@@ -313,7 +310,7 @@ to_scode1(Env, {con, Ann, Ar, I, As}) ->
     N = length(As),
     [ dbg_loc(Env, Ann),
       [to_scode(notail(Env), A) || A <- As],
-      gmb_fate_ops:variant(?a, ?i(Ar), ?i(I), ?i(N)) ];
+      aeb_fate_ops:variant(?a, ?i(Ar), ?i(I), ?i(N)) ];
 
 to_scode1(Env, {tuple, Ann, As}) ->
     N = length(As),
@@ -324,13 +321,13 @@ to_scode1(Env, {tuple, Ann, As}) ->
 to_scode1(Env, {proj, Ann, E, I}) ->
     [ dbg_loc(Env, Ann),
       to_scode(notail(Env), E),
-      gmb_fate_ops:element_op(?a, ?i(I), ?a) ];
+      aeb_fate_ops:element_op(?a, ?i(I), ?a) ];
 
 to_scode1(Env, {set_proj, Ann, R, I, E}) ->
     [ dbg_loc(Env, Ann),
       to_scode(notail(Env), E),
       to_scode(notail(Env), R),
-      gmb_fate_ops:setelement(?a, ?i(I), ?a, ?a) ];
+      aeb_fate_ops:setelement(?a, ?i(I), ?a, ?a) ];
 
 to_scode1(Env, {op, Ann, Op, Args}) ->
     [ dbg_loc(Env, Ann) | call_to_scode(Env, op_to_scode(Op), Args) ];
@@ -341,7 +338,7 @@ to_scode1(Env, {'let', Ann, X, {var, _, Y}, Body}) ->
 to_scode1(Env, {'let', Ann, X, Expr, Body}) ->
     {I, Env1} = bind_local(X, Env),
     SCode = [ to_scode(notail(Env), Expr),
-              gmb_fate_ops:store({var, I}, {stack, 0}),
+              aeb_fate_ops:store({var, I}, {stack, 0}),
               to_scode(Env1, Body) ],
     [ dbg_loc(Env, Ann) | dbg_scoped_vars(Env1, [X], SCode) ];
 
@@ -355,18 +352,18 @@ to_scode1(Env = #env{ current_function = Fun, tailpos = true, debug_info = false
                         {I, Env2} = bind_local("_", Env1),
                         ArgCode   = to_scode(notail(Env2), Arg),
                         Acc1 = [Acc, ArgCode,
-                                gmb_fate_ops:store({var, I}, ?a)],
+                                aeb_fate_ops:store({var, I}, ?a)],
                         {[I | Is], Acc1, Env2}
                     end, {[], [], Env}, Args),
     [ dbg_loc(Env, Ann),
       Code,
-      [ gmb_fate_ops:store({arg, I}, {var, J})
+      [ aeb_fate_ops:store({arg, I}, {var, J})
         || {I, J} <- lists:zip(lists:seq(0, length(Vars) - 1),
                                lists:reverse(Vars)) ],
       loop ];
 to_scode1(Env, {def, Ann, Fun, Args}) ->
     FName = make_function_id(Fun),
-    Lbl   = gmb_fate_data:make_string(FName),
+    Lbl   = aeb_fate_data:make_string(FName),
     [ dbg_loc(Env, Ann) | call_to_scode(Env, local_call(Env, ?i(Lbl)), Args) ];
 to_scode1(Env, {funcall, Ann, Fun, Args}) ->
     [ dbg_loc(Env, Ann) | call_to_scode(Env, [to_scode(Env, Fun), local_call(Env, ?a)], Args) ];
@@ -377,23 +374,23 @@ to_scode1(Env, {builtin, Ann, B, Args}) ->
 to_scode1(Env, {remote, Ann, ArgsT, RetT, Ct, Fun, [Gas, Value, Protected | Args]}) ->
     Lbl = make_function_id(Fun),
     {ArgTypes, RetType0} = typesig_to_scode([{"_", T} || T <- ArgsT], RetT),
-    ArgType = ?i(gmb_fate_data:make_typerep({tuple, ArgTypes})),
+    ArgType = ?i(aeb_fate_data:make_typerep({tuple, ArgTypes})),
-    RetType = ?i(gmb_fate_data:make_typerep(RetType0)),
+    RetType = ?i(aeb_fate_data:make_typerep(RetType0)),
     SCode = case Protected of
         {lit, _, {bool, false}} ->
             case Gas of
                 {builtin, _, call_gas_left, _} ->
-                    Call = gmb_fate_ops:call_r(?a, Lbl, ArgType, RetType, ?a),
+                    Call = aeb_fate_ops:call_r(?a, Lbl, ArgType, RetType, ?a),
                     call_to_scode(Env, Call, [Ct, Value | Args]);
                 _ ->
-                    Call = gmb_fate_ops:call_gr(?a, Lbl, ArgType, RetType, ?a, ?a),
+                    Call = aeb_fate_ops:call_gr(?a, Lbl, ArgType, RetType, ?a, ?a),
                     call_to_scode(Env, Call, [Ct, Value, Gas | Args])
             end;
         {lit, _, {bool, true}} ->
-            Call = gmb_fate_ops:call_pgr(?a, Lbl, ArgType, RetType, ?a, ?a, ?i(true)),
+            Call = aeb_fate_ops:call_pgr(?a, Lbl, ArgType, RetType, ?a, ?a, ?i(true)),
             call_to_scode(Env, Call, [Ct, Value, Gas | Args]);
         _ ->
-            Call = gmb_fate_ops:call_pgr(?a, Lbl, ArgType, RetType, ?a, ?a, ?a),
+            Call = aeb_fate_ops:call_pgr(?a, Lbl, ArgType, RetType, ?a, ?a, ?a),
             call_to_scode(Env, Call, [Ct, Value, Gas, Protected | Args])
     end,
     [ dbg_loc(Env, Ann) | SCode ];
@@ -409,8 +406,8 @@ to_scode1(Env, {closure, Ann, Fun, FVs}) ->
 to_scode1(Env, {switch, Ann, Case}) ->
     [ dbg_loc(Env, Ann) | split_to_scode(Env, Case) ].
 
-local_call( Env = #env{debug_info = false}, Fun) when Env#env.tailpos -> gmb_fate_ops:call_t(Fun);
+local_call( Env = #env{debug_info = false}, Fun) when Env#env.tailpos -> aeb_fate_ops:call_t(Fun);
-local_call(_Env, Fun)                                                 -> gmb_fate_ops:call(Fun).
+local_call(_Env, Fun)                                                 -> aeb_fate_ops:call(Fun).
 
 split_to_scode(Env, {nosplit, Renames, Expr}) ->
     [switch_body, dbg_scoped_vars(Env, Renames, to_scode(Env, Expr))];
@@ -448,13 +445,13 @@ split_to_scode(Env, {split, {list, _}, X, Alts}) ->
                      [{'case', {'::', Y, Z}, S} | _] ->
                          {I, Env1} = bind_local(Y, Env),
                          {J, Env2} = bind_local(Z, Env1),
-                         [gmb_fate_ops:hd({var, I}, Arg),
+                         [aeb_fate_ops:hd({var, I}, Arg),
-                          gmb_fate_ops:tl({var, J}, Arg),
+                          aeb_fate_ops:tl({var, J}, Arg),
                           split_to_scode(Env2, S)]
                  end
              end,
     SAlts = [GetAlt('::'), GetAlt(nil)],
-    [gmb_fate_ops:is_nil(?a, Arg),
+    [aeb_fate_ops:is_nil(?a, Arg),
      {switch, ?a, boolean, SAlts, Def}];
 split_to_scode(Env, {split, Type, X, Alts}) when Type == integer; Type == string ->
     {Def, Alts1} = catchall_to_scode(Env, X, Alts),
@@ -488,9 +485,9 @@ literal_split_to_scode(Env, Type, Arg, [{'case', Lit, Body} | Alts], Def) when T
         end,
     SLit = case Lit of
                {int, N} -> N;
-               {string, S} -> gmb_fate_data:make_string(S)
+               {string, S} -> aeb_fate_data:make_string(S)
            end,
-    [gmb_fate_ops:eq(?a, Arg, ?i(SLit)),
+    [aeb_fate_ops:eq(?a, Arg, ?i(SLit)),
      {switch, ?a, boolean, [False, True], Def}].
 
 catchall_to_scode(Env, X, Alts) -> catchall_to_scode(Env, X, Alts, []).
@@ -504,10 +501,10 @@ catchall_to_scode(_, _, [], Acc) -> {missing, lists:reverse(Acc)}.
 
 %% Tuple is in the accumulator. Arguments are the variable names.
 match_tuple(Env, Arg, Xs) ->
-    match_tuple(Env, 0, fun gmb_fate_ops:element_op/3, Arg, Xs).
+    match_tuple(Env, 0, fun aeb_fate_ops:element_op/3, Arg, Xs).
 
 match_variant(Env, Arg, Xs) ->
-    Elem = fun(Dst, I, Val) -> gmb_fate_ops:variant_element(Dst, Val, I) end,
+    Elem = fun(Dst, I, Val) -> aeb_fate_ops:variant_element(Dst, Val, I) end,
     match_tuple(Env, 0, Elem, Arg, Xs).
 
 match_tuple(Env, I, Elem, Arg, ["_" | Xs]) ->
@@ -526,215 +523,239 @@ call_to_scode(Env, CallCode, Args) ->
      CallCode].
 
 builtin_to_scode(Env, chain_event, Args) ->
-    call_to_scode(Env, [erlang:apply(gmb_fate_ops, log, lists:duplicate(length(Args), ?a)),
+    call_to_scode(Env, [erlang:apply(aeb_fate_ops, log, lists:duplicate(length(Args), ?a)),
                         tuple(0)], Args);
 builtin_to_scode(_Env, map_empty, []) ->
-    [gmb_fate_ops:map_empty(?a)];
+    [aeb_fate_ops:map_empty(?a)];
 builtin_to_scode(_Env, bits_none, []) ->
-    [gmb_fate_ops:bits_none(?a)];
+    [aeb_fate_ops:bits_none(?a)];
 builtin_to_scode(_Env, bits_all, []) ->
-    [gmb_fate_ops:bits_all(?a)];
+    [aeb_fate_ops:bits_all(?a)];
 builtin_to_scode(Env, bytes_to_int, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytes_to_int(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytes_to_int(?a, ?a), Args);
 builtin_to_scode(Env, bytes_to_str, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytes_to_str(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytes_to_str(?a, ?a), Args);
 builtin_to_scode(Env, bytes_concat, [_, _] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytes_concat(?a, ?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytes_concat(?a, ?a, ?a), Args);
 builtin_to_scode(Env, bytes_split, [_, _] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytes_split(?a, ?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytes_split(?a, ?a, ?a), Args);
 builtin_to_scode(Env, bytes_split_any, [_, _] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytes_split_any(?a, ?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytes_split_any(?a, ?a, ?a), Args);
 builtin_to_scode(Env, bytes_to_fixed_size, [_, _] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytes_to_fixed_size(?a, ?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytes_to_fixed_size(?a, ?a, ?a), Args);
 builtin_to_scode(Env, bytes_to_any_size, [A]) ->
     [to_scode(Env, A)]; %% no_op!
 builtin_to_scode(Env, bytes_size, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytes_size(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytes_size(?a, ?a), Args);
 builtin_to_scode(Env, abort, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:abort(?a), Args);
+    call_to_scode(Env, aeb_fate_ops:abort(?a), Args);
 builtin_to_scode(Env, exit, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:exit(?a), Args);
+    call_to_scode(Env, aeb_fate_ops:exit(?a), Args);
 builtin_to_scode(Env, chain_spend, [_, _] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:spend(?a, ?a),
+    call_to_scode(Env, [aeb_fate_ops:spend(?a, ?a),
                         tuple(0)], Args);
 builtin_to_scode(Env, chain_balance, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:balance_other(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:balance_other(?a, ?a), Args);
 builtin_to_scode(Env, chain_block_hash, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:blockhash(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:blockhash(?a, ?a), Args);
 builtin_to_scode(_Env, chain_coinbase, []) ->
-    [gmb_fate_ops:beneficiary(?a)];
+    [aeb_fate_ops:beneficiary(?a)];
 builtin_to_scode(_Env, chain_timestamp, []) ->
-    [gmb_fate_ops:timestamp(?a)];
+    [aeb_fate_ops:timestamp(?a)];
 builtin_to_scode(_Env, chain_block_height, []) ->
-    [gmb_fate_ops:generation(?a)];
+    [aeb_fate_ops:generation(?a)];
 builtin_to_scode(_Env, chain_difficulty, []) ->
-    [gmb_fate_ops:difficulty(?a)];
+    [aeb_fate_ops:difficulty(?a)];
 builtin_to_scode(_Env, chain_gas_limit, []) ->
-    [gmb_fate_ops:gaslimit(?a)];
+    [aeb_fate_ops:gaslimit(?a)];
 builtin_to_scode(_Env, chain_network_id, []) ->
-    [gmb_fate_ops:network_id(?a)];
+    [aeb_fate_ops:network_id(?a)];
 builtin_to_scode(_Env, contract_balance, []) ->
-    [gmb_fate_ops:balance(?a)];
+    [aeb_fate_ops:balance(?a)];
 builtin_to_scode(_Env, contract_address, []) ->
-    [gmb_fate_ops:address(?a)];
+    [aeb_fate_ops:address(?a)];
 builtin_to_scode(_Env, contract_creator, []) ->
-    [gmb_fate_ops:contract_creator(?a)];
+    [aeb_fate_ops:contract_creator(?a)];
 builtin_to_scode(_Env, call_origin, []) ->
-    [gmb_fate_ops:origin(?a)];
+    [aeb_fate_ops:origin(?a)];
 builtin_to_scode(_Env, call_caller, []) ->
-    [gmb_fate_ops:caller(?a)];
+    [aeb_fate_ops:caller(?a)];
 builtin_to_scode(_Env, call_value, []) ->
-    [gmb_fate_ops:call_value(?a)];
+    [aeb_fate_ops:call_value(?a)];
 builtin_to_scode(_Env, call_gas_price, []) ->
-    [gmb_fate_ops:gasprice(?a)];
+    [aeb_fate_ops:gasprice(?a)];
 builtin_to_scode(_Env, call_fee, []) ->
-    [gmb_fate_ops:fee(?a)];
+    [aeb_fate_ops:fee(?a)];
 builtin_to_scode(_Env, call_gas_left, []) ->
-    [gmb_fate_ops:gas(?a)];
+    [aeb_fate_ops:gas(?a)];
+builtin_to_scode(Env, oracle_register, [_Sign,_Account,_QFee,_TTL,_QType,_RType] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_register(?a, ?a, ?a, ?a, ?a, ?a, ?a), Args);
+builtin_to_scode(Env, oracle_expiry, [_Oracle] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_expiry(?a, ?a), Args);
+builtin_to_scode(Env, oracle_query_fee, [_Oracle] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_query_fee(?a, ?a), Args);
+builtin_to_scode(Env, oracle_query, [_Oracle, _Question, _QFee, _QTTL, _RTTL, _QType, _RType] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_query(?a, ?a, ?a, ?a, ?a, ?a, ?a, ?a), Args);
+builtin_to_scode(Env, oracle_get_question, [_Oracle, _QueryId, _QType, _RType] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_get_question(?a, ?a, ?a, ?a, ?a), Args);
+builtin_to_scode(Env, oracle_respond, [_Sign, _Oracle, _QueryId, _Response, _QType, _RType] = Args) ->
+    call_to_scode(Env, [aeb_fate_ops:oracle_respond(?a, ?a, ?a, ?a, ?a, ?a),
+                        tuple(0)], Args);
+builtin_to_scode(Env, oracle_extend, [_Sign, _Oracle, _TTL] = Args) ->
+    call_to_scode(Env, [aeb_fate_ops:oracle_extend(?a, ?a, ?a),
+                        tuple(0)], Args);
+builtin_to_scode(Env, oracle_get_answer, [_Oracle, _QueryId, _QType, _RType] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_get_answer(?a, ?a, ?a, ?a, ?a), Args);
+builtin_to_scode(Env, oracle_check, [_Oracle, _QType, _RType] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_check(?a, ?a, ?a, ?a), Args);
+builtin_to_scode(Env, oracle_check_query, [_Oracle, _Query, _QType, _RType] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:oracle_check_query(?a, ?a, ?a, ?a, ?a), Args);
+builtin_to_scode(Env, address_is_oracle, [_] = Args) ->
+    call_to_scode(Env, aeb_fate_ops:is_oracle(?a, ?a), Args);
 builtin_to_scode(Env, address_is_contract, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:is_contract(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:is_contract(?a, ?a), Args);
 builtin_to_scode(Env, address_is_payable, [_] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:is_payable(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:is_payable(?a, ?a), Args);
 builtin_to_scode(Env, aens_resolve, [_Name, _Key, _Type] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:aens_resolve(?a, ?a, ?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:aens_resolve(?a, ?a, ?a, ?a), Args);
 builtin_to_scode(Env, aens_preclaim, [_Sign, _Account, _Hash] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:aens_preclaim(?a, ?a, ?a),
+    call_to_scode(Env, [aeb_fate_ops:aens_preclaim(?a, ?a, ?a),
                         tuple(0)], Args);
 builtin_to_scode(Env, aens_claim, [_Sign, _Account, _NameString, _Salt, _NameFee] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:aens_claim(?a, ?a, ?a, ?a, ?a),
+    call_to_scode(Env, [aeb_fate_ops:aens_claim(?a, ?a, ?a, ?a, ?a),
                         tuple(0)], Args);
 builtin_to_scode(Env, aens_transfer, [_Sign, _From, _To, _Name] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:aens_transfer(?a, ?a, ?a, ?a),
+    call_to_scode(Env, [aeb_fate_ops:aens_transfer(?a, ?a, ?a, ?a),
                         tuple(0)], Args);
 builtin_to_scode(Env, aens_revoke, [_Sign, _Account, _Name] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:aens_revoke(?a, ?a, ?a),
+    call_to_scode(Env, [aeb_fate_ops:aens_revoke(?a, ?a, ?a),
                         tuple(0)], Args);
 builtin_to_scode(Env, aens_update, [_Sign, _Account, _NameString, _TTL, _ClientTTL, _Pointers] = Args) ->
-    call_to_scode(Env, [gmb_fate_ops:aens_update(?a, ?a, ?a, ?a, ?a, ?a),
+    call_to_scode(Env, [aeb_fate_ops:aens_update(?a, ?a, ?a, ?a, ?a, ?a),
                         tuple(0)], Args);
 builtin_to_scode(Env, aens_lookup, [_Name] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:aens_lookup(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:aens_lookup(?a, ?a), Args);
 builtin_to_scode(_Env, auth_tx_hash, []) ->
-    [gmb_fate_ops:auth_tx_hash(?a)];
+    [aeb_fate_ops:auth_tx_hash(?a)];
 builtin_to_scode(_Env, auth_tx, []) ->
-    [gmb_fate_ops:auth_tx(?a)];
+    [aeb_fate_ops:auth_tx(?a)];
 builtin_to_scode(Env, chain_bytecode_hash, [_Addr] = Args) ->
-    call_to_scode(Env, gmb_fate_ops:bytecode_hash(?a, ?a), Args);
+    call_to_scode(Env, aeb_fate_ops:bytecode_hash(?a, ?a), Args);
 builtin_to_scode(Env, chain_clone,
                  [InitArgsT, GasCap, Value, Prot, Contract | InitArgs]) ->
     case GasCap of
         {builtin, _, call_gas_left, _} ->
-            call_to_scode(Env, gmb_fate_ops:clone(?a, ?a, ?a, ?a),
+            call_to_scode(Env, aeb_fate_ops:clone(?a, ?a, ?a, ?a),
                           [Contract, InitArgsT, Value, Prot | InitArgs]
                          );
         _ ->
-            call_to_scode(Env, gmb_fate_ops:clone_g(?a, ?a, ?a, ?a, ?a),
+            call_to_scode(Env, aeb_fate_ops:clone_g(?a, ?a, ?a, ?a, ?a),
                           [Contract, InitArgsT, Value, GasCap, Prot | InitArgs]
                          )
     end;
 
 builtin_to_scode(Env, chain_create,
                  [ Code, InitArgsT, Value | InitArgs]) ->
-    call_to_scode(Env, gmb_fate_ops:create(?a, ?a, ?a),
+    call_to_scode(Env, aeb_fate_ops:create(?a, ?a, ?a),
                   [Code, InitArgsT, Value | InitArgs]
                  ).
 
 %% -- Operators --
 
-op_to_scode('+')               -> gmb_fate_ops:add(?a, ?a, ?a);
+op_to_scode('+')               -> aeb_fate_ops:add(?a, ?a, ?a);
-op_to_scode('-')               -> gmb_fate_ops:sub(?a, ?a, ?a);
+op_to_scode('-')               -> aeb_fate_ops:sub(?a, ?a, ?a);
-op_to_scode('*')               -> gmb_fate_ops:mul(?a, ?a, ?a);
+op_to_scode('*')               -> aeb_fate_ops:mul(?a, ?a, ?a);
-op_to_scode('/')               -> gmb_fate_ops:divide(?a, ?a, ?a);
+op_to_scode('/')               -> aeb_fate_ops:divide(?a, ?a, ?a);
-op_to_scode(mod)               -> gmb_fate_ops:modulo(?a, ?a, ?a);
+op_to_scode(mod)               -> aeb_fate_ops:modulo(?a, ?a, ?a);
-op_to_scode('^')               -> gmb_fate_ops:pow(?a, ?a, ?a);
+op_to_scode('^')               -> aeb_fate_ops:pow(?a, ?a, ?a);
-op_to_scode('++')              -> gmb_fate_ops:append(?a, ?a, ?a);
+op_to_scode('++')              -> aeb_fate_ops:append(?a, ?a, ?a);
-op_to_scode('::')              -> gmb_fate_ops:cons(?a, ?a, ?a);
+op_to_scode('::')              -> aeb_fate_ops:cons(?a, ?a, ?a);
-op_to_scode('<')               -> gmb_fate_ops:lt(?a, ?a, ?a);
+op_to_scode('<')               -> aeb_fate_ops:lt(?a, ?a, ?a);
-op_to_scode('>')               -> gmb_fate_ops:gt(?a, ?a, ?a);
+op_to_scode('>')               -> aeb_fate_ops:gt(?a, ?a, ?a);
-op_to_scode('=<')              -> gmb_fate_ops:elt(?a, ?a, ?a);
+op_to_scode('=<')              -> aeb_fate_ops:elt(?a, ?a, ?a);
-op_to_scode('>=')              -> gmb_fate_ops:egt(?a, ?a, ?a);
+op_to_scode('>=')              -> aeb_fate_ops:egt(?a, ?a, ?a);
-op_to_scode('==')              -> gmb_fate_ops:eq(?a, ?a, ?a);
+op_to_scode('==')              -> aeb_fate_ops:eq(?a, ?a, ?a);
-op_to_scode('!=')              -> gmb_fate_ops:neq(?a, ?a, ?a);
+op_to_scode('!=')              -> aeb_fate_ops:neq(?a, ?a, ?a);
-op_to_scode('!')               -> gmb_fate_ops:not_op(?a, ?a);
+op_to_scode('!')               -> aeb_fate_ops:not_op(?a, ?a);
-op_to_scode('bnot')            -> gmb_fate_ops:bin_not(?a, ?a);
+op_to_scode('bnot')            -> aeb_fate_ops:bin_not(?a, ?a);
-op_to_scode('band')            -> gmb_fate_ops:bin_and(?a, ?a, ?a);
+op_to_scode('band')            -> aeb_fate_ops:bin_and(?a, ?a, ?a);
-op_to_scode('bor')             -> gmb_fate_ops:bin_or(?a, ?a, ?a);
+op_to_scode('bor')             -> aeb_fate_ops:bin_or(?a, ?a, ?a);
-op_to_scode('bxor')            -> gmb_fate_ops:bin_xor(?a, ?a, ?a);
+op_to_scode('bxor')            -> aeb_fate_ops:bin_xor(?a, ?a, ?a);
-op_to_scode('<<')              -> gmb_fate_ops:bin_sl(?a, ?a, ?a);
+op_to_scode('<<')              -> aeb_fate_ops:bin_sl(?a, ?a, ?a);
-op_to_scode('>>')              -> gmb_fate_ops:bin_sr(?a, ?a, ?a);
+op_to_scode('>>')              -> aeb_fate_ops:bin_sr(?a, ?a, ?a);
-op_to_scode(map_get)           -> gmb_fate_ops:map_lookup(?a, ?a, ?a);
+op_to_scode(map_get)           -> aeb_fate_ops:map_lookup(?a, ?a, ?a);
-op_to_scode(map_get_d)         -> gmb_fate_ops:map_lookup(?a, ?a, ?a, ?a);
+op_to_scode(map_get_d)         -> aeb_fate_ops:map_lookup(?a, ?a, ?a, ?a);
-op_to_scode(map_set)           -> gmb_fate_ops:map_update(?a, ?a, ?a, ?a);
+op_to_scode(map_set)           -> aeb_fate_ops:map_update(?a, ?a, ?a, ?a);
-op_to_scode(map_from_list)     -> gmb_fate_ops:map_from_list(?a, ?a);
+op_to_scode(map_from_list)     -> aeb_fate_ops:map_from_list(?a, ?a);
-op_to_scode(map_to_list)       -> gmb_fate_ops:map_to_list(?a, ?a);
+op_to_scode(map_to_list)       -> aeb_fate_ops:map_to_list(?a, ?a);
-op_to_scode(map_delete)        -> gmb_fate_ops:map_delete(?a, ?a, ?a);
+op_to_scode(map_delete)        -> aeb_fate_ops:map_delete(?a, ?a, ?a);
-op_to_scode(map_member)        -> gmb_fate_ops:map_member(?a, ?a, ?a);
+op_to_scode(map_member)        -> aeb_fate_ops:map_member(?a, ?a, ?a);
-op_to_scode(map_size)          -> gmb_fate_ops:map_size_(?a, ?a);
+op_to_scode(map_size)          -> aeb_fate_ops:map_size_(?a, ?a);
-op_to_scode(stringinternal_length)    -> gmb_fate_ops:str_length(?a, ?a);
+op_to_scode(stringinternal_length)    -> aeb_fate_ops:str_length(?a, ?a);
-op_to_scode(stringinternal_concat)    -> gmb_fate_ops:str_join(?a, ?a, ?a);
+op_to_scode(stringinternal_concat)    -> aeb_fate_ops:str_join(?a, ?a, ?a);
-op_to_scode(stringinternal_to_bytes)  -> gmb_fate_ops:str_to_bytes(?a, ?a);
+op_to_scode(stringinternal_to_bytes)  -> aeb_fate_ops:str_to_bytes(?a, ?a);
-op_to_scode(stringinternal_to_list)   -> gmb_fate_ops:str_to_list(?a, ?a);
+op_to_scode(stringinternal_to_list)   -> aeb_fate_ops:str_to_list(?a, ?a);
-op_to_scode(stringinternal_from_list) -> gmb_fate_ops:str_from_list(?a, ?a);
+op_to_scode(stringinternal_from_list) -> aeb_fate_ops:str_from_list(?a, ?a);
-op_to_scode(stringinternal_to_lower)  -> gmb_fate_ops:str_to_lower(?a, ?a);
+op_to_scode(stringinternal_to_lower)  -> aeb_fate_ops:str_to_lower(?a, ?a);
-op_to_scode(stringinternal_to_upper)  -> gmb_fate_ops:str_to_upper(?a, ?a);
+op_to_scode(stringinternal_to_upper)  -> aeb_fate_ops:str_to_upper(?a, ?a);
-op_to_scode(char_to_int)       -> gmb_fate_ops:char_to_int(?a, ?a);
+op_to_scode(char_to_int)       -> aeb_fate_ops:char_to_int(?a, ?a);
-op_to_scode(char_from_int)     -> gmb_fate_ops:char_from_int(?a, ?a);
+op_to_scode(char_from_int)     -> aeb_fate_ops:char_from_int(?a, ?a);
-op_to_scode(bits_set)          -> gmb_fate_ops:bits_set(?a, ?a, ?a);
+op_to_scode(bits_set)          -> aeb_fate_ops:bits_set(?a, ?a, ?a);
-op_to_scode(bits_clear)        -> gmb_fate_ops:bits_clear(?a, ?a, ?a);
+op_to_scode(bits_clear)        -> aeb_fate_ops:bits_clear(?a, ?a, ?a);
-op_to_scode(bits_test)         -> gmb_fate_ops:bits_test(?a, ?a, ?a);
+op_to_scode(bits_test)         -> aeb_fate_ops:bits_test(?a, ?a, ?a);
-op_to_scode(bits_sum)          -> gmb_fate_ops:bits_sum(?a, ?a);
+op_to_scode(bits_sum)          -> aeb_fate_ops:bits_sum(?a, ?a);
-op_to_scode(bits_intersection) -> gmb_fate_ops:bits_and(?a, ?a, ?a);
+op_to_scode(bits_intersection) -> aeb_fate_ops:bits_and(?a, ?a, ?a);
-op_to_scode(bits_union)        -> gmb_fate_ops:bits_or(?a, ?a, ?a);
+op_to_scode(bits_union)        -> aeb_fate_ops:bits_or(?a, ?a, ?a);
-op_to_scode(bits_difference)   -> gmb_fate_ops:bits_diff(?a, ?a, ?a);
+op_to_scode(bits_difference)   -> aeb_fate_ops:bits_diff(?a, ?a, ?a);
-op_to_scode(address_to_str)    -> gmb_fate_ops:addr_to_str(?a, ?a);
+op_to_scode(address_to_str)    -> aeb_fate_ops:addr_to_str(?a, ?a);
-op_to_scode(address_to_bytes)  -> gmb_fate_ops:addr_to_bytes(?a, ?a);
+op_to_scode(address_to_bytes)  -> aeb_fate_ops:addr_to_bytes(?a, ?a);
-op_to_scode(int_to_str)        -> gmb_fate_ops:int_to_str(?a, ?a);
+op_to_scode(int_to_str)        -> aeb_fate_ops:int_to_str(?a, ?a);
-op_to_scode(int_to_bytes)      -> gmb_fate_ops:int_to_bytes(?a, ?a, ?a);
+op_to_scode(int_to_bytes)      -> aeb_fate_ops:int_to_bytes(?a, ?a, ?a);
-op_to_scode(int_mulmod)        -> gmb_fate_ops:mulmod(?a, ?a, ?a, ?a);
+op_to_scode(int_mulmod)        -> aeb_fate_ops:mulmod(?a, ?a, ?a, ?a);
-op_to_scode(contract_to_address)         -> gmb_fate_ops:contract_to_address(?a, ?a);
+op_to_scode(contract_to_address)         -> aeb_fate_ops:contract_to_address(?a, ?a);
-op_to_scode(address_to_contract)         -> gmb_fate_ops:address_to_contract(?a, ?a);
+op_to_scode(address_to_contract)         -> aeb_fate_ops:address_to_contract(?a, ?a);
-op_to_scode(crypto_verify_sig)           -> gmb_fate_ops:verify_sig(?a, ?a, ?a, ?a);
+op_to_scode(crypto_verify_sig)           -> aeb_fate_ops:verify_sig(?a, ?a, ?a, ?a);
-op_to_scode(crypto_verify_sig_secp256k1) -> gmb_fate_ops:verify_sig_secp256k1(?a, ?a, ?a, ?a);
+op_to_scode(crypto_verify_sig_secp256k1) -> aeb_fate_ops:verify_sig_secp256k1(?a, ?a, ?a, ?a);
-op_to_scode(crypto_ecverify_secp256k1)   -> gmb_fate_ops:ecverify_secp256k1(?a, ?a, ?a, ?a);
+op_to_scode(crypto_ecverify_secp256k1)   -> aeb_fate_ops:ecverify_secp256k1(?a, ?a, ?a, ?a);
-op_to_scode(crypto_ecrecover_secp256k1)  -> gmb_fate_ops:ecrecover_secp256k1(?a, ?a, ?a);
+op_to_scode(crypto_ecrecover_secp256k1)  -> aeb_fate_ops:ecrecover_secp256k1(?a, ?a, ?a);
-op_to_scode(crypto_sha3)                 -> gmb_fate_ops:sha3(?a, ?a);
+op_to_scode(crypto_sha3)                 -> aeb_fate_ops:sha3(?a, ?a);
-op_to_scode(crypto_sha256)               -> gmb_fate_ops:sha256(?a, ?a);
+op_to_scode(crypto_sha256)               -> aeb_fate_ops:sha256(?a, ?a);
-op_to_scode(crypto_blake2b)              -> gmb_fate_ops:blake2b(?a, ?a);
+op_to_scode(crypto_blake2b)              -> aeb_fate_ops:blake2b(?a, ?a);
-op_to_scode(crypto_poseidon)             -> gmb_fate_ops:poseidon(?a, ?a, ?a);
+op_to_scode(crypto_poseidon)             -> aeb_fate_ops:poseidon(?a, ?a, ?a);
-op_to_scode(stringinternal_sha3)         -> gmb_fate_ops:sha3(?a, ?a);
+op_to_scode(stringinternal_sha3)         -> aeb_fate_ops:sha3(?a, ?a);
-op_to_scode(stringinternal_sha256)       -> gmb_fate_ops:sha256(?a, ?a);
+op_to_scode(stringinternal_sha256)       -> aeb_fate_ops:sha256(?a, ?a);
-op_to_scode(stringinternal_blake2b)      -> gmb_fate_ops:blake2b(?a, ?a);
+op_to_scode(stringinternal_blake2b)      -> aeb_fate_ops:blake2b(?a, ?a);
-op_to_scode(mcl_bls12_381_g1_neg)        -> gmb_fate_ops:bls12_381_g1_neg(?a, ?a);
+op_to_scode(mcl_bls12_381_g1_neg)        -> aeb_fate_ops:bls12_381_g1_neg(?a, ?a);
-op_to_scode(mcl_bls12_381_g1_norm)       -> gmb_fate_ops:bls12_381_g1_norm(?a, ?a);
+op_to_scode(mcl_bls12_381_g1_norm)       -> aeb_fate_ops:bls12_381_g1_norm(?a, ?a);
-op_to_scode(mcl_bls12_381_g1_valid)      -> gmb_fate_ops:bls12_381_g1_valid(?a, ?a);
+op_to_scode(mcl_bls12_381_g1_valid)      -> aeb_fate_ops:bls12_381_g1_valid(?a, ?a);
-op_to_scode(mcl_bls12_381_g1_is_zero)    -> gmb_fate_ops:bls12_381_g1_is_zero(?a, ?a);
+op_to_scode(mcl_bls12_381_g1_is_zero)    -> aeb_fate_ops:bls12_381_g1_is_zero(?a, ?a);
-op_to_scode(mcl_bls12_381_g1_add)        -> gmb_fate_ops:bls12_381_g1_add(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_g1_add)        -> aeb_fate_ops:bls12_381_g1_add(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_g1_mul)        -> gmb_fate_ops:bls12_381_g1_mul(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_g1_mul)        -> aeb_fate_ops:bls12_381_g1_mul(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_g2_neg)        -> gmb_fate_ops:bls12_381_g2_neg(?a, ?a);
+op_to_scode(mcl_bls12_381_g2_neg)        -> aeb_fate_ops:bls12_381_g2_neg(?a, ?a);
-op_to_scode(mcl_bls12_381_g2_norm)       -> gmb_fate_ops:bls12_381_g2_norm(?a, ?a);
+op_to_scode(mcl_bls12_381_g2_norm)       -> aeb_fate_ops:bls12_381_g2_norm(?a, ?a);
-op_to_scode(mcl_bls12_381_g2_valid)      -> gmb_fate_ops:bls12_381_g2_valid(?a, ?a);
+op_to_scode(mcl_bls12_381_g2_valid)      -> aeb_fate_ops:bls12_381_g2_valid(?a, ?a);
-op_to_scode(mcl_bls12_381_g2_is_zero)    -> gmb_fate_ops:bls12_381_g2_is_zero(?a, ?a);
+op_to_scode(mcl_bls12_381_g2_is_zero)    -> aeb_fate_ops:bls12_381_g2_is_zero(?a, ?a);
-op_to_scode(mcl_bls12_381_g2_add)        -> gmb_fate_ops:bls12_381_g2_add(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_g2_add)        -> aeb_fate_ops:bls12_381_g2_add(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_g2_mul)        -> gmb_fate_ops:bls12_381_g2_mul(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_g2_mul)        -> aeb_fate_ops:bls12_381_g2_mul(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_gt_inv)        -> gmb_fate_ops:bls12_381_gt_inv(?a, ?a);
+op_to_scode(mcl_bls12_381_gt_inv)        -> aeb_fate_ops:bls12_381_gt_inv(?a, ?a);
-op_to_scode(mcl_bls12_381_gt_add)        -> gmb_fate_ops:bls12_381_gt_add(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_gt_add)        -> aeb_fate_ops:bls12_381_gt_add(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_gt_mul)        -> gmb_fate_ops:bls12_381_gt_mul(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_gt_mul)        -> aeb_fate_ops:bls12_381_gt_mul(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_gt_pow)        -> gmb_fate_ops:bls12_381_gt_pow(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_gt_pow)        -> aeb_fate_ops:bls12_381_gt_pow(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_gt_is_one)     -> gmb_fate_ops:bls12_381_gt_is_one(?a, ?a);
+op_to_scode(mcl_bls12_381_gt_is_one)     -> aeb_fate_ops:bls12_381_gt_is_one(?a, ?a);
-op_to_scode(mcl_bls12_381_pairing)       -> gmb_fate_ops:bls12_381_pairing(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_pairing)       -> aeb_fate_ops:bls12_381_pairing(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_miller_loop)   -> gmb_fate_ops:bls12_381_miller_loop(?a, ?a, ?a);
+op_to_scode(mcl_bls12_381_miller_loop)   -> aeb_fate_ops:bls12_381_miller_loop(?a, ?a, ?a);
-op_to_scode(mcl_bls12_381_final_exp)     -> gmb_fate_ops:bls12_381_final_exp(?a, ?a);
+op_to_scode(mcl_bls12_381_final_exp)     -> aeb_fate_ops:bls12_381_final_exp(?a, ?a);
-op_to_scode(mcl_bls12_381_int_to_fr)     -> gmb_fate_ops:bls12_381_int_to_fr(?a, ?a);
+op_to_scode(mcl_bls12_381_int_to_fr)     -> aeb_fate_ops:bls12_381_int_to_fr(?a, ?a);
-op_to_scode(mcl_bls12_381_int_to_fp)     -> gmb_fate_ops:bls12_381_int_to_fp(?a, ?a);
+op_to_scode(mcl_bls12_381_int_to_fp)     -> aeb_fate_ops:bls12_381_int_to_fp(?a, ?a);
-op_to_scode(mcl_bls12_381_fr_to_int)     -> gmb_fate_ops:bls12_381_fr_to_int(?a, ?a);
+op_to_scode(mcl_bls12_381_fr_to_int)     -> aeb_fate_ops:bls12_381_fr_to_int(?a, ?a);
-op_to_scode(mcl_bls12_381_fp_to_int)     -> gmb_fate_ops:bls12_381_fp_to_int(?a, ?a).
+op_to_scode(mcl_bls12_381_fp_to_int)     -> aeb_fate_ops:bls12_381_fp_to_int(?a, ?a).
 
 %% PUSH and STORE ?a are the same, so we use STORE to make optimizations
 %% easier, and specialize to PUSH (which is cheaper) at the end.
 push(A) -> {'STORE', ?a, A}.
 
 tuple(0) -> push(?i({tuple, {}}));
-tuple(N) -> gmb_fate_ops:tuple(?a, N).
+tuple(N) -> aeb_fate_ops:tuple(?a, N).
 
 %% -- Debug info functions --
 
@@ -801,8 +822,8 @@ dbg_undef(Undef, SCode) when is_tuple(SCode); is_atom(SCode) ->
             true  -> tuple_to_list(SCode);
             false -> [SCode]
         end,
-    Op = gmb_fate_opcodes:m_to_op(Mnemonic),
+    Op = aeb_fate_opcodes:m_to_op(Mnemonic),
-    case gmb_fate_opcodes:end_bb(Op) of
+    case aeb_fate_opcodes:end_bb(Op) of
         true  -> [Undef, SCode];
         false -> [SCode, Undef]
     end.
@@ -874,7 +895,7 @@ pp_ann(_, []) -> [].
 pp_op(switch_body) -> "SWITCH-BODY";
 pp_op(loop) -> "LOOP";
 pp_op(I)    ->
-    gmb_fate_pp:format_op(I, #{}).
+    aeb_fate_pp:format_op(I, #{}).
 
 pp_arg(?i(I))    -> io_lib:format("~w", [I]);
 pp_arg({arg, N}) -> io_lib:format("arg~p", [N]);
@@ -1644,14 +1665,14 @@ unannotate(Code) when is_list(Code) ->
 unannotate({i, _Ann, I}) -> [I].
 
 %% Desugar and specialize
-desugar({'ADD', ?a, ?i(1), ?a}) -> [gmb_fate_ops:inc()];
+desugar({'ADD', ?a, ?i(1), ?a}) -> [aeb_fate_ops:inc()];
-desugar({'ADD', A,  ?i(1), A})  -> [gmb_fate_ops:inc(desugar_arg(A))];
+desugar({'ADD', A,  ?i(1), A})  -> [aeb_fate_ops:inc(desugar_arg(A))];
-desugar({'ADD', ?a, ?a, ?i(1)}) -> [gmb_fate_ops:inc()];
+desugar({'ADD', ?a, ?a, ?i(1)}) -> [aeb_fate_ops:inc()];
-desugar({'ADD', A,  A,  ?i(1)}) -> [gmb_fate_ops:inc(desugar_arg(A))];
+desugar({'ADD', A,  A,  ?i(1)}) -> [aeb_fate_ops:inc(desugar_arg(A))];
-desugar({'SUB', ?a, ?a, ?i(1)}) -> [gmb_fate_ops:dec()];
+desugar({'SUB', ?a, ?a, ?i(1)}) -> [aeb_fate_ops:dec()];
-desugar({'SUB', A, A, ?i(1)})   -> [gmb_fate_ops:dec(desugar_arg(A))];
+desugar({'SUB', A, A, ?i(1)})   -> [aeb_fate_ops:dec(desugar_arg(A))];
-desugar({'STORE', ?a, A})       -> [gmb_fate_ops:push(desugar_arg(A))];
+desugar({'STORE', ?a, A})       -> [aeb_fate_ops:push(desugar_arg(A))];
-desugar({'STORE', R, ?a})       -> [gmb_fate_ops:pop(desugar_arg(R))];
+desugar({'STORE', R, ?a})       -> [aeb_fate_ops:pop(desugar_arg(R))];
 desugar({switch, Arg, Type, Alts, Def}) ->
     [{switch, desugar_arg(Arg), Type, [desugar(A) || A <- Alts], desugar(Def)}];
 desugar(missing) -> missing;
@@ -1671,11 +1692,11 @@ desugar_arg(A) -> A.
 %%  Constructing basic blocks
 
 to_basic_blocks(Funs) ->
-    to_basic_blocks(maps:to_list(Funs), gmb_fate_code:new()).
+    to_basic_blocks(maps:to_list(Funs), aeb_fate_code:new()).
 
 to_basic_blocks([{Name, {Attrs, Sig, Code}}|Left], Acc) ->
-    BB = bb(Name, Code ++ [gmb_fate_ops:return()]),
+    BB = bb(Name, Code ++ [aeb_fate_ops:return()]),
-    to_basic_blocks(Left, gmb_fate_code:insert_fun(Name, Attrs, Sig, BB, Acc));
+    to_basic_blocks(Left, aeb_fate_code:insert_fun(Name, Attrs, Sig, BB, Acc));
 to_basic_blocks([], Acc) ->
     Acc.
 
@@ -1746,7 +1767,7 @@ block(Blk = #blk{code     = [{switch, Arg, Type, Alts, Default} | Code],
     {DefRef, DefBlk} =
         case Default of
             missing when Catchall == none ->
-                FreshBlk([gmb_fate_ops:abort(?i(<<"Incomplete patterns">>))], none);
+                FreshBlk([aeb_fate_ops:abort(?i(<<"Incomplete patterns">>))], none);
             missing -> {Catchall, []};
             _       -> FreshBlk(Default ++ [{jump, RestRef}], Catchall)
                        %% ^ fall-through to the outer catchall
@@ -1921,14 +1942,14 @@ split_calls(Ref, [I | Code], Acc, Blocks) ->
 
 set_labels(Labels, {Ref, Code}) when is_reference(Ref) ->
     {maps:get(Ref, Labels), [ set_labels(Labels, I) || I <- Code ]};
-set_labels(_Labels, loop)              -> gmb_fate_ops:jump(0);
+set_labels(_Labels, loop)              -> aeb_fate_ops:jump(0);
-set_labels(Labels, {jump, Ref})        -> gmb_fate_ops:jump(maps:get(Ref, Labels));
+set_labels(Labels, {jump, Ref})        -> aeb_fate_ops:jump(maps:get(Ref, Labels));
-set_labels(Labels, {jumpif, Arg, Ref}) -> gmb_fate_ops:jumpif(Arg, maps:get(Ref, Labels));
+set_labels(Labels, {jumpif, Arg, Ref}) -> aeb_fate_ops:jumpif(Arg, maps:get(Ref, Labels));
 set_labels(Labels, {switch, Arg, Refs}) ->
     case [ maps:get(Ref, Labels) || Ref <- Refs ] of
-        [R1, R2]     -> gmb_fate_ops:switch(Arg, R1, R2);
+        [R1, R2]     -> aeb_fate_ops:switch(Arg, R1, R2);
-        [R1, R2, R3] -> gmb_fate_ops:switch(Arg, R1, R2, R3);
+        [R1, R2, R3] -> aeb_fate_ops:switch(Arg, R1, R2, R3);
-        Rs           -> gmb_fate_ops:switch(Arg, Rs)
+        Rs           -> aeb_fate_ops:switch(Arg, Rs)
     end;
 set_labels(_, I) -> I.
 

src/aeso_parse_lib.erl

@@ -6,7 +6,7 @@
 %%%      Programming 14, 6 (November 2004)
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_parse_lib).
+-module(aeso_parse_lib).
 
 -export([parse/2,
          return/1, fail/0, fail/1, fail/2, map/2, bind/2,
@@ -15,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 ------------------------------------------------------------------
@@ -27,16 +27,16 @@
 -type tokens() :: [token()].
 -type error()  :: {pos(), string() | no_error}.
 
--define(lazy(F),     {so_parse_lazy, F}).
+-define(lazy(F),     {aeso_parse_lazy, F}).
--define(fail(Err),   {so_parse_fail, Err}).
+-define(fail(Err),   {aeso_parse_fail, Err}).
--define(choice(Ps),  {so_parse_choice, Ps}).
+-define(choice(Ps),  {aeso_parse_choice, Ps}).
--define(bind(P, F),  {so_parse_bind, P, F}).
+-define(bind(P, F),  {aeso_parse_bind, P, F}).
--define(right(P, Q), {so_parse_right, P, Q}).
+-define(right(P, Q), {aeso_parse_right, P, Q}).
--define(left(P, Q),  {so_parse_left, P, Q}).
+-define(left(P, Q),  {aeso_parse_left, P, Q}).
--define(map(F, P),   {so_parse_map, F, P}).
+-define(map(F, P),   {aeso_parse_map, F, P}).
--define(layout,       so_parse_layout).
+-define(layout,       aeso_parse_layout).
--define(tok(Atom),   {so_parse_tok, Atom}).
+-define(tok(Atom),   {aeso_parse_tok, Atom}).
--define(return(X),   {so_parse_return, X}).
+-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).
@@ -480,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(LET_P(X, P, Q), aeso_parse_lib:bind(P, fun(X) -> Q end)).
--define(LAZY_P(P),      so_parse_lib:lazy(fun() -> P end)).
+-define(LAZY_P(P),      aeso_parse_lib:lazy(fun() -> P end)).
--define(MEMO_P(P),      so_parse_lib:lazy(so_parse_lib:memoised(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,8 +1,8 @@
-%%% File        : so_parser.erl
+%%% File        : aeso_parser.erl
 %%% Author      : Ulf Norell
 %%% Description :
 %%% Created     : 1 Mar 2018 by Ulf Norell
--module(so_parser).
+-module(aeso_parser).
 -compile({no_auto_import,[map_get/2]}).
 
 -export([string/1,
@@ -17,12 +17,11 @@
          run_parser/2,
          run_parser/3]).
 
--include("so_parse_lib.hrl").
+-include("aeso_parse_lib.hrl").
--import(so_parse_lib, [current_file/0, set_current_file/1,
+-import(aeso_parse_lib, [current_file/0, set_current_file/1,
-                         current_dir/0, set_current_dir/1,
                          current_include_type/0, set_current_include_type/1]).
 
--type parse_result() :: 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()}.
 
@@ -36,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
@@ -59,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
+    case aeso_scan:scan(S) of
-        {ok, Tokens} -> so_parse_lib:parse(P, Tokens);
+        {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]));
@@ -86,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({Line, Col})       -> aeso_errors:pos(Line, Col);
-mk_pos({File, Line, Col}) -> so_errors:pos(File, Line, Col).
+mk_pos({File, Line, Col}) -> aeso_errors:pos(File, Line, Col).
 
 %% -- Parsing rules ----------------------------------------------------------
 
@@ -302,7 +300,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() ->
@@ -326,7 +324,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;
@@ -411,7 +409,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).
@@ -525,10 +523,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
@@ -557,14 +555,13 @@ bracket_list(P) -> brackets(comma_sep(P)).
 
 %% -- Annotations ------------------------------------------------------------
 
--type ann()      :: so_syntax:ann().
+-type ann()      :: aeso_syntax:ann().
--type ann_line() :: so_syntax:ann_line().
+-type ann_line() :: aeso_syntax:ann_line().
--type ann_col()  :: so_syntax:ann_col().
+-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} ].
@@ -612,7 +609,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'"});
@@ -622,14 +619,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}.
@@ -647,7 +644,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}) ->
@@ -674,19 +671,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 -------------------------------------------------------
 
@@ -705,7 +702,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 ->
@@ -715,10 +712,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}),
+                    Opts2 = lists:keystore(include_type, 1, Opts1, {include_type, IncludeType}),
-                    Opts3 = lists:keystore(include_type, 1, Opts2, {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, _} ->
@@ -736,21 +732,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);
+            CandidateNames = [ filename:join(Dir, File) || Dir <- Paths ],
-                           (_Path, OK)        -> OK end, {error, not_found}, 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 _:_ ->
@@ -758,52 +755,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
+    case {read_file(File, Opts), read_file(File, stdlib_options())} of
-    Opts1 = include_current_file_dir(Opts, Ann),
+        {{ok, Bin}, {ok, _}} ->
-    case {read_file(File, Opts1), read_file(File, stdlib_options())} of
-        {{ok, Dir, 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, Bin}} ->
-            {ok, stdlib, binary_to_list(Bin)};
+            {ok, binary_to_list(Bin)};
-        {{ok, Dir, Bin}, _} ->
+        {{ok, Bin}, _} ->
-            {ok, Dir, binary_to_list(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);

src/aeso_pretty.erl

@@ -5,7 +5,7 @@
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_pretty).
+-module(aeso_pretty).
 
 -import(prettypr, [text/1, sep/1, above/2, beside/2, nest/2, empty/0]).
 
@@ -13,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].
@@ -24,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.
@@ -45,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 ------------------------------------------------
@@ -125,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))
@@ -139,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));
@@ -172,7 +172,7 @@ decl({fun_decl, Ann, F, T}) ->
     Mod = fun({Mod, true}) when Mod == private; Mod == stateful; Mod == payable ->
                   text(atom_to_list(Mod));
              (_) -> empty() end,
-    Fun = case 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,
@@ -181,7 +181,7 @@ decl(D = {letfun, Attrs, _, _, _, _}) ->
     Mod = fun({Mod, true}) when Mod == private; Mod == stateful; Mod == payable ->
                             text(atom_to_list(Mod));
              (_) -> empty() end,
-    Fun = case so_syntax:get_ann(entrypoint, Attrs, false) of
+    Fun = case aeso_syntax:get_ann(entrypoint, Attrs, false) of
               true  -> "entrypoint";
               false -> "function"
           end,
@@ -192,20 +192,20 @@ decl(D = {letval, _, _, _}) -> letdecl("let", D);
 decl({block, _, Ds}) ->
     above([ decl(D) || D <- Ds ]).
 
--spec pragma(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, "."));
@@ -213,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]}) ->
@@ -221,14 +221,14 @@ letdecl(Let, {letfun, _, F, Args, T, [GuardedBody]}) ->
 letdecl(Let, {letfun, _, F, Args, T, GuardedBodies}) ->
     block(hsep([text(Let), typed(beside(name(F), expr({tuple, [], Args})), T)]), above(lists:map(fun(GB) -> guarded_body(GB, "=") end, GuardedBodies))).
 
--spec args([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");
@@ -241,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}) ->
@@ -296,11 +296,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) ->
@@ -310,7 +310,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}) ->
@@ -318,7 +318,7 @@ expr_p(P, {named_arg, _, Name, E}) ->
 expr_p(P, {lam, _, Args, E}) ->
     paren(P > 100, follow(hsep(args(Args), text("=>")), expr_p(100, E)));
 expr_p(P, If = {'if', Ann, Cond, Then, Else}) ->
-    Format   = so_syntax:get_ann(format, If),
+    Format   = aeso_syntax:get_ann(format, If),
     if  Format == '?:' ->
             paren(P > 100,
                 follow(expr_p(200, Cond),
@@ -361,7 +361,7 @@ expr_p(P, {assign, _, LV, E}) ->
 expr_p(_, {app, _, {'..', _}, [A, B]}) ->
     list([infix(0, '..', A, B)]);
 expr_p(P, E = {app, _, F = {Op, _}, Args}) when is_atom(Op) ->
-    case {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)
@@ -372,7 +372,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,
@@ -387,9 +387,8 @@ expr_p(_, {Type, _, Bin})
     when Type == account_pubkey;
          Type == contract_pubkey;
          Type == oracle_pubkey;
-         Type == oracle_query_id;
+         Type == oracle_query_id ->
-         Type == signature ->
+    text(binary_to_list(aeser_api_encoder:encode(Type, Bin)));
-    text(binary_to_list(gmser_api_encoder:encode(Type, Bin)));
 expr_p(_, {string, _, <<>>}) -> text("\"\"");
 expr_p(_, {string, _, S}) ->
     text(io_lib:format("\"~s\"", [binary_to_list(S)]));
@@ -402,7 +401,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
@@ -419,9 +418,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.
@@ -433,7 +432,7 @@ 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
@@ -460,7 +459,7 @@ 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}.
@@ -468,7 +467,7 @@ un_prec('bnot') -> {850, 850}.
 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,
@@ -530,9 +529,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

@@ -5,12 +5,12 @@
 %%%
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_scan).
+-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]).
+                        override/2, push/2, pop/1]).
 
 lexer() ->
     Number   = fun(Digit) -> [Digit, "+(_", Digit, "+)*"] end,
@@ -79,8 +79,8 @@ lexer() ->
     [{code, Rules}, {comment, CommentRules}].
 
 scan(String) ->
-    Lexer = so_scan_lib:compile(lexer()),
+    Lexer = aeso_scan_lib:compile(lexer()),
-    so_scan_lib:string(Lexer, code, String).
+    aeso_scan_lib:string(Lexer, code, String).
 
 %% -- Helpers ----------------------------------------------------------------
 

src/aeso_scan_lib.erl

@@ -4,7 +4,7 @@
 %%% @doc A customisable lexer.
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_scan_lib).
+-module(aeso_scan_lib).
 
 -export([compile/1, string/3,
          token/1, token/2, symbol/0, skip/0,

src/aeso_stdlib.erl

@@ -8,10 +8,10 @@
 %%%
 %%%-------------------------------------------------------------------
 
--module(so_stdlib).
+-module(aeso_stdlib).
 
 -export([stdlib_include_path/0]).
 
 stdlib_include_path() ->
-    filename:join([code:priv_dir(sophia), "stdlib"]).
+    filename:join([code:priv_dir(aesophia), "stdlib"]).
 

src/aeso_syntax.erl

@@ -6,7 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_syntax).
+-module(aeso_syntax).
 
 -export([get_ann/1, get_ann/2, get_ann/3, set_ann/2, qualify/2]).
 
@@ -100,7 +100,6 @@
      | {contract_pubkey, ann(), binary()}
      | {oracle_pubkey, ann(), binary()}
      | {oracle_query_id, ann(), binary()}
-     | {signature, ann(), binary()}
      | {string, ann(), binary()}
      | {char, ann(), integer()}.
 

src/aeso_syntax_utils.erl

@@ -4,9 +4,9 @@
 %%%     Sophia syntax utilities.
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_syntax_utils).
+-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}).
 
@@ -17,19 +17,19 @@
 -type kind() :: decl | type | bind_type | expr | bind_expr.
 
 -spec fold(alg(A), fun((kind(), _) -> A), kind(), E | [E]) -> A
-    when E :: so_syntax:decl()
+    when E :: aeso_syntax:decl()
-            | so_syntax:typedef()
+            | aeso_syntax:typedef()
-            | so_syntax:field_t()
+            | aeso_syntax:field_t()
-            | so_syntax:constructor_t()
+            | aeso_syntax:constructor_t()
-            | so_syntax:type()
+            | aeso_syntax:type()
-            | so_syntax:expr()
+            | aeso_syntax:expr()
-            | so_syntax:pat()
+            | aeso_syntax:pat()
-            | so_syntax:arg()
+            | aeso_syntax:arg()
-            | so_syntax:alt()
+            | aeso_syntax:alt()
-            | so_syntax:elim()
+            | aeso_syntax:elim()
-            | so_syntax:arg_expr()
+            | aeso_syntax:arg_expr()
-            | so_syntax:field(so_syntax:expr())
+            | aeso_syntax:field(aeso_syntax:expr())
-            | so_syntax:stmt().
+            | 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,
@@ -110,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).
+    [ X || {{term, [X]}, _} <- used(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.
 
 used_types([Top] = _CurrentNS, T) ->
     F = fun({{type, [X]}, _}) -> [X];
@@ -132,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,
@@ -147,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_utils.erl

@@ -4,24 +4,12 @@
 %%%     Sophia utility functions.
 %%% @end
 %%%-------------------------------------------------------------------
--module(so_utils).
+-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

@@ -4,21 +4,18 @@
 %%% @end
 %%%-------------------------------------------------------------------
 
--module(so_vm_decode).
+-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, _, any}, ?FATE_BYTES(Bin)) -> {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) ->
@@ -190,5 +187,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,6 +1,6 @@
--module(so_warnings).
+-module(aeso_warnings).
 
--record(warn, { pos     :: so_errors:pos()
+-record(warn, { pos     :: aeso_errors:pos()
               , message :: iolist()
               }).
 
@@ -16,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,
+{application, aesophia,
- [{description, "Compiler for the Sophia language"},
+ [{description, "Compiler for Aeternity Sophia language"},
-  {vsn, "8.0.1"},
+  {vsn, "8.0.0"},
   {registered, []},
   {applications,
    [kernel,
     stdlib,
     jsx,
     syntax_tools,
-    gmbytecode,
+    getopt,
+    aebytecode,
     eblake2
    ]},
   {env,[]},

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>>}),
+    CallValue32 = aeb_fate_encoding:serialize({bytes, <<20:256>>}),
-    CallValue48 = gmb_fate_encoding:serialize({bytes, <<55:384>>}),
+    CallValue48 = aeb_fate_encoding:serialize({bytes, <<55:384>>}),
-    CallValueTp = gmb_fate_encoding:serialize({tuple, {{bytes, <<15:256>>}, {bytes, <<160:256>>}, {bytes, <<1234:256>>}}}),
+    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),
+    {ok,     _} = aeso_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),
+    {error,  _} = aeso_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),
+    {ok,     _} = aeso_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),
+    {error,  _} = aeso_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_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)),
+    {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", so_errors:pp(Err1)),
+    ?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)),
+    {error, [Err2]} = aeso_compiler:to_sophia_value(Code, "f", revert, encode(12)),
-    ?assertEqual("Data error:\nCould not deserialize the revert message\n", so_errors:pp(Err2)),
+    ?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"]),
+    {error, [Err1]} = aeso_compiler:create_calldata(Code, "f", ["true"]),
-    ?assertEqual(ExpErr1, so_errors:pp(Err1)),
+    ?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>>),
+    {error, [Err1]} = aeso_compiler:decode_calldata(Code2, "f", <<1,2,3>>),
-    ?assertEqual("Data error:\nFailed to decode calldata binary\n", so_errors:pp(Err1)),
+    ?assertEqual("Data error:\nFailed to decode calldata binary\n", aeso_errors:pp(Err1)),
-    {error, [Err2]} = so_compiler:decode_calldata(Code2, "f", CallDataFATE),
+    {error, [Err2]} = aeso_compiler:decode_calldata(Code2, "f", CallDataFATE),
-    ?assertEqual("Data error:\nCannot translate FATE value \"*\"\n  to Sophia type (string)\n", so_errors:pp(Err2)),
+    ?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),
+    {error, [Err3]} = aeso_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)),
+    ?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, Calldata} = aeso_compiler:create_calldata(Code, FunName, Args, []),
-    {ok, _, _} = so_compiler:check_call(Code, FunName, Args, [no_code]),
+    {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),
+    String = aeso_test_utils:read_contract(Name),
-    Opts   = case lists:member(Name, so_compiler_tests:debug_mode_contracts()) of
+    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()]}}],
+             end ++ [{include, {file_system, [aeso_test_utils:contract_path()]}}],
-    JSON = case so_aci:contract_interface(json, String, Opts) of
+    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),
+           ContractString       = aeso_test_utils:read_contract(ContractName),
-           {ok, ContractACIBin} = so_aci:contract_interface(string, ContractString, [no_code]),
+           {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, Data} = (catch aeso_compiler:create_calldata(ContractString, Fun, Args, Opts)),
-    {ok, _Types, Exprs} = (catch so_compiler:decode_calldata(ContractString, Fun, Data, 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", ["()"]},
@@ -97,6 +98,7 @@ compilable_contracts() ->
      {"funargs", "singleton_rec", ["{x = 1000}"]},
      {"funargs", "aens_name", ["AENS.Name(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, RelativeTTL(100), {[\"pt1\"] = AENS.AccountPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)})"]},
      {"funargs", "aens_pointee", ["AENS.AccountPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
+     {"funargs", "aens_pointee", ["AENS.OraclePt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
      {"funargs", "aens_pointee", ["AENS.ContractPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
      {"funargs", "aens_pointee", ["AENS.ChannelPt(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR)"]},
      {"funargs", "chain_ga_meta_tx", ["Chain.GAMetaTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 42)"]},
@@ -104,13 +106,16 @@ compilable_contracts() ->
      {"funargs", "chain_base_tx", ["Chain.SpendTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 42,\"foo\")"]},
      {"funargs", "chain_base_tx", ["Chain.ContractCreateTx(12234)"]},
      {"funargs", "chain_base_tx", ["Chain.ContractCallTx(ak_2dATVcZ9KJU5a8hdsVtTv21pYiGWiPbmVcU1Pz72FFqpk9pSRR, 12234)"]},
+     {"funargs", "chain_base_tx", ["Chain.OracleRegisterTx"]},
+     {"funargs", "chain_base_tx", ["Chain.OracleQueryTx"]},
+     {"funargs", "chain_base_tx", ["Chain.OracleResponseTx"]},
+     {"funargs", "chain_base_tx", ["Chain.OracleExtendTx"]},
      {"funargs", "chain_base_tx", ["Chain.NamePreclaimTx"]},
      {"funargs", "chain_base_tx", ["Chain.NameClaimTx(\"acoolname.chain\")"]},
      {"funargs", "chain_base_tx", ["Chain.NameUpdateTx(#ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)"]},
      {"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",
@@ -222,6 +221,7 @@ compilable_contracts() ->
      "polymorphic_entrypoint_return",
      "polymorphic_map_keys",
      "unapplied_contract_call",
+     "unapplied_named_arg_builtin",
      "resolve_field_constraint_by_arity",
      "toplevel_constants",
      "ceres",
@@ -297,7 +297,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,
@@ -464,7 +464,10 @@ failing_contracts() ->
         [<<?Pos(2, 12)
            "Nested contracts are not allowed. Contract `Con` is not defined at top level.">>])
     , ?TYPE_ERROR(bad_address_literals,
-        [
+        [<<?Pos(11, 5)
+           "Cannot unify `address` and `oracle(int, bool)`\n"
+           "when checking the type of the expression `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt : address` "
+           "against the expected type `oracle(int, bool)`">>,
          <<?Pos(9, 5)
            "Cannot unify `address` and `Remote`\n"
            "when checking the type of the expression `ak_2gx9MEFxKvY9vMG5YnqnXWv1hCsX7rgnfvBLJS4aQurustR1rt : address` "
@@ -473,17 +476,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`">>])
@@ -996,6 +1034,56 @@ failing_contracts() ->
                      "Cannot unify `Animal` and `Cat` in a invariant context\n"
                      "when checking the type of the pattern `r11 : rec_inv(Cat)` against the expected type `Main.rec_inv(Animal)`">>
                   ])
+    , ?TYPE_ERROR(polymorphism_variance_switching_oracles,
+                  [<<?Pos(15,13)
+                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
+                     "when checking the type of the pattern `o03 : oracle(Animal, Animal)` against the expected type `oracle(Cat, Animal)`">>,
+                   <<?Pos(16,13)
+                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
+                     "when checking the type of the pattern `o04 : oracle(Animal, Animal)` against the expected type `oracle(Cat, Cat)`">>,
+                   <<?Pos(17,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `o05 : oracle(Animal, Cat)` against the expected type `oracle(Animal, Animal)`">>,
+                   <<?Pos(19,13)
+                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
+                     "when checking the type of the pattern `o07 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Animal)`">>,
+                   <<?Pos(19,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `o07 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Animal)`">>,
+                   <<?Pos(20,13)
+                     "Cannot unify `Cat` and `Animal` in a contravariant context\n"
+                     "when checking the type of the pattern `o08 : oracle(Animal, Cat)` against the expected type `oracle(Cat, Cat)`">>,
+                   <<?Pos(25,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `o13 : oracle(Cat, Cat)` against the expected type `oracle(Animal, Animal)`">>,
+                   <<?Pos(27,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `o15 : oracle(Cat, Cat)` against the expected type `oracle(Cat, Animal)`">>,
+                   <<?Pos(34,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q05 : oracle_query(Animal, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
+                   <<?Pos(36,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q07 : oracle_query(Animal, Cat)` against the expected type `oracle_query(Cat, Animal)`">>,
+                   <<?Pos(38,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q09 : oracle_query(Cat, Animal)` against the expected type `oracle_query(Animal, Animal)`">>,
+                   <<?Pos(39,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q10 : oracle_query(Cat, Animal)` against the expected type `oracle_query(Animal, Cat)`">>,
+                   <<?Pos(42,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q13 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
+                   <<?Pos(42,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q13 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Animal)`">>,
+                   <<?Pos(43,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q14 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Animal, Cat)`">>,
+                   <<?Pos(44,13)
+                     "Cannot unify `Animal` and `Cat` in a covariant context\n"
+                     "when checking the type of the pattern `q15 : oracle_query(Cat, Cat)` against the expected type `oracle_query(Cat, Animal)`">>
+                  ])
     , ?TYPE_ERROR(polymorphism_variance_switching_chain_create_fail,
                   [<<?Pos(9,22)
                      "I is not implemented.\n"
@@ -1052,19 +1140,47 @@ failing_contracts() ->
                   [<<?Pos(4,5)
                      "Invalid return type of `AENSv2.resolve`:\n"
                      "  `'a`\n"
-                     "It must be a `string` or a pubkey type (`address`, etc)">>
+                     "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"
                      "  `list(int)`\n"
-                     "It must be a `string` or a pubkey type (`address`, etc)">>
+                     "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"
                      "  `list(int)`\n"
-                     "It must be a `string` or a pubkey type (`address`, etc)">>
+                     "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)
@@ -1184,10 +1300,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_() ->
@@ -1227,17 +1339,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)),
+            FCode1   = aeb_fate_code:serialize(aeb_fate_code:strip_init_function(FCode)),
-            Source   = so_test_utils:read_contract(Contract2),
+            Source   = aeso_test_utils:read_contract(Contract2),
-            so_compiler:validate_byte_code(
+            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, [aeso_test_utils:contract_path()]}}]);
-                  , {include, {file_system, [so_test_utils:contract_path()]}}
-                  ]);
         Error -> print_and_throw(Error)
     end.
 
@@ -1247,6 +1357,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]).
 
@@ -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))),
+    Text1     = prettypr:format(aeso_pretty:decls(strip_stdlib(Contract))),
-    Contract1 = parse_string(so_scan:utf8_encode(Text1)),
+    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}

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,13 +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

@@ -14,6 +14,12 @@ main contract AENSTest =
   stateful entrypoint resolve_contract(name : string, key : string) : option(C) =
     AENSv2.resolve(name, key)
 
+  stateful entrypoint resolve_oracle(name : string, key : string) : option(oracle(int, int)) =
+    AENSv2.resolve(name, key)
+
+  stateful entrypoint resolve_oracle_query(name : string, key : string) : option(oracle_query(int, int)) =
+    AENSv2.resolve(name, key)
+
   // Transactions
 
   stateful entrypoint preclaim(addr  : address,     // Claim on behalf of this account (can be Contract.address)

test/contracts/aens_update.aes

@@ -8,13 +8,14 @@ contract interface OldAENSContract =
 main contract AENSUpdate =
   stateful entrypoint update_name(owner : address, name : string, b : bytes(2)) =
     let p1 : AENSv2.pointee = AENSv2.AccountPt(Call.caller)
-    let p2 : AENSv2.pointee = AENSv2.ContractPt(Call.caller)
+    let p2 : AENSv2.pointee = AENSv2.OraclePt(Call.caller)
-    let p3 : AENSv2.pointee = AENSv2.ChannelPt(Call.caller)
+    let p3 : AENSv2.pointee = AENSv2.ContractPt(Call.caller)
-    let p4 : AENSv2.pointee = AENSv2.DataPt(String.to_bytes("any something will do"))
+    let p4 : AENSv2.pointee = AENSv2.ChannelPt(Call.caller)
-    let p5 : AENSv2.pointee = AENSv2.DataPt(Int.to_bytes(1345, 4))
+    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,
+                  Some({ ["account_pubkey"] = p1, ["oracle_pubkey"] = p2,
-                         ["contract_pubkey"] = p2, ["misc"] = p3, ["data"] = p4, ["data2"] = p5 }))
+                         ["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")
@@ -26,3 +27,6 @@ main contract AENSUpdate =
   entrypoint get_ttl(name : string) =
     switch(AENSv2.lookup(name))
      Some(AENSv2.Name(_, FixedTTL(ttl), _)) => ttl
+
+  entrypoint expiry(o : oracle(int, int)) : int =
+    Oracle.expiry(o)

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/basic_auth_tx.aes

@@ -9,6 +9,7 @@
 //   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) |
@@ -41,6 +42,10 @@ contract BasicAuthTx =
                              fee = 123, ttl = 0, actor = Call.caller }
         switch(tx0.tx)
           Chain.SpendTx(receiver, amount, payload) => verify(tx_hash, n, s)
+          Chain.OracleRegisterTx                   => false
+          Chain.OracleQueryTx                      => false
+          Chain.OracleResponseTx                   => false
+          Chain.OracleExtendTx                     => false
           Chain.NamePreclaimTx                     => false
           Chain.NameClaimTx(name)                  => false
           Chain.NameUpdateTx(name)                 => false

test/contracts/ceres.aes

@@ -11,5 +11,4 @@ contract C =
     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)
-    (a bor b band c bxor a << bnot b >> a, k, l)

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_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_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/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,11 +28,13 @@ contract C =
     let c16 = #000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f
     let c17 = #000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0f
     let c18 = RelativeTTL(50)
-    let c19 = ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ : C
+    let c19 = ok_2YNyxd6TRJPNrTcEDCe9ra59SVUdp9FR9qWC5msKZWYD9bP9z5
-    let c20 = N.nsconst
+    let c20 = oq_2oRvyowJuJnEkxy58Ckkw77XfWJrmRgmGaLzhdqb67SKEL1gPY
-    let c21 = c01
+    let c21 = ct_Ez6MyeTMm17YnTnDdHTSrzMEBKmy7Uz2sXu347bTDPgVH2ifJ : C
-    let c22 = c11.name
+    let c22 = N.nsconst
-    let c23 : int = 1
+    let c23 = c01
+    let c24 = c11.name
+    let c25 : int = 1
 
     entrypoint f01() = c01
     entrypoint f02() = c02
@@ -57,4 +59,6 @@ contract C =
     entrypoint f21() = c21
     entrypoint f22() = c22
     entrypoint f23() = c23
+    entrypoint f24() = c24
+    entrypoint f25() = c25
     entrypoint fqual() = C.c01

test/contracts/unapplied_builtins.aes

@@ -1,12 +1,16 @@
 // Builtins without named arguments can appear unapplied.
 // Named argument builtins are:
+//    Oracle.register
+//    Oracle.respond
 //    AENSv2.preclaim
 //    AENSv2.claim
 //    AENSv2.transfer
 //    AENSv2.revoke
+//    Oracle.extend
 include "String.aes"
 contract UnappliedBuiltins =
   entrypoint main_fun() = ()
+  type o = oracle(int, int)
   type t = list(int * string)
   type m = map(int, int)
   datatype event = Event(int)
@@ -17,6 +21,13 @@ contract UnappliedBuiltins =
   function call_gas_left()               = Call.gas_left
   function b_abort()                     = abort
   function b_require()                   = require
+  function oracle_query_fee()            = Oracle.query_fee
+  function oracle_expiry()               = Oracle.expiry
+  stateful function oracle_query()       = Oracle.query        : (o, _, _, _, _) => _
+  function oracle_get_question()         = Oracle.get_question : (o, _) => _
+  function oracle_get_answer()           = Oracle.get_answer   : (o, _) => _
+  function oracle_check()                = Oracle.check        : o => _
+  function oracle_check_query()          = Oracle.check_query  : (o, _) => _
   function aens_resolve()                = AENSv2.resolve      : (_, _) => option(string)
   function map_lookup()                  = Map.lookup          : (_, m) => _
   function map_lookup_default()          = Map.lookup_default  : (_, m, _) => _
@@ -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).