diff --git a/Cargo.lock b/Cargo.lock index 35fff8807..1093236eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1338,17 +1338,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw-hooks" -version = "2.2.0" -source = "git+https://github.com/DA0-DA0/dao-contracts?branch=main#7f89ad1604e8022f202aef729853b0c8c7196988" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 1.2.0", - "thiserror", -] - [[package]] name = "cw-hooks" version = "2.4.2" @@ -1973,19 +1962,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw20" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45a8794a5dd33b66af34caee52a7beceb690856adcc1682b6e3db88b2cdee62" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 0.16.0", - "schemars", - "serde", -] - [[package]] name = "cw20" version = "1.1.2" @@ -2525,20 +2501,6 @@ dependencies = [ "dao-voting 2.5.0", ] -[[package]] -name = "dao-interface" -version = "2.2.0" -source = "git+https://github.com/DA0-DA0/dao-contracts?branch=main#7f89ad1604e8022f202aef729853b0c8c7196988" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-hooks 2.2.0", - "cw-utils 0.16.0", - "cw2 0.16.0", - "cw20 0.16.0", - "cw721 0.16.0", -] - [[package]] name = "dao-interface" version = "2.4.1" @@ -5401,7 +5363,6 @@ dependencies = [ "cw-vesting", "cw721-roles", "dao-cw-orch", - "dao-interface 2.2.0", "dao-interface 2.5.0", "dao-migrator", "dao-proposal-single 2.5.0", diff --git a/packages/cw-orch/Cargo.toml b/packages/cw-orch/Cargo.toml index 2bc5a3112..e9147b054 100644 --- a/packages/cw-orch/Cargo.toml +++ b/packages/cw-orch/Cargo.toml @@ -12,7 +12,7 @@ default = [] wasm_test = [] [dependencies] -btsg-ft-factory = { path = "../../contracts/external/btsg-ft-factory" } +btsg-ft-factory.workspace = true cosmwasm-std.workspace = true cw-orch.workspace = true cw20-stake.workspace = true diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml index 4ae7ec307..7a098602c 100644 --- a/scripts/Cargo.toml +++ b/scripts/Cargo.toml @@ -6,24 +6,23 @@ repository.workspace = true version.workspace = true [dependencies] -cw-orch = { workspace = true, features = ["daemon"] } -dao-cw-orch = { path = "../packages/cw-orch", version = "2.5.0" } +cw-orch = { workspace = true, features = ["daemon"] } +dao-cw-orch = { path = "../packages/cw-orch", version = "2.5.0" } # scripts specific dotenv = { version = "0.15.0" } pretty_env_logger = { version = "0.5.0" } # cw-orch enabled DAO DAO deps [dev-dependencies] -dao-interface-master = { package = "dao-interface", git = "https://github.com/DA0-DA0/dao-contracts", branch = "main" } -dao-proposal-sudo = { workspace = true, features = ["library"] } -dao-proposal-single = { workspace = true, features = ["library"] } -dao-interface = { workspace = true } -dao-voting = { workspace = true } -cw-payroll-factory = { workspace = true } -cw-token-swap = { workspace = true } -cw-admin-factory = { workspace = true } -cw-tokenfactory-issuer = { workspace = true } -cw-vesting = { workspace = true } -cw721-roles = { workspace = true } -dao-migrator = { workspace = true } -btsg-ft-factory = { workspace = true } \ No newline at end of file +dao-proposal-sudo = { workspace = true, features = ["library"] } +dao-proposal-single = { workspace = true, features = ["library"] } +dao-interface = { workspace = true } +dao-voting = { workspace = true } +cw-payroll-factory = { workspace = true } +cw-token-swap = { workspace = true } +cw-admin-factory = { workspace = true } +cw-tokenfactory-issuer = { workspace = true } +cw-vesting = { workspace = true } +cw721-roles = { workspace = true } +dao-migrator = { workspace = true } +btsg-ft-factory = { workspace = true }