update package versions to 2.5.1

DA0-DA0 · Oct 23, 2024 · 895e56f · 895e56f
1 parent b099a26
commit 895e56f
Show file tree

Hide file tree

Showing 29 changed files with 428 additions and 583 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ resolver = "2"
 edition = "2021"
 license = "BSD-3-Clause"
 repository = "https://github.com/DA0-DA0/dao-contracts"
-version = "2.5.0"
+version = "2.5.1"
 
 [profile.release]
 codegen-units = 1
@@ -85,51 +85,51 @@ wynd-utils = "0.4"
 # optional owner.
 cw-ownable = "0.5"
 
-btsg-ft-factory = { path = "./contracts/external/btsg-ft-factory", version = "2.5.0" }
-cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "2.5.0" }
-cw-denom = { path = "./packages/cw-denom", version = "2.5.0" }
-cw-fund-distributor = { path = "./contracts/distribution/cw-fund-distributor", version = "2.5.0" }
-cw-hooks = { path = "./packages/cw-hooks", version = "2.5.0" }
-cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.5.0" }
-cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.5.0" }
-cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.5.0" }
-cw-token-swap = { path = "./contracts/external/cw-token-swap", version = "2.5.0" }
-cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.5.0", default-features = false }
-cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.5.0", default-features = false }
-cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.5.0" }
-cw-wormhole = { path = "./packages/cw-wormhole", version = "2.5.0" }
-cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.5.0" }
-cw20-stake-external-rewards = { path = "./contracts/staking/cw20-stake-external-rewards", version = "2.5.0" }
-cw20-stake-reward-distributor = { path = "./contracts/staking/cw20-stake-reward-distributor", version = "2.5.0" }
-cw721-controllers = { path = "./packages/cw721-controllers", version = "2.5.0" }
-cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.5.0" }
-dao-cw721-extensions = { path = "./packages/dao-cw721-extensions", version = "2.5.0" }
-dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.5.0" }
-dao-dao-macros = { path = "./packages/dao-dao-macros", version = "2.5.0" }
-dao-hooks = { path = "./packages/dao-hooks", version = "2.5.0" }
-dao-interface = { path = "./packages/dao-interface", version = "2.5.0" }
-dao-migrator = { path = "./contracts/external/dao-migrator", version = "2.5.0" }
-dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.5.0" }
-dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.5.0" }
-dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.5.0" }
-dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "2.5.0" }
-dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single", version = "2.5.0" }
-dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "2.5.0" }
-dao-proposal-hook-counter = { path = "./contracts/test/dao-proposal-hook-counter", version = "2.5.0" }
-dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "2.5.0" }
-dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "2.5.0" }
-dao-proposal-sudo = { path = "./contracts/test/dao-proposal-sudo", version = "2.5.0" }
-dao-rewards-distributor = { path = "./contracts/distribution/dao-rewards-distributor", version = "2.5.0" }
-dao-test-custom-factory = { path = "./contracts/test/dao-test-custom-factory", version = "2.5.0" }
-dao-testing = { path = "./packages/dao-testing", version = "2.5.0" }
-dao-voting = { path = "./packages/dao-voting", version = "2.5.0" }
-dao-voting-cw20-balance = { path = "./contracts/test/dao-voting-cw20-balance", version = "2.5.0" }
-dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", version = "2.5.0" }
-dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.5.0" }
-dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", version = "2.5.0" }
-dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "2.5.0" }
-dao-voting-onft-staked = { path = "./contracts/voting/dao-voting-onft-staked", version = "2.5.0" }
-dao-voting-token-staked = { path = "./contracts/voting/dao-voting-token-staked", version = "2.5.0" }
+btsg-ft-factory = { path = "./contracts/external/btsg-ft-factory", version = "2.5.1" }
+cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "2.5.1" }
+cw-denom = { path = "./packages/cw-denom", version = "2.5.1" }
+cw-fund-distributor = { path = "./contracts/distribution/cw-fund-distributor", version = "2.5.1" }
+cw-hooks = { path = "./packages/cw-hooks", version = "2.5.1" }
+cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.5.1" }
+cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.5.1" }
+cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.5.1" }
+cw-token-swap = { path = "./contracts/external/cw-token-swap", version = "2.5.1" }
+cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.5.1", default-features = false }
+cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.5.1", default-features = false }
+cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.5.1" }
+cw-wormhole = { path = "./packages/cw-wormhole", version = "2.5.1" }
+cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.5.1" }
+cw20-stake-external-rewards = { path = "./contracts/staking/cw20-stake-external-rewards", version = "2.5.1" }
+cw20-stake-reward-distributor = { path = "./contracts/staking/cw20-stake-reward-distributor", version = "2.5.1" }
+cw721-controllers = { path = "./packages/cw721-controllers", version = "2.5.1" }
+cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.5.1" }
+dao-cw721-extensions = { path = "./packages/dao-cw721-extensions", version = "2.5.1" }
+dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.5.1" }
+dao-dao-macros = { path = "./packages/dao-dao-macros", version = "2.5.1" }
+dao-hooks = { path = "./packages/dao-hooks", version = "2.5.1" }
+dao-interface = { path = "./packages/dao-interface", version = "2.5.1" }
+dao-migrator = { path = "./contracts/external/dao-migrator", version = "2.5.1" }
+dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.5.1" }
+dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.5.1" }
+dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.5.1" }
+dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "2.5.1" }
+dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single", version = "2.5.1" }
+dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "2.5.1" }
+dao-proposal-hook-counter = { path = "./contracts/test/dao-proposal-hook-counter", version = "2.5.1" }
+dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "2.5.1" }
+dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "2.5.1" }
+dao-proposal-sudo = { path = "./contracts/test/dao-proposal-sudo", version = "2.5.1" }
+dao-rewards-distributor = { path = "./contracts/distribution/dao-rewards-distributor", version = "2.5.1" }
+dao-test-custom-factory = { path = "./contracts/test/dao-test-custom-factory", version = "2.5.1" }
+dao-testing = { path = "./packages/dao-testing", version = "2.5.1" }
+dao-voting = { path = "./packages/dao-voting", version = "2.5.1" }
+dao-voting-cw20-balance = { path = "./contracts/test/dao-voting-cw20-balance", version = "2.5.1" }
+dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", version = "2.5.1" }
+dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.5.1" }
+dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", version = "2.5.1" }
+dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "2.5.1" }
+dao-voting-onft-staked = { path = "./contracts/voting/dao-voting-onft-staked", version = "2.5.1" }
+dao-voting-token-staked = { path = "./contracts/voting/dao-voting-token-staked", version = "2.5.1" }
 
 # v1 dependencies. used for state migrations.
 cw-core-v1 = { package = "cw-core", version = "0.1.0" }

diff --git a/contracts/dao-dao-core/schema/dao-dao-core.json b/contracts/dao-dao-core/schema/dao-dao-core.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "dao-dao-core",
-  "contract_version": "2.5.0",
+  "contract_version": "2.5.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/distribution/cw-fund-distributor/schema/cw-fund-distributor.json b/contracts/distribution/cw-fund-distributor/schema/cw-fund-distributor.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-fund-distributor",
-  "contract_version": "2.5.0",
+  "contract_version": "2.5.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/distribution/dao-rewards-distributor/schema/dao-rewards-distributor.json b/contracts/distribution/dao-rewards-distributor/schema/dao-rewards-distributor.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "dao-rewards-distributor",
-  "contract_version": "2.5.0",
+  "contract_version": "2.5.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -225,6 +225,28 @@
         },
         "additionalProperties": false
       },
+      {
+        "description": "forcibly withdraw funds from the contract. this is unsafe and should only be used to recover funds that are stuck in the contract.",
+        "type": "object",
+        "required": [
+          "unsafe_force_withdraw"
+        ],
+        "properties": {
+          "unsafe_force_withdraw": {
+            "type": "object",
+            "required": [
+              "amount"
+            ],
+            "properties": {
+              "amount": {
+                "$ref": "#/definitions/Coin"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
       {
         "description": "Update the contract's ownership. The `action` to be provided can be either to propose transferring ownership to an account, accept a pending ownership transfer, or renounce the ownership permanently.",
         "type": "object",
@@ -299,6 +321,21 @@
         "description": "Binary is a wrapper around Vec<u8> to add base64 de/serialization with serde. It also adds some helper methods to help encode inline.\n\nThis is only needed as serde-json-{core,wasm} has a horrible encoding for Vec<u8>. See also <https://github.com/CosmWasm/cosmwasm/blob/main/docs/MESSAGE_TYPES.md>.",
         "type": "string"
       },
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint128"
+          },
+          "denom": {
+            "type": "string"
+          }
+        }
+      },
       "CreateMsg": {
         "type": "object",
         "required": [
@@ -899,8 +936,22 @@
   "migrate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "MigrateMsg",
-    "type": "object",
-    "additionalProperties": false
+    "oneOf": [
+      {
+        "description": "Migrate from v2.5.0",
+        "type": "object",
+        "required": [
+          "from_v250"
+        ],
+        "properties": {
+          "from_v250": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
   },
   "sudo": null,
   "responses": {

diff --git a/contracts/external/btsg-ft-factory/schema/btsg-ft-factory.json b/contracts/external/btsg-ft-factory/schema/btsg-ft-factory.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "btsg-ft-factory",
-  "contract_version": "2.5.0",
+  "contract_version": "2.5.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/external/cw-admin-factory/schema/cw-admin-factory.json b/contracts/external/cw-admin-factory/schema/cw-admin-factory.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-admin-factory",
-  "contract_version": "2.5.0",
+  "contract_version": "2.5.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -9,10 +9,7 @@
     "properties": {
       "admin": {
         "description": "The account allowed to execute this contract. If no admin, anyone can execute it.",
-        "type": [
-          "string",
-          "null"
-        ]
+        "type": ["string", "null"]
       }
     },
     "additionalProperties": false
@@ -24,17 +21,11 @@
       {
         "description": "Instantiates the target contract with the provided instantiate message, code ID, and label and updates the contract's admin to be itself.",
         "type": "object",
-        "required": [
-          "instantiate_contract_with_self_admin"
-        ],
+        "required": ["instantiate_contract_with_self_admin"],
         "properties": {
           "instantiate_contract_with_self_admin": {
             "type": "object",
-            "required": [
-              "code_id",
-              "instantiate_msg",
-              "label"
-            ],
+            "required": ["code_id", "instantiate_msg", "label"],
             "properties": {
               "code_id": {
                 "type": "integer",
@@ -56,18 +47,11 @@
       {
         "description": "Instantiates the target contract with the provided instantiate message, code ID, label, and salt, via instantiate2 to give a predictable address, and updates the contract's admin to be itself.",
         "type": "object",
-        "required": [
-          "instantiate2_contract_with_self_admin"
-        ],
+        "required": ["instantiate2_contract_with_self_admin"],
         "properties": {
           "instantiate2_contract_with_self_admin": {
             "type": "object",
-            "required": [
-              "code_id",
-              "instantiate_msg",
-              "label",
-              "salt"
-            ],
+            "required": ["code_id", "instantiate_msg", "label", "salt"],
             "properties": {
               "code_id": {
                 "type": "integer",
@@ -76,10 +60,7 @@
               },
               "expect": {
                 "description": "Optionally specify the expected address and fail if it doesn't match the instantiated contract. This makes it easy for a consumer to validate that they are using the correct address elsewhere.",
-                "type": [
-                  "string",
-                  "null"
-                ]
+                "type": ["string", "null"]
               },
               "instantiate_msg": {
                 "$ref": "#/definitions/Binary"
@@ -110,9 +91,7 @@
     "oneOf": [
       {
         "type": "object",
-        "required": [
-          "admin"
-        ],
+        "required": ["admin"],
         "properties": {
           "admin": {
             "type": "object",