Zilliqa · anton-trunov · Aug 3, 2020 · Jun 1, 2020 · Jun 1, 2020 · Aug 3, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,13 @@ matrix:
   include:
     - os: linux
       dist: xenial
-      env: OCAML_VERSION=4.09.1
+      env: OCAML_VERSION=4.10.0
     - os: linux
       dist: xenial
-      env: OCAML_VERSION=4.08.1
+      env: OCAML_VERSION=4.09.1
     - os: linux
       dist: xenial
-      env: OCAML_VERSION=4.07.1
+      env: OCAML_VERSION=4.08.1
     # - os: osx
     #  osx_image: xcode10.1
 

diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update \
     libpcre3-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV OCAML_VERSION 4.07.1
+ENV OCAML_VERSION 4.08.1
 
 RUN make opamdep-ci \
     && echo '. ~/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true ' >> ~/.bashrc \

diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -29,7 +29,7 @@ RUN apt-get update \
     libpcre3-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV OCAML_VERSION 4.07.1
+ENV OCAML_VERSION 4.08.1
 
 RUN make opamdep-ci \
     && echo '. ~/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true ' >> ~/.bashrc \

diff --git a/INSTALL.md b/INSTALL.md
@@ -150,7 +150,7 @@ Disabling sandboxing is required since [WSL does not support Sandboxing](https:/
 To disable sandboxing, simply run:
 
 ```shell
-opam init --disable-sandboxing --compiler=4.07.1 --yes
+opam init --disable-sandboxing --compiler=4.08.1 --yes
 ```
 
 7. Set up current shell to work with opam
@@ -170,7 +170,7 @@ opam install ./scilla.opam --deps-only --with-test
 then
 
 ```shell
-opam switch create ./ --deps-only --with-test --yes ocaml-base-compiler.4.07.1
+opam switch create ./ --deps-only --with-test --yes ocaml-base-compiler.4.08.1
 ```
 
 9. Build and install
@@ -218,7 +218,7 @@ The binaries (`eval-runner`, `scilla-checker`, `scilla-runner` & `type-checker`)
 
 #### Initialize opam
 ```shell
-opam init --compiler=4.07.1 --yes
+opam init --compiler=4.08.1 --yes
 ```
 Note: the initializer will change your shell configuration to setup the environment opam needs to work.
 You can remove `--yes` from the above command to manually control that process.
@@ -277,7 +277,7 @@ This is like a standard opam switch but instead of `$HOME/.opam`, it will reside
 This lets us to avoid dependency conflict and changing our switches back and forth when working on different projects.
 To create a local opam switch and install all the Scilla dependencies, `cd` into project root and execute:
 ```shell
-opam switch create ./ --deps-only --with-test --yes ocaml-base-compiler.4.07.1
+opam switch create ./ --deps-only --with-test --yes ocaml-base-compiler.4.08.1
 ```
 Now, whenever you are inside the project directory, opam will prefer the local switch to any globally installed switches,
 unless being told explicitly which one to use.

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Invoke `make` to build, `make clean` to clean up, etc.
 
-OCAML_VERSION_RECOMMENDED=4.07.1
-OCAMLFORMAT_VERSION=0.14.1
+OCAML_VERSION_RECOMMENDED=4.08.1
+OCAMLFORMAT_VERSION=0.14.3
 IPC_SOCK_PATH="/tmp/zilliqa.sock"
 CPPLIB_DIR=${PWD}/_build/default/src/base/cpp
 

diff --git a/scilla.opam b/scilla.opam
@@ -6,28 +6,28 @@ bug-reports: "https://github.com/Zilliqa/scilla/issues"
 dev-repo: "git+https://github.com/Zilliqa/scilla.git"
 license: "GPL-3.0"
 depends: [
-  "ocaml" {>= "4.07.1" & < "4.10~"}
+  "ocaml" {>= "4.08.0" & < "4.11~"}
   "dune" {>= "2.0"}
   "menhir"
-  "core" {>= "v0.12.4" & < "v0.13~"}
+  "core" {>= "v0.14.0" & < "v0.15~"}
   "bitstring" {>= "3.1.0" & < "3.2~"}
-  "angstrom" {>= "0.11.0" & < "0.14~"}
-  "bisect_ppx" {>= "2.0.0" & < "2.3~"}
+  "angstrom" {>= "0.11.0" & < "0.15~"}
+  "bisect_ppx" {>= "2.0.0" & < "2.5~"}
   "cryptokit" {>= "1.13" & < "1.15~"}
   "ctypes" {>= "0.14.0" & < "0.18~"}
   "ctypes-foreign" {>= "0.4.0" & < "0.5~"}
   "fileutils" {>= "0.5.3" & < "0.7~"}
   "hex" {>= "1.3.0" & < "1.5~"}
   "yojson" {>= "1.7.0" & < "1.8~"}
   "ocaml-protoc" {>= "1.2.0" & < "2.1~"}
-  "ppx_deriving" {>= "4.2.1" & < "4.5~"}
-  "ppx_sexp_conv" {>= "v0.12.0" & < "v0.13~"}
-  "ppx_compare" {>= "v0.12.0" & < "v0.13~"}
+  "ppx_deriving" {>= "4.2.1" & < "4.6~"}
+  "ppx_sexp_conv" {>= "v0.14.0" & < "v0.15~"}
+  "ppx_compare" {>= "v0.14.0" & < "v0.15~"}
   "ppx_deriving_rpc" {>= "6.0.0" & < "8.0~"}
   "secp256k1" {>= "0.4.0" & < "0.5~"}
   "stdint" {>= "0.5.1" & < "0.7~"}
   "ounit" {>= "2.0.8" & < "2.3~"}
-  "patdiff" {>= "v0.12.1" & < "v0.13~"}
+  "patdiff" {>= "v0.14.0" & < "v0.15~"}
   "conf-cmake" {build}
   "conf-gcc" {build}
   "conf-g++" {build}

diff --git a/src/base/Accept.ml b/src/base/Accept.ml
@@ -26,7 +26,6 @@
    so again we only generate warnings not errors. *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open TypeUtil
 open ErrorUtils

diff --git a/src/base/AssocDictionary.ml b/src/base/AssocDictionary.ml
@@ -21,7 +21,6 @@
 (**********************************************************)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 
 (* Simple association list implementation of a dictionary. *)
 type key = string

diff --git a/src/base/Bech32.ml b/src/base/Bech32.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Bitstring
 open Utils
 

diff --git a/src/base/BuiltIns.ml b/src/base/BuiltIns.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open Syntax
 open ErrorUtils

diff --git a/src/base/Cashflow.ml b/src/base/Cashflow.ml
@@ -16,7 +16,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Sexplib.Std
 open Literal
 open Syntax

diff --git a/src/base/Checker.ml b/src/base/Checker.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open ParserUtil
 open Syntax
 open ErrorUtils

diff --git a/src/base/ContractUtil.ml b/src/base/ContractUtil.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open Syntax
 open MonadUtil

diff --git a/src/base/Datatypes.ml b/src/base/Datatypes.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open MonadUtil
 open Result.Let_syntax

diff --git a/src/base/DebugMessage.ml b/src/base/DebugMessage.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open GlobalConfig
 
 (* Prints to log file *)

diff --git a/src/base/Disambiguate.ml b/src/base/Disambiguate.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Result.Let_syntax
 open ErrorUtils
 open MonadUtil

diff --git a/src/base/ErrorUtils.ml b/src/base/ErrorUtils.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 
 (* Location info, slightly more usable than Lexing.position *)
 type loc = {

diff --git a/src/base/EventInfo.ml b/src/base/EventInfo.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Result.Let_syntax
 open TypeUtil
 open Literal

diff --git a/src/base/FrontEndParser.ml b/src/base/FrontEndParser.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Lexing
 open ErrorUtils
 open MonadUtil

diff --git a/src/base/Gas.ml b/src/base/Gas.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open ErrorUtils
 open Result.Let_syntax
 open MonadUtil

diff --git a/src/base/GlobalConfig.ml b/src/base/GlobalConfig.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open ScillaUtil.FilePathInfix
 
 (* Available debug levels for functions in DbgMsg *)
@@ -46,7 +45,7 @@ let rec get_highest_numbered_log files =
  * scilla-runner-[0-9]+.log and return the next in sequence *)
 let create_log_filename dir =
   if (not (Caml.Sys.file_exists dir)) || not (Caml.Sys.is_directory dir) then
-    Unix.mkdir dir 0o766;
+    Core.Unix.mkdir dir ~perm:0o766;
   (* Arbitrary *)
   let files = Sys.readdir dir in
   let num = get_highest_numbered_log (Array.to_list files) in

diff --git a/src/base/Integer256.ml b/src/base/Integer256.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Stdint
 
 type uint256 = { high : uint128; low : uint128 }

diff --git a/src/base/JSON.ml b/src/base/JSON.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open Syntax
 open ErrorUtils

diff --git a/src/base/JSONParser.ml b/src/base/JSONParser.ml
@@ -19,7 +19,6 @@
 (* A fast JSON parser for states that performs no validations. *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Yojson
 open ErrorUtils
 open TypeUtil

diff --git a/src/base/Literal.ml b/src/base/Literal.ml
@@ -34,7 +34,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Sexplib.Std
 open Stdint
 open MonadUtil

diff --git a/src/base/MonadUtil.ml b/src/base/MonadUtil.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Result.Let_syntax
 open ErrorUtils
 open Stdint

diff --git a/src/base/PatternChecker.ml b/src/base/PatternChecker.ml
@@ -17,7 +17,6 @@
 open Literal
 open Syntax
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open ErrorUtils
 open MonadUtil
 open Result.Let_syntax

diff --git a/src/base/PatternUtil.ml b/src/base/PatternUtil.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open ErrorUtils
 
 (****************************************************************)

diff --git a/src/base/PrettyPrinters.ml b/src/base/PrettyPrinters.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open Syntax
 open Yojson

diff --git a/src/base/Recursion.ml b/src/base/Recursion.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open Syntax
 open ErrorUtils

diff --git a/src/base/RecursionPrinciples.ml b/src/base/RecursionPrinciples.ml
@@ -18,7 +18,6 @@
 
 open ParserUtil
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open FrontEndParser
 
 (***********************************************************)

diff --git a/src/base/RunnerUtil.ml b/src/base/RunnerUtil.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Printf
 open GlobalConfig
 open ErrorUtils

diff --git a/src/base/SafeArith.ml b/src/base/SafeArith.ml
@@ -16,9 +16,6 @@
   scilla.  If not, see <http://www.gnu.org/licenses/>.
 *)
 open Base
-
-(* No need to open! Int.Replace_polymorphic_compare
-   because open Base already disables polymorphic comparisons except for ints *)
 open Stdint
 
 exception IntOverflow

diff --git a/src/base/SanityChecker.ml b/src/base/SanityChecker.ml
@@ -16,7 +16,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Result.Let_syntax
 open TypeUtil
 open Literal

diff --git a/src/base/ScillaUtil.ml b/src/base/ScillaUtil.ml
@@ -16,9 +16,6 @@
   scilla.  If not, see <http://www.gnu.org/licenses/>.
 *)
 
-open Core_kernel
-open! Int.Replace_polymorphic_compare
-
 module FilePathInfix = struct
   let ( ^/ ) = FilePath.concat
 

diff --git a/src/base/Syntax.ml b/src/base/Syntax.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Sexplib.Std
 open ErrorUtils
 open Literal

diff --git a/src/base/Type.ml b/src/base/Type.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Sexplib.Std
 open ErrorUtils
 open Identifier

diff --git a/src/base/TypeChecker.ml b/src/base/TypeChecker.ml
@@ -17,7 +17,6 @@
 *)
 
 open Core_kernel
-open! Int.Replace_polymorphic_compare
 open Literal
 open Syntax
 open ErrorUtils
@@ -922,8 +921,8 @@ module ScillaTypechecker (SR : Rep) (ER : Rep) = struct
     let lib_vars, lib_types =
       List.partition_map rec_libs ~f:(fun le ->
           match le with
-          | LibVar (n, t, e) -> `Fst (n, t, e)
-          | LibTyp (n, ts) -> `Snd (n, ts))
+          | LibVar (n, t, e) -> First (n, t, e)
+          | LibTyp (n, ts) -> Second (n, ts))
     in
     (* recursion primitives must not contain type declarations *)
     let%bind () =