Merge branch 'compatible' into georgeee/signkind-out-of-transcation

Author: georgeee

flake.lock

@@ -14,6 +14,7 @@
   inputs.utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11-small";
   inputs.nixpkgs-old.url = "github:nixos/nixpkgs/nixos-23.05-small";
+  inputs.nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
   inputs.mix-to-nix.url = "github:serokell/mix-to-nix";
   inputs.nix-npm-buildPackage.url = "github:serokell/nix-npm-buildpackage";
@@ -38,7 +39,8 @@
   # - flake.nix (and flake.lock after running
   #   `nix flake update opam-repository`).
   # - scripts/update_opam_switch.sh
-  inputs.opam-repository.url = "github:ocaml/opam-repository/08d8c16c16dc6b23a5278b06dff0ac6c7a217356";
+  inputs.opam-repository.url =
+    "github:ocaml/opam-repository/08d8c16c16dc6b23a5278b06dff0ac6c7a217356";
   inputs.opam-repository.flake = false;
 
   inputs.nixpkgs-mozilla.url = "github:mozilla/nixpkgs-mozilla";
@@ -60,7 +62,7 @@
 
   outputs = inputs@{ self, nixpkgs, utils, mix-to-nix, nix-npm-buildPackage
     , opam-nix, opam-repository, nixpkgs-mozilla, flake-buildkite-pipeline
-    , nix-utils, flockenzeit, nixpkgs-old, ... }:
+    , nix-utils, flockenzeit, nixpkgs-old, nixpkgs-unstable, ... }:
     let
       inherit (nixpkgs) lib;
 
@@ -103,9 +105,7 @@
         # Skip tests on nodejs dep due to known issue with nixpkgs 24.11 https://github.com/NixOS/nixpkgs/issues/402079
         # this can be removed after upgrading
         skipNodeTests = final: prev: {
-          nodejs = prev.nodejs.overrideAttrs(old: {
-            doCheck = false;
-          });
+          nodejs = prev.nodejs.overrideAttrs (old: { doCheck = false; });
         };
       };
       nixosModules.mina = import ./nix/modules/mina.nix inputs;
@@ -273,12 +273,47 @@
         };
     } // utils.lib.eachDefaultSystem (system:
       let
-        rocksdbOverlay = pkgs: prev:
-          if prev.stdenv.isx86_64 then {
-            rocksdb-mina = pkgs.rocksdb511;
-          } else {
-            rocksdb-mina = pkgs.rocksdb;
-          };
+        # Helper function to map dependencies to current nixpkgs equivalents
+        mapDepsToCurrentPkgs = pkgs: deps:
+          map (dep:
+            if pkgs ? ${dep.pname or dep.name or ""} then
+              pkgs.${dep.pname or dep.name or ""}
+            else
+              dep) deps;
+
+        # Helper function to disable compression libraries in cmake flags
+        disableCompressionLibs = flags:
+          builtins.filter (flag: flag != [ ]) (map (flag:
+            if builtins.isString flag
+            && builtins.match ".*WITH_(BZ2|LZ4|SNAPPY|ZLIB|ZSTD)=1.*" flag
+            != null then
+              builtins.replaceStrings [ "=1" ] [ "=0" ] flag
+            else
+              flag) flags);
+
+        rocksdbOverlay = pkgs: prev: {
+          rocksdb-mina = let
+            # Get the full derivation from unstable but build with current nixpkgs
+            unstableRocksdb =
+              (nixpkgs-unstable.legacyPackages.${system}.rocksdb.override {
+                enableShared = false;
+                enableLiburing = false;
+                bzip2 = null;
+                lz4 = null;
+                snappy = null;
+                zlib = null;
+                zstd = null;
+              });
+          in pkgs.stdenv.mkDerivation (unstableRocksdb.drvAttrs // {
+            cmakeFlags =
+              disableCompressionLibs unstableRocksdb.drvAttrs.cmakeFlags;
+            # Override the build environment to use current nixpkgs toolchain
+            nativeBuildInputs = mapDepsToCurrentPkgs pkgs
+              (unstableRocksdb.nativeBuildInputs or [ ]);
+            buildInputs =
+              mapDepsToCurrentPkgs pkgs (unstableRocksdb.buildInputs or [ ]);
+          });
+        };
         go119Overlay = (_: _: {
           inherit (nixpkgs-old.legacyPackages.${system})
             go_1_19 buildGo119Module;
@@ -326,7 +361,7 @@
           (pkgs.python3.withPackages
             (python-pkgs: [ python-pkgs.click python-pkgs.requests ]))
           jq
-          rocksdb.tools
+          rocksdb-mina.tools
         ];
       in {
 

flake.nix

@@ -21,7 +21,7 @@ pkgs.mkShell {
     wasm-pack
     lmdb
     rosetta-cli
-    rocksdb.tools
+    rocksdb-mina.tools
   ];
   OPAMSWITCH = "mina";
   MINA_ROCKSDB = "${pkgs.rocksdb-mina}/lib/librocksdb.a";

nix/impure-shell.nix

@@ -2,41 +2,4 @@
 final: prev: {
   sodium-static =
     final.libsodium.overrideAttrs (o: { dontDisableStatic = true; });
-
-  rocksdb = (prev.rocksdb.override {
-    snappy = null;
-    lz4 = null;
-    zstd = null;
-    bzip2 = null;
-  }).overrideAttrs (_: {
-    cmakeFlags = [
-      "-DPORTABLE=1"
-      "-DWITH_JEMALLOC=0"
-      "-DWITH_JNI=0"
-      "-DWITH_BENCHMARK_TOOLS=0"
-      "-DWITH_TESTS=1"
-      "-DWITH_TOOLS=0"
-      "-DWITH_BZ2=0"
-      "-DWITH_LZ4=0"
-      "-DWITH_SNAPPY=0"
-      "-DWITH_ZLIB=0"
-      "-DWITH_ZSTD=0"
-      "-DWITH_GFLAGS=0"
-      "-DUSE_RTTI=1"
-    ];
-  });
-
-  rocksdb511 = let
-    impl = (import (fetchTarball {
-      url = "https://github.com/NixOS/nixpkgs/archive/nixos-19.03-small.tar.gz";
-      sha256 = "11z6ajj108fy2q5g8y4higlcaqncrbjm3dnv17pvif6avagw4mcb";
-    }) { system = "x86_64-linux"; }).rocksdb.override {
-      snappy = null;
-      lz4 = null;
-      bzip2 = null;
-    };
-  in if impl.version == "5.11.3" then
-    impl
-  else
-    throw "Expected rocksdb version 5.11.3, but got ${impl.version}";
 }

nix/misc.nix

@@ -65,19 +65,14 @@ let
         '';
       };
 
-      rocksdb_stubs = super.rocksdb_stubs.overrideAttrs (oa: {
-        MINA_ROCKSDB = let
-          mainPath = "${pkgs.rocksdb-mina}/lib/librocksdb.a";
-          staticPath =
-            "${pkgs.rocksdb-mina.static or pkgs.rocksdb-mina}/lib/librocksdb.a";
-        in if builtins.pathExists mainPath then
-          mainPath
-        else if builtins.pathExists staticPath then
-          staticPath
-        else
-          throw
-          "Could not find librocksdb.a in either ${mainPath} or ${staticPath}";
-      });
+      rocksdb_stubs =
+        # TODO uncomment after updating rocksdb_stubs to 10.5.1
+        # assert (super.rocksdb_stubs.version == pkgs.rocksdb-mina.version)
+        #   || builtins.throw
+        #   "rocksdb_stubs version (${super.rocksdb_stubs.version}) does not match rocksdb-mina version (${pkgs.rocksdb-mina.version})";
+        super.rocksdb_stubs.overrideAttrs {
+          MINA_ROCKSDB = "${pkgs.rocksdb-mina}/lib/librocksdb.a";
+        };
 
       # This is needed because
       # - lld package is not wrapped to pick up the correct linker flags

nix/ocaml.nix

@@ -59,7 +59,7 @@ readonly DEFAULT_PAYMENT_TX_INTERVAL="2"
 readonly DEFAULT_ZKAPP_TX_INTERVAL="1"
 
 # Default memory threshold for PostgreSQL processes
-readonly DEFAULT_POSTGRES_MEMORY_THRESHOLD="2500"  # MB
+readonly DEFAULT_POSTGRES_MEMORY_THRESHOLD="3000"  # MB
 
 # Default memory threshold for Rosetta API processes
 readonly DEFAULT_ROSETTA_MEMORY_THRESHOLD="300"   # MB

scripts/tests/rosetta-load.sh

@@ -3,31 +3,31 @@
  (public_name zkapps_examples)
  (libraries
   ;; opam libraries
-  base
   async_kernel
+  base
   core_kernel
   ;; local libraries
-  mina_numbers
   crypto_params
   currency
-  pasta_bindings
   kimchi_backend
   kimchi_backend_common
   kimchi_pasta
   kimchi_pasta.basic
   mina_base
   mina_base.import
   mina_ledger
+  mina_numbers
+  mina_stdlib
+  pasta_bindings
   pickles
   pickles.backend
   pickles_types
   random_oracle
   random_oracle_input
-  snarky.backendless
-  snark_params
-  mina_stdlib
   sgn
   signature_lib
+  snarky.backendless
+  snark_params
   tuple_lib
   with_hash)
  (instrumentation

src/app/zkapps_examples/dune

@@ -1,21 +1,20 @@
-(executable
+(test
  (name empty_update)
  (libraries
   ;; opam libraries
+  alcotest
   async
   async_kernel
   async_unix
   base
   core
   core_kernel
-  ppx_inline_test.config
   yojson
   ;; local libraries
   cache_dir
   currency
   data_hash_lib
   genesis_constants
-  pasta_bindings
   kimchi_backend
   kimchi_pasta
   kimchi_pasta.basic
@@ -24,13 +23,15 @@
   mina_ledger
   mina_numbers
   mina_state
+  mina_stdlib
   mina_transaction_logic
+  pasta_bindings
   pickles
   pickles.backend
   pickles_base
   pickles_types
-  random_oracle_input
   random_oracle
+  random_oracle_input
   sgn
   signature_lib
   snark_params
@@ -40,14 +41,8 @@
   transaction_snark_tests
   with_hash
   zkapps_empty_update
-  zkapps_examples
-  mina_stdlib)
+  zkapps_examples)
  (preprocess
   (pps ppx_snarky ppx_version ppx_jane))
  (instrumentation
   (backend bisect_ppx)))
-
-(rule
- (alias runtest)
- (action
-  (run ./empty_update.exe)))

src/app/zkapps_examples/test/empty_update/dune

@@ -1,3 +1,12 @@
+(** Testing
+    -------
+
+    Component: Zkapps_examples
+    Subject: Test zkapp empty update
+    Invocation: \
+     dune exec src/app/zkapps_examples/test/empty_update/empty_update.exe
+*)
+
 open Transaction_snark_tests.Util
 open Core_kernel
 open Mina_base
@@ -137,7 +146,7 @@ let zkapp_command : Zkapp_command.t =
     ; memo
     }
 
-let () =
+let test_empty_update () =
   Ledger.with_ledger ~depth:ledger_depth ~f:(fun ledger ->
       Async.Thread_safe.block_on_async_exn (fun () ->
           let (_ : _) =
@@ -148,3 +157,8 @@ let () =
                      (add_amount zero (Currency.Amount.of_nanomina_int_exn 500))) )
           in
           check_zkapp_command_with_merges_exn ledger [ zkapp_command ] ) )
+
+let () =
+  let open Alcotest in
+  run "Empty update test"
+    [ ("empty_update", [ test_case "Empty_update" `Quick test_empty_update ]) ]

src/app/zkapps_examples/test/empty_update/empty_update.ml

@@ -1,21 +1,20 @@
-(library
+(test
  (name initialize_state)
  (libraries
   ;; opam libraries
+  alcotest
   async
   async_kernel
   async_unix
   base
   core
   core_kernel
-  ppx_inline_test.config
   yojson
   ;; local libraries
   cache_dir
   currency
   data_hash_lib
   genesis_constants
-  pasta_bindings
   kimchi_backend
   kimchi_pasta
   kimchi_pasta.basic
@@ -26,11 +25,12 @@
   mina_numbers
   mina_state
   mina_transaction_logic
+  pasta_bindings
   pickles
   pickles.backend
   pickles_types
-  random_oracle_input
   random_oracle
+  random_oracle_input
   sgn
   signature_lib
   snark_params
@@ -39,10 +39,8 @@
   transaction_snark
   transaction_snark_tests
   with_hash
-  zkapps_initialize_state
-  zkapps_examples)
- (inline_tests
-  (flags -verbose -show-counts))
+  zkapps_examples
+  zkapps_initialize_state)
  (preprocess
   (pps ppx_snarky ppx_version ppx_jane))
  (instrumentation