Skip to content

Commit

Permalink
Merge pull request #287 from CosmWasm/cosmwasm-beta5
Browse files Browse the repository at this point in the history 
Cosmwasm beta5
  • Loading branch information
@ethanfrey
ethanfrey authored Apr 28, 2021
2 parents 475d5b5 + e82bed9 commit 2e6f291
Show file tree
Hide file tree
Showing 37 changed files with 564 additions and 69 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock
View file

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
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-beta4", features = ["iterator", "staking"] }
cosmwasm-std = { version = "0.14.0-beta5", 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-beta4" }
cosmwasm-schema = { version = "0.14.0-beta5" }
46 changes: 46 additions & 0 deletions contracts/cw1-subkeys/schema/execute_msg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,52 @@
}
},
"additionalProperties": false
},
{
"description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"update_admin"
],
"properties": {
"update_admin": {
"type": "object",
"required": [
"admin",
"contract_addr"
],
"properties": {
"admin": {
"type": "string"
},
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"clear_admin"
],
"properties": {
"clear_admin": {
"type": "object",
"required": [
"contract_addr"
],
"properties": {
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
}
]
}
Expand Down
46 changes: 46 additions & 0 deletions contracts/cw1-subkeys/schema/query_msg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,52 @@
}
},
"additionalProperties": false
},
{
"description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"update_admin"
],
"properties": {
"update_admin": {
"type": "object",
"required": [
"admin",
"contract_addr"
],
"properties": {
"admin": {
"type": "string"
},
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"clear_admin"
],
"properties": {
"clear_admin": {
"type": "object",
"required": [
"contract_addr"
],
"properties": {
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/cw1-whitelist/Cargo.toml
View file
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-beta2" }
cw1 = { path = "../../packages/cw1", version = "0.6.0-beta2" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-beta2" }
cosmwasm-std = { version = "0.14.0-beta4", features = ["iterator", "staking"] }
cosmwasm-std = { version = "0.14.0-beta5", 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-beta4" }
cosmwasm-schema = { version = "0.14.0-beta5" }
46 changes: 46 additions & 0 deletions contracts/cw1-whitelist/schema/execute_msg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,52 @@
}
},
"additionalProperties": false
},
{
"description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"update_admin"
],
"properties": {
"update_admin": {
"type": "object",
"required": [
"admin",
"contract_addr"
],
"properties": {
"admin": {
"type": "string"
},
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"clear_admin"
],
"properties": {
"clear_admin": {
"type": "object",
"required": [
"contract_addr"
],
"properties": {
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
}
]
}
Expand Down
46 changes: 46 additions & 0 deletions contracts/cw1-whitelist/schema/query_msg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,52 @@
}
},
"additionalProperties": false
},
{
"description": "Sets a new admin (for migrate) on the given contract. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"update_admin"
],
"properties": {
"update_admin": {
"type": "object",
"required": [
"admin",
"contract_addr"
],
"properties": {
"admin": {
"type": "string"
},
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "Clears the admin on the given contract, so no more migration possible. Fails if this contract is not currently admin of the target contract.",
"type": "object",
"required": [
"clear_admin"
],
"properties": {
"clear_admin": {
"type": "object",
"required": [
"contract_addr"
],
"properties": {
"contract_addr": {
"type": "string"
}
}
}
},
"additionalProperties": false
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/cw1155-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-beta2" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-beta2" }
cw1155 = { path = "../../packages/cw1155", version = "0.6.0-beta2" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-beta2" , features = ["iterator"]}
cosmwasm-std = { version = "0.14.0-beta4", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta5", 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
View file
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-beta2" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-beta2" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-beta2" }
cosmwasm-std = { version = "0.14.0-beta4", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta5", features = ["iterator"] }
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"] }
Expand All @@ -27,4 +27,4 @@ hex = "0.3.1"
sha2 = "0.8.0"

[dev-dependencies]
cosmwasm-schema = { version = "0.14.0-beta4" }
cosmwasm-schema = { version = "0.14.0-beta5" }
4 changes: 2 additions & 2 deletions contracts/cw20-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-beta2" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-beta2" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-beta2" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-beta2", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta4", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta5", 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-beta4" }
cosmwasm-schema = { version = "0.14.0-beta5" }
4 changes: 2 additions & 2 deletions contracts/cw20-bonding/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cw2 = { path = "../../packages/cw2", version = "0.6.0-beta2" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-beta2" }
cw20-base = { path = "../../contracts/cw20-base", version = "0.6.0-beta2", features = ["library"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-beta2" }
cosmwasm-std = { version = "0.14.0-beta4", features = ["staking"] }
cosmwasm-std = { version = "0.14.0-beta5", 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-beta4" }
cosmwasm-schema = { version = "0.14.0-beta5" }
4 changes: 2 additions & 2 deletions contracts/cw20-escrow/Cargo.toml
View file
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-beta2" }
cw2 = { path = "../../packages/cw2", version = "0.6.0-beta2" }
cw20 = { path = "../../packages/cw20", version = "0.6.0-beta2" }
cosmwasm-std = { version = "0.14.0-beta4", features = ["iterator"] }
cosmwasm-std = { version = "0.14.0-beta5", features = ["iterator"] }
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-beta4" }
cosmwasm-schema = { version = "0.14.0-beta5" }
cw-multi-test = { path = "../../packages/multi-test", version = "0.6.0-beta2" }
cw20-base = { path = "../cw20-base", version = "0.6.0-beta2", features = ["library"] }
Loading

0 comments on commit 2e6f291

Please sign in to comment.