diff --git a/Cargo.toml b/Cargo.toml
index e4cd45752..955e9b8a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,7 @@ members = [
   # internal crates that are not published
   "tests-integration",
 ]
+
 exclude = [
   "ci/cw-check",
   "ci/no-std-check",
@@ -105,8 +106,7 @@ ibc-client-tendermint-types = { version = "0.53.0", path = "./ibc-clients/ics07-
 ibc-client-wasm-types       = { version = "0.53.0", path = "./ibc-clients/ics08-wasm/types", default-features = false }
 ibc-app-transfer-types      = { version = "0.53.0", path = "./ibc-apps/ics20-transfer/types", default-features = false }
 ibc-app-nft-transfer-types  = { version = "0.53.0", path = "./ibc-apps/ics721-nft-transfer/types", default-features = false }
-
-ibc-proto = { version = "0.45.0", default-features = false }
+ibc-proto                   = { version = "0.45.0", default-features = false }
 
 # cosmos dependencies
 tendermint                       = { version = "0.36.0", default-features = false }
@@ -120,10 +120,10 @@ tendermint-testgen               = { version = "0.36.0", default-features = fals
 ### Note: Kept at the following version to match the CosmWasm module version
 ### used by chains supporting the wasm-enabled version of ibc-go v7.3
 ### (This is the min version of `ibc-go` that supports `08-wasm` light clients)
-cosmwasm-schema = { version = "1.5.4" }
-cosmwasm-std    = { version = "1.5.4" }
-cosmwasm-vm     = { version = "1.5.4" }
-cw-storage-plus = { version = "1.2.0" }
+cosmwasm-schema = { version = "2.0.4" }
+cosmwasm-std    = { version = "2.0.4" }
+cosmwasm-vm     = { version = "2.0.4" }
+cw-storage-plus = { version = "2.0.0" }
 
 # parity dependencies
 parity-scale-codec = { version = "3.6.5", default-features = false, features = [ "derive" ] }
diff --git a/ci/cw-check/Cargo.lock b/ci/cw-check/Cargo.lock
index a4fa71c13..e3222cac5 100644
--- a/ci/cw-check/Cargo.lock
+++ b/ci/cw-check/Cargo.lock
@@ -160,12 +160,11 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
 name = "cosmwasm-crypto"
-version = "1.5.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd50718a2b6830ce9eb5d465de5a018a12e71729d66b70807ce97e6dd14f931d"
+checksum = "c7a339f6b59ff7ad4ae05a70512a4f3c19bf8fcc845d46bfef90f4ec0810f72c"
 dependencies = [
  "digest 0.10.7",
- "ecdsa",
  "ed25519-zebra",
  "k256",
  "rand_core 0.6.4",
@@ -174,18 +173,18 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-derive"
-version = "1.5.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "242e98e7a231c122e08f300d9db3262d1007b51758a8732cd6210b3e9faa4f3a"
+checksum = "7d3bfea6af94a83880fb05478135ed0c256d9a2fcde58c595a10d64dcb9c925d"
 dependencies = [
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "cosmwasm-schema"
-version = "1.5.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7879036156092ad1c22fe0d7316efc5a5eceec2bc3906462a2560215f2a2f929"
+checksum = "101d0739564bd34cba9b84bf73665f0822487ae3b29b2dd59930608ed3aafd43"
 dependencies = [
  "cosmwasm-schema-derive",
  "schemars",
@@ -196,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-schema-derive"
-version = "1.5.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb57855fbfc83327f8445ae0d413b1a05ac0d68c396ab4d122b2abd7bb82cb6"
+checksum = "cf4be75f60158478da2c5d319ed59295bca1687ad50c18215a0485aa91a995ea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -207,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "cosmwasm-std"
-version = "1.5.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c1556156fdf892a55cced6115968b961eaaadd6f724a2c2cb7d1e168e32dd3"
+checksum = "ded932165de44cd0717979c34fc3b84d8e8066b8dde4f5bd78f96a643b090f90"
 dependencies = [
  "base64 0.21.7",
  "bech32",
@@ -221,7 +220,7 @@ dependencies = [
  "hex",
  "schemars",
  "serde",
- "serde-json-wasm 0.5.2",
+ "serde-json-wasm",
  "sha2 0.10.8",
  "static_assertions",
  "thiserror",
@@ -285,7 +284,7 @@ dependencies = [
  "cosmwasm-std",
  "ibc-apps",
  "ibc-core",
- "serde-json-wasm 1.0.1",
+ "serde-json-wasm",
  "thiserror",
 ]
 
@@ -602,7 +601,7 @@ version = "0.53.0"
 dependencies = [
  "ibc-app-transfer-types",
  "ibc-core",
- "serde-json-wasm 1.0.1",
+ "serde-json-wasm",
 ]
 
 [[package]]
@@ -999,9 +998,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "k256"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
 dependencies = [
  "cfg-if",
  "ecdsa",
@@ -1298,15 +1297,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-json-wasm"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde-json-wasm"
 version = "1.0.1"
diff --git a/ci/cw-check/Cargo.toml b/ci/cw-check/Cargo.toml
index 31627ddc3..d46ca8d85 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.4", default-features = false }
-cosmwasm-schema = { version = "1.5.4", default-features = false }
+cosmwasm-std    = { version = "2.0.4", default-features = false, features = [ "std" ] }
+cosmwasm-schema = { version = "2.0.4", 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-clients/cw-context/src/context/mod.rs b/ibc-clients/cw-context/src/context/mod.rs
index 40a027528..bc719d681 100644
--- a/ibc-clients/cw-context/src/context/mod.rs
+++ b/ibc-clients/cw-context/src/context/mod.rs
@@ -28,7 +28,7 @@ type Checksum = Vec<u8>;
 /// - Only a sorted set is needed. So the value type is set to
 /// [`Empty`] following
 /// ([cosmwasm-book](https://book.cosmwasm.com/cross-contract/map-storage.html#maps-as-sets)).
-pub const CONSENSUS_STATE_HEIGHT_MAP: Map<'_, (u64, u64), Empty> =
+pub const CONSENSUS_STATE_HEIGHT_MAP: Map<(u64, u64), Empty> =
     Map::new(ITERATE_CONSENSUS_STATE_PREFIX);
 
 /// Context is a wrapper around the deps and env that provides access
diff --git a/tests-integration/tests/cosmwasm/helper.rs b/tests-integration/tests/cosmwasm/helper.rs
index f1c9ad74b..e66e0036a 100644
--- a/tests-integration/tests/cosmwasm/helper.rs
+++ b/tests-integration/tests/cosmwasm/helper.rs
@@ -1,13 +1,16 @@
 use std::str::FromStr;
 
-use cosmwasm_std::testing::{mock_env, mock_info};
+use cosmwasm_std::testing::{message_info, mock_dependencies, mock_env};
 use cosmwasm_std::{coins, Env, MessageInfo, Timestamp as CwTimestamp};
 use ibc::clients::tendermint::types::ConsensusState;
 use ibc::core::primitives::Timestamp as IbcTimestamp;
 use tendermint::Hash;
 
 pub fn dummy_msg_info() -> MessageInfo {
-    mock_info("creator", &coins(1000, "ibc"))
+    let deps = mock_dependencies();
+    let creator = deps.api.addr_make("creator");
+
+    message_info(&creator, &coins(1000, "ibc"))
 }
 
 pub fn dummy_checksum() -> Vec<u8> {