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.

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

Bump dependency to cosmasm v0.14.0-beta3 #269

Merged
merged 7 commits into from
Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 11 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions contracts/cw1-subkeys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
cw1 = { path = "../../packages/cw1", version = "0.6.0-alpha3" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw1-whitelist = { path = "../cw1-whitelist", version = "0.6.0-alpha3", features = ["library"] }
cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator", "staking"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["iterator", "staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
cosmwasm-schema = { version = "0.14.0-beta3" }
24 changes: 24 additions & 0 deletions contracts/cw1-subkeys/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,30 @@
}
},
"additionalProperties": false
},
{
"description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
"type": "object",
"required": [
"burn"
],
"properties": {
"burn": {
"type": "object",
"required": [
"amount"
],
"properties": {
"amount": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
},
"additionalProperties": false
}
]
},
Expand Down
24 changes: 24 additions & 0 deletions contracts/cw1-subkeys/schema/query_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,30 @@
}
},
"additionalProperties": false
},
{
"description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
"type": "object",
"required": [
"burn"
],
"properties": {
"burn": {
"type": "object",
"required": [
"amount"
],
"properties": {
"amount": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
},
"additionalProperties": false
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions contracts/cw1-whitelist/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ library = []
cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
cw1 = { path = "../../packages/cw1", version = "0.6.0-alpha3" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["iterator"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
cosmwasm-schema = { version = "0.14.0-beta3" }
24 changes: 24 additions & 0 deletions contracts/cw1-whitelist/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,30 @@
}
},
"additionalProperties": false
},
{
"description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
"type": "object",
"required": [
"burn"
],
"properties": {
"burn": {
"type": "object",
"required": [
"amount"
],
"properties": {
"amount": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
},
"additionalProperties": false
}
]
},
Expand Down
24 changes: 24 additions & 0 deletions contracts/cw1-whitelist/schema/query_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,30 @@
}
},
"additionalProperties": false
},
{
"description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
"type": "object",
"required": [
"burn"
],
"properties": {
"burn": {
"type": "object",
"required": [
"amount"
],
"properties": {
"amount": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
},
"additionalProperties": false
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/cw1155-base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw1155 = { path = "../../packages/cw1155", version = "0.6.0-alpha3" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3" , features = ["iterator"]}
cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }
Expand Down
4 changes: 2 additions & 2 deletions contracts/cw20-atomic-swap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ library = []
cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["iterator"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
Expand All @@ -27,4 +27,4 @@ hex = "0.3.1"
sha2 = "0.8.0"

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
cosmwasm-schema = { version = "0.14.0-beta3" }
4 changes: 2 additions & 2 deletions contracts/cw20-base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
cosmwasm-schema = { version = "0.14.0-beta3" }
4 changes: 2 additions & 2 deletions contracts/cw20-bonding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
cw20-base = { path = "../../contracts/cw20-base", version = "0.6.0-alpha3", features = ["library"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3" }
cosmwasm-std = { version = "0.14.0-beta2", features = ["staking"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["staking"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }
Expand All @@ -34,4 +34,4 @@ integer-sqrt = { version = "0.1.5" }
integer-cbrt = { version = "0.1" }

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
cosmwasm-schema = { version = "0.14.0-beta3" }
4 changes: 2 additions & 2 deletions contracts/cw20-escrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ library = []
cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["iterator"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
cosmwasm-schema = { version = "0.14.0-beta3" }
cw-multi-test = { path = "../../packages/multi-test", version = "0.6.0-alpha3" }
cw20-base = { path = "../cw20-base", version = "0.6.0-alpha3", features = ["library"] }
4 changes: 1 addition & 3 deletions contracts/cw20-escrow/src/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ fn escrow_happy_path_cw20_tokens() {
// set personal balance
let owner = Addr::unchecked("owner");
let init_funds = coins(2000, "btc");
router
.set_bank_balance(owner.clone(), init_funds.clone())
.unwrap();
router.set_bank_balance(&owner, init_funds.clone()).unwrap();

// set up cw20 contract with some tokens
let cw20_id = router.store_code(contract_cw20());
Expand Down
4 changes: 2 additions & 2 deletions contracts/cw20-staking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
cw-controllers = { path = "../../packages/controllers", version = "0.6.0-alpha3" }
cw20-base = { path = "../../contracts/cw20-base", version = "0.6.0-alpha3", features = ["library"] }
cosmwasm-std = { version = "0.14.0-beta2", features = ["staking"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
cosmwasm-schema = { version = "0.14.0-beta3" }
4 changes: 2 additions & 2 deletions contracts/cw20-staking/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ mod tests {

fn sample_validator(addr: &str) -> Validator {
Validator {
address: Addr::unchecked(addr),
address: addr.into(),
commission: Decimal::percent(3),
max_commission: Decimal::percent(10),
max_change_rate: Decimal::percent(1),
Expand All @@ -484,7 +484,7 @@ mod tests {
let can_redelegate = amount.clone();
let accumulated_rewards = coins(0, &amount.denom);
FullDelegation {
validator: Addr::unchecked(addr),
validator: addr.into(),
delegator: Addr::unchecked(MOCK_CONTRACT_ADDR),
amount,
can_redelegate,
Expand Down
10 changes: 5 additions & 5 deletions contracts/cw3-fixed-multisig/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
cw3 = { path = "../../packages/cw3", version = "0.6.0-alpha3" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta3", features = ["iterator"] }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta2" }
#cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
#cw20-base = { path = "../cw20-base", version = "0.6.0-alpha3", features = ["library"] }
#cw-multi-test = { path = "../../packages/multi-test", version = "0.6.0-alpha3" }
cosmwasm-schema = { version = "0.14.0-beta3" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
cw20-base = { path = "../cw20-base", version = "0.6.0-alpha3", features = ["library"] }
cw-multi-test = { path = "../../packages/multi-test", version = "0.6.0-alpha3" }
24 changes: 24 additions & 0 deletions contracts/cw3-fixed-multisig/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,30 @@
}
},
"additionalProperties": false
},
{
"description": "This will burn the given coins from the contract's account. There is no Cosmos SDK message that performs this, but it can be done by calling the bank keeper. Important if a contract controls significant token supply that must be retired.",
"type": "object",
"required": [
"burn"
],
"properties": {
"burn": {
"type": "object",
"required": [
"amount"
],
"properties": {
"amount": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
}
}
}
},
"additionalProperties": false
}
]
},
Expand Down
Loading