moved all contract wrappers to dao-testing

Cargo.toml

@@ -85,25 +85,30 @@ 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" }
@@ -134,9 +139,12 @@ cw20-stake-external-rewards-v1 = { package = "stake-cw20-external-rewards", vers
 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" }
+cw4-voting-v1 = { package = "cw4-voting", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
+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" }
 voting-v1 = { package = "dao-voting", version = "0.1.0" }
+cw20-v1 = { version = "0.13", package = "cw20" }
+cw4-v1 = { version = "0.13", package = "cw4" }
 
 # v2.4.1 dependencies. used for state migrations.
 cw-denom-v241 = { package = "cw-denom", version = "=2.4.1" }

contracts/dao-dao-core/Cargo.toml

@@ -31,8 +31,10 @@ cw-paginate-storage = { workspace = true }
 cw-core-v1 = { workspace = true, features = ["library"] }
 
 [dev-dependencies]
+dao-dao-core = { workspace = true }
 cw-multi-test = { workspace = true }
 cw20-base = { workspace = true }
 cw721-base = { workspace = true }
 dao-proposal-sudo = { workspace = true }
+dao-testing = { workspace = true }
 dao-voting-cw20-balance = { workspace = true }