Skip to content

Commit 2e8e2ce

Browse files
committed
feat: update cosmwasm 1.5.5
1 parent d46ff9c commit 2e8e2ce

File tree

11 files changed

+476
-594
lines changed

11 files changed

+476
-594
lines changed

Cargo.lock

+456-567
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repository = "https://github.com/icon-project/ibc-integration.git"
1313
version="0.1.1"
1414

1515
[workspace.dependencies]
16-
cosmwasm-std = {version="1.2.2",default-features = false,features = ["iterator", "ibc3","staking"]}
16+
cosmwasm-std = {version="1.5.5",default-features = false,features = ["iterator", "ibc3","staking"]}
1717
cosmwasm-storage = "1.2.2"
1818
cosmwasm-schema = "1.2.2"
1919
schemars = "0.8.12"

contracts/cosmwasm-vm/cw-common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["cdylib", "rlib"]
1111

1212
[dependencies]
1313
cosmwasm-schema = {workspace=true}
14-
cosmwasm-std = {workspace=true, features=["ibc3"]}
14+
cosmwasm-std = {workspace=true}
1515
serde = { workspace=true}
1616
cw-storage-plus = {workspace=true}
1717
serde_json = {workspace=true}

contracts/cosmwasm-vm/cw-ibc-core/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ exclude = [
1717
crate-type = ["cdylib", "rlib"]
1818

1919
[features]
20-
# for more explicit tests, cargo test --features=backtraces
21-
backtraces = ["cosmwasm-std/backtraces"]
20+
2221
# use library feature to disable all instantiate/execute/query exports
2322
library = []
2423

contracts/cosmwasm-vm/cw-icon-light-client/Cargo.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ crate-type = ["cdylib", "rlib"]
1717

1818
[features]
1919
default = []
20-
# for more explicit tests, cargo test --features=backtraces
21-
backtraces = ["cosmwasm-std/backtraces"]
20+
2221
# use library feature to disable all instantiate/execute/query exports
2322
library = []
2423
mock=[]
@@ -51,7 +50,6 @@ debug_print = {workspace=true}
5150

5251

5352
[dev-dependencies]
54-
cosmwasm = "0.7.2"
5553
hex-literal="*"
5654
test-utils={path="../../../libraries/rust/test-utils"}
5755
getrandom = {version = "0.2", default-features = false, features = ["custom"]}

contracts/cosmwasm-vm/cw-mock-ibc-connection/Cargo.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ exclude = [
1616
crate-type = ["cdylib", "rlib"]
1717

1818
[features]
19-
# for more explicit tests, cargo test --features=backtraces
20-
backtraces = ["cosmwasm-std/backtraces"]
19+
2120
# use native_ibc feature to enable entry points for ibc
2221
native_ibc = []
2322
library = []
@@ -48,6 +47,5 @@ cw-xcall = {workspace=true}
4847

4948

5049
[dev-dependencies]
51-
cosmwasm = "0.7.2"
5250
getrandom = {version = "0.2", default-features = false, features = ["custom"]}
5351
hex = "0.4.3"

contracts/cosmwasm-vm/cw-mock-ibc-core/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ incremental = false
2727
overflow-checks = true
2828

2929
[features]
30-
# for more explicit tests, cargo test --features=backtraces
31-
backtraces = ["cosmwasm-std/backtraces"]
30+
3231
# use library feature to disable all instantiate/execute/query exports
3332
library = []
3433

contracts/cosmwasm-vm/cw-mock-ibc-dapp/Cargo.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ exclude = [
1616
crate-type = ["cdylib", "rlib"]
1717

1818
[features]
19-
# for more explicit tests, cargo test --features=backtraces
20-
backtraces = ["cosmwasm-std/backtraces"]
19+
2120
# use native_ibc feature to enable entry points for ibc
2221
native_ibc = []
2322
library = []
@@ -46,6 +45,5 @@ debug_print={workspace=true}
4645

4746

4847
[dev-dependencies]
49-
cosmwasm = "0.7.2"
5048
getrandom = {version = "0.2", default-features = false, features = ["custom"]}
5149
hex = "0.4.3"

contracts/cosmwasm-vm/cw-xcall-ibc-connection/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ exclude = [
1616
crate-type = ["cdylib", "rlib"]
1717

1818
[features]
19-
# for more explicit tests, cargo test --features=backtraces
20-
backtraces = ["cosmwasm-std/backtraces"]
2119
# use native_ibc feature to enable entry points for ibc
2220
native_ibc = []
2321
library = []
@@ -48,6 +46,5 @@ cw-xcall = {workspace=true}
4846

4947

5048
[dev-dependencies]
51-
cosmwasm = "0.7.2"
5249
getrandom = {version = "0.2", default-features = false, features = ["custom"]}
5350
hex = "0.4.3"

libraries/rust/common/src/lib.rs

+12-8
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ impl<'a> PrimaryKey<'a> for &ClientId {
6363
impl KeyDeserialize for &ClientId {
6464
type Output = ClientId;
6565

66-
fn from_vec(value: Vec<u8>) -> StdResult<Self::Output> {
66+
fn from_vec(value: Vec<u8>) -> std::result::Result<ClientId, cosmwasm_std::StdError> {
6767
let result = String::from_utf8(value).unwrap();
6868
let client_id = ClientId::from_str(&result).unwrap();
6969
Ok(client_id)
@@ -191,13 +191,17 @@ impl<'a> PrimaryKey<'a> for &ChannelId {
191191

192192
impl KeyDeserialize for &ChannelId {
193193
type Output = ChannelId;
194-
fn from_vec(value: Vec<u8>) -> cosmwasm_std::StdResult<Self::Output> {
195-
let result = String::from_utf8(value)
196-
.map_err(StdError::invalid_utf8)
197-
.unwrap();
198-
let chan_id = ChannelId::from_str(&result).unwrap();
199-
Ok(chan_id)
200-
}
194+
195+
fn from_vec(value: Vec<u8>) -> StdResult<Self::Output> {
196+
todo!()
197+
}
198+
// fn from_vec(value: Vec<u8>) -> Result<Self::Output,cosmwasm_std::errors::std_error::StdError> {
199+
// let result = String::from_utf8(value)
200+
// .map_err(StdError::invalid_utf8)
201+
// .unwrap();
202+
// let chan_id = ChannelId::from_str(&result).unwrap();
203+
// Ok(chan_id)
204+
// }
201205
}
202206

203207
impl<'a> Prefixer<'a> for &ChannelId {

libraries/rust/test-utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
serde = { workspace=true}
1010
serde_json = "1.0"
11-
cosmwasm-std = {workspace=true, features = ["iterator", "ibc3"]}
11+
cosmwasm-std = {workspace=true, features = ["iterator"]}
1212
prost = { workspace=true}
1313
ibc-proto = { workspace=true}
1414
#ibc = { version = "0.32.0", default-features = false, features = ["parity-scale-codec", "mocks-no-std", "serde", "borsh"]}

0 commit comments

Comments
 (0)