Merge pull request #75 from neutron-org/feat/neutron-voting-registry-v2

[NTRN-78] upgrade neutron voting registry to v2
neutron-org · Sep 5, 2023 · 1cd5d88 · 1cd5d88
2 parents 83b7733 + cdbb558
commit 1cd5d88
Show file tree

Hide file tree

Showing 14 changed files with 1,459 additions and 510 deletions.
diff --git a/contracts/dao/voting/neutron-voting-registry/schema/neutron-voting-registry.json b/contracts/dao/voting/neutron-voting-registry/schema/neutron-voting-registry.json
@@ -49,16 +49,36 @@
       {
         "type": "object",
         "required": [
-          "remove_voting_vault"
+          "deactivate_voting_vault"
         ],
         "properties": {
-          "remove_voting_vault": {
+          "deactivate_voting_vault": {
             "type": "object",
             "required": [
-              "old_voting_vault_contract"
+              "voting_vault_contract"
             ],
             "properties": {
-              "old_voting_vault_contract": {
+              "voting_vault_contract": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "activate_voting_vault"
+        ],
+        "properties": {
+          "activate_voting_vault": {
+            "type": "object",
+            "required": [
+              "voting_vault_contract"
+            ],
+            "properties": {
+              "voting_vault_contract": {
                 "type": "string"
               }
             }
@@ -126,6 +146,16 @@
         "properties": {
           "voting_vaults": {
             "type": "object",
+            "properties": {
+              "height": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint64",
+                "minimum": 0.0
+              }
+            },
             "additionalProperties": false
           }
         },
@@ -206,18 +236,11 @@
       "title": "Config",
       "type": "object",
       "required": [
-        "owner",
-        "voting_vaults"
+        "owner"
       ],
       "properties": {
         "owner": {
           "$ref": "#/definitions/Addr"
-        },
-        "voting_vaults": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Addr"
-          }
         }
       },
       "definitions": {
@@ -329,7 +352,8 @@
           "required": [
             "address",
             "description",
-            "name"
+            "name",
+            "state"
           ],
           "properties": {
             "address": {
@@ -340,8 +364,29 @@
             },
             "name": {
               "type": "string"
+            },
+            "state": {
+              "$ref": "#/definitions/VotingVaultState"
             }
           }
+        },
+        "VotingVaultState": {
+          "oneOf": [
+            {
+              "description": "Voting vault is active means that it's considered in voting power queries to the Neutron voting registry.",
+              "type": "string",
+              "enum": [
+                "Active"
+              ]
+            },
+            {
+              "description": "Voting vault is inactive means that it's not considered in voting power queries to the Neutron voting registry.",
+              "type": "string",
+              "enum": [
+                "Inactive"
+              ]
+            }
+          ]
         }
       }
     }

diff --git a/contracts/dao/voting/neutron-voting-registry/schema/raw/execute.json b/contracts/dao/voting/neutron-voting-registry/schema/raw/execute.json
@@ -25,16 +25,36 @@
     {
       "type": "object",
       "required": [
-        "remove_voting_vault"
+        "deactivate_voting_vault"
       ],
       "properties": {
-        "remove_voting_vault": {
+        "deactivate_voting_vault": {
           "type": "object",
           "required": [
-            "old_voting_vault_contract"
+            "voting_vault_contract"
           ],
           "properties": {
-            "old_voting_vault_contract": {
+            "voting_vault_contract": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "activate_voting_vault"
+      ],
+      "properties": {
+        "activate_voting_vault": {
+          "type": "object",
+          "required": [
+            "voting_vault_contract"
+          ],
+          "properties": {
+            "voting_vault_contract": {
               "type": "string"
             }
           }

diff --git a/contracts/dao/voting/neutron-voting-registry/schema/raw/query.json b/contracts/dao/voting/neutron-voting-registry/schema/raw/query.json
@@ -36,6 +36,16 @@
       "properties": {
         "voting_vaults": {
           "type": "object",
+          "properties": {
+            "height": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          },
           "additionalProperties": false
         }
       },

diff --git a/contracts/dao/voting/neutron-voting-registry/schema/raw/response_to_config.json b/contracts/dao/voting/neutron-voting-registry/schema/raw/response_to_config.json
@@ -3,18 +3,11 @@
   "title": "Config",
   "type": "object",
   "required": [
-    "owner",
-    "voting_vaults"
+    "owner"
   ],
   "properties": {
     "owner": {
       "$ref": "#/definitions/Addr"
-    },
-    "voting_vaults": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/Addr"
-      }
     }
   },
   "definitions": {

diff --git a/contracts/dao/voting/neutron-voting-registry/schema/raw/response_to_voting_vaults.json b/contracts/dao/voting/neutron-voting-registry/schema/raw/response_to_voting_vaults.json
@@ -11,7 +11,8 @@
       "required": [
         "address",
         "description",
-        "name"
+        "name",
+        "state"
       ],
       "properties": {
         "address": {
@@ -22,8 +23,29 @@
         },
         "name": {
           "type": "string"
+        },
+        "state": {
+          "$ref": "#/definitions/VotingVaultState"
         }
       }
+    },
+    "VotingVaultState": {
+      "oneOf": [
+        {
+          "description": "Voting vault is active means that it's considered in voting power queries to the Neutron voting registry.",
+          "type": "string",
+          "enum": [
+            "Active"
+          ]
+        },
+        {
+          "description": "Voting vault is inactive means that it's not considered in voting power queries to the Neutron voting registry.",
+          "type": "string",
+          "enum": [
+            "Inactive"
+          ]
+        }
+      ]
     }
   }
 }