Merge pull request #3 from comdex-official/binding_locking

fix clippy
comdex-official · Aug 29, 2022 · 4cff155 · 4cff155
2 parents 9459a44 + ce76064
commit 4cff155
Show file tree

Hide file tree

Showing 6 changed files with 208 additions and 97 deletions.
diff --git a/schema/execute_msg.json b/schema/execute_msg.json
@@ -61,16 +61,16 @@
     {
       "type": "object",
       "required": [
-        "claim_bribe"
+        "claim_reward"
       ],
       "properties": {
-        "claim_bribe": {
+        "claim_reward": {
           "type": "object",
           "required": [
-            "proposal_id"
+            "app_id"
           ],
           "properties": {
-            "proposal_id": {
+            "app_id": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -139,31 +139,15 @@
         "rebase": {
           "type": "object",
           "required": [
+            "app_id",
             "proposal_id"
           ],
           "properties": {
-            "proposal_id": {
+            "app_id": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
-            }
-          }
-        }
-      },
-      "additionalProperties": false
-    },
-    {
-      "type": "object",
-      "required": [
-        "claim_rebase"
-      ],
-      "properties": {
-        "claim_rebase": {
-          "type": "object",
-          "required": [
-            "proposal_id"
-          ],
-          "properties": {
+            },
             "proposal_id": {
               "type": "integer",
               "format": "uint64",
@@ -209,15 +193,11 @@
         "withdraw": {
           "type": "object",
           "required": [
-            "denom",
-            "lockingperiod"
+            "denom"
           ],
           "properties": {
             "denom": {
               "type": "string"
-            },
-            "lockingperiod": {
-              "$ref": "#/definitions/LockingPeriod"
             }
           }
         }

diff --git a/schema/instantiate_msg.json b/schema/instantiate_msg.json
@@ -21,7 +21,7 @@
     "foundation_addr": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/Addr"
+        "type": "string"
       }
     },
     "foundation_percentage": {

diff --git a/schema/query_msg.json b/schema/query_msg.json
@@ -34,14 +34,28 @@
           "type": "object",
           "required": [
             "address",
-            "denom"
+            "denom",
+            "start_after"
           ],
           "properties": {
             "address": {
               "$ref": "#/definitions/Addr"
             },
             "denom": {
               "type": "string"
+            },
+            "limit": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "start_after": {
+              "type": "integer",
+              "format": "uint32",
+              "minimum": 0.0
             }
           }
         }
@@ -141,11 +155,11 @@
         "bribe_by_proposal": {
           "type": "object",
           "required": [
-            "app_id",
+            "extended_pair_id",
             "proposal_id"
           ],
           "properties": {
-            "app_id": {
+            "extended_pair_id": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -237,6 +251,117 @@
         }
       },
       "additionalProperties": false
+    },
+    {
+      "description": "Total amount of given denom withdrawable.",
+      "type": "object",
+      "required": [
+        "withdrawable"
+      ],
+      "properties": {
+        "withdrawable": {
+          "type": "object",
+          "required": [
+            "address",
+            "denom"
+          ],
+          "properties": {
+            "address": {
+              "type": "string"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "total_v_tokens"
+      ],
+      "properties": {
+        "total_v_tokens": {
+          "type": "object",
+          "required": [
+            "address",
+            "denom"
+          ],
+          "properties": {
+            "address": {
+              "$ref": "#/definitions/Addr"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "state"
+      ],
+      "properties": {
+        "state": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "emission"
+      ],
+      "properties": {
+        "emission": {
+          "type": "object",
+          "required": [
+            "app_id"
+          ],
+          "properties": {
+            "app_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "extended_pair_vote"
+      ],
+      "properties": {
+        "extended_pair_vote": {
+          "type": "object",
+          "required": [
+            "extended_pair_id",
+            "proposal_id"
+          ],
+          "properties": {
+            "extended_pair_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "proposal_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            }
+          }
+        }
+      },
+      "additionalProperties": false
     }
   ],
   "definitions": {

diff --git a/schema/state.json b/schema/state.json
@@ -19,7 +19,7 @@
     "foundation_addr": {
       "type": "array",
       "items": {
-        "$ref": "#/definitions/Addr"
+        "type": "string"
       }
     },
     "foundation_percentage": {