Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade CW packages to v2 #840

Draft
wants to merge 1 commit into
base: development
Choose a base branch
from
Draft

upgrade CW packages to v2 #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
965 changes: 553 additions & 412 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,21 @@ assert_matches = "1.5"
cosm-orc = { version = "4.0" }
cosm-tome = "0.2"
cosmos-sdk-proto = "0.19"
cosmwasm-schema = { version = "1.5.4" }
cosmwasm-std = { version = "1.5.4", features = ["ibc3"] }
cw-controllers = "1.1"
cw-multi-test = "0.18"
cw-storage-plus = { version = "1.1" }
cw-utils = "1.0"
cw2 = "1.1"
cw20 = "1.1"
cw20-base = "1.1"
cw3 = "1.1"
cw4 = "1.1"
cw4-group = "1.1"
cosmwasm-schema = "2.0.4"
cosmwasm-std = { version = "2.0.4", features = ["stargate"] }
cw-controllers = "2.0.0"
cw-multi-test = { version = "2.0.1", default-features = false }
cw-storage-plus = "2.0.0"
cw-utils = "2.0.0"
cw2 = "2.0.0"
cw20 = "2.0.0"
cw20-base = "2.0.0"
cw3 = "2.0.0"
cw4 = "2.0.0"
cw4-group = "2.0.0"
# TODO: update to v2
cw721 = "0.18"
# TODO: update to v2
cw721-base = "0.18"
env_logger = "0.10"
once_cell = "1.18"
Expand Down
2 changes: 1 addition & 1 deletion ci/bootstrap-env/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = { workspace = true }
cosm-orc = { workspace = true }
cw20 = { workspace = true }
cw-utils = { workspace = true }
cosmwasm-std = { workspace = true, features = ["ibc3"] }
cosmwasm-std = { workspace = true }
cw-admin-factory = { workspace = true }
dao-dao-core = { workspace = true }
cw20-stake = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion ci/integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cw721-base = { workspace = true }
cw721-roles = { workspace = true }
cw721 = { workspace = true }
cw-utils = { workspace = true }
cosmwasm-std = { workspace = true, features = ["ibc3"] }
cosmwasm-std = { workspace = true }

cw-vesting = { workspace = true }
cw20-stake = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions contracts/dao-dao-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

[dependencies]
cosmwasm-std = { workspace = true, features = ["ibc3"] }
cosmwasm-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
Expand All @@ -31,7 +31,7 @@ cw-paginate-storage = { workspace = true }
cw-core-v1 = { workspace = true, features = ["library"] }

[dev-dependencies]
cw-multi-test = { workspace = true, features = ["stargate"] }
cw-multi-test = { workspace = true }
cw20-base = { workspace = true }
cw721-base = { workspace = true }
dao-proposal-sudo = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion contracts/distribution/cw-fund-distributor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand Down
11 changes: 8 additions & 3 deletions contracts/distribution/dao-rewards-distributor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
[package]
name = "dao-rewards-distributor"
authors = ["Ben2x4 <Ben2x4@tutanota.com>", "ekez <ekez@withoutdoing.com>", "Jake Hartnell <no-reply@no-reply.com>", "bekauz <bekauz@protonmail.com>"]
authors = [
"Ben2x4 <Ben2x4@tutanota.com>",
"ekez <ekez@withoutdoing.com>",
"Jake Hartnell <no-reply@no-reply.com>",
"bekauz <bekauz@protonmail.com>",
]
description = "Distributes rewards based on DAO membership."
edition = { workspace = true }
license = { workspace = true }
Expand All @@ -11,7 +16,7 @@ version = { workspace = true }
crate-type = ["cdylib", "rlib"]

[features]
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand All @@ -21,7 +26,7 @@ cosmwasm-schema = { workspace = true }
cw2 = { workspace = true }
cw4 = { workspace = true }
cw20 = { workspace = true }
cw20-base = { workspace = true, features = ["library"] }
cw20-base = { workspace = true, features = ["library"] }
cw-controllers = { workspace = true }
cw-ownable = { workspace = true }
cw-storage-plus = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions contracts/external/cw-admin-factory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name ="cw-admin-factory"
name = "cw-admin-factory"
authors = ["Jake Hartnell", "blue-note", "ekez <ekez@withoutdoing.com>"]
description = "A CosmWasm factory contract for instantiating a contract as its own admin."
edition = { workspace = true }
Expand All @@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand Down
4 changes: 2 additions & 2 deletions contracts/external/cw-payroll-factory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name ="cw-payroll-factory"
name = "cw-payroll-factory"
authors = ["Jake Hartnell"]
description = "A CosmWasm factory contract for instantiating a payroll contract."
edition = { workspace = true }
Expand All @@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-token-swap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# For more explicit tests, `cargo test --features=backtraces`.
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# Use library feature to disable all instantiate/execute/query exports.
library = []

Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-tokenfactory-issuer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ crate-type = ["cdylib", "rlib"]
[features]
default = ["osmosis_tokenfactory"]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []
# use test tube feature to enable test-tube integration tests, for example
Expand Down
2 changes: 1 addition & 1 deletion contracts/external/cw-vesting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
[features]
default = ["staking"]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []
# enable staking features on chains that support staking. most do, so this is a
Expand Down
40 changes: 20 additions & 20 deletions contracts/external/cw721-roles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
[package]
name = "cw721-roles"
authors = ["Jake Hartnell"]
description = "Non-transferable CW721 NFT contract that incorporates voting weights and on-chain roles."
version = { workspace = true }
edition = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
name = "cw721-roles"
authors = ["Jake Hartnell"]
description = "Non-transferable CW721 NFT contract that incorporates voting weights and on-chain roles."
version = { workspace = true }
edition = { workspace = true }
repository = { workspace = true }
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

[dependencies]
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-controllers = { workspace = true }
cw-ownable = { workspace = true }
cosmwasm-std = { workspace = true }
cw-controllers = { workspace = true }
cw-ownable = { workspace = true }
cw-storage-plus = { workspace = true }
cw-utils = { workspace = true }
cw2 = { workspace = true }
cw4 = { workspace = true }
cw721 = { workspace = true }
cw721-base = { workspace = true, features = ["library"] }
cw-utils = { workspace = true }
cw2 = { workspace = true }
cw4 = { workspace = true }
cw721 = { workspace = true }
cw721-base = { workspace = true, features = ["library"] }
dao-cw721-extensions = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }

[dev-dependencies]
cw-multi-test = { workspace = true }
dao-testing = { workspace = true }
cw-multi-test = { workspace = true }
dao-testing = { workspace = true }
dao-voting-cw721-staked = { workspace = true }
64 changes: 32 additions & 32 deletions contracts/external/dao-migrator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
[package]
name = "dao-migrator"
authors = ["Art3mix <art3mix.90@gmail.com>"]
name = "dao-migrator"
authors = ["Art3mix <art3mix.90@gmail.com>"]
description = "A DAO DAO migrator module for modules."
edition = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
repository = { workspace = true }
version = { workspace = true }
repository = { workspace = true }
version = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

[dependencies]
cosmwasm-std = { workspace = true, features = ["ibc3"] }
cosmwasm-schema = { workspace = true }
cw-storage-plus = { workspace = true }
cw-utils = { workspace = true }
thiserror = { workspace = true }
cw2 = { workspace = true }
cw20 = { workspace = true }
dao-interface = { workspace = true }
cosmwasm-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cw-storage-plus = { workspace = true }
cw-utils = { workspace = true }
thiserror = { workspace = true }
cw2 = { workspace = true }
cw20 = { workspace = true }
dao-interface = { workspace = true }

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"] }
cw20-stake = { 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"] }
cw20-stake = { workspace = true, features = ["library"] }
dao-voting-cw20-staked = { workspace = true, features = ["library"] }
cw20-base = { workspace = true, features = ["library"] }
cw20-base = { workspace = true, features = ["library"] }

cw-utils-v1 = { workspace = true }
voting-v1 = { workspace = true }
cw-core-v1 = { workspace = true, features = ["library"] }
cw-proposal-single-v1 = { workspace = true, features = ["library"] }
cw-utils-v1 = { workspace = true }
voting-v1 = { workspace = true }
cw-core-v1 = { workspace = true, features = ["library"] }
cw-proposal-single-v1 = { workspace = true, features = ["library"] }
cw20-staked-balance-voting-v1 = { workspace = true, features = ["library"] }
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" }
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" }

[dev-dependencies]
cosmwasm-schema = { workspace = true }
cw-multi-test = { workspace = true }
dao-testing = { workspace = true }
anyhow = { workspace = true }
cw-multi-test = { workspace = true }
dao-testing = { workspace = true }
anyhow = { workspace = true }
7 changes: 5 additions & 2 deletions contracts/pre-propose/dao-pre-propose-approval-single/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[package]
name = "dao-pre-propose-approval-single"
authors = ["ekez <ekez@withoutdoing.com>", "Jake Hartnell <no-reply@no-reply.com>"]
authors = [
"ekez <ekez@withoutdoing.com>",
"Jake Hartnell <no-reply@no-reply.com>",
]
description = "A DAO DAO pre-propose module handling a proposal approval flow for for dao-proposal-single."
edition = { workspace = true }
license = { workspace = true }
Expand All @@ -12,7 +15,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand Down
7 changes: 5 additions & 2 deletions contracts/pre-propose/dao-pre-propose-approver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[package]
name = "dao-pre-propose-approver"
authors = ["ekez <ekez@withoutdoing.com>", "Jake Hartnell <no-reply@no-reply.com>"]
authors = [
"ekez <ekez@withoutdoing.com>",
"Jake Hartnell <no-reply@no-reply.com>",
]
description = "A DAO DAO pre-propose module for automatically making approval proposals for dao-pre-propose-approval-single."
edition = { workspace = true }
license = { workspace = true }
Expand All @@ -12,7 +15,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand Down
8 changes: 6 additions & 2 deletions contracts/pre-propose/dao-pre-propose-multiple/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "dao-pre-propose-multiple"
authors = ["ekez <zekemedley@gmail.com>", "Jake Hartnell <meow@no-reply.com>", "blue-note"]
authors = [
"ekez <zekemedley@gmail.com>",
"Jake Hartnell <meow@no-reply.com>",
"blue-note",
]
description = "A DAO DAO pre-propose module for dao-proposal-multiple for native and cw20 deposits."
edition = { workspace = true }
license = { workspace = true }
Expand All @@ -12,7 +16,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand Down
2 changes: 1 addition & 1 deletion contracts/pre-propose/dao-pre-propose-single/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
backtraces = ["cw-multi-test/backtrace"]
# use library feature to disable all instantiate/execute/query exports
library = []

Expand Down
Loading
Loading