Merge branch 'development' into noah/add-approver-reset

Cargo.toml

@@ -16,7 +16,7 @@ members = [
 edition = "2021"
 license = "BSD-3-Clause"
 repository = "https://github.com/DA0-DA0/dao-contracts"
-version = "2.3.0"
+version = "2.4.0"
 
 [profile.release]
 codegen-units = 1
@@ -32,17 +32,17 @@ rpath = false
 overflow-checks = true
 
 [workspace.dependencies]
-anyhow = {version = "1.0"}
+anyhow = { version = "1.0" }
 assert_matches = "1.5"
-cosm-orc = {version = "4.0"}
+cosm-orc = { version = "4.0" }
 cosm-tome = "0.2"
 cosmos-sdk-proto = "0.19"
-cosmwasm-schema = {version = "1.2"}
-cosmwasm-std = {version = "1.5.0", features = ["ibc3"]}
-cosmwasm-storage = {version = "1.2"}
+cosmwasm-schema = { version = "1.2" }
+cosmwasm-std = { version = "1.5.0", features = ["ibc3"] }
+cosmwasm-storage = { version = "1.2" }
 cw-controllers = "1.1"
 cw-multi-test = "0.18"
-cw-storage-plus = {version = "1.1"}
+cw-storage-plus = { version = "1.1" }
 cw-utils = "1.0"
 cw2 = "1.1"
 cw20 = "1.1"
@@ -61,68 +61,68 @@ prost = "0.11"
 quote = "1.0"
 rand = "0.8"
 schemars = "0.8"
-serde = {version = "1.0", default-features = false, features = ["derive"]}
+serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 sg-multi-test = "3.1.0"
 sg-std = "3.1.0"
 sg721 = "3.1.0"
 sg721-base = "3.1.0"
-syn = {version = "1.0", features = ["derive"]}
+syn = { version = "1.0", features = ["derive"] }
 test-context = "0.1"
-thiserror = {version = "1.0"}
+thiserror = { version = "1.0" }
 token-bindings = "0.11.0"
 wynd-utils = "0.4"
 
 # One commit ahead of version 0.3.0. Allows initialization with an
 # optional owner.
 cw-ownable = "0.5"
 
-cw-admin-factory = {path = "./contracts/external/cw-admin-factory", version = "2.3.0"}
-cw-denom = {path = "./packages/cw-denom", version = "2.3.0"}
-cw-hooks = {path = "./packages/cw-hooks", version = "2.3.0"}
-cw-paginate-storage = {path = "./packages/cw-paginate-storage", version = "2.3.0"}
-cw-payroll-factory = {path = "./contracts/external/cw-payroll-factory", version = "2.3.0"}
-cw-stake-tracker = {path = "./packages/cw-stake-tracker", version = "2.3.0"}
-cw-tokenfactory-issuer = {path = "./contracts/external/cw-tokenfactory-issuer", version = "2.3.0"}
-cw-vesting = {path = "./contracts/external/cw-vesting", version = "2.3.0"}
-cw-wormhole = {path = "./packages/cw-wormhole", version = "2.3.0"}
-cw20-stake = {path = "./contracts/staking/cw20-stake", version = "2.3.0"}
-cw721-controllers = {path = "./packages/cw721-controllers", version = "2.3.0"}
-cw721-roles = {path = "./contracts/external/cw721-roles", version = "2.3.0"}
-dao-cw721-extensions = {path = "./packages/dao-cw721-extensions", version = "2.3.0"}
-dao-dao-core = {path = "./contracts/dao-dao-core", version = "2.3.0"}
-dao-dao-macros = {path = "./packages/dao-dao-macros", version = "2.3.0"}
-dao-hooks = {path = "./packages/dao-hooks", version = "2.3.0"}
-dao-interface = {path = "./packages/dao-interface", version = "2.3.0"}
-dao-pre-propose-approval-single = {path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.3.0"}
-dao-pre-propose-approver = {path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.3.0"}
-dao-pre-propose-base = {path = "./packages/dao-pre-propose-base", version = "2.3.0"}
-dao-pre-propose-multiple = {path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "2.3.0"}
-dao-pre-propose-single = {path = "./contracts/pre-propose/dao-pre-propose-single", version = "2.3.0"}
-dao-proposal-condorcet = {path = "./contracts/proposal/dao-proposal-condorcet", version = "2.3.0"}
-dao-proposal-hook-counter = {path = "./contracts/test/dao-proposal-hook-counter", version = "2.3.0"}
-dao-proposal-multiple = {path = "./contracts/proposal/dao-proposal-multiple", version = "2.3.0"}
-dao-proposal-single = {path = "./contracts/proposal/dao-proposal-single", version = "2.3.0"}
-dao-proposal-sudo = {path = "./contracts/test/dao-proposal-sudo", version = "2.3.0"}
-dao-test-custom-factory = {path = "./contracts/test/dao-test-custom-factory", version = "2.3.0"}
-dao-testing = {path = "./packages/dao-testing", version = "2.3.0"}
-dao-voting = {path = "./packages/dao-voting", version = "2.3.0"}
-dao-voting-cw20-balance = {path = "./contracts/test/dao-voting-cw20-balance", version = "2.3.0"}
-dao-voting-cw20-staked = {path = "./contracts/voting/dao-voting-cw20-staked", version = "2.3.0"}
-dao-voting-cw4 = {path = "./contracts/voting/dao-voting-cw4", version = "2.3.0"}
-dao-voting-cw721-roles = {path = "./contracts/voting/dao-voting-cw721-roles", version = "2.3.0"}
-dao-voting-cw721-staked = {path = "./contracts/voting/dao-voting-cw721-staked", version = "2.3.0"}
-dao-voting-token-staked = {path = "./contracts/voting/dao-voting-token-staked", version = "2.3.0"}
+cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "2.4.0" }
+cw-denom = { path = "./packages/cw-denom", version = "2.4.0" }
+cw-hooks = { path = "./packages/cw-hooks", version = "2.4.0" }
+cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.4.0" }
+cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.4.0" }
+cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.4.0" }
+cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.4.0" }
+cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.4.0" }
+cw-wormhole = { path = "./packages/cw-wormhole", version = "2.4.0" }
+cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.4.0" }
+cw721-controllers = { path = "./packages/cw721-controllers", version = "2.4.0" }
+cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.4.0" }
+dao-cw721-extensions = { path = "./packages/dao-cw721-extensions", version = "2.4.0" }
+dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.4.0" }
+dao-dao-macros = { path = "./packages/dao-dao-macros", version = "2.4.0" }
+dao-hooks = { path = "./packages/dao-hooks", version = "2.4.0" }
+dao-interface = { path = "./packages/dao-interface", version = "2.4.0" }
+dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.4.0" }
+dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.4.0" }
+dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.4.0" }
+dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "2.4.0" }
+dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single", version = "2.4.0" }
+dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "2.4.0" }
+dao-proposal-hook-counter = { path = "./contracts/test/dao-proposal-hook-counter", version = "2.4.0" }
+dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "2.4.0" }
+dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "2.4.0" }
+dao-proposal-sudo = { path = "./contracts/test/dao-proposal-sudo", version = "2.4.0" }
+dao-test-custom-factory = { path = "./contracts/test/dao-test-custom-factory", version = "2.4.0" }
+dao-testing = { path = "./packages/dao-testing", version = "2.4.0" }
+dao-voting = { path = "./packages/dao-voting", version = "2.4.0" }
+dao-voting-cw20-balance = { path = "./contracts/test/dao-voting-cw20-balance", version = "2.4.0" }
+dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", version = "2.4.0" }
+dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "2.4.0" }
+dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", version = "2.4.0" }
+dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "2.4.0" }
+dao-voting-token-staked = { path = "./contracts/voting/dao-voting-token-staked", version = "2.4.0" }
 
 # v1 dependencies. used for state migrations.
-cw-core-v1 = {package = "cw-core", version = "0.1.0"}
-cw-proposal-single-v1 = {package = "cw-proposal-single", version = "0.1.0"}
-cw-utils-v1 = {package = "cw-utils", version = "0.13"}
-cw20-stake-external-rewards-v1 = {package = "stake-cw20-external-rewards", version = "0.2.6"}
-cw20-stake-reward-distributor-v1 = {package = "stake-cw20-reward-distributor", version = "0.1.0"}
-cw20-stake-v1 = {package = "cw20-stake", version = "0.2.6"}
-cw20-staked-balance-voting-v1 = {package = "cw20-staked-balance-voting", version = "0.1.0"}
-cw4-voting-v1 = {package = "cw4-voting", version = "0.1.0"}
-stake-cw20-v03 = {package = "stake-cw20", version = "0.2.6"}
-voting-v1 = {package = "dao-voting", version = "0.1.0"}
+cw-core-v1 = { package = "cw-core", version = "0.1.0" }
+cw-proposal-single-v1 = { package = "cw-proposal-single", version = "0.1.0" }
+cw-utils-v1 = { package = "cw-utils", version = "0.13" }
+cw20-stake-external-rewards-v1 = { package = "stake-cw20-external-rewards", version = "0.2.6" }
+cw20-stake-reward-distributor-v1 = { package = "stake-cw20-reward-distributor", version = "0.1.0" }
+cw20-stake-v1 = { package = "cw20-stake", version = "0.2.6" }
+cw20-staked-balance-voting-v1 = { package = "cw20-staked-balance-voting", version = "0.1.0" }
+cw4-voting-v1 = { package = "cw4-voting", version = "0.1.0" }
+stake-cw20-v03 = { package = "stake-cw20", version = "0.2.6" }
+voting-v1 = { package = "dao-voting", version = "0.1.0" }

ci/bootstrap-env/src/main.rs

@@ -107,6 +107,7 @@ fn main() -> Result<()> {
                     },
                 },
                 close_proposal_on_execution_failure: false,
+                veto: None,
             })?,
             admin: Some(Admin::CoreModule {}),
             funds: vec![],

ci/integration-tests/src/helpers/helper.rs

@@ -91,6 +91,7 @@ pub fn create_dao(
                         label: "DAO DAO Pre-Propose Module".to_string(),
                     },
                 },
+                veto: None,
             })?,
             admin: Some(Admin::CoreModule {}),
             funds: vec![],

contracts/dao-dao-core/schema/dao-dao-core.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "dao-dao-core",
-  "contract_version": "2.3.0",
+  "contract_version": "2.4.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw-admin-factory/schema/cw-admin-factory.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-admin-factory",
-  "contract_version": "2.3.0",
+  "contract_version": "2.4.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw-payroll-factory/schema/cw-payroll-factory.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-payroll-factory",
-  "contract_version": "2.3.0",
+  "contract_version": "2.4.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw-token-swap/schema/cw-token-swap.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-token-swap",
-  "contract_version": "2.3.0",
+  "contract_version": "2.4.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw-tokenfactory-issuer/schema/cw-tokenfactory-issuer.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-tokenfactory-issuer",
-  "contract_version": "2.3.0",
+  "contract_version": "2.4.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw-vesting/schema/cw-vesting.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-vesting",
-  "contract_version": "2.3.0",
+  "contract_version": "2.4.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/cw721-roles/schema/cw721-roles.json

@@ -1,6 +1,6 @@
 {
   "contract_name": "cw721-roles",
-  "contract_version": "2.3.0",
+  "contract_version": "2.4.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

contracts/external/dao-migrator/Cargo.toml

@@ -26,7 +26,7 @@ cw2              = { workspace = true }
 cw20             = { workspace = true }
 dao-interface    = { workspace = true }
 
-dao-dao-core               = { workspace = true, features = ["library"] }
+dao-dao-core           = { workspace = true, features = ["library"] }
 dao-voting             = { workspace = true }
 dao-proposal-single    = { workspace = true, features = ["library"] }
 dao-voting-cw4         = { workspace = true, features = ["library"] }
@@ -43,7 +43,7 @@ cw20-stake-v1                 = { workspace = true, features = ["library"] }
 cw-core-interface-v1          = { package = "cw-core-interface", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
 cw4-voting-v1                 = { package = "cw4-voting", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
 cw20-v1                       = { version = "0.13", package = "cw20" }
-cw4-v1                       = { version = "0.13", package = "cw4" }
+cw4-v1                        = { version = "0.13", package = "cw4" }
 
 [dev-dependencies]
 cosmwasm-schema = { workspace = true }

contracts/external/dao-migrator/examples/schema.rs

@@ -1,11 +1,10 @@
 use cosmwasm_schema::write_api;
-use dao_proposal_single::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use dao_migrator::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
 
 fn main() {
     write_api! {
         instantiate: InstantiateMsg,
         query: QueryMsg,
         execute: ExecuteMsg,
-        migrate: MigrateMsg,
     }
 }