amaci: harden signup/tally validation and clean up unused state

.gitignore

@@ -69,3 +69,5 @@ add-new-key_v3/
 .idea
 
 maci-details.md
+
+.local/

artifacts/checksums.txt

@@ -1,5 +1,5 @@
-bc0ce3afb95d044fb9e24605f48e00212b09b0d1bfa0a59578cd9211ac5ce30c  cw_amaci-aarch64.wasm
-4607bebf17551c904c451b652ce2e0693fee498c1e7ad45e55e54b9747337dd3  cw_amaci_registry-aarch64.wasm
+bf095310e0fd04c48eff6d9cb3cefc9063af9f19289e2c133891f7cfefe580a3  cw_amaci-aarch64.wasm
+faa7d0f2e1fbc9878223d8c5b048bc5d41237360de840c7ca1c730aa9840213a  cw_amaci_registry-aarch64.wasm
 86583bd5db998cff1bd9b45c62e9d207875fa3ae63929d69afeacf4cb3938fab  cw_api_saas-aarch64.wasm
 9b20be65d366f0c05a678448c3cf90a9717ed394e0e77df5aec71cfed7df80e4  cw_maci-aarch64.wasm
 904c160324e3f943f5841e4acfdb61402332c228d3fad4345f9c1f9c0b23f237  cw_test-aarch64.wasm

contracts/amaci/schema/cw-amaci.json

@@ -1251,27 +1251,6 @@
         },
         "additionalProperties": false
       },
-      {
-        "type": "object",
-        "required": [
-          "get_state_idx_inc"
-        ],
-        "properties": {
-          "get_state_idx_inc": {
-            "type": "object",
-            "required": [
-              "address"
-            ],
-            "properties": {
-              "address": {
-                "$ref": "#/definitions/Addr"
-              }
-            },
-            "additionalProperties": false
-          }
-        },
-        "additionalProperties": false
-      },
       {
         "type": "object",
         "required": [
@@ -1623,6 +1602,20 @@
           }
         },
         "additionalProperties": false
+      },
+      {
+        "description": "Returns the stored Groth16 verifying keys for all circuits.",
+        "type": "object",
+        "required": [
+          "get_vkeys"
+        ],
+        "properties": {
+          "get_vkeys": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
       }
     ],
     "definitions": {
@@ -2071,12 +2064,6 @@
       },
       "additionalProperties": false
     },
-    "get_state_idx_inc": {
-      "$schema": "http://json-schema.org/draft-07/schema#",
-      "title": "Uint256",
-      "description": "An implementation of u256 that is using strings for JSON encoding/decoding, such that the full u256 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances out of primitive uint types or `new` to provide big endian bytes:\n\n``` # use cosmwasm_std::Uint256; let a = Uint256::from(258u128); let b = Uint256::new([ 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8, 2u8, ]); assert_eq!(a, b); ```",
-      "type": "string"
-    },
     "get_state_tree_root": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "Uint256",
@@ -2125,6 +2112,96 @@
         }
       }
     },
+    "get_vkeys": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "VkeysResponse",
+      "type": "object",
+      "required": [
+        "add_key_vkey",
+        "deactivate_vkey",
+        "process_vkey",
+        "tally_vkey"
+      ],
+      "properties": {
+        "add_key_vkey": {
+          "$ref": "#/definitions/Groth16VkeyStr"
+        },
+        "deactivate_vkey": {
+          "$ref": "#/definitions/Groth16VkeyStr"
+        },
+        "process_vkey": {
+          "$ref": "#/definitions/Groth16VkeyStr"
+        },
+        "tally_vkey": {
+          "$ref": "#/definitions/Groth16VkeyStr"
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Groth16VkeyStr": {
+          "type": "object",
+          "required": [
+            "alpha_1",
+            "beta_2",
+            "delta_2",
+            "gamma_2",
+            "ic0",
+            "ic1"
+          ],
+          "properties": {
+            "alpha_1": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "uint8",
+                "minimum": 0.0
+              }
+            },
+            "beta_2": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "uint8",
+                "minimum": 0.0
+              }
+            },
+            "delta_2": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "uint8",
+                "minimum": 0.0
+              }
+            },
+            "gamma_2": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "uint8",
+                "minimum": 0.0
+              }
+            },
+            "ic0": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "uint8",
+                "minimum": 0.0
+              }
+            },
+            "ic1": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "uint8",
+                "minimum": 0.0
+              }
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    },
     "get_voice_credit_amount": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "title": "Uint256",

contracts/amaci/schema/raw/query.json

@@ -226,27 +226,6 @@
       },
       "additionalProperties": false
     },
-    {
-      "type": "object",
-      "required": [
-        "get_state_idx_inc"
-      ],
-      "properties": {
-        "get_state_idx_inc": {
-          "type": "object",
-          "required": [
-            "address"
-          ],
-          "properties": {
-            "address": {
-              "$ref": "#/definitions/Addr"
-            }
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
     {
       "type": "object",
       "required": [
@@ -598,6 +577,20 @@
         }
       },
       "additionalProperties": false
+    },
+    {
+      "description": "Returns the stored Groth16 verifying keys for all circuits.",
+      "type": "object",
+      "required": [
+        "get_vkeys"
+      ],
+      "properties": {
+        "get_vkeys": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
     }
   ],
   "definitions": {

contracts/amaci/schema/raw/response_to_get_vkeys.json

@@ -0,0 +1,90 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "VkeysResponse",
+  "type": "object",
+  "required": [
+    "add_key_vkey",
+    "deactivate_vkey",
+    "process_vkey",
+    "tally_vkey"
+  ],
+  "properties": {
+    "add_key_vkey": {
+      "$ref": "#/definitions/Groth16VkeyStr"
+    },
+    "deactivate_vkey": {
+      "$ref": "#/definitions/Groth16VkeyStr"
+    },
+    "process_vkey": {
+      "$ref": "#/definitions/Groth16VkeyStr"
+    },
+    "tally_vkey": {
+      "$ref": "#/definitions/Groth16VkeyStr"
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Groth16VkeyStr": {
+      "type": "object",
+      "required": [
+        "alpha_1",
+        "beta_2",
+        "delta_2",
+        "gamma_2",
+        "ic0",
+        "ic1"
+      ],
+      "properties": {
+        "alpha_1": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        },
+        "beta_2": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        },
+        "delta_2": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        },
+        "gamma_2": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        },
+        "ic0": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        },
+        "ic1": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "uint8",
+            "minimum": 0.0
+          }
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}