Single Choice and Multiple Choice Veto

Cargo.toml

@@ -116,13 +116,13 @@ dao-voting-cw721-staked = {path = "./contracts/voting/dao-voting-cw721-staked",
 dao-voting-token-staked = {path = "./contracts/voting/dao-voting-token-staked", version = "2.3.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/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,
     }
 }