Merge pull request #14882 from MinaProtocol/feature/verification-key-…

…update-txn-version-develop just to resolve merge conflict of 14407
MinaProtocol · Jan 19, 2024 · 100d44c · 100d44c
2 parents 75ecfaf + 5eab2fe
commit 100d44c
Show file tree

Hide file tree

Showing 82 changed files with 3,275 additions and 727 deletions.
diff --git a/graphql_schema.json b/graphql_schema.json
@@ -950,6 +950,78 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "INPUT_OBJECT",
+          "name": "VerificationKeyPermissionInput",
+          "description": null,
+          "fields": [
+            {
+              "name": "auth",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "AuthRequired",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "txnVersion",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "UInt32",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": [
+            {
+              "name": "auth",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "AuthRequired",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "txnVersion",
+              "description": null,
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "UInt32",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "INPUT_OBJECT",
           "name": "PermissionsInput",
@@ -1059,8 +1131,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "AuthRequired",
+                  "kind": "INPUT_OBJECT",
+                  "name": "VerificationKeyPermissionInput",
                   "ofType": null
                 }
               },
@@ -1256,8 +1328,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "AuthRequired",
+                  "kind": "INPUT_OBJECT",
+                  "name": "VerificationKeyPermissionInput",
                   "ofType": null
                 }
               },
@@ -7846,8 +7918,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "SCALAR",
-                  "name": "AuthRequired",
+                  "kind": "OBJECT",
+                  "name": "VerificationKeyPermission",
                   "ofType": null
                 }
               },
@@ -11837,6 +11909,50 @@
           "enumValues": null,
           "possibleTypes": null
         },
+        {
+          "kind": "OBJECT",
+          "name": "VerificationKeyPermission",
+          "description": null,
+          "fields": [
+            {
+              "name": "auth",
+              "description":
+                "Authorization required to set the verification key of the zkApp associated with the account",
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "ENUM",
+                  "name": "AccountAuthRequired",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "txnVersion",
+              "description": null,
+              "args": [],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [],
+          "enumValues": null,
+          "possibleTypes": null
+        },
         {
           "kind": "ENUM",
           "name": "AccountAuthRequired",
@@ -11988,8 +12104,8 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "ENUM",
-                  "name": "AccountAuthRequired",
+                  "kind": "OBJECT",
+                  "name": "VerificationKeyPermission",
                   "ofType": null
                 }
               },

diff --git a/src/app/archive/lib/load_data.ml b/src/app/archive/lib/load_data.ml
@@ -192,7 +192,8 @@ let update_of_id pool update_id =
                   ; access
                   ; set_delegate
                   ; set_permissions
-                  ; set_verification_key
+                  ; set_verification_key_auth
+                  ; set_verification_key_txn_version
                   ; set_zkapp_uri
                   ; edit_action_state
                   ; set_token_symbol
@@ -210,7 +211,10 @@ let update_of_id pool update_id =
               ; access
               ; set_delegate
               ; set_permissions
-              ; set_verification_key
+              ; set_verification_key =
+                  ( set_verification_key_auth
+                  , Mina_numbers.Txn_version.of_int
+                      set_verification_key_txn_version )
               ; set_zkapp_uri
               ; edit_action_state
               ; set_token_symbol
@@ -735,7 +739,8 @@ let get_account_accessed ~pool (account : Processor.Accounts_accessed.t) :
             ; access
             ; set_delegate
             ; set_permissions
-            ; set_verification_key
+            ; set_verification_key_auth
+            ; set_verification_key_txn_version
             ; set_zkapp_uri
             ; edit_action_state
             ; set_token_symbol
@@ -751,7 +756,9 @@ let get_account_accessed ~pool (account : Processor.Accounts_accessed.t) :
       ; access
       ; set_delegate
       ; set_permissions
-      ; set_verification_key
+      ; set_verification_key =
+          ( set_verification_key_auth
+          , Mina_numbers.Txn_version.of_int set_verification_key_txn_version )
       ; set_zkapp_uri
       ; edit_action_state
       ; set_token_symbol