Merge branch 'develop' into feature/protocol-version-chain-id

Author: psteckler

flake.nix

@@ -48,7 +48,20 @@
       nixosModules.mina = import ./nix/modules/mina.nix inputs;
       nixosConfigurations.container = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
+        modules = let
+          PK = "B62qiZfzW27eavtPrnF6DeDSAKEjXuGFdkouC3T5STRa6rrYLiDUP2p";
+          wallet = {
+            box_primitive = "xsalsa20poly1305";
+            ciphertext =
+              "Dmq1Qd8uNbZRT1NT7zVbn3eubpn9Myx9Je9ZQGTKDxUv4BoPNmZAGox18qVfbbEUSuhT4ZGDt";
+            nonce = "6pcvpWSLkMi393dT5VSLR6ft56AWKkCYRqJoYia";
+            pw_primitive = "argon2i";
+            pwdiff = [ 134217728 6 ];
+            pwsalt = "ASoBkV3NsY7ZRuxztyPJdmJCiz3R";
+          };
+          wallet-file = builtins.toFile "mina-wallet" (builtins.toJSON wallet);
+          wallet-file-pub = builtins.toFile "mina-wallet-pub" PK;
+        in [
           self.nixosModules.mina
           {
             boot.isContainer = true;
@@ -57,10 +70,46 @@
 
             services.mina = {
               enable = true;
+              config = {
+                "ledger" = {
+                  "name" = "mina-demo";
+                  "accounts" = [{
+                    "pk" = PK;
+                    "balance" = "66000";
+                    "sk" = null;
+                    "delegate" = null;
+                  }];
+                };
+              };
               waitForRpc = false;
               external-ip = "0.0.0.0";
-              extraArgs = [ "--seed" ];
+              generate-genesis-proof = true;
+              seed = true;
+              block-producer-key = "/var/lib/mina/wallets/store/${PK}";
+              extraArgs = [
+                "--demo-mode"
+                "--proof-level"
+                "none"
+                "--run-snark-worker"
+                "B62qjnkjj3zDxhEfxbn1qZhUawVeLsUr2GCzEz8m1MDztiBouNsiMUL"
+                "-insecure-rest-server"
+              ];
+            };
+
+            systemd.services.mina = {
+              preStart = ''
+                printf '{"genesis":{"genesis_state_timestamp":"%s"}}' "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" > /var/lib/mina/daemon.json
+              '';
+              environment = {
+                MINA_TIME_OFFSET = "0";
+                MINA_PRIVKEY_PASS = "";
+              };
             };
+
+            systemd.tmpfiles.rules = [
+              "C /var/lib/mina/wallets/store/${PK}.pub 700 mina mina - ${wallet-file-pub}"
+              "C /var/lib/mina/wallets/store/${PK}     700 mina mina - ${wallet-file}"
+            ];
           }
         ];
       };

nix/README.md

@@ -106,6 +106,26 @@ directory, which links to a tarball containing the docker image. You
 can load the image using `docker load -i result`, then note the tag it
 outputs. You can then run Mina from this docker image with `docker run mina:<tag> mina.exe <args>`.
 
+### Demo nixos-container
+
+If you're running NixOS, you can use `nixos-container` to run a demo of mina daemon from your local checkout. To do so, try
+
+```
+sudo nixos-container create mina --flake mina
+sudo nixos-container start mina
+sudo nixos-container root-login mina
+```
+
+From there, you can poke the mina daemon, e.g. with `systemctl status mina`.
+
+If you want to update the container to reflect the latest checkout, try
+
+```
+sudo nixos-container stop mina
+sudo nixos-container update mina --flake mina
+sudo nixos-container start mina
+```
+
 ### direnv
 
 It is considered as a good practice to automatically enter the Nix shell instead of keeping in mind that you need to execute the `nix develop mina` command every time you enter the Mina repo directory.  

src/app/archive/archive_lib/load_data.ml

@@ -105,7 +105,8 @@ let update_of_id pool update_id =
   in
   let%bind app_state =
     let%bind field_id_array =
-      query_db ~f:(fun db -> Processor.Zkapp_states.load db app_state_id)
+      query_db ~f:(fun db ->
+          Processor.Zkapp_states_nullable.load db app_state_id )
     in
     let field_ids = Array.to_list field_id_array in
     let%map field_strs =
@@ -533,7 +534,8 @@ let get_other_party_body ~pool body_id =
         let%bind delegate = get_pk delegate_id in
         let%bind state =
           let%bind field_ids =
-            query_db ~f:(fun db -> Processor.Zkapp_states.load db state_id)
+            query_db ~f:(fun db ->
+                Processor.Zkapp_states_nullable.load db state_id )
           in
           let%map fields =
             Deferred.List.map (Array.to_list field_ids) ~f:(fun id_opt ->
@@ -739,12 +741,10 @@ let get_account_accessed ~pool (account : Processor.Accounts_accessed.t) :
         let%bind app_state_ints =
           query_db ~f:(fun db -> Processor.Zkapp_states.load db app_state_id)
         in
-        (* for app state, all elements are non-NULL *)
-        assert (Array.for_all app_state_ints ~f:Option.is_some) ;
         let%bind app_state =
           let%map field_strs =
             Deferred.List.init (Array.length app_state_ints) ~f:(fun ndx ->
-                let id = Option.value_exn app_state_ints.(ndx) in
+                let id = app_state_ints.(ndx) in
                 query_db ~f:(fun db -> Processor.Zkapp_state_data.load db id) )
           in
           let fields = List.map field_strs ~f:Zkapp_basic.F.of_string in
@@ -781,7 +781,7 @@ let get_account_accessed ~pool (account : Processor.Accounts_accessed.t) :
         let%map sequence_state =
           let%map field_strs =
             Deferred.List.init (Array.length sequence_state_ints) ~f:(fun ndx ->
-                let id = Option.value_exn app_state_ints.(ndx) in
+                let id = sequence_state_ints.(ndx) in
                 query_db ~f:(fun db -> Processor.Zkapp_state_data.load db id) )
           in
           let fields = List.map field_strs ~f:Zkapp_basic.F.of_string in

src/app/archive/archive_lib/processor.ml

@@ -273,8 +273,8 @@ module Zkapp_state_data_array = struct
       id
 end
 
-module Zkapp_states = struct
-  let table_name = "zkapp_states"
+module Zkapp_states_nullable = struct
+  let table_name = "zkapp_states_nullable"
 
   let add_if_doesn't_exist (module Conn : CONNECTION)
       (fps : (Pickles.Backend.Tick.Field.t option, 'n) Vector.vec) =
@@ -300,6 +300,31 @@ module Zkapp_states = struct
       id
 end
 
+module Zkapp_states = struct
+  let table_name = "zkapp_states"
+
+  let add_if_doesn't_exist (module Conn : CONNECTION)
+      (fps : (Pickles.Backend.Tick.Field.t, 'n) Vector.vec) =
+    let open Deferred.Result.Let_syntax in
+    let%bind (element_ids : int array) =
+      Mina_caqti.deferred_result_list_map (Vector.to_list fps)
+        ~f:(Zkapp_state_data.add_if_doesn't_exist (module Conn))
+      >>| Array.of_list
+    in
+    Mina_caqti.select_insert_into_cols ~select:("id", Caqti_type.int)
+      ~table_name
+      ~cols:([ "element_ids" ], Mina_caqti.array_int_typ)
+      ~tannot:(function "element_ids" -> Some "int[]" | _ -> None)
+      (module Conn)
+      element_ids
+
+  let load (module Conn : CONNECTION) id =
+    Conn.find
+      (Caqti_request.find Caqti_type.int Mina_caqti.array_int_typ
+         (Mina_caqti.select_cols_from_id ~table_name ~cols:[ "element_ids" ]) )
+      id
+end
+
 module Zkapp_sequence_states = struct
   let table_name = "zkapp_sequence_states"
 
@@ -552,7 +577,7 @@ module Zkapp_updates = struct
     let open Deferred.Result.Let_syntax in
     let%bind app_state_id =
       Vector.map ~f:Zkapp_basic.Set_or_keep.to_option update.app_state
-      |> Zkapp_states.add_if_doesn't_exist (module Conn)
+      |> Zkapp_states_nullable.add_if_doesn't_exist (module Conn)
     in
     let%bind delegate_id =
       Mina_caqti.add_if_zkapp_set
@@ -717,7 +742,7 @@ module Zkapp_precondition_account = struct
     in
     let%bind state_id =
       Vector.map ~f:Zkapp_basic.Or_ignore.to_option acct.state
-      |> Zkapp_states.add_if_doesn't_exist (module Conn)
+      |> Zkapp_states_nullable.add_if_doesn't_exist (module Conn)
     in
     let%bind sequence_state_id =
       Mina_caqti.add_if_zkapp_check
@@ -2315,7 +2340,6 @@ module Zkapp_account = struct
           : Mina_base.Zkapp_account.t ) =
       zkapp_account
     in
-    let app_state = Vector.map app_state ~f:(fun field -> Some field) in
     let%bind app_state_id =
       Zkapp_states.add_if_doesn't_exist (module Conn) app_state
     in

src/app/archive/drop_tables.sql

@@ -60,6 +60,8 @@ DROP TABLE zkapp_permissions;
 
 DROP TABLE zkapp_state_data_array;
 
+DROP TABLE zkapp_states_nullable;
+
 DROP TABLE zkapp_states;
 
 DROP TABLE zkapp_state_data;

src/app/archive/zkapp_tables.sql

@@ -42,15 +42,24 @@ CREATE TABLE zkapp_state_data_array
    Postgresql does not allow enforcing that the array elements are
    foreign keys
 
-   Any element of the array may be NULL, meaning Ignore, per the
-   NULL convention
+   Any element of the array may be NULL, per the NULL convention
+*/
+CREATE TABLE zkapp_states_nullable
+( id                       serial           PRIMARY KEY
+, element_ids              int[]            NOT NULL
+);
+
+/* like zkapp_states_nullable, but elements are not NULL (not enforced by Postgresql)
 */
 CREATE TABLE zkapp_states
 ( id                       serial           PRIMARY KEY
 , element_ids              int[]            NOT NULL
 );
 
-/* like zkapp_states, but for sequences */
+/* like zkapp_states, but for sequence states; width may differ from that table
+
+   Elements are not NULL (not enforced by Postgresql)
+*/
 CREATE TABLE zkapp_sequence_states
 ( id                       serial           PRIMARY KEY
 , element_ids              int[]            NOT NULL
@@ -104,7 +113,7 @@ CREATE TABLE zkapp_uris
 /* NULL convention */
 CREATE TABLE zkapp_updates
 ( id                       serial           PRIMARY KEY
-, app_state_id             int              NOT NULL REFERENCES zkapp_states(id)
+, app_state_id             int              NOT NULL REFERENCES zkapp_states_nullable(id)
 , delegate_id              int              REFERENCES public_keys(id)
 , verification_key_id      int              REFERENCES zkapp_verification_keys(id)
 , permissions_id           int              REFERENCES zkapp_permissions(id)
@@ -135,7 +144,7 @@ CREATE TABLE zkapp_precondition_accounts
 , nonce_id                 int                    REFERENCES zkapp_nonce_bounds(id)
 , receipt_chain_hash       text
 , delegate_id              int                    REFERENCES public_keys(id)
-, state_id                 int        NOT NULL    REFERENCES zkapp_states(id)
+, state_id                 int        NOT NULL    REFERENCES zkapp_states_nullable(id)
 , sequence_state_id        int                    REFERENCES zkapp_state_data(id)
 , proved_state             boolean
 , is_new                   boolean