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

Update to 0.14.0 beta4 #280

Merged
merged 12 commits into from
Apr 21, 2021
Merged

Update to 0.14.0 beta4 #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
891f5da
Update packages to 0.14.0-beta4
maurolacy Apr 20, 2021
7cd195f
Add (empty) admin to WasmMsg::Instantiate
maurolacy Apr 20, 2021
512ee86
Update contracts to 0.14.0-beta4
maurolacy Apr 20, 2021
c7c58f1
Update cargo lock file
maurolacy Apr 20, 2021
dba6152
Remove Staking::Withdraw support / tests
maurolacy Apr 20, 2021
7960069
s/query_validators/query_all_validators
maurolacy Apr 20, 2021
78fa208
Fix clippy warning
maurolacy Apr 21, 2021
2397d93
Update schema
maurolacy Apr 21, 2021
bf7f8c6
Update packages schema
maurolacy Apr 21, 2021
9daea73
Revert "Remove Staking::Withdraw support / tests"
maurolacy Apr 21, 2021
5a745c8
Update withdrawing permission check
maurolacy Apr 21, 2021
f0f0efc
Replace StakignMsg::Withdraw with DistributionMsg::WithdrawDelegatorR…
maurolacy Apr 21, 2021
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
73 changes: 37 additions & 36 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-beta2" }
cw1 = { path = "../../packages/cw1", version = "0.6.0-beta2" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-beta2" }
cw1-whitelist = { path = "../cw1-whitelist", version = "0.6.0-beta2", features = ["library"] }
cosmwasm-std = { version = "=0.14.0-beta3", features = ["iterator", "staking"] }
cosmwasm-std = { version = "0.14.0-beta4", features = ["iterator", "staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-beta2", 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-beta3" }
cosmwasm-schema = { version = "0.14.0-beta4" }
97 changes: 68 additions & 29 deletions contracts/cw1-subkeys/schema/execute_msg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,18 @@
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"distribution"
],
"properties": {
"distribution": {
"$ref": "#/definitions/DistributionMsg"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
Expand All @@ -287,6 +299,55 @@
}
]
},
"DistributionMsg": {
"description": "The message types of the distribution module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto",
"anyOf": [
{
"description": "This is translated to a [MsgSetWithdrawAddress](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L29-L37). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"set_withdraw_address"
],
"properties": {
"set_withdraw_address": {
"type": "object",
"required": [
"address"
],
"properties": {
"address": {
"description": "The `withdraw_address`",
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "This is translated to a [[MsgWithdrawDelegatorReward](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L42-L50). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"withdraw_delegator_reward"
],
"properties": {
"withdraw_delegator_reward": {
"type": "object",
"required": [
"validator"
],
"properties": {
"validator": {
"description": "The `validator_address`",
"type": "string"
}
}
}
},
"additionalProperties": false
}
]
},
"Empty": {
"description": "An empty struct that serves as a placeholder in different places, such as contracts that don't set a custom message.\n\nIt is designed to be expressable in correct JSON and JSON Schema but contains no meaningful data. Previously we used enums without cases, but those cannot represented as valid JSON Schema (https://github.com/CosmWasm/cosmwasm/issues/451)",
"type": "object"
Expand Down Expand Up @@ -415,34 +476,6 @@
},
"additionalProperties": false
},
{
"description": "This is translated to a [MsgSetWithdrawAddress](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/distribution/v1beta1/tx.proto#L29-L37) followed by a [MsgWithdrawDelegatorReward](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/distribution/v1beta1/tx.proto#L42-L50). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"withdraw"
],
"properties": {
"withdraw": {
"type": "object",
"required": [
"validator"
],
"properties": {
"recipient": {
"description": "this is the \"withdraw address\", the one that should receive the rewards if None, then use delegator address",
"type": [
"string",
"null"
]
},
"validator": {
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "This is translated to a [MsgBeginRedelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L95-L105). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
Expand Down Expand Up @@ -518,7 +551,7 @@
"additionalProperties": false
},
{
"description": "Instantiates a new contracts from previously uploaded Wasm code.\n\nThis is translated to a [MsgInstantiateContract](https://github.com/CosmWasm/wasmd/blob/v0.14.0/x/wasm/internal/types/tx.proto#L47-L61). `sender` is automatically filled with the current contract's address.",
"description": "Instantiates a new contracts from previously uploaded Wasm code.\n\nThis is translated to a [MsgInstantiateContract](https://github.com/CosmWasm/wasmd/blob/v0.16.0-alpha1/x/wasm/internal/types/tx.proto#L47-L61). `sender` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"instantiate"
Expand All @@ -533,6 +566,12 @@
"send"
],
"properties": {
"admin": {
"type": [
"string",
"null"
]
},
"code_id": {
"type": "integer",
"format": "uint64",
Expand Down
Loading