Mesa Testing branch

changes/17462.md

@@ -0,0 +1,3 @@
+# PR #17462 Increase the App state to 32
+
+Increase the app state size from 8 to 32

src/app/archive/create_schema.sql

@@ -150,6 +150,30 @@ CREATE TABLE zkapp_states_nullable
 , element5                 int		    REFERENCES zkapp_field(id)
 , element6                 int		    REFERENCES zkapp_field(id)
 , element7                 int		    REFERENCES zkapp_field(id)
+, element8                 int		    REFERENCES zkapp_field(id)
+, element9                 int		    REFERENCES zkapp_field(id)
+, element10                 int		    REFERENCES zkapp_field(id)
+, element11                 int		    REFERENCES zkapp_field(id)
+, element12                 int		    REFERENCES zkapp_field(id)
+, element13                 int		    REFERENCES zkapp_field(id)
+, element14                 int		    REFERENCES zkapp_field(id)
+, element15                 int		    REFERENCES zkapp_field(id)
+, element16                 int		    REFERENCES zkapp_field(id)
+, element17                 int		    REFERENCES zkapp_field(id)
+, element18                 int		    REFERENCES zkapp_field(id)
+, element19                 int		    REFERENCES zkapp_field(id)
+, element20                 int		    REFERENCES zkapp_field(id)
+, element21                 int		    REFERENCES zkapp_field(id)
+, element22                 int		    REFERENCES zkapp_field(id)
+, element23                 int		    REFERENCES zkapp_field(id)
+, element24                 int		    REFERENCES zkapp_field(id)
+, element25                 int		    REFERENCES zkapp_field(id)
+, element26                 int		    REFERENCES zkapp_field(id)
+, element27                 int		    REFERENCES zkapp_field(id)
+, element28                 int		    REFERENCES zkapp_field(id)
+, element29                 int		    REFERENCES zkapp_field(id)
+, element30                 int		    REFERENCES zkapp_field(id)
+, element31                 int		    REFERENCES zkapp_field(id)
 );
 
 /* like zkapp_states_nullable, but elements are not NULL */
@@ -163,6 +187,30 @@ CREATE TABLE zkapp_states
 , element5                 int              NOT NULL REFERENCES zkapp_field(id)
 , element6                 int              NOT NULL REFERENCES zkapp_field(id)
 , element7                 int              NOT NULL REFERENCES zkapp_field(id)
+, element8                 int              NOT NULL REFERENCES zkapp_field(id)
+, element9                 int              NOT NULL REFERENCES zkapp_field(id)
+, element10                 int              NOT NULL REFERENCES zkapp_field(id)
+, element11                 int              NOT NULL REFERENCES zkapp_field(id)
+, element12                 int              NOT NULL REFERENCES zkapp_field(id)
+, element13                 int              NOT NULL REFERENCES zkapp_field(id)
+, element14                 int              NOT NULL REFERENCES zkapp_field(id)
+, element15                 int              NOT NULL REFERENCES zkapp_field(id)
+, element16                 int              NOT NULL REFERENCES zkapp_field(id)
+, element17                 int              NOT NULL REFERENCES zkapp_field(id)
+, element18                 int              NOT NULL REFERENCES zkapp_field(id)
+, element19                 int              NOT NULL REFERENCES zkapp_field(id)
+, element20                 int              NOT NULL REFERENCES zkapp_field(id)
+, element21                 int              NOT NULL REFERENCES zkapp_field(id)
+, element22                 int              NOT NULL REFERENCES zkapp_field(id)
+, element23                 int              NOT NULL REFERENCES zkapp_field(id)
+, element24                 int              NOT NULL REFERENCES zkapp_field(id)
+, element25                 int              NOT NULL REFERENCES zkapp_field(id)
+, element26                 int              NOT NULL REFERENCES zkapp_field(id)
+, element27                 int              NOT NULL REFERENCES zkapp_field(id)
+, element28                 int              NOT NULL REFERENCES zkapp_field(id)
+, element29                 int              NOT NULL REFERENCES zkapp_field(id)
+, element30                 int              NOT NULL REFERENCES zkapp_field(id)
+, element31                 int              NOT NULL REFERENCES zkapp_field(id)
 );
 
 /* like zkapp_states, but for action states */

src/app/test_executive/block_reward_test.ml

@@ -36,12 +36,12 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
         (Wait_condition.nodes_to_initialize
            (Core.String.Map.data all_mina_nodes) )
     in
+    let constraint_constants = Network.constraint_constants network in
     let node = Network.block_producer_exn network "node" in
     let bp_keypair = (Network.genesis_keypair_exn network "node-key").keypair in
     let bp_pk = bp_keypair.public_key |> Signature_lib.Public_key.compress in
     let bp_pk_account_id = Account_id.create bp_pk Token_id.default in
     let bp_original_balance = Currency.Amount.of_mina_string_exn "1000" in
-    let coinbase_reward = Currency.Amount.of_mina_string_exn "720" in
     let%bind () =
       section_hard "wait for 1 block to be produced"
         (wait_for t (Wait_condition.blocks_to_be_produced 1))
@@ -58,7 +58,8 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
           test_constants.coinbase_amount for whatever reason, so hardcoding this
           until that is fixed *)
        let bp_expected =
-         Currency.Amount.add bp_original_balance coinbase_reward
+         Currency.Amount.add bp_original_balance
+           constraint_constants.coinbase_amount
          |> Option.value_exn
        in
        [%log info] "bp_expected: %s"

src/app/zkapp_limits/zkapp_limits.ml

@@ -2,31 +2,35 @@
 open Core_kernel
 
 let main () =
-  let genesis_constants = Genesis_constants.Compiled.genesis_constants in
-  let cost_limit = genesis_constants.zkapp_transaction_cost_limit in
-  let max_event_elements = genesis_constants.max_event_elements in
-  let max_action_elements = genesis_constants.max_action_elements in
-  let values = List.init 20 ~f:Fn.id in
+  let Genesis_constants.
+        { max_event_elements
+        ; max_action_elements
+        ; max_zkapp_segment_per_transaction
+        ; _
+        } =
+    Genesis_constants.Compiled.genesis_constants
+  in
+  let values = List.init (1 + max_zkapp_segment_per_transaction) ~f:Fn.id in
   printf "max field elements for events per transaction: %d\n"
     max_event_elements ;
   printf "max field elements for actions per transaction: %d\n"
     max_action_elements ;
   printf "All possible zkApp account update combinations:\n" ;
-  List.iter values ~f:(fun proofs ->
+  List.iter values ~f:(fun proof_segments ->
       List.iter values ~f:(fun signed_single_segments ->
           List.iter values ~f:(fun signed_pair_segments ->
               let cost =
-                Mina_base.Zkapp_command.zkapp_cost ~proof_segments:proofs
+                Mina_base.Zkapp_command.zkapp_cost ~proof_segments
                   ~signed_single_segments ~signed_pair_segments
-                  ~genesis_constants ()
               in
-              if Float.(cost <. cost_limit) then
+              if cost <= max_zkapp_segment_per_transaction then
                 printf
                   "Proofs updates=%d  Signed/None updates=%d  Pairs of \
-                   Signed/None updates=%d: Total account updates: %d Cost: %f \n\
+                   Signed/None updates=%d: Total account updates: %d Cost: %d \n\
                    %!"
-                  proofs signed_single_segments signed_pair_segments
-                  (proofs + signed_single_segments + (signed_pair_segments * 2))
+                  proof_segments signed_single_segments signed_pair_segments
+                  ( proof_segments + signed_single_segments
+                  + (signed_pair_segments * 2) )
                   cost ) ) )
 
 let () = main ()

src/config/devnet.mlh

@@ -6,7 +6,7 @@
 
 
 (*BEGIN src/config/coinbase/realistic.mlh*)
-[%%define coinbase "720"]
+[%%define coinbase "360"]
 (*END src/config/coinbase/realistic.mlh*)
 
 
@@ -57,7 +57,7 @@
 [%%define plugins false]
 [%%define genesis_ledger "testnet_postake"]
 [%%define genesis_state_timestamp "2021-09-24T00:00:00Z"]
-[%%define block_window_duration 180000]
+[%%define block_window_duration 90000]
 [%%define print_versioned_types false]
 [%%define test_full_epoch false]
 
@@ -81,4 +81,4 @@
 
 (* Constants determining sync ledger query/response size*)
 [%%define sync_ledger_max_subtree_depth 8]
-[%%define sync_ledger_default_subtree_depth 6]
+[%%define sync_ledger_default_subtree_depth 6]

src/config/lightnet.mlh

@@ -6,7 +6,7 @@
 
 
 (*BEGIN src/config/coinbase/realistic.mlh*)
-[%%define coinbase "720"]
+[%%define coinbase "360"]
 (*END src/config/coinbase/realistic.mlh*)
 
 

src/config/mainnet.mlh

@@ -6,7 +6,7 @@
 
 
 (*BEGIN src/config/coinbase/realistic.mlh*)
-[%%define coinbase "720"]
+[%%define coinbase "360"]
 (*END src/config/coinbase/realistic.mlh*)
 
 
@@ -57,7 +57,7 @@
 [%%define plugins false]
 [%%define genesis_ledger "testnet_postake"]
 [%%define genesis_state_timestamp "2020-09-16 03:15:00-07:00"]
-[%%define block_window_duration 180000]
+[%%define block_window_duration 90000]
 [%%define print_versioned_types false]
 [%%define test_full_epoch false]
 

src/lib/genesis_constants/genesis_constants.ml

@@ -215,10 +215,11 @@ module T = struct
     { protocol : Protocol.Stable.Latest.t
     ; txpool_max_size : int
     ; num_accounts : int option
-    ; zkapp_proof_update_cost : float
-    ; zkapp_signed_single_update_cost : float
-    ; zkapp_signed_pair_update_cost : float
-    ; zkapp_transaction_cost_limit : float
+    ; max_zkapp_segment_per_transaction : int
+          (** The maximum number of segments allowed per zkapp command. A
+              segment is either: a proof, a signed single update, or a signed
+              pair update. Transactions with a number of segments equal to this
+              limit are valid. *)
     ; max_event_elements : int
     ; max_action_elements : int
     ; zkapp_cmd_limit_hardcap : int
@@ -425,11 +426,8 @@ module Make (Node_config : Node_config_intf.S) : S = struct
         }
     ; txpool_max_size = pool_max_size
     ; num_accounts = None
-    ; zkapp_proof_update_cost = Node_config.zkapp_proof_update_cost
-    ; zkapp_signed_single_update_cost =
-        Node_config.zkapp_signed_single_update_cost
-    ; zkapp_signed_pair_update_cost = Node_config.zkapp_signed_pair_update_cost
-    ; zkapp_transaction_cost_limit = Node_config.zkapp_transaction_cost_limit
+    ; max_zkapp_segment_per_transaction =
+        Node_config.max_zkapp_segment_per_transaction
     ; max_event_elements = Node_config.max_event_elements
     ; max_action_elements = Node_config.max_action_elements
     ; zkapp_cmd_limit_hardcap = Node_config.zkapp_cmd_limit_hardcap

src/lib/genesis_ledger_helper/lib/genesis_ledger_helper_lib.ml

@@ -563,18 +563,9 @@ let make_genesis_constants ~logger ~(default : Genesis_constants.t)
   ; txpool_max_size =
       Option.value ~default:default.txpool_max_size
         (config.daemon >>= fun cfg -> cfg.txpool_max_size)
-  ; zkapp_proof_update_cost =
-      Option.value ~default:default.zkapp_proof_update_cost
-        (config.daemon >>= fun cfg -> cfg.zkapp_proof_update_cost)
-  ; zkapp_signed_single_update_cost =
-      Option.value ~default:default.zkapp_signed_single_update_cost
-        (config.daemon >>= fun cfg -> cfg.zkapp_signed_single_update_cost)
-  ; zkapp_signed_pair_update_cost =
-      Option.value ~default:default.zkapp_signed_pair_update_cost
-        (config.daemon >>= fun cfg -> cfg.zkapp_signed_pair_update_cost)
-  ; zkapp_transaction_cost_limit =
-      Option.value ~default:default.zkapp_transaction_cost_limit
-        (config.daemon >>= fun cfg -> cfg.zkapp_transaction_cost_limit)
+  ; max_zkapp_segment_per_transaction =
+      Option.value ~default:default.max_zkapp_segment_per_transaction
+        (config.daemon >>= fun cfg -> cfg.max_zkapp_segment_per_transaction)
   ; max_event_elements =
       Option.value ~default:default.max_event_elements
         (config.daemon >>= fun cfg -> cfg.max_event_elements)
@@ -647,7 +638,7 @@ let%test_module "Runtime config" =
         sprintf
           {json| {"accounts": [ { "pk": "%s",
                                   "balance": "1087.37",
-                                  "zkapp": { "app_state": [ "14", "0", "0", "0", "0", "0", "0", "0" ],
+                                  "zkapp": { "app_state": [ "14", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0" ],
                                              "verification_key": null,
                                              "zkapp_version": "0",
                                              "action_state": [ "0", "0", "0", "0", "0" ],

src/lib/mina_base/account_update.ml

@@ -1087,13 +1087,35 @@ module Body = struct
   let hash_fold_array f init x = Array.fold ~init ~f x
 
   module Events' = struct
+    (* NOTE: in the "Increase events&actions Limit MIP", we claimed that the
+       limit is unbounded, the reason we're still using [Bounded_types.ArrayN],
+       lies in that the serialization of this type is a bit different from a
+       normal array. Setting the array size limit to [max_event_elements] remove
+       the limit on event level in practice. Same goes for types in[Actions']. *)
+    module Bounded = Mina_stdlib.Bounded_types.ArrayN (struct
+      let max_array_len = Node_config.max_event_elements
+    end)
+
     [%%versioned
     module Stable = struct
       module V1 = struct
-        type t =
-          Pickles.Backend.Tick.Field.Stable.V1.t
-          Mina_stdlib.Bounded_types.ArrayN16.Stable.V1.t
-          list
+        type t = Pickles.Backend.Tick.Field.Stable.V1.t Bounded.Stable.V1.t list
+        [@@deriving sexp, equal, hash, compare, yojson]
+
+        let to_latest = Fn.id
+      end
+    end]
+  end
+
+  module Actions' = struct
+    module Bounded = Mina_stdlib.Bounded_types.ArrayN (struct
+      let max_array_len = Node_config.max_action_elements
+    end)
+
+    [%%versioned
+    module Stable = struct
+      module V1 = struct
+        type t = Pickles.Backend.Tick.Field.Stable.V1.t Bounded.Stable.V1.t list
         [@@deriving sexp, equal, hash, compare, yojson]
 
         let to_latest = Fn.id
@@ -1113,7 +1135,7 @@ module Body = struct
               (Amount.Stable.V1.t, Sgn.Stable.V1.t) Signed_poly.Stable.V1.t
           ; increment_nonce : bool
           ; events : Events'.Stable.V1.t
-          ; actions : Events'.Stable.V1.t
+          ; actions : Actions'.Stable.V1.t
           ; call_data : Pickles.Backend.Tick.Field.Stable.V1.t
           ; call_depth : int
           ; preconditions : Preconditions.Stable.V2.t
@@ -1171,7 +1193,7 @@ module Body = struct
               (Amount.Stable.V1.t, Sgn.Stable.V1.t) Signed_poly.Stable.V1.t
           ; increment_nonce : bool
           ; events : Events'.Stable.V1.t
-          ; actions : Events'.Stable.V1.t
+          ; actions : Actions'.Stable.V1.t
           ; call_data : Pickles.Backend.Tick.Field.Stable.V1.t
           ; call_depth : int
           ; preconditions : Preconditions.Stable.V2.t
@@ -1198,7 +1220,7 @@ module Body = struct
             (Amount.Stable.V1.t, Sgn.Stable.V1.t) Signed_poly.Stable.V1.t
         ; increment_nonce : bool
         ; events : Events'.Stable.V1.t
-        ; actions : Events'.Stable.V1.t
+        ; actions : Actions'.Stable.V1.t
         ; call_data : Pickles.Backend.Tick.Field.Stable.V1.t
         ; preconditions : Preconditions.Stable.V2.t
         ; use_full_commitment : bool

src/lib/mina_base/permissions.ml

@@ -649,7 +649,7 @@ let%test_unit "json value" =
         setPermissions: "Signature",
         setVerificationKey: {
           auth: "Signature",
-          txnVersion: "3"
+          txnVersion: "4"
           },
         setZkappUri: "Signature",
         editActionState: "Signature",

src/lib/mina_base/test/account_update_test.ml

@@ -101,7 +101,7 @@ let precondition_to_json () =
        balance: null,
        nonce: {lower: "34928", upper: "34928"},
        receiptChainHash: null, delegate: null,
-       state: [null,null,null,null,null,null,null,null],
+       state: [null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],
        actionState: null, provedState: null, isNew: null
        }|json}
     |> Yojson.Safe.from_string |> Yojson.Safe.to_string )