Merge branch 'berkeley' into feature/berkeley-into-rampup-2023-10-05

MinaProtocol · Oct 10, 2023 · a9f4645 · a9f4645
2 parents 995389b + 19de438
commit a9f4645
Show file tree

Hide file tree

Showing 18 changed files with 890 additions and 499 deletions.
diff --git a/graphql_schema.json b/graphql_schema.json
@@ -12280,6 +12280,54 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "snarkPoolDiffReceived",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "snarkPoolDiffBroadcasted",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "pendingSnarkWork",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "snarkPoolSize",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,

diff --git a/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml b/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml
@@ -539,7 +539,7 @@ let setup_daemon logger =
           ~transport:
             (Logger_file_system.dumb_logrotate ~directory:conf_dir
                ~log_filename:"mina-oversized-logs.log"
-               ~max_size:logrotate_max_size ~num_rotate:file_log_rotations ) ;
+               ~max_size:logrotate_max_size ~num_rotate:20 ) ;
         (* Consumer for `[%log internal]` logging used for internal tracing *)
         Itn_logger.set_message_postprocessor
           Internal_tracing.For_itn_logger.post_process_message ;

diff --git a/src/app/itn_orchestrator/schema.graphql b/src/app/itn_orchestrator/schema.graphql
@@ -173,6 +173,12 @@ scalar UInt16
 
 """Keys and other information for scheduling zkapp commands"""
 input ZkappCommandsDetails {
+  """
+  Parameter of zkapp generation, each generated zkapp tx will have
+  (2*maxAccountUpdates+2) account updates (including balancing and fee payer)
+  """
+  maxAccountUpdates: Int
+
   """Generate max cost zkApp command"""
   maxCost: Boolean!
 
@@ -193,18 +199,18 @@ input ZkappCommandsDetails {
   """
   initBalance: CurrencyAmount!
 
+  """Maximum new zkapp balance"""
+  maxNewZkappBalance: CurrencyAmount!
+
+  """Minimum new zkapp balance"""
+  minNewZkappBalance: CurrencyAmount!
+
   """Maximum balance change"""
   maxBalanceChange: CurrencyAmount!
 
   """Minimum balance change"""
   minBalanceChange: CurrencyAmount!
 
-  """Minimum new zkapp balance"""
-  minNewZkappBalance: CurrencyAmount!
-
-  """Maximum new zkapp balance"""
-  maxNewZkappBalance: CurrencyAmount!
-
   """Disable the precondition in account updates"""
   noPrecondition: Boolean!