Add threshold to cw3 flex

contracts/cw3-fixed-multisig/src/contract.rs

@@ -292,7 +292,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
 fn query_threshold(deps: Deps) -> StdResult<ThresholdResponse> {
     let cfg = CONFIG.load(deps.storage)?;
     Ok(ThresholdResponse::AbsoluteCount {
-        weight_needed: cfg.required_weight,
+        weight: cfg.required_weight,
         total_weight: cfg.total_weight,
     })
 }

contracts/cw3-flex-multisig/schema/init_msg.json

@@ -5,7 +5,7 @@
   "required": [
     "group_addr",
     "max_voting_period",
-    "required_weight"
+    "threshold"
   ],
   "properties": {
     "group_addr": {
@@ -14,13 +14,15 @@
     "max_voting_period": {
       "$ref": "#/definitions/Duration"
     },
-    "required_weight": {
-      "type": "integer",
-      "format": "uint64",
-      "minimum": 0.0
+    "threshold": {
+      "$ref": "#/definitions/Threshold"
     }
   },
   "definitions": {
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
+    },
     "Duration": {
       "description": "Duration is a delta of time. You can add it to a BlockInfo or Expiration to move that further in the future. Note that an height-based Duration and a time-based Expiration cannot be combined",
       "anyOf": [
@@ -54,6 +56,76 @@
     },
     "HumanAddr": {
       "type": "string"
+    },
+    "Threshold": {
+      "anyOf": [
+        {
+          "description": "Declares a total weight needed to pass This usually implies that weight_needed is stable, even if total_weight changes eg. 3 of 5 multisig -> 3 of 6 multisig",
+          "type": "object",
+          "required": [
+            "absolute_count"
+          ],
+          "properties": {
+            "absolute_count": {
+              "type": "object",
+              "required": [
+                "weight"
+              ],
+              "properties": {
+                "weight": {
+                  "type": "integer",
+                  "format": "uint64",
+                  "minimum": 0.0
+                }
+              }
+            }
+          }
+        },
+        {
+          "description": "Declares a percentage of the total weight needed to pass This implies the percentage is stable, when total_weight changes eg. at 50.1%, we go from needing 51/100 to needing 101/200\n\nNote: percentage_needed = 60% is different than threshold = 60%, quora = 100% as the first will pass with 60% yes votes and 10% no votes, while the second will require the others to vote anything (no, abstain...) to pass",
+          "type": "object",
+          "required": [
+            "absolute_percentage"
+          ],
+          "properties": {
+            "absolute_percentage": {
+              "type": "object",
+              "required": [
+                "percentage"
+              ],
+              "properties": {
+                "percentage": {
+                  "$ref": "#/definitions/Decimal"
+                }
+              }
+            }
+          }
+        },
+        {
+          "description": "Declares a threshold (minimum percentage of votes that must approve) and a quorum (minimum percentage of voter weight that must vote). This allows eg. 20.04% of the total weight yes votes to pass, if we have a quorum of 40% and threshold of 51%, and most of the people sit out the election.\n\nThis is more common in general elections, where participation is expected to be low.",
+          "type": "object",
+          "required": [
+            "threshold_quora"
+          ],
+          "properties": {
+            "threshold_quora": {
+              "type": "object",
+              "required": [
+                "quorum",
+                "threshold"
+              ],
+              "properties": {
+                "quorum": {
+                  "$ref": "#/definitions/Decimal"
+                },
+                "threshold": {
+                  "$ref": "#/definitions/Decimal"
+                }
+              }
+            }
+          }
+        }
+      ]
     }
   }
 }