diff --git a/.changelog/unreleased/bug-fixes/1084-fix-potential-base64-resolution-issue.md b/.changelog/unreleased/bug-fixes/1084-fix-potential-base64-resolution-issue.md new file mode 100644 index 000000000..17ab5aca2 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/1084-fix-potential-base64-resolution-issue.md @@ -0,0 +1,3 @@ +- [ibc] Resolve potential `base64` dependency resolution issue by bringing it to + the workspace `Cargo.toml` + ([\#1084](https://github.com/cosmos/ibc-rs/issues/1084)) diff --git a/Cargo.toml b/Cargo.toml index f645467b6..c4590de59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,6 +50,7 @@ authors = ["Informal Systems "] [workspace.dependencies] # external dependencies +base64 = { version = "0.21", default-features = false } borsh = { version = "0.10", default-features = false } displaydoc = { version = "0.2", default-features = false } derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display", "try_into"] } diff --git a/ci/cw-check/Cargo.lock b/ci/cw-check/Cargo.lock index b37e44bb4..98a8201e7 100644 --- a/ci/cw-check/Cargo.lock +++ b/ci/cw-check/Cargo.lock @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "bnum" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9008b6bb9fc80b5277f2fe481c09e828743d9151203e804583eb4c9e15b31d" +checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f" [[package]] name = "byte-slice-cast" @@ -120,9 +120,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "cosmwasm-crypto" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad24bc9dae9aac5dc124b4560e3f7678729d701f1bf3cb11140703d91f247d31" +checksum = "9934c79e58d9676edfd592557dee765d2a6ef54c09d5aa2edb06156b00148966" dependencies = [ "digest 0.10.7", "ecdsa", @@ -134,18 +134,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca65635b768406eabdd28ba015cc3f2f863ca5a2677a7dc4c237b8ee1298efb3" +checksum = "bc5e72e330bd3bdab11c52b5ecbdeb6a8697a004c57964caeb5d876f0b088b3c" dependencies = [ "syn 1.0.109", ] [[package]] name = "cosmwasm-schema" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e2a6ce6dbcad572495fd9d9c1072793fe682aebfcc09752c3b0de3fa1814d7" +checksum = "ac3e3a2136e2a60e8b6582f5dffca5d1a683ed77bf38537d330bc1dfccd69010" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904408dc6d73fd1d535c764a55370803cccf6b9be5af7423c4db8967058673f0" +checksum = "f5d803bea6bd9ed61bd1ee0b4a2eb09ee20dbb539cc6e0b8795614d20952ebb1" dependencies = [ "proc-macro2", "quote", @@ -167,9 +167,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed4564772e5d779235f2d7353e3d66e37793065c3a5155a2978256bf4c5b7d5" +checksum = "ef8666e572a3a2519010dde88c04d16e9339ae751b56b2bb35081fe3f7d6be74" dependencies = [ "base64 0.21.6", "bech32", @@ -181,7 +181,7 @@ dependencies = [ "hex", "schemars", "serde", - "serde-json-wasm 0.5.1", + "serde-json-wasm 0.5.2", "sha2 0.10.8", "static_assertions", "thiserror", @@ -970,9 +970,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "k256" -version = "0.13.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", "ecdsa", @@ -1287,9 +1287,9 @@ dependencies = [ [[package]] name = "serde-json-wasm" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137" +checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7" dependencies = [ "serde", ] diff --git a/ci/cw-check/Cargo.toml b/ci/cw-check/Cargo.toml index 72b1313f9..5b24d0e3c 100644 --- a/ci/cw-check/Cargo.toml +++ b/ci/cw-check/Cargo.toml @@ -9,8 +9,8 @@ crate-type = ["cdylib", "rlib"] [dependencies] ibc-apps = { path = "../../ibc-apps", default_features = false, features = ["serde", "parity-scale-codec"] } ibc-core = { path = "../../ibc-core", features = ["serde", "parity-scale-codec", "schema"] } -cosmwasm-std = { version = "^1.5.0", default-features = false } -cosmwasm-schema = { version = "^1.5.0", default-features = false } +cosmwasm-std = { version = "^1.5.3", default-features = false } +cosmwasm-schema = { version = "^1.5.3", default-features = false } serde_json = { package = "serde-json-wasm", version = "^1.0.1", default-features = false } thiserror = { version = "^1.0", default-features = false } diff --git a/ibc-apps/ics721-nft-transfer/types/Cargo.toml b/ibc-apps/ics721-nft-transfer/types/Cargo.toml index beda003a3..9deb1a361 100644 --- a/ibc-apps/ics721-nft-transfer/types/Cargo.toml +++ b/ibc-apps/ics721-nft-transfer/types/Cargo.toml @@ -20,7 +20,7 @@ all-features = true [dependencies] # external dependencies borsh = { workspace = true, optional = true } -base64 = { version = "0.21.6", default-features = false } +base64 = { workspace = true } derive_more = { workspace = true } displaydoc = { workspace = true } http = "1.0.0" diff --git a/ibc-clients/ics08-wasm/types/Cargo.toml b/ibc-clients/ics08-wasm/types/Cargo.toml index b920c4cba..3fbf0cb68 100644 --- a/ibc-clients/ics08-wasm/types/Cargo.toml +++ b/ibc-clients/ics08-wasm/types/Cargo.toml @@ -16,7 +16,7 @@ description = """ [dependencies] # external dependencies -base64 = { version = "0.21", default-features = false, features = ["alloc"] } +base64 = { workspace = true , features = ["alloc"] } displaydoc = { workspace = true } serde = { workspace = true , optional = true } cosmwasm-schema = { version = "1.4.1", default-features = false, optional = true }