Upgrades (#232)

v0.11 of libs, 4.06.1 of ocaml, jbuilder 1.0+beta20 ; use opam.export in the root to get env

Author: bkase

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: gcr.io/o1labs-192920/ocaml-base:77b01ebb7094f4bc73a8fd3290963e660737c55f
+      - image: gcr.io/o1labs-192920/ocaml-base:2eeb0f6460680af652d5c6b2b38fecf24df6a5b9
         # ENV variable is located in circleci
         auth:
           username: _json_key

Dockerfile

@@ -1,10 +1,10 @@
-FROM gcr.io/o1labs-192920/ocaml-base:77b01ebb7094f4bc73a8fd3290963e660737c55f
+FROM gcr.io/o1labs-192920/ocaml-base:2eeb0f6460680af652d5c6b2b38fecf24df6a5b9
 
-ENV PATH "/home/opam/.opam/4.05.0/bin:$PATH"
-ENV CAML_LD_LIBRARY_PATH "/home/opam/.opam/4.05.0/lib/stublibs"
-ENV MANPATH "/home/opam/.opam/4.05.0/man:"
-ENV PERL5LIB "/home/opam/.opam/4.05.0/lib/perl5"
-ENV OCAML_TOPLEVEL_PATH "/home/opam/.opam/4.05.0/lib/toplevel"
+ENV PATH "/home/opam/.opam/4.06.1/bin:$PATH"
+ENV CAML_LD_LIBRARY_PATH "/home/opam/.opam/4.06.1/lib/stublibs"
+ENV MANPATH "/home/opam/.opam/4.06.1/man:"
+ENV PERL5LIB "/home/opam/.opam/4.06.1/lib/perl5"
+ENV OCAML_TOPLEVEL_PATH "/home/opam/.opam/4.06.1/lib/toplevel"
 ENV FORCE_BUILD 1
 
 RUN sudo apt-get install --yes python

Makefile

@@ -42,11 +42,11 @@ base-minikube :
 base-googlecloud :
 	./rebuild-googlecloud.sh ocaml-base base-Dockerfile $(shell git rev-parse HEAD)
 
-ocaml405-googlecloud:
-	./rebuild-googlecloud.sh ocaml405 ocaml405-Dockerfile
+ocaml406-googlecloud:
+	./rebuild-googlecloud.sh ocaml406 ocaml406-Dockerfile
 
-pull-ocaml405-googlecloud:
-	gcloud docker -- pull gcr.io/o1labs-192920/ocaml405:latest
+pull-ocaml406-googlecloud:
+	gcloud docker -- pull gcr.io/o1labs-192920/ocaml406:latest
 
 ci-base-docker:
 	./rebuild-docker.sh o1labs/ci-base ci-base-Dockerfile

app/logproc/src/jbuild

@@ -4,7 +4,7 @@
   ((name logproc)
    (public_name logproc)
    (libraries (core logger async))
-   (preprocess (pps (ppx_jane ppx_inline_test ppx_driver.runner (-inline-test-lib logproc))))
+   (preprocess (pps (ppx_jane ppx_inline_test)))
    (flags (-w -40 -g -warn-error +3+4+6+8+9+10+11+12+14+16+20+21+23+24+26+27+29+32..39+56+58+59+60+61))
    (modes (native))
   ))

app/nanobit/src/jbuild

@@ -30,7 +30,7 @@
       async_ssl
       cohttp
       cohttp-async))
-   (preprocess (pps (ppx_jane ppx_deriving.eq ppx_inline_test ppx_driver.runner (-inline-test-lib cli))))
+   (preprocess (pps (ppx_jane ppx_deriving.eq ppx_inline_test)))
    (flags (-w -40 -g -warn-error +3+4+6+8+9+10+11+12+14+16+20+21+23+24+26+27+29+32..39+56+58+59+60+61))
    (modes (native))
   ))

base-Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/o1labs-192920/ocaml405:latest
+FROM gcr.io/o1labs-192920/ocaml406:latest
 
 # Install nix for our haskell deps
 RUN sudo mkdir -p /nix
@@ -17,20 +17,18 @@ RUN sudo apt-get install --yes libgmp3-dev
 RUN sudo apt-get install --yes libboost-dev
 RUN sudo apt-get install --yes libboost-program-options-dev
 
+RUN opam update -y && opam upgrade -y
 RUN opam depext -i jbuilder
 RUN opam install core async ppx_deriving
 
 RUN opam install merlin ocp-indent
-RUN opam install ctypes-foreign
-RUN opam install ctypes
+RUN opam install ctypes-foreign ctypes
 RUN opam install jbuilder
-RUN opam install yojson menhir
+RUN opam install yojson menhir bignum
 RUN opam install async_ssl cohttp cohttp-async
-RUN opam install bignum
+RUN opam install extlib rpc_parallel
 
 ADD ./app/kademlia-haskell/prefetch /prefetch
 RUN sudo chown -R opam /prefetch
 RUN cd /prefetch && . /home/opam/.nix-profile/etc/profile.d/nix.sh && nix-build prefetch.nix
 
-RUN opam install extlib
-RUN opam install rpc_parallel

bignum_bigint.opam

@@ -0,0 +1,6 @@
+opam-version: "1.2"
+version: "0.1"
+build: [
+  ["jbuilder" "build" "--only" "src" "--root" "." "-j" jobs "@install"]
+]
+

lib/bignum_bigint/bignum_bigint.ml

@@ -0,0 +1 @@
+include Bigint

lib/bignum_bigint/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(library
+ ((name bignum_bigint)
+  (public_name bignum_bigint)
+  (library_flags (-linkall))
+  (inline_tests)
+  (libraries (core async async_extra bignum))
+  (preprocess (pps (ppx_jane)))
+  (synopsis "Bignum's bigint re-exported as Bignum_bigint")))
+

lib/blockchain_snark/blockchain_state.ml

@@ -14,21 +14,21 @@ let target_time_ms = `Two_to_the 13 (* 8.192 seconds *)
 let compute_target timestamp (previous_target : Target.t) time =
   let target_time_ms =
     let `Two_to_the k = target_time_ms in
-    Bignum.Bigint.(pow (of_int 2) (of_int k))
+    Bignum_bigint.(pow (of_int 2) (of_int k))
   in
   let target_max = Target.(to_bigint max) in
   let delta_minus_one_max =
-    Bignum.Bigint.(pow (of_int 2) (of_int delta_minus_one_max_bits) - one)
+    Bignum_bigint.(pow (of_int 2) (of_int delta_minus_one_max_bits) - one)
   in
-  let div_pow_2 x (`Two_to_the k) = Bignum.Bigint.shift_right x k in
+  let div_pow_2 x (`Two_to_the k) = Bignum_bigint.shift_right x k in
   let previous_target = Target.to_bigint previous_target in
   assert Block_time.(time > timestamp);
-  let rate_multiplier = div_pow_2 Bignum.Bigint.(target_max - previous_target) bound_divisor in
+  let rate_multiplier = div_pow_2 Bignum_bigint.(target_max - previous_target) bound_divisor in
   let delta =
-    Bignum.Bigint.(
+    Bignum_bigint.(
       of_int64 Block_time.(Span.to_ms (diff time timestamp)) / target_time_ms)
   in
-  let open Bignum.Bigint in
+  let open Bignum_bigint in
   Target.of_bigint begin
     if delta = zero
     then begin
@@ -50,7 +50,7 @@ let negative_one =
     then Target.max
     else
       Target.of_bigint
-        Bignum.Bigint.(
+        Bignum_bigint.(
           Target.(to_bigint max) / pow (of_int 2) (of_int 4))
   in
   let timestamp =

lib/blockchain_snark/jbuild

@@ -4,7 +4,8 @@
  ((name blockchain_snark)
   (public_name blockchain_snark)
   (library_flags (-linkall))
-  (libraries (core protocols snarky nanobit_base proof_of_work transaction_snark bignum ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_driver.runner (-inline-test-lib blockchain_snark))))
+  (libraries (core protocols snarky nanobit_base proof_of_work transaction_snark bignum_bigint))
+  (inline_tests)
+  (preprocess (pps (ppx_jane ppx_deriving.eq)))
   (synopsis "blockchain state transition snarking library")))
 

lib/client_lib/jbuild

@@ -4,7 +4,8 @@
  ((name client_lib)
   (public_name client_lib)
   (library_flags (-linkall))
-  (libraries (core async nanobit_base ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_driver.runner (-inline-test-lib client_lib))))
+  (inline_tests)
+  (libraries (core async nanobit_base))
+  (preprocess (pps (ppx_jane)))
   (synopsis "Lib powering the client interactions with the daemon")))
 

lib/client_lib_test/client_lib_test.ml

@@ -4,7 +4,8 @@
  ((name coda)
   (public_name coda)
   (library_flags (-linkall))
-  (libraries (core protocols linear_pipe logger async async_extra ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_deriving.make ppx_driver.runner (-inline-test-lib minibit))))
+  (inline_tests)
+  (libraries (core protocols linear_pipe logger async async_extra))
+  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_deriving.make)))
   (synopsis "Coda gut layer")))
 

lib/client_lib_test/jbuild

@@ -4,7 +4,8 @@
  ((name distributed_dsl)
   (public_name distributed_dsl)
   (library_flags (-linkall))
-  (libraries (logger core linear_pipe async async_extra extlib ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_deriving.enum ppx_driver.runner (-inline-test-lib distributed_dsl))))
+  (inline_tests)
+  (libraries (logger core linear_pipe async async_extra extlib))
+  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_deriving.enum)))
   (synopsis "Distributed DSL")))
 

lib/coda/jbuild

@@ -4,7 +4,8 @@
  ((name gossip_net)
   (public_name gossip_net)
   (library_flags (-linkall))
-  (libraries (core linear_pipe logger kademlia async async_extra ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_driver.runner (-inline-test-lib gossip_net))))
+  (inline_tests)
+  (libraries (core linear_pipe logger kademlia async async_extra))
+  (preprocess (pps (ppx_jane)))
   (synopsis "Gossip Network")))
 

lib/distributed_dsl/jbuild

@@ -4,7 +4,8 @@
  ((name kademlia)
   (public_name kademlia)
   (library_flags (-linkall))
-  (libraries (core logger linear_pipe async async_extra ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_driver.runner (-inline-test-lib kademlia))))
+  (inline_tests)
+  (libraries (core logger linear_pipe async async_extra))
+  (preprocess (pps (ppx_jane)))
   (synopsis "Kademlia DHT -- only being used for it's membership")))
 

lib/distributed_dsl_test/distributed_dsl_test.ml

@@ -4,7 +4,8 @@
  ((name ledger_fetcher)
   (public_name ledger_fetcher)
   (library_flags (-linkall))
-  (libraries (core storage logger protocols minibit async async_extra ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_driver.runner ppx_deriving.std (-inline-test-lib nanobit_base))))
+  (inline_tests)
+  (libraries (core storage logger protocols minibit async async_extra))
+  (preprocess (pps (ppx_jane ppx_deriving.std)))
   (synopsis "Ledger fetcher fetches ledgers over the network")))
 

lib/distributed_dsl_test/jbuild

@@ -4,7 +4,8 @@
  ((name linear_pipe)
   (public_name linear_pipe)
   (library_flags (-linkall))
-  (libraries (core async async_extra ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_driver.runner (-inline-test-lib nanobit_base))))
+  (inline_tests)
+  (libraries (core async async_extra))
+  (preprocess (pps (ppx_jane)))
   (synopsis "Linear pipes are like pipes, but they're linear (enforced at runtime)")))
 

lib/gossip_net/jbuild

@@ -4,7 +4,8 @@
  ((name logger)
   (public_name logger)
   (library_flags (-linkall))
-  (libraries (core async ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_driver.runner (-inline-test-lib logger))))
+  (inline_tests)
+  (libraries (core async))
+  (preprocess (pps (ppx_jane)))
   (synopsis "Logging library")))
 

lib/kademlia-test/jbuild

@@ -4,7 +4,8 @@
  ((name merkle_ledger)
   (public_name merkle_ledger)
   (library_flags (-linkall))
-  (libraries (core extlib ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_driver.runner (-inline-test-lib merkle_ledger))))
+  (inline_tests)
+  (libraries (core extlib))
+  (preprocess (pps (ppx_jane ppx_deriving.eq)))
   (synopsis "Merkle Ledger implementation")))
 

lib/kademlia-test/kademliatest.ml

@@ -3,8 +3,9 @@
 (library
  ((name minibit)
   (public_name minibit)
+  (inline_tests)
   (library_flags (-linkall))
-  (libraries (core protocols linear_pipe logger async async_extra ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_deriving.make ppx_driver.runner (-inline-test-lib minibit))))
+  (libraries (core protocols linear_pipe logger async async_extra))
+  (preprocess (pps (ppx_jane ppx_deriving.eq ppx_deriving.make)))
   (synopsis "Minibit gut layer")))
 

lib/kademlia/jbuild

@@ -4,14 +4,14 @@
  ((name minibit_miner)
   (public_name minibit_miner)
   (library_flags (-linkall))
+  (inline_tests)
   (libraries
     ( core
       async
       minibit
       nanobit_base
       protocols
-      async_extra
-      ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_driver.runner (-inline-test-lib minibit_networking))))
+      async_extra ))
+  (preprocess (pps (ppx_jane)))
   (synopsis "Miner layer for Minibit")))
 

lib/ledger_fetcher/jbuild

@@ -3,8 +3,9 @@
 (library
  ((name minibit_networking)
   (public_name minibit_networking)
+  (inline_tests)
   (library_flags (-linkall))
-  (libraries (core async gossip_net minibit protocols async_extra ppx_inline_test.runtime-lib))
-  (preprocess (pps (ppx_jane ppx_deriving.make ppx_driver.runner (-inline-test-lib minibit_networking))))
+  (libraries (core async gossip_net minibit protocols async_extra))
+  (preprocess (pps (ppx_jane ppx_deriving.make)))
   (synopsis "Networking layer for Minibit")))