diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 001ccfc..b3254a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ permissions:
   contents: read
 
 env:
-  nightly: nightly-2024-05-15
+  nightly: nightly-2024-09-08
 
 jobs:
   validate-swagger:
diff --git a/Cargo.lock b/Cargo.lock
index 67d6448..458e574 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2520,8 +2520,8 @@ dependencies = [
 
 [[package]]
 name = "ibc"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-apps",
  "ibc-clients",
@@ -2533,8 +2533,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-nft-transfer"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-app-nft-transfer-types",
  "ibc-core",
@@ -2543,8 +2543,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-nft-transfer-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "base64 0.22.1",
  "borsh",
@@ -2564,8 +2564,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-transfer"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-app-transfer-types",
  "ibc-core",
@@ -2574,8 +2574,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-app-transfer-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2592,8 +2592,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-apps"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-app-nft-transfer",
  "ibc-app-transfer",
@@ -2601,8 +2601,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-client-tendermint"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "derive_more",
  "ibc-client-tendermint-types",
@@ -2618,8 +2618,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-client-tendermint-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "displaydoc",
  "ibc-core-client-types",
@@ -2635,8 +2635,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-client-wasm-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "base64 0.22.1",
  "displaydoc",
@@ -2649,8 +2649,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-clients"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-client-tendermint",
  "ibc-client-wasm-types",
@@ -2658,8 +2658,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -2674,8 +2674,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-channel"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-core-channel-types",
  "ibc-core-client",
@@ -2689,8 +2689,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-channel-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2712,8 +2712,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-core-client-context",
  "ibc-core-client-types",
@@ -2725,8 +2725,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client-context"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -2741,8 +2741,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-client-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2761,8 +2761,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-commitment-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2780,8 +2780,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-connection"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-client-wasm-types",
  "ibc-core-client",
@@ -2789,13 +2789,13 @@ dependencies = [
  "ibc-core-handler-types",
  "ibc-core-host",
  "ibc-primitives",
- "prost",
+ "prost 0.13.2",
 ]
 
 [[package]]
 name = "ibc-core-connection-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2815,8 +2815,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-handler"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "ibc-core-channel",
  "ibc-core-client",
@@ -2830,8 +2830,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-handler-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2854,8 +2854,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -2872,8 +2872,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host-cosmos"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -2895,8 +2895,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-host-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2910,8 +2910,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-router"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "derive_more",
  "displaydoc",
@@ -2924,8 +2924,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-core-router-types"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
@@ -2943,8 +2943,8 @@ dependencies = [
 
 [[package]]
 name = "ibc-derive"
-version = "0.7.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.8.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2953,15 +2953,15 @@ dependencies = [
 
 [[package]]
 name = "ibc-primitives"
-version = "0.53.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=0c3b3c0ab598e1e627089d06941efe0e39b61cd7#0c3b3c0ab598e1e627089d06941efe0e39b61cd7"
+version = "0.54.0"
+source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=38bd2a32f35117d4d9165a3c68c64ccd87ad56dd#38bd2a32f35117d4d9165a3c68c64ccd87ad56dd"
 dependencies = [
  "borsh",
  "derive_more",
  "displaydoc",
  "ibc-proto",
  "parity-scale-codec",
- "prost",
+ "prost 0.13.2",
  "scale-info",
  "schemars",
  "serde",
@@ -2971,9 +2971,9 @@ dependencies = [
 
 [[package]]
 name = "ibc-proto"
-version = "0.46.0"
+version = "0.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cb09e0b52b8a16e98ce98845e7c15b018440f3c56defa12fa44782cd66bab65"
+checksum = "c852d22b782d2d793f4a646f968de419be635e02bc8798d5d74a6e44eef27733"
 dependencies = [
  "base64 0.22.1",
  "borsh",
@@ -2982,7 +2982,7 @@ dependencies = [
  "ics23",
  "informalsystems-pbjson",
  "parity-scale-codec",
- "prost",
+ "prost 0.13.2",
  "scale-info",
  "schemars",
  "serde",
@@ -2992,9 +2992,9 @@ dependencies = [
 
 [[package]]
 name = "ics23"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc3b8be84e7285c73b88effdc3294b552277d6b0ec728ee016c861b7b9a2c19c"
+checksum = "73b17f1a5bd7d12ad30a21445cfa5f52fd7651cb3243ba866f9916b1ec112f12"
 dependencies = [
  "anyhow",
  "blake2",
@@ -3002,7 +3002,7 @@ dependencies = [
  "bytes",
  "hex",
  "informalsystems-pbjson",
- "prost",
+ "prost 0.13.2",
  "ripemd",
  "serde",
  "sha2 0.10.8",
@@ -3606,7 +3606,7 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
 [[package]]
 name = "namada_account"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "namada_core",
@@ -3618,7 +3618,7 @@ dependencies = [
 [[package]]
 name = "namada_controller"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "namada_core",
  "smooth-operator",
@@ -3628,7 +3628,7 @@ dependencies = [
 [[package]]
 name = "namada_core"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "bech32 0.8.1",
  "borsh",
@@ -3639,7 +3639,6 @@ dependencies = [
  "ethabi",
  "ethbridge-structs",
  "eyre",
- "futures",
  "ibc",
  "ics23",
  "impl-num-traits",
@@ -3655,9 +3654,10 @@ dependencies = [
  "num256",
  "num_enum",
  "primitive-types",
- "prost-types",
+ "prost-types 0.13.2",
  "rand 0.8.5",
  "rand_core 0.6.4",
+ "rayon",
  "ripemd",
  "serde",
  "serde_json",
@@ -3678,7 +3678,7 @@ dependencies = [
 [[package]]
 name = "namada_ethereum_bridge"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "ethers",
@@ -3696,7 +3696,7 @@ dependencies = [
  "namada_trans_token",
  "namada_tx",
  "namada_vote_ext",
- "namada_vp",
+ "namada_vp_env",
  "serde",
  "smooth-operator",
  "thiserror",
@@ -3706,7 +3706,7 @@ dependencies = [
 [[package]]
 name = "namada_events"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "namada_core",
@@ -3720,7 +3720,7 @@ dependencies = [
 [[package]]
 name = "namada_gas"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "namada_core",
@@ -3733,7 +3733,7 @@ dependencies = [
 [[package]]
 name = "namada_governance"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "itertools 0.12.1",
@@ -3745,7 +3745,7 @@ dependencies = [
  "namada_state",
  "namada_systems",
  "namada_tx",
- "namada_vp",
+ "namada_vp_env",
  "serde",
  "serde_json",
  "smooth-operator",
@@ -3756,7 +3756,7 @@ dependencies = [
 [[package]]
 name = "namada_ibc"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "data-encoding",
@@ -3770,12 +3770,11 @@ dependencies = [
  "namada_gas",
  "namada_macros",
  "namada_state",
- "namada_storage",
  "namada_systems",
  "namada_tx",
  "namada_vp",
  "primitive-types",
- "prost",
+ "prost 0.13.2",
  "serde",
  "serde_json",
  "sha2 0.9.9",
@@ -3784,10 +3783,23 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "namada_io"
+version = "0.43.0"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
+dependencies = [
+ "async-trait",
+ "kdam",
+ "namada_core",
+ "tendermint-rpc",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "namada_macros"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "data-encoding",
  "proc-macro2",
@@ -3799,14 +3811,14 @@ dependencies = [
 [[package]]
 name = "namada_merkle_tree"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "eyre",
  "ics23",
  "namada_core",
  "namada_macros",
- "prost",
+ "prost 0.13.2",
  "sparse-merkle-tree",
  "thiserror",
 ]
@@ -3814,15 +3826,14 @@ dependencies = [
 [[package]]
 name = "namada_parameters"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "namada_core",
  "namada_macros",
  "namada_state",
- "namada_storage",
  "namada_systems",
  "namada_tx",
- "namada_vp",
+ "namada_vp_env",
  "smooth-operator",
  "thiserror",
 ]
@@ -3830,7 +3841,7 @@ dependencies = [
 [[package]]
 name = "namada_proof_of_stake"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "itertools 0.12.1",
@@ -3841,10 +3852,9 @@ dependencies = [
  "namada_events",
  "namada_macros",
  "namada_state",
- "namada_storage",
  "namada_systems",
  "namada_tx",
- "namada_vp",
+ "namada_vp_env",
  "once_cell",
  "serde",
  "smooth-operator",
@@ -3855,7 +3865,7 @@ dependencies = [
 [[package]]
 name = "namada_replay_protection"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "namada_core",
 ]
@@ -3863,7 +3873,7 @@ dependencies = [
 [[package]]
 name = "namada_sdk"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "async-trait",
  "bimap",
@@ -3872,18 +3882,15 @@ dependencies = [
  "circular-queue",
  "clap",
  "data-encoding",
- "derivation-path",
  "duration-str",
  "either",
  "ethbridge-bridge-contract",
  "ethers",
  "eyre",
  "fd-lock",
- "flume",
  "futures",
  "init-once",
  "itertools 0.12.1",
- "kdam",
  "lazy_static",
  "masp_primitives",
  "masp_proofs",
@@ -3894,6 +3901,7 @@ dependencies = [
  "namada_gas",
  "namada_governance",
  "namada_ibc",
+ "namada_io",
  "namada_macros",
  "namada_parameters",
  "namada_proof_of_stake",
@@ -3904,32 +3912,30 @@ dependencies = [
  "namada_vm",
  "namada_vote_ext",
  "namada_vp",
+ "namada_wallet",
  "num-traits 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "num256",
- "orion",
  "owo-colors",
  "paste",
  "patricia_tree",
- "prost",
+ "prost 0.13.2",
  "rand 0.8.5",
  "rand_core 0.6.4",
  "rayon",
  "regex",
  "reqwest",
+ "rustversion",
  "serde",
  "serde_json",
  "sha2 0.9.9",
- "slip10_ed25519",
  "smooth-operator",
  "tempfile",
  "tendermint-rpc",
  "thiserror",
  "tiny-bip39",
- "tiny-hderive",
  "tokio",
  "toml 0.5.11",
  "tracing",
- "typed-builder",
  "xorf",
  "zeroize",
 ]
@@ -3937,34 +3943,48 @@ dependencies = [
 [[package]]
 name = "namada_shielded_token"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
+ "async-trait",
  "borsh",
+ "eyre",
+ "flume",
+ "futures",
+ "itertools 0.12.1",
  "lazy_static",
  "masp_primitives",
  "masp_proofs",
  "namada_account",
  "namada_controller",
  "namada_core",
+ "namada_events",
  "namada_gas",
+ "namada_io",
+ "namada_macros",
  "namada_state",
- "namada_storage",
  "namada_systems",
  "namada_tx",
- "namada_vp",
+ "namada_vp_env",
+ "namada_wallet",
+ "rand 0.8.5",
  "rand_core 0.6.4",
+ "rayon",
  "ripemd",
  "serde",
+ "serde_json",
  "sha2 0.9.9",
  "smooth-operator",
+ "tempfile",
  "thiserror",
  "tracing",
+ "typed-builder",
+ "xorf",
 ]
 
 [[package]]
 name = "namada_state"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "clru",
@@ -3987,11 +4007,12 @@ dependencies = [
 [[package]]
 name = "namada_storage"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "itertools 0.12.1",
  "namada_core",
+ "namada_gas",
  "namada_macros",
  "namada_merkle_tree",
  "namada_replay_protection",
@@ -4005,23 +4026,23 @@ dependencies = [
 [[package]]
 name = "namada_systems"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "namada_core",
+ "namada_events",
  "namada_storage",
 ]
 
 [[package]]
 name = "namada_token"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "namada_core",
  "namada_events",
  "namada_macros",
  "namada_shielded_token",
- "namada_storage",
  "namada_systems",
  "namada_trans_token",
  "serde",
@@ -4030,16 +4051,15 @@ dependencies = [
 [[package]]
 name = "namada_trans_token"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "konst",
  "namada_core",
  "namada_events",
  "namada_state",
- "namada_storage",
  "namada_systems",
  "namada_tx",
- "namada_vp",
+ "namada_vp_env",
  "thiserror",
  "tracing",
 ]
@@ -4047,7 +4067,7 @@ dependencies = [
 [[package]]
 name = "namada_tx"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "ark-bls12-381",
  "bitflags 2.6.0",
@@ -4056,14 +4076,15 @@ dependencies = [
  "either",
  "konst",
  "masp_primitives",
+ "namada_account",
  "namada_core",
  "namada_events",
  "namada_gas",
  "namada_macros",
  "num-derive 0.4.2",
  "num-traits 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "prost",
- "prost-types",
+ "prost 0.13.2",
+ "prost-types 0.13.2",
  "rand_core 0.6.4",
  "serde",
  "serde_json",
@@ -4075,10 +4096,11 @@ dependencies = [
 [[package]]
 name = "namada_vm"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "clru",
+ "namada_account",
  "namada_core",
  "namada_events",
  "namada_gas",
@@ -4096,7 +4118,7 @@ dependencies = [
 [[package]]
 name = "namada_vote_ext"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "borsh",
  "namada_core",
@@ -4108,7 +4130,7 @@ dependencies = [
 [[package]]
 name = "namada_vp"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "namada_core",
  "namada_events",
@@ -4124,17 +4146,47 @@ dependencies = [
 [[package]]
 name = "namada_vp_env"
 version = "0.43.0"
-source = "git+https://github.com/anoma/namada?tag=v0.43.0#f5c3b708018c38bb8768da57ce3199a208ff9e12"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
 dependencies = [
  "derivative",
  "masp_primitives",
  "namada_core",
  "namada_events",
+ "namada_gas",
  "namada_storage",
  "namada_tx",
  "smooth-operator",
 ]
 
+[[package]]
+name = "namada_wallet"
+version = "0.43.0"
+source = "git+https://github.com/anoma/namada?rev=6c813dfc3cd3ba3757ee29923a78caa2124704e9#6c813dfc3cd3ba3757ee29923a78caa2124704e9"
+dependencies = [
+ "bimap",
+ "borsh",
+ "borsh-ext",
+ "data-encoding",
+ "derivation-path",
+ "fd-lock",
+ "itertools 0.12.1",
+ "masp_primitives",
+ "namada_core",
+ "namada_ibc",
+ "namada_macros",
+ "orion",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "serde",
+ "slip10_ed25519",
+ "smooth-operator",
+ "thiserror",
+ "tiny-bip39",
+ "tiny-hderive",
+ "toml 0.5.11",
+ "zeroize",
+]
+
 [[package]]
 name = "nanorand"
 version = "0.7.0"
@@ -4926,7 +4978,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
  "bytes",
- "prost-derive",
+ "prost-derive 0.12.6",
+]
+
+[[package]]
+name = "prost"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995"
+dependencies = [
+ "bytes",
+ "prost-derive 0.13.2",
 ]
 
 [[package]]
@@ -4943,8 +5005,8 @@ dependencies = [
  "once_cell",
  "petgraph",
  "prettyplease",
- "prost",
- "prost-types",
+ "prost 0.12.6",
+ "prost-types 0.12.6",
  "regex",
  "syn 2.0.68",
  "tempfile",
@@ -4963,13 +5025,35 @@ dependencies = [
  "syn 2.0.68",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
+dependencies = [
+ "anyhow",
+ "itertools 0.13.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
- "prost",
+ "prost 0.12.6",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
+dependencies = [
+ "prost 0.13.2",
 ]
 
 [[package]]
@@ -5878,7 +5962,7 @@ dependencies = [
 [[package]]
 name = "sparse-merkle-tree"
 version = "0.3.1-pre"
-source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=bab8cb96872db22cc9a139b2d3dfc4e00521d097#bab8cb96872db22cc9a139b2d3dfc4e00521d097"
+source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=a93c55ccd47840ee0967eee237e47d9245478594#a93c55ccd47840ee0967eee237e47d9245478594"
 dependencies = [
  "borsh",
  "cfg-if",
@@ -6081,9 +6165,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "954496fbc9716eb4446cdd6d00c071a3e2f22578d62aa03b40c7e5b4fda3ed42"
+checksum = "505d9d6ffeb83b1de47c307c6e0d2dff56c6256989299010ad03cd80a8491e97"
 dependencies = [
  "bytes",
  "digest 0.10.7",
@@ -6094,8 +6178,8 @@ dependencies = [
  "k256",
  "num-traits 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell",
- "prost",
- "prost-types",
+ "prost 0.13.2",
+ "prost-types 0.13.2",
  "ripemd",
  "serde",
  "serde_bytes",
@@ -6112,9 +6196,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-config"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84b11b57d20ee4492a1452faff85f5c520adc36ca9fe5e701066935255bb89f"
+checksum = "9de111ea653b2adaef627ac2452b463c77aa615c256eaaddf279ec5a1cf9775f"
 dependencies = [
  "flex-error",
  "serde",
@@ -6126,9 +6210,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-light-client-verifier"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3848090df4502a09ee27cb1a00f1835e1111c8993b22c5e1e41ffb7f6f09d57e"
+checksum = "7a2674adbf0dc51aa0c8eaf8462c7d6692ec79502713e50ed5432a442002be90"
 dependencies = [
  "derive_more",
  "flex-error",
@@ -6139,14 +6223,14 @@ dependencies = [
 
 [[package]]
 name = "tendermint-proto"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc87024548c7f3da479885201e3da20ef29e85a3b13d04606b380ac4c7120d87"
+checksum = "8ed14abe3b0502a3afe21ca74ca5cdd6c7e8d326d982c26f98a394445eb31d6e"
 dependencies = [
  "bytes",
  "flex-error",
- "prost",
- "prost-types",
+ "prost 0.13.2",
+ "prost-types 0.13.2",
  "serde",
  "serde_bytes",
  "subtle-encoding",
@@ -6155,9 +6239,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-rpc"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfdc2281e271277fda184d96d874a6fe59f569b130b634289257baacfc95aa85"
+checksum = "02f96a2b8a0d3d0b59e4024b1a6bdc1589efc6af4709d08a480a20cc4ba90f63"
 dependencies = [
  "async-trait",
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index c5cef49..fa4c7a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,15 +24,15 @@ diesel_migrations = { version = "2.2.0", default-features = false, features = [
 futures = "0.3.30"
 itertools = "0.13.0"
 lazy_static = "1.4.0"
-namada_core = { git = "https://github.com/anoma/namada", tag = "v0.43.0" }
-namada_sdk = { git = "https://github.com/anoma/namada", tag = "v0.43.0" }
-namada_tx = { git = "https://github.com/anoma/namada", tag = "v0.43.0" }
+namada_core = { git = "https://github.com/anoma/namada", rev = "6c813dfc3cd3ba3757ee29923a78caa2124704e9" }
+namada_sdk = { git = "https://github.com/anoma/namada", rev = "6c813dfc3cd3ba3757ee29923a78caa2124704e9" }
+namada_tx = { git = "https://github.com/anoma/namada", rev = "6c813dfc3cd3ba3757ee29923a78caa2124704e9" }
 orm = { path = "orm" }
 serde = { version = "1.0.138", features = [ "derive" ] }
 serde_json = "1.0"
 shared = { path = "shared" }
-tendermint = "0.37.0"
-tendermint-rpc = { version = "0.37.0", features = ["http-client"] }
+tendermint = "0.38.0"
+tendermint-rpc = { version = "0.38.0", features = ["http-client"] }
 thiserror = "1.0.56"
 tokio = { version = "1.0", features = [ "full" ] }
 tokio-retry = "0.3"
diff --git a/rust-nightly-version b/rust-nightly-version
index d7d44f1..2a62052 100644
--- a/rust-nightly-version
+++ b/rust-nightly-version
@@ -1 +1 @@
-nightly-2024-05-15
+nightly-2024-09-08
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 239183c..c2f79e3 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.78.0"
+channel = "1.81.0"
 components = ["rustc", "cargo", "rust-std", "rust-docs", "rls", "rust-src", "rust-analysis"]
 targets = []
\ No newline at end of file
diff --git a/rustfmt.toml b/rustfmt.toml
index 0243bf5..686c505 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -24,7 +24,6 @@ format_macro_matchers = true
 format_strings = true
 group_imports = "StdExternalCrate"
 hard_tabs = false
-hide_parse_errors = false
 ignore = []
 imports_granularity = "Module"
 imports_indent = "Block"
@@ -45,7 +44,8 @@ remove_nested_parens = true
 reorder_impl_items = true
 reorder_imports = true
 reorder_modules = true
-required_version = "1.7.0"
+required_version = "1.7.1"
+show_parse_errors = true
 skip_children = false
 space_after_colon = true
 space_before_colon = false
diff --git a/shared/src/block.rs b/shared/src/block.rs
index fafd4e7..72dc853 100644
--- a/shared/src/block.rs
+++ b/shared/src/block.rs
@@ -30,18 +30,18 @@ impl Block {
         for (block_index, masp_tx_refs) in indexed_masp_txs.locations {
             let tx_bytes = &raw_block.block.data[block_index];
 
-            let tx = match Transaction::from_namada_tx(tx_bytes, &masp_tx_refs)
-            {
-                Some(tx) => tx,
-                None => {
-                    tracing::warn!(
-                        block_hash = %block.hash,
-                        block_index,
-                        "Invalid Namada transaction in block"
-                    );
-                    continue;
-                }
-            };
+            let tx =
+                match Transaction::from_namada_tx(tx_bytes, &masp_tx_refs.0) {
+                    Some(tx) => tx,
+                    None => {
+                        tracing::warn!(
+                            block_hash = %block.hash,
+                            block_index,
+                            "Invalid Namada transaction in block"
+                        );
+                        continue;
+                    }
+                };
 
             block.transactions.push((block_index, tx));
         }
diff --git a/shared/src/block_results.rs b/shared/src/block_results.rs
index d45351a..aec813e 100644
--- a/shared/src/block_results.rs
+++ b/shared/src/block_results.rs
@@ -1,26 +1,13 @@
 use std::collections::BTreeMap;
 
-use namada_core::hash::Hash;
-use namada_core::masp::TxId;
 use namada_sdk::events::extend::{
-    IbcMaspTxBatchRefs, MaspTxBatchRefs, MaspTxBlockIndex,
-    ReadFromEventAttributes,
+    MaspTxBatchRefs, MaspTxBlockIndex, MaspTxRefs, ReadFromEventAttributes,
 };
 use tendermint_rpc::endpoint::block_results;
 
-pub enum IndexedMaspTxRef {
-    /// The masp tx is located in section with
-    /// the given masp [`TxId`].
-    TxId(TxId),
-    /// The masp tx pertains to an ibc shielding,
-    /// and is located in an ibc envelope message
-    /// inside the data section with the given [`Hash`].
-    IbcEnvelopeDataSecHash(Hash),
-}
-
 pub struct IndexedMaspTxs {
     /// Mapping of block indexes to valid masp tx ids.
-    pub locations: BTreeMap<usize, Vec<IndexedMaspTxRef>>,
+    pub locations: BTreeMap<usize, MaspTxRefs>,
 }
 
 pub fn locate_masp_txs(
@@ -37,26 +24,13 @@ pub fn locate_masp_txs(
                     &event.attributes,
                 )
                 .ok()?;
-                let mut refs = vec![];
-                if let Ok(tx_ids) = MaspTxBatchRefs::read_from_event_attributes(
+
+                // Extract the references to the correct masp sections
+                let refs = MaspTxBatchRefs::read_from_event_attributes(
                     &event.attributes,
-                ) {
-                    refs.extend(
-                        tx_ids.0.into_iter().map(IndexedMaspTxRef::TxId),
-                    );
-                }
-                if let Ok(sechashes) =
-                    IbcMaspTxBatchRefs::read_from_event_attributes(
-                        &event.attributes,
-                    )
-                {
-                    refs.extend(
-                        sechashes
-                            .0
-                            .into_iter()
-                            .map(IndexedMaspTxRef::IbcEnvelopeDataSecHash),
-                    );
-                }
+                )
+                .unwrap_or_default();
+
                 Some((index.0 as usize, refs))
             })
             .collect(),
diff --git a/shared/src/height.rs b/shared/src/height.rs
index 561bf79..2886df0 100644
--- a/shared/src/height.rs
+++ b/shared/src/height.rs
@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-use namada_core::storage::BlockHeight as NamadaBlockHeight;
+use namada_core::chain::BlockHeight as NamadaBlockHeight;
 use tendermint::block::Height;
 
 pub struct FollowingHeights(BlockHeight);
diff --git a/shared/src/transaction.rs b/shared/src/transaction.rs
index fe497b1..c2477c5 100644
--- a/shared/src/transaction.rs
+++ b/shared/src/transaction.rs
@@ -4,12 +4,12 @@ use std::fmt::Display;
 use namada_core::borsh::BorshDeserialize;
 use namada_core::collections::HashMap;
 use namada_core::hash::Hash;
-use namada_core::masp::TxId;
+use namada_core::masp::MaspTxId;
 use namada_core::masp_primitives::transaction::Transaction as NamadaMaspTransaction;
+use namada_sdk::events::extend::MaspTxRef;
 use namada_sdk::token::Transfer;
 use namada_tx::{Data, Section, Tx as NamadaTx, TxCommitments};
 
-use crate::block_results::IndexedMaspTxRef;
 use crate::id::Id;
 use crate::tx_index::MaspTxIndex;
 
@@ -22,7 +22,7 @@ pub struct Transaction {
 impl Transaction {
     pub fn from_namada_tx(
         nam_tx_bytes: &[u8],
-        valid_masp_tx_refs: &[IndexedMaspTxRef],
+        valid_masp_tx_refs: &[MaspTxRef],
     ) -> Option<Self> {
         let transaction = NamadaTx::try_from(nam_tx_bytes)
             .map_err(|e| e.to_string())
@@ -44,7 +44,7 @@ impl Transaction {
             .iter()
             .filter_map(|masp_tx_ref| {
                 let masp_tx = match masp_tx_ref {
-                    IndexedMaspTxRef::TxId(masp_tx_id) => {
+                    MaspTxRef::MaspSection(masp_tx_id) => {
                         let Some(masp_tx) = transaction.get_masp_section(masp_tx_id)
                         else {
                             tracing::warn!(
@@ -56,7 +56,7 @@ impl Transaction {
                         };
                         Cow::Borrowed(masp_tx)
                     }
-                    IndexedMaspTxRef::IbcEnvelopeDataSecHash(sechash) => {
+                    MaspTxRef::IbcData(sechash) => {
                         let Some(masp_tx) = get_masp_tx_from_ibc_data(&transaction, sechash) else {
                             tracing::warn!(
                                 %transaction_id,
@@ -70,7 +70,7 @@ impl Transaction {
                 };
 
                 let masp_tx_index =
-                    all_masp_txs.get(&TxId::from(masp_tx.txid())).cloned().or_else(|| {
+                    all_masp_txs.get(&MaspTxId::from(masp_tx.txid())).cloned().or_else(|| {
                         tracing::warn!(
                             %transaction_id,
                             ?masp_tx,
@@ -99,7 +99,7 @@ impl Display for Transaction {
 fn get_shielded_tx_id(
     transaction: &NamadaTx,
     cmt: &TxCommitments,
-) -> Option<TxId> {
+) -> Option<MaspTxId> {
     let tx_data = get_namada_tx_data(transaction, &cmt.data_hash)?;
 
     Transfer::try_from_slice(tx_data)
@@ -107,7 +107,7 @@ fn get_shielded_tx_id(
         .and_then(|tx| tx.shielded_section_hash)
         .or_else(|| {
             get_masp_tx_from_ibc_data(transaction, &cmt.data_hash)
-                .map(|tx| TxId::from(tx.txid()))
+                .map(|tx| MaspTxId::from(tx.txid()))
         })
 }