Skip to content

Commit e3beed0

Browse files
uintuint
committed
Update contracts to cosmwasm 0.16.0-rc4
1 parent 055dc0b commit e3beed0

File tree

27 files changed

+60
-66
lines changed

27 files changed

+60
-66
lines changed

‎Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contracts/cw1-subkeys/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2222
cw1 = { path = "../../packages/cw1", version = "0.7.0" }
2323
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2424
cw1-whitelist = { path = "../cw1-whitelist", version = "0.7.0", features = ["library"] }
25-
cosmwasm-std = { version = "0.16.0-rc2", features = ["iterator", "staking"] }
25+
cosmwasm-std = { version = "0.16.0-rc4", features = ["iterator", "staking"] }
2626
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
2727
schemars = "0.8.1"
2828
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2929
thiserror = { version = "1.0.23" }
3030

3131
[dev-dependencies]
32-
cosmwasm-schema = { version = "0.16.0-rc2" }
32+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw1-whitelist/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ library = []
2121
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2222
cw1 = { path = "../../packages/cw1", version = "0.7.0" }
2323
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
24-
cosmwasm-std = { version = "0.16.0-rc2", features = ["iterator", "staking"] }
24+
cosmwasm-std = { version = "0.16.0-rc4", features = ["iterator", "staking"] }
2525
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
2626
schemars = "0.8.1"
2727
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2828
thiserror = { version = "1.0.23" }
2929

3030
[dev-dependencies]
31-
cosmwasm-schema = { version = "0.16.0-rc2" }
31+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw1155-base/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2222
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2323
cw1155 = { path = "../../packages/cw1155", version = "0.7.0" }
2424
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
25-
cosmwasm-std = { version = "0.16.0-rc2" }
25+
cosmwasm-std = { version = "0.16.0-rc4" }
2626
schemars = "0.8.1"
2727
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2828
thiserror = { version = "1.0.20" }
2929

3030
[dev-dependencies]
31-
cosmwasm-schema = { version = "0.16.0-rc2" }
31+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw20-atomic-swap/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ library = []
1818
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
1919
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2020
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
21-
cosmwasm-std = { version = "0.16.0-rc2" }
21+
cosmwasm-std = { version = "0.16.0-rc4" }
2222
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
2323
schemars = "0.8.1"
2424
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
@@ -27,4 +27,4 @@ hex = "0.3.1"
2727
sha2 = "0.8.0"
2828

2929
[dev-dependencies]
30-
cosmwasm-schema = { version = "0.16.0-rc2" }
30+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw20-base/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2222
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2323
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
2424
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
25-
cosmwasm-std = { version = "0.16.0-rc2" }
25+
cosmwasm-std = { version = "0.16.0-rc4" }
2626
schemars = "0.8.1"
2727
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2828
thiserror = { version = "1.0.23" }
2929

3030
[dev-dependencies]
31-
cosmwasm-schema = { version = "0.16.0-rc2" }
31+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw20-bonding/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2525
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
2626
cw20-base = { path = "../../contracts/cw20-base", version = "0.7.0", features = ["library"] }
2727
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
28-
cosmwasm-std = { version = "0.16.0-rc2", default-features = false, features = ["staking"] }
28+
cosmwasm-std = { version = "0.16.0-rc4", default-features = false, features = ["staking"] }
2929
schemars = "0.8.1"
3030
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
3131
thiserror = { version = "1.0.23" }
@@ -34,4 +34,4 @@ integer-sqrt = { version = "0.1.5" }
3434
integer-cbrt = { version = "0.1.2" }
3535

3636
[dev-dependencies]
37-
cosmwasm-schema = { version = "0.16.0-rc2" }
37+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw20-escrow/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ library = []
2121
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2222
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2323
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
24-
cosmwasm-std = { version = "0.16.0-rc2" }
24+
cosmwasm-std = { version = "0.16.0-rc4" }
2525
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
2626
schemars = "0.8.1"
2727
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2828
thiserror = { version = "1.0.23" }
2929

3030
[dev-dependencies]
31-
cosmwasm-schema = { version = "0.16.0-rc2" }
31+
cosmwasm-schema = { version = "0.16.0-rc4" }
3232
cw-multi-test = { path = "../../packages/multi-test", version = "0.7.0" }
3333
cw20-base = { path = "../cw20-base", version = "0.7.0", features = ["library"] }

‎contracts/cw20-ics20/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ library = []
2121
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2222
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2323
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
24-
cosmwasm-std = { version = "0.16.0-rc2", features = ["iterator", "stargate"] }
24+
cosmwasm-std = { version = "0.16.0-rc4", features = ["iterator", "stargate"] }
2525
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
2626
schemars = "0.8.1"
2727
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2828
thiserror = { version = "1.0.23" }
2929

3030
[dev-dependencies]
31-
cosmwasm-schema = { version = "0.16.0-rc2" }
31+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw20-ics20/src/ibc.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,10 @@ pub fn ibc_packet_ack(
247247
msg: IbcPacketAckMsg,
248248
) -> Result<IbcBasicResponse, ContractError> {
249249
// TODO: trap error like in receive?
250-
let ack = msg.ack;
251-
let msg: Ics20Ack = from_binary(&ack.acknowledgement.data)?;
252-
match msg {
253-
Ics20Ack::Result(_) => on_packet_success(deps, ack.original_packet),
254-
Ics20Ack::Error(err) => on_packet_failure(deps, ack.original_packet, err),
250+
let ics20msg: Ics20Ack = from_binary(&msg.acknowledgement.data)?;
251+
match ics20msg {
252+
Ics20Ack::Result(_) => on_packet_success(deps, msg.original_packet),
253+
Ics20Ack::Error(err) => on_packet_failure(deps, msg.original_packet, err),
255254
}
256255
}
257256

@@ -353,10 +352,7 @@ mod test {
353352

354353
use crate::contract::query_channel;
355354
use cosmwasm_std::testing::mock_env;
356-
use cosmwasm_std::{
357-
coins, to_vec, IbcAcknowledgement, IbcAcknowledgementWithPacket, IbcEndpoint, IbcTimeout,
358-
Timestamp,
359-
};
355+
use cosmwasm_std::{coins, to_vec, IbcAcknowledgement, IbcEndpoint, IbcTimeout, Timestamp};
360356

361357
#[test]
362358
fn check_ack_json() {
@@ -478,11 +474,10 @@ mod test {
478474
assert_eq!(ack, no_funds);
479475

480476
// we get a success cache (ack) for a send
481-
let ack = IbcAcknowledgementWithPacket {
477+
let msg = IbcPacketAckMsg {
482478
acknowledgement: IbcAcknowledgement::new(ack_success()),
483479
original_packet: sent_packet,
484480
};
485-
let msg = IbcPacketAckMsg::new(ack);
486481
let res = ibc_packet_ack(deps.as_mut(), mock_env(), msg).unwrap();
487482
assert_eq!(0, res.messages.len());
488483

@@ -536,11 +531,10 @@ mod test {
536531
assert_eq!(ack, no_funds);
537532

538533
// we get a success cache (ack) for a send
539-
let ack = IbcAcknowledgementWithPacket {
534+
let msg = IbcPacketAckMsg {
540535
acknowledgement: IbcAcknowledgement::new(ack_success()),
541536
original_packet: sent_packet,
542537
};
543-
let msg = IbcPacketAckMsg::new(ack);
544538
let res = ibc_packet_ack(deps.as_mut(), mock_env(), msg).unwrap();
545539
assert_eq!(0, res.messages.len());
546540

‎contracts/cw20-staking/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2525
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
2626
cw-controllers = { path = "../../packages/controllers", version = "0.7.0" }
2727
cw20-base = { path = "../../contracts/cw20-base", version = "0.7.0", features = ["library"] }
28-
cosmwasm-std = { version = "0.16.0-rc2", features = ["staking"] }
28+
cosmwasm-std = { version = "0.16.0-rc4", features = ["staking"] }
2929
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
3030
schemars = "0.8.1"
3131
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
3232
thiserror = { version = "1.0.23" }
3333

3434
[dev-dependencies]
35-
cosmwasm-schema = { version = "0.16.0-rc2" }
35+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw3-fixed-multisig/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2222
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2323
cw3 = { path = "../../packages/cw3", version = "0.7.0" }
2424
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
25-
cosmwasm-std = { version = "0.16.0-rc2" }
25+
cosmwasm-std = { version = "0.16.0-rc4" }
2626
schemars = "0.8.1"
2727
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2828
thiserror = { version = "1.0.23" }
2929

3030
[dev-dependencies]
31-
cosmwasm-schema = { version = "0.16.0-rc2" }
31+
cosmwasm-schema = { version = "0.16.0-rc4" }
3232
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
3333
cw20-base = { path = "../cw20-base", version = "0.7.0", features = ["library"] }
3434
cw-multi-test = { path = "../../packages/multi-test", version = "0.7.0" }

‎contracts/cw3-flex-multisig/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ cw2 = { path = "../../packages/cw2", version = "0.7.0" }
2323
cw3 = { path = "../../packages/cw3", version = "0.7.0" }
2424
cw4 = { path = "../../packages/cw4", version = "0.7.0" }
2525
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
26-
cosmwasm-std = { version = "0.16.0-rc2" }
26+
cosmwasm-std = { version = "0.16.0-rc4" }
2727
schemars = "0.8.1"
2828
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
2929
thiserror = { version = "1.0.23" }
3030

3131
[dev-dependencies]
32-
cosmwasm-schema = { version = "0.16.0-rc2" }
32+
cosmwasm-schema = { version = "0.16.0-rc4" }
3333
cw4-group = { path = "../cw4-group", version = "0.7.0" }
3434
cw-multi-test = { path = "../../packages/multi-test", version = "0.7.0" }

‎contracts/cw4-group/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ cw2 = { path = "../../packages/cw2", version = "0.7.0" }
3131
cw4 = { path = "../../packages/cw4", version = "0.7.0" }
3232
cw-controllers = { path = "../../packages/controllers", version = "0.7.0" }
3333
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
34-
cosmwasm-std = { version = "0.16.0-rc2" }
34+
cosmwasm-std = { version = "0.16.0-rc4" }
3535
schemars = "0.8.1"
3636
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
3737
thiserror = { version = "1.0.23" }
3838

3939
[dev-dependencies]
40-
cosmwasm-schema = { version = "0.16.0-rc2" }
40+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw4-stake/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ cw4 = { path = "../../packages/cw4", version = "0.7.0" }
3232
cw20 = { path = "../../packages/cw20", version = "0.7.0" }
3333
cw-controllers = { path = "../../packages/controllers", version = "0.7.0" }
3434
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
35-
cosmwasm-std = { version = "0.16.0-rc2" }
35+
cosmwasm-std = { version = "0.16.0-rc4" }
3636
schemars = "0.8.1"
3737
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
3838
thiserror = { version = "1.0.23" }
3939

4040
[dev-dependencies]
41-
cosmwasm-schema = { version = "0.16.0-rc2" }
41+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎contracts/cw721-base/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ cw0 = { path = "../../packages/cw0", version = "0.7.0" }
2929
cw2 = { path = "../../packages/cw2", version = "0.7.0" }
3030
cw721 = { path = "../../packages/cw721", version = "0.7.0" }
3131
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
32-
cosmwasm-std = { version = "0.16.0-rc2" }
32+
cosmwasm-std = { version = "0.16.0-rc4" }
3333
schemars = "0.8.1"
3434
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
3535
thiserror = { version = "1.0.23" }
3636

3737
[dev-dependencies]
38-
cosmwasm-schema = { version = "0.16.0-rc2" }
38+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎packages/controllers/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ documentation = "https://docs.cosmwasm.com"
1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[dependencies]
15-
cosmwasm-std = { version = "0.16.0-rc2" }
15+
cosmwasm-std = { version = "0.16.0-rc4" }
1616
cw0 = { path = "../cw0", version = "0.7.0" }
1717
cw-storage-plus = { path = "../storage-plus", version = "0.7.0" }
1818
schemars = "0.8.1"

‎packages/cw0/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ documentation = "https://docs.cosmwasm.com"
1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[dependencies]
15-
cosmwasm-std = { version = "0.16.0-rc2" }
15+
cosmwasm-std = { version = "0.16.0-rc4" }
1616
schemars = "0.8.1"
1717
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1818
thiserror = { version = "1.0.21" }

‎packages/cw1/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ homepage = "https://cosmwasm.com"
1010
documentation = "https://docs.cosmwasm.com"
1111

1212
[dependencies]
13-
cosmwasm-std = { version = "0.16.0-rc2" }
13+
cosmwasm-std = { version = "0.16.0-rc4" }
1414
schemars = "0.8.1"
1515
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1616

1717
[dev-dependencies]
18-
cosmwasm-schema = { version = "0.16.0-rc2" }
18+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎packages/cw1155/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"
1111

1212
[dependencies]
1313
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
14-
cosmwasm-std = { version = "0.16.0-rc2" }
14+
cosmwasm-std = { version = "0.16.0-rc4" }
1515
schemars = "0.8.1"
1616
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1717

1818
[dev-dependencies]
19-
cosmwasm-schema = { version = "0.16.0-rc2" }
19+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎packages/cw2/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ homepage = "https://cosmwasm.com"
1010
documentation = "https://docs.cosmwasm.com"
1111

1212
[dependencies]
13-
cosmwasm-std = { version = "0.16.0-rc2", default-features = false }
13+
cosmwasm-std = { version = "0.16.0-rc4", default-features = false }
1414
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.7.0" }
1515
schemars = "0.8.1"
1616
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

‎packages/cw20/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"
1111

1212
[dependencies]
1313
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
14-
cosmwasm-std = { version = "0.16.0-rc2" }
14+
cosmwasm-std = { version = "0.16.0-rc4" }
1515
schemars = "0.8.1"
1616
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1717

1818
[dev-dependencies]
19-
cosmwasm-schema = { version = "0.16.0-rc2" }
19+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎packages/cw3/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"
1111

1212
[dependencies]
1313
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
14-
cosmwasm-std = { version = "0.16.0-rc2" }
14+
cosmwasm-std = { version = "0.16.0-rc4" }
1515
schemars = "0.8.1"
1616
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1717

1818
[dev-dependencies]
19-
cosmwasm-schema = { version = "0.16.0-rc2" }
19+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎packages/cw4/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ homepage = "https://cosmwasm.com"
1010
documentation = "https://docs.cosmwasm.com"
1111

1212
[dependencies]
13-
cosmwasm-std = { version = "0.16.0-rc2" }
13+
cosmwasm-std = { version = "0.16.0-rc4" }
1414
schemars = "0.8.1"
1515
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1616

1717
[dev-dependencies]
18-
cosmwasm-schema = { version = "0.16.0-rc2" }
18+
cosmwasm-schema = { version = "0.16.0-rc4" }

‎packages/cw721/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"
1111

1212
[dependencies]
1313
cw0 = { path = "../../packages/cw0", version = "0.7.0" }
14-
cosmwasm-std = { version = "0.16.0-rc2" }
14+
cosmwasm-std = { version = "0.16.0-rc4" }
1515
schemars = "0.8.1"
1616
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
1717

1818
[dev-dependencies]
19-
cosmwasm-schema = { version = "0.16.0-rc2" }
19+
cosmwasm-schema = { version = "0.16.0-rc4" }

0 commit comments

Comments
 (0)