WIP

Author: dkijania

buildkite/src/Constants/ContainerImages.dhall

@@ -4,11 +4,11 @@
 -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
 { toolchainBase = "codaprotocol/ci-toolchain-base:v3"
 , minaToolchainBullseye =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:92657cb93045c8431e7aabff3d5493f4e5c482376526b3567b9f42b664de1cfc"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:e537f1fb060ddb5b5db2270a4220f3d777c31c175a0480a5b0c4dc66433c0726"
 , minaToolchainBookworm =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:92657cb93045c8431e7aabff3d5493f4e5c482376526b3567b9f42b664de1cfc"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:e537f1fb060ddb5b5db2270a4220f3d777c31c175a0480a5b0c4dc66433c0726"
 , minaToolchain =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:92657cb93045c8431e7aabff3d5493f4e5c482376526b3567b9f42b664de1cfc"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:e537f1fb060ddb5b5db2270a4220f3d777c31c175a0480a5b0c4dc66433c0726"
 , elixirToolchain = "elixir:1.10-alpine"
 , nodeToolchain = "node:14.13.1-stretch-slim"
 , ubuntu2004 = "ubuntu:20.04"

opam.export

@@ -75,9 +75,9 @@ installed: [
   "camlp-streams.5.0.1"
   "camomile.1.0.2"
   "capnp.3.4.0"
-  "caqti.1.5.0"
-  "caqti-async.1.3.0"
-  "caqti-driver-postgresql.1.5.1"
+  "caqti.2.0.1"
+  "caqti-async.2.0.1"
+  "caqti-driver-postgresql.2.0.1"
   "charInfo_width.1.1.0"
   "check_opam_switch.~dev"
   "cmdliner.1.0.3"
@@ -143,6 +143,7 @@ installed: [
   "lmdb.1.0"
   "logs.0.7.0"
   "lwt.5.4.0"
+  "lwt-dllist.1.0.1"
   "lwt_log.1.1.1"
   "lwt_react.1.1.2"
   "macaddr.5.0.1"
@@ -160,6 +161,7 @@ installed: [
   "mirage-crypto-rng.0.11.0"
   "mirage-crypto-rng-async.0.11.0"
   "mmap.1.1.0"
+  "mtime.2.0.0"
   "num.1.1"
   "ocaml.4.14.0"
   "ocaml-base-compiler.4.14.0"

src/app/archive/cli/archive_cli.ml

@@ -91,9 +91,7 @@ let command_prune =
        in
        let go () =
          let open Deferred.Result.Let_syntax in
-         let%bind ((module Conn) as conn) =
-           Caqti_async.connect postgres.value
-         in
+         let%bind ((module Conn) as conn) = Mina_caqti.connect postgres.value in
          let%bind () = Conn.start () in
          match%bind.Async.Deferred
            let%bind () =

src/app/archive/cli/dune

@@ -18,6 +18,7 @@
    logger
    block_time
    mina_version
+   mina_caqti
  )
  (instrumentation (backend bisect_ppx --bisect-sigterm))
  (preprocess (pps ppx_version ppx_jane ppx_mina)))

src/app/archive/drop_tables.sql

@@ -105,3 +105,7 @@ DROP TABLE zkapp_events;
 DROP TABLE token_symbols;
 
 DROP TABLE voting_for;
+
+DROP TABLE zkapp_field;
+
+DROP TABLE zkapp_verification_key_hashes;

src/app/archive/lib/load_data.ml

@@ -91,9 +91,10 @@ let update_of_id pool update_id =
   let open Zkapp_basic in
   let query_db ~f = Mina_caqti.query ~f pool in
   let with_pool ~f arg =
-    let open Caqti_async in
+    let open Mina_caqti in
     Pool.use
-      (fun (module Conn : CONNECTION) -> f (module Conn : CONNECTION) arg)
+      (fun (module Conn : Mina_caqti.CONNECTION) ->
+        f (module Conn : Mina_caqti.CONNECTION) arg )
       pool
   in
   let%bind { app_state_id
@@ -636,9 +637,10 @@ let get_account_accessed ~pool (account : Processor.Accounts_accessed.t) :
     (int * Account.t) Deferred.t =
   let query_db ~f = Mina_caqti.query ~f pool in
   let with_pool ~f arg =
-    let open Caqti_async in
+    let open Mina_caqti in
     Pool.use
-      (fun (module Conn : CONNECTION) -> f (module Conn : CONNECTION) arg)
+      (fun (module Conn : Mina_caqti.CONNECTION) ->
+        f (module Conn : Mina_caqti.CONNECTION) arg )
       pool
   in
   let pk_of_id = pk_of_id pool in

src/app/archive/lib/metrics.ml

@@ -14,10 +14,10 @@ let default_missing_blocks_width = 2000
 
 module Max_block_height = struct
   let query =
-    Caqti_request.find Caqti_type.unit Caqti_type.int
+    Mina_caqti.find_req Caqti_type.unit Caqti_type.int
       "SELECT GREATEST(0, MAX(height)) FROM blocks"
 
-  let update (module Conn : Caqti_async.CONNECTION) metric_server =
+  let update (module Conn : Mina_caqti.CONNECTION) metric_server =
     time ~label:"max_block_height" (fun () ->
         let open Deferred.Result.Let_syntax in
         let%map max_height = Conn.find query () in
@@ -30,7 +30,7 @@ end
 module Missing_blocks = struct
   (*A block is missing if there is no entry for a specific height. However, if there is an entry then it doesn't necessarily mean that it is part of the main chain. Unparented_blocks will show value > 1 in that case. Look for the last 2000 blocks*)
   let query missing_blocks_width =
-    Caqti_request.find Caqti_type.unit Caqti_type.int
+    Mina_caqti.find_req Caqti_type.unit Caqti_type.int
       (Core_kernel.sprintf
          {sql| 
         SELECT COUNT( * )
@@ -40,7 +40,7 @@ module Missing_blocks = struct
       |sql}
          missing_blocks_width )
 
-  let update ~missing_blocks_width (module Conn : Caqti_async.CONNECTION)
+  let update ~missing_blocks_width (module Conn : Mina_caqti.CONNECTION)
       metric_server =
     let open Deferred.Result.Let_syntax in
     time ~label:"missing_blocks" (fun () ->
@@ -55,13 +55,13 @@ module Unparented_blocks = struct
   (* parent_hashes represent ends of chains leading to an orphan block *)
 
   let query =
-    Caqti_request.find Caqti_type.unit Caqti_type.int
+    Mina_caqti.find_req Caqti_type.unit Caqti_type.int
       {sql|
            SELECT COUNT( * ) FROM blocks
            WHERE parent_id IS NULL
       |sql}
 
-  let update (module Conn : Caqti_async.CONNECTION) metric_server =
+  let update (module Conn : Mina_caqti.CONNECTION) metric_server =
     let open Deferred.Result.Let_syntax in
     time ~label:"unparented_blocks" (fun () ->
         let%map unparented_block_count = Conn.find query () in
@@ -73,13 +73,13 @@ end
 
 let log_error ~logger pool metric_server
     (f :
-         (module Caqti_async.CONNECTION)
+         (module Mina_caqti.CONNECTION)
       -> Mina_metrics.Archive.t
       -> (unit, [> Caqti_error.call_or_retrieve ]) Deferred.Result.t ) =
   let open Deferred.Let_syntax in
   match%map
-    Caqti_async.Pool.use
-      (fun (module Conn : Caqti_async.CONNECTION) ->
+    Mina_caqti.Pool.use
+      (fun (module Conn : Mina_caqti.CONNECTION) ->
         f (module Conn) metric_server )
       pool
   with