Merge pull request #17860 from MinaProtocol/lyh/bump-opam-export-develop

bump various dependencies to fix nix build test dev

Author: cjjdespres

README-dev.md

@@ -150,7 +150,7 @@ A number of C libraries are expected to be available in the system and are also
 If you use vim, add this snippet in your `.vimrc` file to use Merlin. (Note:Be sure to change the HOME directory to match yours.)
 
 ```bash
-let s:ocamlmerlin="/Users/USERNAME/.opam/4.14.0/share/merlin"
+let s:ocamlmerlin="/Users/USERNAME/.opam/4.14.2/share/merlin"
 execute "set rtp+=".s:ocamlmerlin."/vim"
 execute "set rtp+=".s:ocamlmerlin."/vimbufsync"
 let g:syntastic_ocaml_checkers=['merlin']
@@ -301,10 +301,10 @@ We use the [Dune](https://github.com/ocaml/dune/) build system for OCaml code.
 
 OCaml dependencies live in the [`opam.export`](./opam.export) file. This file is machine generated and must not be modified.
 
-To add a new dependency, you most likely will need to create a new fresh switch to avoid pushing in any local dependency (like `ocaml-lsp`). The following commands assume that the version of the OCaml compiler used in the codebase is 4.14.0:
+To add a new dependency, you most likely will need to create a new fresh switch to avoid pushing in any local dependency (like `ocaml-lsp`). The following commands assume that the version of the OCaml compiler used in the codebase is 4.14.2:
 
 ```shell
-opam switch create mina_fresh 4.14.0
+opam switch create mina_fresh 4.14.2
 opam switch import opam.export
 ```
 

buildkite/Makefile

@@ -5,9 +5,11 @@ check_syntax:
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" &&  dhall --file {} > /dev/null || exit 255'
 
 check_lint:
+	@echo "Dhall version: $$(dhall --version)"
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{}" && dhall --ascii lint --check --inplace {} || exit 255'
 
 check_format:
+	@echo "Dhall version: $$(dhall --version)"
 	find ./src/ -name "*.dhall" -print0 | xargs -I{} -0 -n1 bash -c 'echo "{} format" && dhall --ascii format --check --inplace {} || exit 255'
 
 lint:

buildkite/src/Constants/ContainerImages.dhall

@@ -4,23 +4,23 @@
 -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
 { toolchainBase = "codaprotocol/ci-toolchain-base:v3"
 , minaToolchainBookworm =
-    { arm64 =
-        "gcr.io/o1labs-192920/mina-toolchain@sha256:12a68c1a8024fa5a87f28eedaabf7f5aaa1843d89af2987360796f3c91bb2479"
-    , amd64 =
-        "gcr.io/o1labs-192920/mina-toolchain@sha256:8479f26d8cd58f8e663b8e576ba84242217c2b2e272fcd4cd50a13f04f4ac9fa"
+    { amd64 =
+        "gcr.io/o1labs-192920/mina-toolchain@sha256:0c2764790ae18788b97a9c6361d7c4b0a96c515d176226868d929415e24f8251"
+    , arm64 =
+        "gcr.io/o1labs-192920/mina-toolchain@sha256:deb63964399029d681e39ac4ff529616b179c72fff3a0ab350e11a7099f6f23d"
     }
 , minaToolchainBullseye.amd64 =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:c9ae80ed80d78080d8d3c5c962dc4480edfcffca2f08eb159fc4caec4959198a"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:db00940ea2c778592a520da755388014231db52aa2d89e0c853abfafc4fa5846"
 , minaToolchainNoble =
-    { arm64 =
-        "gcr.io/o1labs-192920/mina-toolchain@sha256:4c713087da8cd2159c67ced71d0f1b546a85dabedf48ece6190c5d521fdcebbf"
-    , amd64 =
-        "gcr.io/o1labs-192920/mina-toolchain@sha256:1dacf0645b6c6d60abe08cbe1a3a3ef5348fd56bee718bf35cf75f151c7319bf"
+    { amd64 =
+        "gcr.io/o1labs-192920/mina-toolchain@sha256:669c4053d2f3b7ecf5787b9dc0d908b7061c8a8908dcc766c4de57bcd1c67fa1"
+    , arm64 =
+        "gcr.io/o1labs-192920/mina-toolchain@sha256:2a71e234ca0cc42a663e42daabef3736207fd91bac414b2d511b30b336529b74"
     }
 , minaToolchainJammy.amd64 =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:cadfb4d932aa88588ce610e14cb374959251cb3639ba5c48777f82260f79d49a"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:b16023b65bb90fc2242c83b7c9f3f3c62aca521f316a16a45f5f7cb115e95f15"
 , minaToolchain =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:c9ae80ed80d78080d8d3c5c962dc4480edfcffca2f08eb159fc4caec4959198a"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:db00940ea2c778592a520da755388014231db52aa2d89e0c853abfafc4fa5846"
 , postgres = "postgres:12.4-alpine"
 , xrefcheck =
     "dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

opam.export

@@ -48,8 +48,8 @@ roots: [
   "qcheck.0.20"
   "qcheck-alcotest.0.20"
   "re2.v0.14.0"
-  "rocks.0.1.1"
-  "rocksdb_stubs.5.17.2"
+  "rocks.0.2.0"
+  "rocksdb_stubs.10.2.1"
   "rpc_parallel.v0.14.0"
   "sexp_diff_kernel.v0.14.0"
   "sodium.dev"
@@ -180,7 +180,7 @@ installed: [
   "num.1.1"
   "ocaml.4.14.2"
   "ocaml-base-compiler.4.14.2"
-  "ocaml-compiler-libs.v0.12.3"
+  "ocaml-compiler-libs.v0.12.4"
   "ocaml-config.2"
   "ocaml-migrate-parsetree.2.3.0"
   "ocaml-options-vanilla.1"
@@ -249,8 +249,8 @@ installed: [
   "react.1.2.1"
   "res.5.0.1"
   "result.1.5"
-  "rocks.0.1.1"
-  "rocksdb_stubs.5.17.2"
+  "rocks.0.2.0"
+  "rocksdb_stubs.10.2.1"
   "rpc_parallel.v0.14.0"
   "rresult.0.6.0"
   "seq.base"

src/app/test_executive/hard_fork.ml

@@ -303,7 +303,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
         }
       in
       Transaction_snark.For_tests.deploy_snapp ~constraint_constants
-        zkapp_command_spec
+        ~signature_kind zkapp_command_spec
     in
     let%bind zkapp_command_update_vk_proof, zkapp_command_update_vk_impossible =
       let snapp_update =

src/app/test_executive/peers_reliability_test.ml

@@ -34,7 +34,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
         ]
     }
 
-  let run ~config:_ network t =
+  let run ~config:Test_config.{ signature_kind; _ } network t =
     let open Network in
     let open Malleable_error.Let_syntax in
     let logger = Logger.create () in
@@ -143,7 +143,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
            Malleable_error.lift
            @@ Transaction_snark.For_tests.deploy_snapp
                 ~constraint_constants:(Network.constraint_constants network)
-                parties_spec
+                ~signature_kind parties_spec
          in
          let%bind () =
            send_zkapp ~logger

src/app/test_executive/verification_key_update.ml

@@ -207,7 +207,8 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
         }
       in
       Malleable_error.lift
-      @@ Transaction_snark.For_tests.deploy_snapp ~constraint_constants spec
+      @@ Transaction_snark.For_tests.deploy_snapp ~constraint_constants
+           ~signature_kind spec
     in
     let call_forest_to_zkapp ~call_forest ~nonce : Zkapp_command.t =
       let memo = Signed_command_memo.empty in

src/app/test_executive/zkapps.ml

@@ -178,7 +178,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       in
       Malleable_error.lift
       @@ Transaction_snark.For_tests.deploy_snapp ~constraint_constants
-           zkapp_command_spec
+           ~signature_kind zkapp_command_spec
     in
     let%bind.Deferred zkapp_command_update_permissions, permissions_updated =
       (* construct a Zkapp_command.t, similar to zkapp_test_transaction
@@ -347,7 +347,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
           }
         in
         Transaction_snark.For_tests.single_account_update ~constraint_constants
-          spec
+          ~signature_kind spec
       in
       ( snapp_update
       , zkapp_command_update_all

src/app/test_executive/zkapps_timing.ml

@@ -33,7 +33,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
     ; num_archive_nodes = 1
     }
 
-  let run ~config:_ network t =
+  let run ~config:Test_config.{ signature_kind; _ } network t =
     let open Malleable_error.Let_syntax in
     let logger = Logger.create () in
     let all_mina_nodes = Network.all_mina_nodes network in
@@ -104,7 +104,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       in
       let%map.Async.Deferred deploy_zkapp =
         Transaction_snark.For_tests.deploy_snapp ~constraint_constants
-          zkapp_command_spec
+          ~signature_kind zkapp_command_spec
       in
       ( deploy_zkapp
       , timing_account_id
@@ -151,7 +151,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       in
       Malleable_error.lift
       @@ Transaction_snark.For_tests.deploy_snapp ~constraint_constants
-           zkapp_command_spec
+           ~signature_kind zkapp_command_spec
     in
     (* Create a timed account that with initial liquid balance being 0, and vesting 1 mina at each slot.
        This account would be used to test the edge case of vesting. See `zkapp_command_transfer_from_third_timed_account`
@@ -202,7 +202,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
       in
       let%map.Async.Deferred deploy_zkapp =
         Transaction_snark.For_tests.deploy_snapp ~constraint_constants
-          zkapp_command_spec
+          ~signature_kind zkapp_command_spec
       in
       (deploy_zkapp, timing_account_id, zkapp_keypair)
     in
@@ -244,7 +244,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
         }
       in
       Transaction_snark.For_tests.deploy_snapp ~constraint_constants
-        zkapp_command_spec
+        ~signature_kind zkapp_command_spec
     in
     let%bind zkapp_command_transfer_from_timed_account =
       let open Mina_base in

src/app/zkapp_test_transaction/lib/commands.ml

@@ -368,7 +368,8 @@ let create_zkapp_account ~debug ~sender ~sender_nonce ~fee ~fee_payer
   in
   let%bind zkapp_command =
     Transaction_snark.For_tests.deploy_snapp
-      ~permissions:Permissions.user_default ~constraint_constants spec
+      ~permissions:Permissions.user_default ~constraint_constants
+      ~signature_kind:Testnet spec
   in
   let%map () =
     if debug then