From 4a15719ab76ca3ac4819c49ab9fc7fde3b2f6ca2 Mon Sep 17 00:00:00 2001
From: Sean Chen <seanchen11235@gmail.com>
Date: Mon, 5 Feb 2024 14:54:37 -0600
Subject: [PATCH 1/4] Import ibc::derive::ConsensusState macro

---
 Cargo.lock                          | 220 +++++++++++-----------------
 Cargo.toml                          |   8 +-
 crates/app/src/modules/ibc/impls.rs |   1 +
 3 files changed, 94 insertions(+), 135 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 708044d0..0b08d7b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -184,9 +184,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -198,7 +198,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 name = "basecoin-app"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "basecoin-store",
  "clap",
  "cosmrs",
@@ -483,41 +483,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "darling"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.40",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.40",
-]
-
 [[package]]
 name = "der"
 version = "0.7.8"
@@ -1005,9 +970,8 @@ dependencies = [
 
 [[package]]
 name = "ibc"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08258907d8b5b20b5de6eb064d17bc45fd4f48e64e96efbe62e035150a7d150e"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-apps",
  "ibc-clients",
@@ -1019,9 +983,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-transfer"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038cacbeb1658ee4295449676a4870fdc79b1edbcb5905f6ad64e68f200d1488"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-app-transfer-types",
  "ibc-core",
@@ -1030,9 +993,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-transfer-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d89a3a0233a4e5927b116a9e6dc222cbdab0cf0fd7f0dee6308c8eefc00bb63"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1045,18 +1007,16 @@ dependencies = [
 
 [[package]]
 name = "ibc-apps"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61d7aafdb984fcfbbc9268fd9fa924964c2f5dfd036c5bbe3695cf28b2b2f0ea"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-app-transfer",
 ]
 
 [[package]]
 name = "ibc-client-tendermint"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "189dd739853e9cef400b4cb91e58ba261b85f17002caa862a7af924237d14879"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-client-tendermint-types",
  "ibc-core-client",
@@ -1071,9 +1031,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-client-tendermint-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc6e8ff8d3a4477bfe8bc97f100dd7f13a7710e9de6e1541b76d33fa6a472ef"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "displaydoc",
  "ibc-core-client-types",
@@ -1087,20 +1046,33 @@ dependencies = [
  "tendermint-proto",
 ]
 
+[[package]]
+name = "ibc-client-wasm-types"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+dependencies = [
+ "base64 0.21.7",
+ "displaydoc",
+ "ibc-core-client",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+]
+
 [[package]]
 name = "ibc-clients"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875afb9fd11cfeaa23de0234b5a353781fb18b4c4fb165719eb29a9c69a3fae6"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-client-tendermint",
+ "ibc-client-wasm-types",
 ]
 
 [[package]]
 name = "ibc-core"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91444e562962b9dab6f44117cb8a20a2a681733108343c4d9fbf89c506fa8081"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1109,14 +1081,14 @@ dependencies = [
  "ibc-core-handler",
  "ibc-core-host",
  "ibc-core-router",
+ "ibc-derive",
  "ibc-primitives",
 ]
 
 [[package]]
 name = "ibc-core-channel"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6279ffdba5f9ea605688d2e769f5cefecd77c888d9b9d001862d2d9dfa16ee4d"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-channel-types",
  "ibc-core-client",
@@ -1130,9 +1102,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-channel-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445888ebca9e2e72a3c03a758254887ef5ef9a1bae6baf204f2b1f6f656f70ff"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1150,9 +1121,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8744739af25917b484d1030712af53331e62f0477b8411bd9ce5691c46a1b6dc"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-client-context",
  "ibc-core-client-types",
@@ -1164,9 +1134,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client-context"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a87a59fa85ceb0bcf5973e2327094605d2a0ef7f51e519a47f242d6d1322fe0"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1174,7 +1143,6 @@ dependencies = [
  "ibc-core-commitment-types",
  "ibc-core-handler-types",
  "ibc-core-host-types",
- "ibc-derive",
  "ibc-primitives",
  "subtle-encoding",
  "tendermint",
@@ -1182,9 +1150,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20be8f5b66c483810ff3bda67db59e5dedeeb5cef0edd18dc08f8c1f32804a2d"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1199,9 +1166,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-commitment-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f784dd0a1d15430dee55558b3f7d270d3a52539ad20e1e4530bd60959e590324"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1214,9 +1180,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-connection"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0075f40dae0d9d18b3e4335db78ec7cda962ba2ed791673d9015e636810b04fb"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-client",
  "ibc-core-connection-types",
@@ -1227,9 +1192,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-connection-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b27882397e2d105ddc57718b18c74c5b6db76ed40c97c5c53dc1620c99d0554c"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1245,9 +1209,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-handler"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd99fb91b3a2a4fe410a7d3f91a177f0cec32e4b29d878a334503d2341ea226"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1261,9 +1224,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-handler-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf5890e3a731ba6f615853858b73f5db91f5f31648208250e64473c44d90e36"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1282,9 +1244,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0e4e1f9e595af3f371e5cbeca6916e23eab1d2c172591fab51c21c0307642d7"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1301,9 +1262,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host-cosmos"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0d7c5228389e154b3a5ba9cc1c33eb481855aa8ae732a9135cb205a0acbca0a"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1325,9 +1285,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02ecf33c6a328b922b819c336a85a8ca9ff404c64ce024d01181754b3c2671f1"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1337,9 +1296,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-router"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bc590d9460935782d15f9ec307fa705847f88ca0a271c417f8b61ac4b7b55e0"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1352,9 +1310,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-router-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81c009c007673cfc677b120577dd11d95e8a7613eed5a8f0b9a9f0a23f9a4895"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1368,11 +1325,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-derive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cac1e3c7ab92abf785bb86675bdc02e3d67e9e4624c1d513e83ff3098f9c461"
+version = "0.6.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
- "darling",
  "proc-macro2",
  "quote",
  "syn 2.0.40",
@@ -1380,9 +1335,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-primitives"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff38e0e738c53cb38fe8a7b52571a7205c3014fa194dcebc018b5f0528258cc5"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1395,14 +1349,15 @@ dependencies = [
 
 [[package]]
 name = "ibc-proto"
-version = "0.39.1"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8a8b1356652b9f160f5a010dd6b084675b8a28e163bf2b41ca5abecf27d9701"
+checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "flex-error",
  "ics23",
+ "informalsystems-pbjson 0.7.0",
  "prost",
  "serde",
  "subtle-encoding",
@@ -1412,9 +1367,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-query"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6b842c18a030e4ad39f577739d0cce3ae47016b94ec59a8d200d326088bf51e"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "displaydoc",
  "ibc",
@@ -1431,7 +1385,7 @@ dependencies = [
  "anyhow",
  "bytes",
  "hex",
- "informalsystems-pbjson",
+ "informalsystems-pbjson 0.6.0",
  "prost",
  "ripemd",
  "serde",
@@ -1439,12 +1393,6 @@ dependencies = [
  "sha3",
 ]
 
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -1500,6 +1448,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "informalsystems-pbjson"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.9.0"
@@ -1918,7 +1876,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2034,7 +1992,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -2757,7 +2715,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "h2",
  "http",
diff --git a/Cargo.toml b/Cargo.toml
index 75ea7bc5..5b391adf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,13 +8,13 @@ members = [
 ]
 
 [workspace.dependencies]
-base64 = { version = "0.21", default-features = false, features = ["alloc"] }
+base64 = { version = "0.21.6", default-features = false, features = ["alloc"] }
 displaydoc = { version = "0.2", default-features = false }
 derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
 ed25519 = { version = "2.1.0", default-features = false }
-ibc = { version = "0.49.1", default-features = false, features = ["serde"] }
-ibc-query = { version = "0.49.1", default-features = false }
-ibc-proto = { version = "0.39.1", default-features = false }
+ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "790553e", default-features = false, features = ["serde"] }
+ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "790553e", default-features = false }
+ibc-proto = { version = "0.41.0", default-features = false }
 ics23 = { version = "0.11", default-features = false }
 prost = { version = "0.12", default-features = false }
 serde = "1.0"
diff --git a/crates/app/src/modules/ibc/impls.rs b/crates/app/src/modules/ibc/impls.rs
index 2296e136..f9dbf259 100644
--- a/crates/app/src/modules/ibc/impls.rs
+++ b/crates/app/src/modules/ibc/impls.rs
@@ -29,6 +29,7 @@ use ibc::core::handler::types::msgs::MsgEnvelope;
 use ibc::core::host::types::identifiers::Sequence;
 use ibc::core::host::{ExecutionContext, ValidationContext};
 use ibc::cosmos_host::IBC_QUERY_PATH;
+use ibc::derive::ConsensusState;
 use ibc::primitives::{Signer, Timestamp};
 use ibc::{
     apps::transfer::types::msgs::transfer::MsgTransfer,

From 03ce94f3b58bb57504cdd06188adb6cc9d425e05 Mon Sep 17 00:00:00 2001
From: Farhad Shabani <Farhad.Shabani@gmail.com>
Date: Mon, 5 Feb 2024 13:30:38 -0800
Subject: [PATCH 2/4] chore: track ibc-rs changes up to PR #1062 (#151)

* chore: track ibc-rs changes in 1060

* deps: bump ibc-proto-rs

* chore: track ibc-rs changes in PR 1062

* deps: update ibc rev to fcb273d

* deps: update ibc rev to 6d9416dc2

* chore: track changes in ibc-rs PR 972
---
 Cargo.lock                                    | 206 +++++++-----------
 Cargo.toml                                    |   6 +-
 crates/app/src/modules/ibc/client_contexts.rs |  70 ++----
 crates/app/src/modules/ibc/impls.rs           |   3 +-
 4 files changed, 109 insertions(+), 176 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 708044d0..ea8b335e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -483,41 +483,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "darling"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.40",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.40",
-]
-
 [[package]]
 name = "der"
 version = "0.7.8"
@@ -1005,9 +970,8 @@ dependencies = [
 
 [[package]]
 name = "ibc"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08258907d8b5b20b5de6eb064d17bc45fd4f48e64e96efbe62e035150a7d150e"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-apps",
  "ibc-clients",
@@ -1019,9 +983,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-transfer"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038cacbeb1658ee4295449676a4870fdc79b1edbcb5905f6ad64e68f200d1488"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-app-transfer-types",
  "ibc-core",
@@ -1030,9 +993,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-transfer-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d89a3a0233a4e5927b116a9e6dc222cbdab0cf0fd7f0dee6308c8eefc00bb63"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1045,18 +1007,16 @@ dependencies = [
 
 [[package]]
 name = "ibc-apps"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61d7aafdb984fcfbbc9268fd9fa924964c2f5dfd036c5bbe3695cf28b2b2f0ea"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-app-transfer",
 ]
 
 [[package]]
 name = "ibc-client-tendermint"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "189dd739853e9cef400b4cb91e58ba261b85f17002caa862a7af924237d14879"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-client-tendermint-types",
  "ibc-core-client",
@@ -1071,9 +1031,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-client-tendermint-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc6e8ff8d3a4477bfe8bc97f100dd7f13a7710e9de6e1541b76d33fa6a472ef"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "displaydoc",
  "ibc-core-client-types",
@@ -1087,20 +1046,33 @@ dependencies = [
  "tendermint-proto",
 ]
 
+[[package]]
+name = "ibc-client-wasm-types"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+dependencies = [
+ "base64 0.21.5",
+ "displaydoc",
+ "ibc-core-client",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+]
+
 [[package]]
 name = "ibc-clients"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875afb9fd11cfeaa23de0234b5a353781fb18b4c4fb165719eb29a9c69a3fae6"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-client-tendermint",
+ "ibc-client-wasm-types",
 ]
 
 [[package]]
 name = "ibc-core"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91444e562962b9dab6f44117cb8a20a2a681733108343c4d9fbf89c506fa8081"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1109,14 +1081,14 @@ dependencies = [
  "ibc-core-handler",
  "ibc-core-host",
  "ibc-core-router",
+ "ibc-derive",
  "ibc-primitives",
 ]
 
 [[package]]
 name = "ibc-core-channel"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6279ffdba5f9ea605688d2e769f5cefecd77c888d9b9d001862d2d9dfa16ee4d"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-core-channel-types",
  "ibc-core-client",
@@ -1130,9 +1102,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-channel-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445888ebca9e2e72a3c03a758254887ef5ef9a1bae6baf204f2b1f6f656f70ff"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1150,9 +1121,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8744739af25917b484d1030712af53331e62f0477b8411bd9ce5691c46a1b6dc"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-core-client-context",
  "ibc-core-client-types",
@@ -1164,9 +1134,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client-context"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a87a59fa85ceb0bcf5973e2327094605d2a0ef7f51e519a47f242d6d1322fe0"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1174,7 +1143,6 @@ dependencies = [
  "ibc-core-commitment-types",
  "ibc-core-handler-types",
  "ibc-core-host-types",
- "ibc-derive",
  "ibc-primitives",
  "subtle-encoding",
  "tendermint",
@@ -1182,9 +1150,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20be8f5b66c483810ff3bda67db59e5dedeeb5cef0edd18dc08f8c1f32804a2d"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1199,9 +1166,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-commitment-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f784dd0a1d15430dee55558b3f7d270d3a52539ad20e1e4530bd60959e590324"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1214,9 +1180,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-connection"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0075f40dae0d9d18b3e4335db78ec7cda962ba2ed791673d9015e636810b04fb"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-core-client",
  "ibc-core-connection-types",
@@ -1227,9 +1192,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-connection-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b27882397e2d105ddc57718b18c74c5b6db76ed40c97c5c53dc1620c99d0554c"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1245,9 +1209,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-handler"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd99fb91b3a2a4fe410a7d3f91a177f0cec32e4b29d878a334503d2341ea226"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1261,9 +1224,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-handler-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf5890e3a731ba6f615853858b73f5db91f5f31648208250e64473c44d90e36"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1282,9 +1244,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0e4e1f9e595af3f371e5cbeca6916e23eab1d2c172591fab51c21c0307642d7"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1301,9 +1262,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host-cosmos"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0d7c5228389e154b3a5ba9cc1c33eb481855aa8ae732a9135cb205a0acbca0a"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1325,9 +1285,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02ecf33c6a328b922b819c336a85a8ca9ff404c64ce024d01181754b3c2671f1"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1337,9 +1296,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-router"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bc590d9460935782d15f9ec307fa705847f88ca0a271c417f8b61ac4b7b55e0"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1352,9 +1310,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-router-types"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81c009c007673cfc677b120577dd11d95e8a7613eed5a8f0b9a9f0a23f9a4895"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1368,11 +1325,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-derive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cac1e3c7ab92abf785bb86675bdc02e3d67e9e4624c1d513e83ff3098f9c461"
+version = "0.6.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
- "darling",
  "proc-macro2",
  "quote",
  "syn 2.0.40",
@@ -1380,9 +1335,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-primitives"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff38e0e738c53cb38fe8a7b52571a7205c3014fa194dcebc018b5f0528258cc5"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1395,14 +1349,15 @@ dependencies = [
 
 [[package]]
 name = "ibc-proto"
-version = "0.39.1"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8a8b1356652b9f160f5a010dd6b084675b8a28e163bf2b41ca5abecf27d9701"
+checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553"
 dependencies = [
  "base64 0.21.5",
  "bytes",
  "flex-error",
  "ics23",
+ "informalsystems-pbjson 0.7.0",
  "prost",
  "serde",
  "subtle-encoding",
@@ -1412,9 +1367,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-query"
-version = "0.49.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6b842c18a030e4ad39f577739d0cce3ae47016b94ec59a8d200d326088bf51e"
+version = "0.50.0"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
 dependencies = [
  "displaydoc",
  "ibc",
@@ -1431,7 +1385,7 @@ dependencies = [
  "anyhow",
  "bytes",
  "hex",
- "informalsystems-pbjson",
+ "informalsystems-pbjson 0.6.0",
  "prost",
  "ripemd",
  "serde",
@@ -1439,12 +1393,6 @@ dependencies = [
  "sha3",
 ]
 
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -1500,6 +1448,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "informalsystems-pbjson"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d"
+dependencies = [
+ "base64 0.21.5",
+ "serde",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index 75ea7bc5..47538727 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,9 +12,9 @@ base64 = { version = "0.21", default-features = false, features = ["alloc"] }
 displaydoc = { version = "0.2", default-features = false }
 derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
 ed25519 = { version = "2.1.0", default-features = false }
-ibc = { version = "0.49.1", default-features = false, features = ["serde"] }
-ibc-query = { version = "0.49.1", default-features = false }
-ibc-proto = { version = "0.39.1", default-features = false }
+ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "2330339", default-features = false, features = ["serde"] }
+ibc-query = {  git = "https://github.com/cosmos/ibc-rs.git", rev = "2330339", default-features = false }
+ibc-proto = { version = "0.41.0", default-features = false }
 ics23 = { version = "0.11", default-features = false }
 prost = { version = "0.12", default-features = false }
 serde = "1.0"
diff --git a/crates/app/src/modules/ibc/client_contexts.rs b/crates/app/src/modules/ibc/client_contexts.rs
index 669d4989..4d196e42 100644
--- a/crates/app/src/modules/ibc/client_contexts.rs
+++ b/crates/app/src/modules/ibc/client_contexts.rs
@@ -19,38 +19,30 @@ impl<S> ClientValidationContext for IbcContext<S>
 where
     S: Store + Debug,
 {
-    /// Returns the time when the client state for the given [`ClientId`] was updated with a header for the given [`IbcHeight`]
-    fn client_update_time(
+    /// Returns the time and height when the client state for the given
+    /// [`ClientId`] was updated with a header for the given [`IbcHeight`]
+    fn update_meta(
         &self,
         client_id: &ClientId,
         height: &IbcHeight,
-    ) -> Result<Timestamp, ContextError> {
+    ) -> Result<(Timestamp, IbcHeight), ContextError> {
         let processed_timestamp = self
             .client_processed_times
             .get(&(client_id.clone(), *height))
             .cloned()
-            .ok_or(ClientError::ProcessedTimeNotFound {
+            .ok_or(ClientError::UpdateMetaDataNotFound {
                 client_id: client_id.clone(),
                 height: *height,
             })?;
-        Ok(processed_timestamp)
-    }
-
-    /// Returns the height when the client state for the given [`ClientId`] was updated with a header for the given [`IbcHeight`]
-    fn client_update_height(
-        &self,
-        client_id: &ClientId,
-        height: &IbcHeight,
-    ) -> Result<IbcHeight, ContextError> {
         let processed_height = self
             .client_processed_heights
             .get(&(client_id.clone(), *height))
             .cloned()
-            .ok_or(ClientError::ProcessedHeightNotFound {
+            .ok_or(ClientError::UpdateMetaDataNotFound {
                 client_id: client_id.clone(),
                 height: *height,
             })?;
-        Ok(processed_height)
+        Ok((processed_timestamp, processed_height))
     }
 }
 
@@ -97,61 +89,43 @@ where
         Ok(())
     }
 
-    /// Called upon successful client update.
-    /// Implementations are expected to use this to record the specified time as the time at which
-    /// this update (or header) was processed.
-    fn store_update_time(
+    fn delete_consensus_state(
         &mut self,
-        client_id: ClientId,
-        height: IbcHeight,
-        timestamp: Timestamp,
+        consensus_state_path: ClientConsensusStatePath,
     ) -> Result<(), ContextError> {
-        self.client_processed_times
-            .insert((client_id, height), timestamp);
+        self.consensus_state_store.delete(consensus_state_path);
         Ok(())
     }
 
-    /// Called upon successful client update.
-    /// Implementations are expected to use this to record the specified height as the height at
-    /// at which this update (or header) was processed.
-    fn store_update_height(
+    /// Called upon successful client update. Implementations are expected to
+    /// use this to record the specified time and height at which this update
+    /// (or header) was processed.
+    fn store_update_meta(
         &mut self,
         client_id: ClientId,
         height: IbcHeight,
+        host_timestamp: Timestamp,
         host_height: IbcHeight,
     ) -> Result<(), ContextError> {
+        self.client_processed_times
+            .insert((client_id.clone(), height), host_timestamp);
         self.client_processed_heights
             .insert((client_id, height), host_height);
         Ok(())
     }
 
-    /// Delete the update time associated with the client at the specified height.
-    fn delete_update_time(
-        &mut self,
-        client_id: ClientId,
-        height: IbcHeight,
-    ) -> Result<(), ContextError> {
-        self.client_processed_times.remove(&(client_id, height));
-        Ok(())
-    }
-
-    /// Delete the update height associated with the client at the specified height.
-    fn delete_update_height(
+    /// Delete the update time and height associated with the client at the
+    /// specified height.
+    fn delete_update_meta(
         &mut self,
         client_id: ClientId,
         height: IbcHeight,
     ) -> Result<(), ContextError> {
+        self.client_processed_times
+            .remove(&(client_id.clone(), height));
         self.client_processed_heights.remove(&(client_id, height));
         Ok(())
     }
-
-    fn delete_consensus_state(
-        &mut self,
-        consensus_state_path: ClientConsensusStatePath,
-    ) -> Result<(), ContextError> {
-        self.consensus_state_store.delete(consensus_state_path);
-        Ok(())
-    }
 }
 
 impl<S> CommonContext for IbcContext<S>
diff --git a/crates/app/src/modules/ibc/impls.rs b/crates/app/src/modules/ibc/impls.rs
index 2296e136..871e1124 100644
--- a/crates/app/src/modules/ibc/impls.rs
+++ b/crates/app/src/modules/ibc/impls.rs
@@ -19,7 +19,7 @@ use ibc::apps::transfer::handler::send_transfer;
 use ibc::clients::tendermint::client_state::ClientState as TmClientState;
 use ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusState;
 use ibc::clients::tendermint::types::ConsensusState as ConsensusStateType;
-use ibc::core::client::context::consensus_state::ConsensusState;
+use ibc::core::client::context::consensus_state::ConsensusState as _;
 use ibc::core::client::types::Height as IbcHeight;
 use ibc::core::commitment_types::commitment::{CommitmentPrefix, CommitmentRoot};
 use ibc::core::entrypoint::dispatch;
@@ -29,6 +29,7 @@ use ibc::core::handler::types::msgs::MsgEnvelope;
 use ibc::core::host::types::identifiers::Sequence;
 use ibc::core::host::{ExecutionContext, ValidationContext};
 use ibc::cosmos_host::IBC_QUERY_PATH;
+use ibc::derive::ConsensusState;
 use ibc::primitives::{Signer, Timestamp};
 use ibc::{
     apps::transfer::types::msgs::transfer::MsgTransfer,

From ab355eacb64f29628a4194cbc69d390a7a1facf3 Mon Sep 17 00:00:00 2001
From: Sean Chen <seanchen11235@gmail.com>
Date: Mon, 5 Feb 2024 15:48:15 -0600
Subject: [PATCH 3/4] Merge in changes from PR 151

---
 Cargo.lock | 72 +++++++++++++++++++++++++++---------------------------
 Cargo.toml |  6 ++---
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ea8b335e..b19416af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -184,9 +184,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64ct"
@@ -198,7 +198,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 name = "basecoin-app"
 version = "0.1.0"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "basecoin-store",
  "clap",
  "cosmrs",
@@ -971,7 +971,7 @@ dependencies = [
 [[package]]
 name = "ibc"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-apps",
  "ibc-clients",
@@ -984,7 +984,7 @@ dependencies = [
 [[package]]
 name = "ibc-app-transfer"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-app-transfer-types",
  "ibc-core",
@@ -994,7 +994,7 @@ dependencies = [
 [[package]]
 name = "ibc-app-transfer-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1008,7 +1008,7 @@ dependencies = [
 [[package]]
 name = "ibc-apps"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-app-transfer",
 ]
@@ -1016,7 +1016,7 @@ dependencies = [
 [[package]]
 name = "ibc-client-tendermint"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-client-tendermint-types",
  "ibc-core-client",
@@ -1032,7 +1032,7 @@ dependencies = [
 [[package]]
 name = "ibc-client-tendermint-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "displaydoc",
  "ibc-core-client-types",
@@ -1049,9 +1049,9 @@ dependencies = [
 [[package]]
 name = "ibc-client-wasm-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "displaydoc",
  "ibc-core-client",
  "ibc-core-host-types",
@@ -1063,7 +1063,7 @@ dependencies = [
 [[package]]
 name = "ibc-clients"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-client-tendermint",
  "ibc-client-wasm-types",
@@ -1072,7 +1072,7 @@ dependencies = [
 [[package]]
 name = "ibc-core"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1088,7 +1088,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-channel"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-channel-types",
  "ibc-core-client",
@@ -1103,7 +1103,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-channel-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1122,7 +1122,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-client"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-client-context",
  "ibc-core-client-types",
@@ -1135,7 +1135,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-client-context"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1151,7 +1151,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-client-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1167,7 +1167,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-commitment-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1181,7 +1181,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-connection"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-client",
  "ibc-core-connection-types",
@@ -1193,7 +1193,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-connection-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1210,7 +1210,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-handler"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1225,7 +1225,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-handler-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1245,7 +1245,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-host"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1263,7 +1263,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-host-cosmos"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1286,7 +1286,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-host-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1297,7 +1297,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-router"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1311,7 +1311,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-router-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1326,7 +1326,7 @@ dependencies = [
 [[package]]
 name = "ibc-derive"
 version = "0.6.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1336,7 +1336,7 @@ dependencies = [
 [[package]]
 name = "ibc-primitives"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1353,7 +1353,7 @@ version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd4ee32b22d3b06f31529b956f4928e5c9a068d71e46cf6abfa19c31ca550553"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "flex-error",
  "ics23",
@@ -1368,7 +1368,7 @@ dependencies = [
 [[package]]
 name = "ibc-query"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs.git?rev=2330339#2330339f5e0638b9abf36c177a1789ed189e3d92"
+source = "git+https://github.com/cosmos/ibc-rs.git?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
 dependencies = [
  "displaydoc",
  "ibc",
@@ -1454,7 +1454,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "serde",
 ]
 
@@ -1876,7 +1876,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -1992,7 +1992,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -2715,7 +2715,7 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64 0.21.5",
+ "base64 0.21.7",
  "bytes",
  "h2",
  "http",
diff --git a/Cargo.toml b/Cargo.toml
index 47538727..3f8f489e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,12 +8,12 @@ members = [
 ]
 
 [workspace.dependencies]
-base64 = { version = "0.21", default-features = false, features = ["alloc"] }
+base64 = { version = "0.21.6", default-features = false, features = ["alloc"] }
 displaydoc = { version = "0.2", default-features = false }
 derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
 ed25519 = { version = "2.1.0", default-features = false }
-ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "2330339", default-features = false, features = ["serde"] }
-ibc-query = {  git = "https://github.com/cosmos/ibc-rs.git", rev = "2330339", default-features = false }
+ibc = { git = "https://github.com/cosmos/ibc-rs.git", rev = "790553e", default-features = false, features = ["serde"] }
+ibc-query = {  git = "https://github.com/cosmos/ibc-rs.git", rev = "790553e", default-features = false }
 ibc-proto = { version = "0.41.0", default-features = false }
 ics23 = { version = "0.11", default-features = false }
 prost = { version = "0.12", default-features = false }

From d63c21503244acf8f25b3273bed25561b7425af7 Mon Sep 17 00:00:00 2001
From: Sean Chen <seanchen11235@gmail.com>
Date: Tue, 6 Feb 2024 10:19:33 -0600
Subject: [PATCH 4/4] Update cargo.toml ibc dependency

---
 Cargo.lock | 54 +++++++++++++++++++++++++++---------------------------
 Cargo.toml |  4 ++--
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e84b21ae..3b83a159 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1005,7 +1005,7 @@ dependencies = [
 [[package]]
 name = "ibc"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-apps",
  "ibc-clients",
@@ -1018,7 +1018,7 @@ dependencies = [
 [[package]]
 name = "ibc-app-transfer"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-app-transfer-types",
  "ibc-core",
@@ -1028,7 +1028,7 @@ dependencies = [
 [[package]]
 name = "ibc-app-transfer-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1042,7 +1042,7 @@ dependencies = [
 [[package]]
 name = "ibc-apps"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-app-transfer",
 ]
@@ -1050,7 +1050,7 @@ dependencies = [
 [[package]]
 name = "ibc-client-tendermint"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-client-tendermint-types",
  "ibc-core-client",
@@ -1066,7 +1066,7 @@ dependencies = [
 [[package]]
 name = "ibc-client-tendermint-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "displaydoc",
  "ibc-core-client-types",
@@ -1083,7 +1083,7 @@ dependencies = [
 [[package]]
 name = "ibc-client-wasm-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "base64",
  "displaydoc",
@@ -1097,7 +1097,7 @@ dependencies = [
 [[package]]
 name = "ibc-clients"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-client-tendermint",
  "ibc-client-wasm-types",
@@ -1106,7 +1106,7 @@ dependencies = [
 [[package]]
 name = "ibc-core"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1122,7 +1122,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-channel"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-core-channel-types",
  "ibc-core-client",
@@ -1137,7 +1137,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-channel-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1156,7 +1156,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-client"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-core-client-context",
  "ibc-core-client-types",
@@ -1169,7 +1169,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-client-context"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1185,7 +1185,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-client-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1201,7 +1201,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-commitment-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1215,7 +1215,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-connection"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-core-client",
  "ibc-core-connection-types",
@@ -1227,7 +1227,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-connection-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1244,7 +1244,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-handler"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -1259,7 +1259,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-handler-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1279,7 +1279,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-host"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1297,7 +1297,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-host-cosmos"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1320,7 +1320,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-host-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1331,7 +1331,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-router"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1345,7 +1345,7 @@ dependencies = [
 [[package]]
 name = "ibc-core-router-types"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1360,7 +1360,7 @@ dependencies = [
 [[package]]
 name = "ibc-derive"
 version = "0.6.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1370,7 +1370,7 @@ dependencies = [
 [[package]]
 name = "ibc-primitives"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -1402,7 +1402,7 @@ dependencies = [
 [[package]]
 name = "ibc-query"
 version = "0.50.0"
-source = "git+https://github.com/cosmos/ibc-rs?rev=790553e#790553e48586971065f53d04c132f51a2c1c7f1e"
+source = "git+https://github.com/cosmos/ibc-rs?rev=4769bd7#4769bd76525239279f08b93b0dfafd09eb294d9c"
 dependencies = [
  "displaydoc",
  "ibc",
diff --git a/Cargo.toml b/Cargo.toml
index 5b391adf..aa47a0f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,8 @@ base64 = { version = "0.21.6", default-features = false, features = ["alloc"] }
 displaydoc = { version = "0.2", default-features = false }
 derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display"] }
 ed25519 = { version = "2.1.0", default-features = false }
-ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "790553e", default-features = false, features = ["serde"] }
-ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "790553e", default-features = false }
+ibc = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false, features = ["serde"] }
+ibc-query = { git = "https://github.com/cosmos/ibc-rs", rev = "4769bd7", default-features = false }
 ibc-proto = { version = "0.41.0", default-features = false }
 ics23 = { version = "0.11", default-features = false }
 prost = { version = "0.12", default-features = false }