diff --git a/Cargo.lock b/Cargo.lock
index b49f97ed00..3a6e374f43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -49,17 +49,6 @@ dependencies = [
  "version_check 0.9.4",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
- "version_check 0.9.4",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.0.1"
@@ -903,40 +892,17 @@ name = "borsh"
 version = "0.9.4"
 source = "git+https://github.com/heliaxdev/borsh-rs.git?rev=cd5223e5103c4f139e0c54cf8259b7ec5ec4073a#cd5223e5103c4f139e0c54cf8259b7ec5ec4073a"
 dependencies = [
- "borsh-derive 0.9.4",
+ "borsh-derive",
  "hashbrown 0.11.2",
 ]
 
-[[package]]
-name = "borsh"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
-dependencies = [
- "borsh-derive 0.10.3",
- "hashbrown 0.13.2",
-]
-
 [[package]]
 name = "borsh-derive"
 version = "0.9.4"
 source = "git+https://github.com/heliaxdev/borsh-rs.git?rev=cd5223e5103c4f139e0c54cf8259b7ec5ec4073a#cd5223e5103c4f139e0c54cf8259b7ec5ec4073a"
 dependencies = [
- "borsh-derive-internal 0.9.4",
- "borsh-schema-derive-internal 0.9.4",
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7"
-dependencies = [
- "borsh-derive-internal 0.10.3",
- "borsh-schema-derive-internal 0.10.3",
+ "borsh-derive-internal",
+ "borsh-schema-derive-internal",
  "proc-macro-crate 0.1.5",
  "proc-macro2",
  "syn 1.0.109",
@@ -952,17 +918,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "borsh-derive-internal"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "borsh-schema-derive-internal"
 version = "0.9.4"
@@ -973,17 +928,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "borsh-schema-derive-internal"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "bs58"
 version = "0.4.0"
@@ -2141,7 +2085,7 @@ dependencies = [
  "bincode",
  "blake2",
  "blake2b_simd 1.0.1",
- "borsh 0.9.4",
+ "borsh",
  "digest 0.10.6",
  "ed25519-dalek",
  "either",
@@ -2644,7 +2588,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash 0.7.6",
+ "ahash",
 ]
 
 [[package]]
@@ -2653,16 +2597,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash 0.8.3",
+ "ahash",
 ]
 
 [[package]]
@@ -2990,38 +2925,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ibc"
-version = "0.36.0"
-source = "git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=db14744bfba6239cc5f58345ff90f8b7d42637d6#db14744bfba6239cc5f58345ff90f8b7d42637d6"
-dependencies = [
- "bytes 1.4.0",
- "cfg-if 1.0.0",
- "derive_more",
- "displaydoc",
- "dyn-clone",
- "erased-serde",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs?rev=dd8ba23110a144ffe2074a0b889676468266435a)",
- "ics23",
- "num-traits 0.2.15",
- "parking_lot 0.12.1",
- "primitive-types",
- "prost",
- "safe-regex",
- "serde 1.0.163",
- "serde_derive",
- "serde_json",
- "sha2 0.10.6",
- "subtle-encoding",
- "tendermint 0.23.5",
- "tendermint-light-client-verifier 0.23.5",
- "tendermint-proto 0.23.5",
- "tendermint-testgen 0.23.5",
- "time 0.3.17",
- "tracing 0.1.37",
- "uint",
-]
-
 [[package]]
 name = "ibc"
 version = "0.36.0"
@@ -3033,7 +2936,7 @@ dependencies = [
  "displaydoc",
  "dyn-clone",
  "erased-serde",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs.git?rev=6f4038fcf4981f1ed70771d1cd89931267f917af)",
+ "ibc-proto",
  "ics23",
  "num-traits 0.2.15",
  "parking_lot 0.12.1",
@@ -3045,10 +2948,10 @@ dependencies = [
  "serde_json",
  "sha2 0.10.6",
  "subtle-encoding",
- "tendermint 0.23.6",
- "tendermint-light-client-verifier 0.23.6",
- "tendermint-proto 0.23.6",
- "tendermint-testgen 0.23.6",
+ "tendermint",
+ "tendermint-light-client-verifier",
+ "tendermint-proto",
+ "tendermint-testgen",
  "time 0.3.17",
  "tracing 0.1.37",
  "uint",
@@ -3065,27 +2968,10 @@ dependencies = [
  "prost",
  "serde 1.0.163",
  "subtle-encoding",
- "tendermint-proto 0.23.6",
+ "tendermint-proto",
  "tonic",
 ]
 
-[[package]]
-name = "ibc-proto"
-version = "0.26.0"
-source = "git+https://github.com/heliaxdev/ibc-proto-rs?rev=dd8ba23110a144ffe2074a0b889676468266435a#dd8ba23110a144ffe2074a0b889676468266435a"
-dependencies = [
- "base64 0.13.1",
- "borsh 0.10.3",
- "bytes 1.4.0",
- "flex-error",
- "parity-scale-codec",
- "prost",
- "scale-info",
- "serde 1.0.163",
- "subtle-encoding",
- "tendermint-proto 0.23.5",
-]
-
 [[package]]
 name = "ibc-relayer"
 version = "0.22.0"
@@ -3111,7 +2997,7 @@ dependencies = [
  "http",
  "humantime",
  "humantime-serde",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs.git?rev=6f4038fcf4981f1ed70771d1cd89931267f917af)",
+ "ibc-proto",
  "ibc-relayer-types",
  "itertools",
  "moka",
@@ -3130,11 +3016,11 @@ dependencies = [
  "signature",
  "strum",
  "subtle-encoding",
- "tendermint 0.23.6",
+ "tendermint",
  "tendermint-light-client",
- "tendermint-light-client-verifier 0.23.6",
- "tendermint-proto 0.23.6",
- "tendermint-rpc 0.23.6",
+ "tendermint-light-client-verifier",
+ "tendermint-proto",
+ "tendermint-rpc",
  "thiserror",
  "tiny-bip39 1.0.0",
  "tiny-keccak",
@@ -3155,7 +3041,7 @@ dependencies = [
  "dyn-clone",
  "erased-serde",
  "flex-error",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs.git?rev=6f4038fcf4981f1ed70771d1cd89931267f917af)",
+ "ibc-proto",
  "ics23",
  "itertools",
  "num-rational",
@@ -3166,11 +3052,11 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "subtle-encoding",
- "tendermint 0.23.6",
- "tendermint-light-client-verifier 0.23.6",
- "tendermint-proto 0.23.6",
- "tendermint-rpc 0.23.6",
- "tendermint-testgen 0.23.6",
+ "tendermint",
+ "tendermint-light-client-verifier",
+ "tendermint-proto",
+ "tendermint-rpc",
+ "tendermint-testgen",
  "time 0.3.17",
  "uint",
 ]
@@ -3266,7 +3152,7 @@ name = "index-set"
 version = "0.7.1"
 source = "git+https://github.com/heliaxdev/index-set?tag=v0.7.1#dc24cdbbe3664514d59f1a4c4031863fc565f1c2"
 dependencies = [
- "borsh 0.9.4",
+ "borsh",
  "serde 1.0.163",
 ]
 
@@ -3699,7 +3585,7 @@ dependencies = [
  "blake2b_simd 1.0.1",
  "blake2s_simd 1.0.1",
  "bls12_381",
- "borsh 0.9.4",
+ "borsh",
  "byteorder",
  "chacha20poly1305",
  "crypto_api_chachapoly",
@@ -4007,7 +3893,7 @@ dependencies = [
  "bellman",
  "bimap",
  "bls12_381",
- "borsh 0.9.4",
+ "borsh",
  "byte-unit",
  "circular-queue",
  "clru",
@@ -4015,10 +3901,8 @@ dependencies = [
  "derivation-path",
  "derivative",
  "hex",
- "ibc 0.36.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=db14744bfba6239cc5f58345ff90f8b7d42637d6)",
- "ibc 0.36.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs.git?rev=e71bc2cc79f8c2b32e970d95312f251398c93d9e)",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs.git?rev=6f4038fcf4981f1ed70771d1cd89931267f917af)",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs?rev=dd8ba23110a144ffe2074a0b889676468266435a)",
+ "ibc",
+ "ibc-proto",
  "itertools",
  "libsecp256k1 0.7.0",
  "loupe",
@@ -4044,9 +3928,9 @@ dependencies = [
  "sha2 0.9.9",
  "slip10_ed25519",
  "tempfile",
- "tendermint 0.23.6",
- "tendermint-proto 0.23.6",
- "tendermint-rpc 0.23.6",
+ "tendermint",
+ "tendermint-proto",
+ "tendermint-rpc",
  "test-log",
  "thiserror",
  "tiny-bip39 0.8.2",
@@ -4079,7 +3963,7 @@ dependencies = [
  "bimap",
  "bit-set",
  "blake2b-rs",
- "borsh 0.9.4",
+ "borsh",
  "byte-unit",
  "byteorder",
  "clap",
@@ -4131,10 +4015,10 @@ dependencies = [
  "sysinfo",
  "tar",
  "tempfile",
- "tendermint 0.23.6",
- "tendermint-config 0.23.6",
- "tendermint-proto 0.23.6",
- "tendermint-rpc 0.23.6",
+ "tendermint",
+ "tendermint-config",
+ "tendermint-proto",
+ "tendermint-rpc",
  "test-log",
  "thiserror",
  "tokio",
@@ -4142,8 +4026,7 @@ dependencies = [
  "toml",
  "tonic",
  "tower",
- "tower-abci 0.1.0 (git+https://github.com/heliaxdev/tower-abci.git?rev=367d8d958b83c501ed2c09e9c4595f8bf75a0b01)",
- "tower-abci 0.1.0 (git+https://github.com/heliaxdev/tower-abci?rev=a31ce06533f5fbd943508676059d44de27395792)",
+ "tower-abci",
  "tracing 0.1.37",
  "tracing-log",
  "tracing-subscriber 0.3.17",
@@ -4162,7 +4045,7 @@ dependencies = [
  "assert_matches",
  "bech32 0.8.1",
  "bellman",
- "borsh 0.9.4",
+ "borsh",
  "chrono",
  "data-encoding",
  "derivative",
@@ -4170,10 +4053,8 @@ dependencies = [
  "ferveo",
  "ferveo-common",
  "group-threshold-cryptography",
- "ibc 0.36.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs?rev=db14744bfba6239cc5f58345ff90f8b7d42637d6)",
- "ibc 0.36.0 (git+https://github.com/heliaxdev/cosmos-ibc-rs.git?rev=e71bc2cc79f8c2b32e970d95312f251398c93d9e)",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs.git?rev=6f4038fcf4981f1ed70771d1cd89931267f917af)",
- "ibc-proto 0.26.0 (git+https://github.com/heliaxdev/ibc-proto-rs?rev=dd8ba23110a144ffe2074a0b889676468266435a)",
+ "ibc",
+ "ibc-proto",
  "ics23",
  "index-set",
  "itertools",
@@ -4193,8 +4074,8 @@ dependencies = [
  "serde_json",
  "sha2 0.9.9",
  "sparse-merkle-tree",
- "tendermint 0.23.6",
- "tendermint-proto 0.23.6",
+ "tendermint",
+ "tendermint-proto",
  "test-log",
  "thiserror",
  "tonic-build",
@@ -4207,7 +4088,7 @@ dependencies = [
 name = "namada_encoding_spec"
 version = "0.16.0"
 dependencies = [
- "borsh 0.9.4",
+ "borsh",
  "itertools",
  "lazy_static",
  "madato",
@@ -4227,7 +4108,7 @@ dependencies = [
 name = "namada_proof_of_stake"
 version = "0.16.0"
 dependencies = [
- "borsh 0.9.4",
+ "borsh",
  "data-encoding",
  "derivative",
  "hex",
@@ -4247,7 +4128,7 @@ dependencies = [
 name = "namada_test_utils"
 version = "0.16.0"
 dependencies = [
- "borsh 0.9.4",
+ "borsh",
  "namada_core",
  "strum",
 ]
@@ -4257,7 +4138,7 @@ name = "namada_tests"
 version = "0.16.0"
 dependencies = [
  "assert_cmd",
- "borsh 0.9.4",
+ "borsh",
  "chrono",
  "color-eyre",
  "concat-idents",
@@ -4287,10 +4168,10 @@ dependencies = [
  "serde_json",
  "sha2 0.9.9",
  "tempfile",
- "tendermint 0.23.6",
- "tendermint-config 0.23.6",
- "tendermint-proto 0.23.6",
- "tendermint-rpc 0.23.6",
+ "tendermint",
+ "tendermint-config",
+ "tendermint-proto",
+ "tendermint-rpc",
  "test-log",
  "tokio",
  "toml",
@@ -4302,7 +4183,7 @@ dependencies = [
 name = "namada_tx_prelude"
 version = "0.16.0"
 dependencies = [
- "borsh 0.9.4",
+ "borsh",
  "masp_primitives",
  "namada_core",
  "namada_macros",
@@ -4317,7 +4198,7 @@ dependencies = [
 name = "namada_vm_env"
 version = "0.16.0"
 dependencies = [
- "borsh 0.9.4",
+ "borsh",
  "hex",
  "masp_primitives",
  "masp_proofs",
@@ -4328,7 +4209,7 @@ dependencies = [
 name = "namada_vp_prelude"
 version = "0.16.0"
 dependencies = [
- "borsh 0.9.4",
+ "borsh",
  "namada_core",
  "namada_macros",
  "namada_proof_of_stake",
@@ -5767,7 +5648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c"
 dependencies = [
  "arrayvec 0.7.2",
- "borsh 0.9.4",
+ "borsh",
  "num-traits 0.2.15",
  "serde 1.0.163",
 ]
@@ -5985,30 +5866,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scale-info"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b569c32c806ec3abdf3b5869fb8bf1e0d275a7c1c9b0b05603d9464632649edf"
-dependencies = [
- "cfg-if 1.0.0",
- "derive_more",
- "parity-scale-codec",
- "scale-info-derive",
-]
-
-[[package]]
-name = "scale-info-derive"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.21"
@@ -6480,7 +6337,7 @@ version = "0.3.1-pre"
 source = "git+https://github.com/heliaxdev/sparse-merkle-tree?rev=e086b235ed6e68929bf73f617dd61cd17b000a56#e086b235ed6e68929bf73f617dd61cd17b000a56"
 dependencies = [
  "blake2b-rs",
- "borsh 0.9.4",
+ "borsh",
  "cfg-if 1.0.0",
  "ics23",
  "sha2 0.9.9",
@@ -6656,34 +6513,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "tendermint"
-version = "0.23.5"
-source = "git+https://github.com/heliaxdev/tendermint-rs?rev=a3a0ad5f07d380976bbd5321239aec9cc3a8f916#a3a0ad5f07d380976bbd5321239aec9cc3a8f916"
-dependencies = [
- "async-trait",
- "bytes 1.4.0",
- "ed25519",
- "ed25519-dalek",
- "flex-error",
- "futures 0.3.28",
- "num-traits 0.2.15",
- "once_cell",
- "prost",
- "prost-types",
- "serde 1.0.163",
- "serde_bytes",
- "serde_json",
- "serde_repr",
- "sha2 0.9.9",
- "signature",
- "subtle 2.4.1",
- "subtle-encoding",
- "tendermint-proto 0.23.5",
- "time 0.3.17",
- "zeroize",
-]
-
 [[package]]
 name = "tendermint"
 version = "0.23.6"
@@ -6709,24 +6538,11 @@ dependencies = [
  "signature",
  "subtle 2.4.1",
  "subtle-encoding",
- "tendermint-proto 0.23.6",
+ "tendermint-proto",
  "time 0.3.17",
  "zeroize",
 ]
 
-[[package]]
-name = "tendermint-config"
-version = "0.23.5"
-source = "git+https://github.com/heliaxdev/tendermint-rs?rev=a3a0ad5f07d380976bbd5321239aec9cc3a8f916#a3a0ad5f07d380976bbd5321239aec9cc3a8f916"
-dependencies = [
- "flex-error",
- "serde 1.0.163",
- "serde_json",
- "tendermint 0.23.5",
- "toml",
- "url 2.3.1",
-]
-
 [[package]]
 name = "tendermint-config"
 version = "0.23.6"
@@ -6735,7 +6551,7 @@ dependencies = [
  "flex-error",
  "serde 1.0.163",
  "serde_json",
- "tendermint 0.23.6",
+ "tendermint",
  "toml",
  "url 2.3.1",
 ]
@@ -6754,26 +6570,13 @@ dependencies = [
  "serde_cbor",
  "serde_derive",
  "static_assertions",
- "tendermint 0.23.6",
- "tendermint-light-client-verifier 0.23.6",
- "tendermint-rpc 0.23.6",
+ "tendermint",
+ "tendermint-light-client-verifier",
+ "tendermint-rpc",
  "time 0.3.17",
  "tokio",
 ]
 
-[[package]]
-name = "tendermint-light-client-verifier"
-version = "0.23.5"
-source = "git+https://github.com/heliaxdev/tendermint-rs?rev=a3a0ad5f07d380976bbd5321239aec9cc3a8f916#a3a0ad5f07d380976bbd5321239aec9cc3a8f916"
-dependencies = [
- "derive_more",
- "flex-error",
- "serde 1.0.163",
- "tendermint 0.23.5",
- "tendermint-rpc 0.23.5",
- "time 0.3.17",
-]
-
 [[package]]
 name = "tendermint-light-client-verifier"
 version = "0.23.6"
@@ -6782,24 +6585,7 @@ dependencies = [
  "derive_more",
  "flex-error",
  "serde 1.0.163",
- "tendermint 0.23.6",
- "time 0.3.17",
-]
-
-[[package]]
-name = "tendermint-proto"
-version = "0.23.5"
-source = "git+https://github.com/heliaxdev/tendermint-rs?rev=a3a0ad5f07d380976bbd5321239aec9cc3a8f916#a3a0ad5f07d380976bbd5321239aec9cc3a8f916"
-dependencies = [
- "bytes 1.4.0",
- "flex-error",
- "num-derive",
- "num-traits 0.2.15",
- "prost",
- "prost-types",
- "serde 1.0.163",
- "serde_bytes",
- "subtle-encoding",
+ "tendermint",
  "time 0.3.17",
 ]
 
@@ -6820,30 +6606,6 @@ dependencies = [
  "time 0.3.17",
 ]
 
-[[package]]
-name = "tendermint-rpc"
-version = "0.23.5"
-source = "git+https://github.com/heliaxdev/tendermint-rs?rev=a3a0ad5f07d380976bbd5321239aec9cc3a8f916#a3a0ad5f07d380976bbd5321239aec9cc3a8f916"
-dependencies = [
- "bytes 1.4.0",
- "flex-error",
- "getrandom 0.2.9",
- "peg",
- "pin-project",
- "serde 1.0.163",
- "serde_bytes",
- "serde_json",
- "subtle-encoding",
- "tendermint 0.23.5",
- "tendermint-config 0.23.5",
- "tendermint-proto 0.23.5",
- "thiserror",
- "time 0.3.17",
- "url 2.3.1",
- "uuid 0.8.2",
- "walkdir",
-]
-
 [[package]]
 name = "tendermint-rpc"
 version = "0.23.6"
@@ -6865,9 +6627,9 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "subtle-encoding",
- "tendermint 0.23.6",
- "tendermint-config 0.23.6",
- "tendermint-proto 0.23.6",
+ "tendermint",
+ "tendermint-config",
+ "tendermint-proto",
  "thiserror",
  "time 0.3.17",
  "tokio",
@@ -6877,21 +6639,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "tendermint-testgen"
-version = "0.23.5"
-source = "git+https://github.com/heliaxdev/tendermint-rs?rev=a3a0ad5f07d380976bbd5321239aec9cc3a8f916#a3a0ad5f07d380976bbd5321239aec9cc3a8f916"
-dependencies = [
- "ed25519-dalek",
- "gumdrop",
- "serde 1.0.163",
- "serde_json",
- "simple-error",
- "tempfile",
- "tendermint 0.23.5",
- "time 0.3.17",
-]
-
 [[package]]
 name = "tendermint-testgen"
 version = "0.23.6"
@@ -6903,7 +6650,7 @@ dependencies = [
  "serde_json",
  "simple-error",
  "tempfile",
- "tendermint 0.23.6",
+ "tendermint",
  "time 0.3.17",
 ]
 
@@ -7418,25 +7165,7 @@ dependencies = [
  "futures 0.3.28",
  "pin-project",
  "prost",
- "tendermint-proto 0.23.6",
- "tokio",
- "tokio-stream",
- "tokio-util 0.6.10",
- "tower",
- "tracing 0.1.30",
- "tracing-tower",
-]
-
-[[package]]
-name = "tower-abci"
-version = "0.1.0"
-source = "git+https://github.com/heliaxdev/tower-abci?rev=a31ce06533f5fbd943508676059d44de27395792#a31ce06533f5fbd943508676059d44de27395792"
-dependencies = [
- "bytes 1.4.0",
- "futures 0.3.28",
- "pin-project",
- "prost",
- "tendermint-proto 0.23.5",
+ "tendermint-proto",
  "tokio",
  "tokio-stream",
  "tokio-util 0.6.10",
diff --git a/Makefile b/Makefile
index f55016292c..3f2724af97 100644
--- a/Makefile
+++ b/Makefile
@@ -47,15 +47,6 @@ check:
 	make -C $(wasms_for_tests) check && \
 	$(foreach wasm,$(wasm_templates),$(check-wasm) && ) true
 
-check-abcipp:
-	$(cargo) +$(nightly) check \
-		--workspace \
-		--exclude namada_tests \
-		--all-targets \
-		--no-default-features \
-		--features "abcipp ibc-mocks-abcipp testing" \
-		-Z unstable-options
-
 check-mainnet:
 	$(cargo) check --workspace --features "mainnet"
 
@@ -67,25 +58,6 @@ clippy:
 	make -C $(wasms_for_tests) clippy && \
 	$(foreach wasm,$(wasm_templates),$(clippy-wasm) && ) true
 
-clippy-abcipp:
-	NAMADA_DEV=false $(cargo) +$(nightly) clippy --all-targets \
-		--manifest-path ./apps/Cargo.toml \
-		--no-default-features \
-		--features "std testing abcipp" && \
-	$(cargo) +$(nightly) clippy --all-targets \
-		--manifest-path ./proof_of_stake/Cargo.toml \
-		--features "testing" && \
-	$(cargo) +$(nightly) clippy --all-targets \
-		--manifest-path ./shared/Cargo.toml \
-		--no-default-features \
-		--features "testing wasm-runtime abcipp ibc-mocks-abcipp ferveo-tpke" && \
-	$(cargo) +$(nightly) clippy \
-		--all-targets \
-		--manifest-path ./vm_env/Cargo.toml \
-		--no-default-features && \
-	make -C $(wasms) clippy && \
-	$(foreach wasm,$(wasm_templates),$(clippy-wasm) && ) true
-
 clippy-mainnet:
 	$(cargo) +$(nightly) clippy --all-targets --features "mainnet" -- -D warnings
 
@@ -138,36 +110,6 @@ test-e2e:
 	--test-threads=1 \
 	-Z unstable-options --report-time
 
-test-unit-abcipp:
-	$(cargo) test \
-		--manifest-path ./apps/Cargo.toml \
-		--no-default-features \
-		--features "testing std abcipp" \
-		-Z unstable-options \
-		$(TEST_FILTER) -- \
-		-Z unstable-options --report-time && \
-	$(cargo) test \
-		--manifest-path \
-		./proof_of_stake/Cargo.toml \
-		--features "testing" \
-		-Z unstable-options \
-		$(TEST_FILTER) -- \
-		-Z unstable-options --report-time && \
-	$(cargo) test \
-		--manifest-path ./shared/Cargo.toml \
-		--no-default-features \
-		--features "testing wasm-runtime abcipp ibc-mocks-abcipp" \
-		-Z unstable-options \
-		$(TEST_FILTER) -- \
-		-Z unstable-options --report-time && \
-	$(cargo) test \
-		--manifest-path ./vm_env/Cargo.toml \
-		--no-default-features \
-		--features "abcipp" \
-		-Z unstable-options \
-		$(TEST_FILTER) -- \
-		-Z unstable-options --report-time
-
 test-unit:
 	$(cargo) +$(nightly) test \
 		$(TEST_FILTER) \
@@ -279,4 +221,4 @@ test-miri:
 	MIRIFLAGS="-Zmiri-disable-isolation" $(cargo) +$(nightly) miri test
 
 
-.PHONY : build check build-release clippy install run-ledger run-gossip reset-ledger test test-debug fmt watch clean build-doc doc build-wasm-scripts-docker debug-wasm-scripts-docker build-wasm-scripts debug-wasm-scripts clean-wasm-scripts dev-deps test-miri test-unit test-unit-abcipp clippy-abcipp
+.PHONY : build check build-release clippy install run-ledger run-gossip reset-ledger test test-debug fmt watch clean build-doc doc build-wasm-scripts-docker debug-wasm-scripts-docker build-wasm-scripts debug-wasm-scripts clean-wasm-scripts dev-deps test-miri test-unit
diff --git a/apps/Cargo.toml b/apps/Cargo.toml
index b9d824c37d..7bc04afea5 100644
--- a/apps/Cargo.toml
+++ b/apps/Cargo.toml
@@ -49,16 +49,6 @@ std = ["ed25519-consensus/std", "rand/std", "rand_core/std"]
 # for integration tests and test utilies
 testing = ["dev"]
 
-abcipp = [
-    "namada/abcipp",
-    "namada/tendermint-rpc-abcipp",
-    "tendermint-abcipp",
-    "tendermint-config-abcipp",
-    "tendermint-proto-abcipp",
-    "tendermint-rpc-abcipp",
-    "tower-abci-abcipp",
-]
-
 abciplus = [
     "namada/abciplus",
     "namada/tendermint-rpc",
@@ -126,10 +116,6 @@ signal-hook = "0.3.9"
 sysinfo = {version = "=0.21.1", default-features = false}
 tar = "0.4.37"
 # temporarily using fork work-around
-tendermint-abcipp = {package = "tendermint", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", optional = true}
-tendermint-config-abcipp = {package = "tendermint-config", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", optional = true}
-tendermint-proto-abcipp = {package = "tendermint-proto", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", optional = true}
-tendermint-rpc-abcipp = {package = "tendermint-rpc", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", features = ["http-client", "websocket-client"], optional = true}
 tendermint = {version = "0.23.6", optional = true}
 tendermint-config = {version = "0.23.6", optional = true}
 tendermint-proto = {version = "0.23.6", optional = true}
@@ -141,7 +127,6 @@ tonic = "0.8.3"
 tower = "0.4"
 # Also, using the same version of tendermint-rs as we do here.
 # with a patch for https://github.com/penumbra-zone/tower-abci/issues/7.
-tower-abci-abcipp = {package = "tower-abci", git = "https://github.com/heliaxdev/tower-abci", rev = "a31ce06533f5fbd943508676059d44de27395792", optional = true}
 tower-abci = {version = "0.1.0", optional = true}
 tracing = "0.1.30"
 tracing-log = "0.1.2"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index a19caa6ecf..4642a9e9ad 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -25,12 +25,6 @@ secp256k1-sign-verify = [
   "libsecp256k1/hmac",
 ]
 
-abcipp = [
-  "ibc-proto-abcipp",
-  "ibc-abcipp",
-  "tendermint-abcipp",
-  "tendermint-proto-abcipp",
-]
 abciplus = [
   "ibc",
   "ibc-proto",
@@ -43,11 +37,6 @@ ibc-mocks = [
   "ibc/std",
 ]
 
-ibc-mocks-abcipp = [
-  "ibc-abcipp/mocks",
-  "ibc-abcipp/std",
-]
-
 multicore = [
   "bellman/multicore"
 ]
@@ -80,8 +69,6 @@ tpke = {package = "group-threshold-cryptography", optional = true, git = "https:
 # TODO using the same version of tendermint-rs as we do here.
 ibc = {version = "0.36.0", default-features = false, features = ["serde"], optional = true}
 ibc-proto = {version = "0.26.0", default-features = false, optional = true}
-ibc-abcipp = {package = "ibc", git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "db14744bfba6239cc5f58345ff90f8b7d42637d6", default-features = false, features = ["serde"], optional = true}
-ibc-proto-abcipp = {package = "ibc-proto", git = "https://github.com/heliaxdev/ibc-proto-rs", rev = "dd8ba23110a144ffe2074a0b889676468266435a", default-features = false, optional = true}
 ics23 = "0.9.0"
 index-set = {git = "https://github.com/heliaxdev/index-set", tag = "v0.7.1", features = ["serialize-borsh", "serialize-serde"]}
 itertools = "0.10.0"
@@ -100,8 +87,6 @@ serde_json = "1.0.62"
 sha2 = "0.9.3"
 tendermint = {version = "0.23.6", optional = true}
 tendermint-proto = {version = "0.23.6", optional = true}
-tendermint-abcipp = {package = "tendermint", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", optional = true}
-tendermint-proto-abcipp = {package = "tendermint-proto", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", optional = true}
 thiserror = "1.0.38"
 tracing = "0.1.30"
 zeroize = {version = "1.5.5", features = ["zeroize_derive"]}
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 15f393b0a0..c3f097b038 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -40,20 +40,7 @@ tendermint-rpc = [
   "async-client",
   "dep:tendermint-rpc",
 ]
-tendermint-rpc-abcipp = [
-  "async-client",
-  "dep:tendermint-rpc-abcipp",
-]
 
-abcipp = [
-  "namada_core/abcipp",
-  "ibc-proto-abcipp",
-  "ibc-abcipp",
-  "tendermint-abcipp",
-  "tendermint-proto-abcipp",
-  # it's OK to include the tendermint-rpc feature here, as we aren't currently building wasms with `abcipp`
-  "tendermint-rpc-abcipp",
-]
 abciplus = [
   "namada_core/abciplus",
   "namada_proof_of_stake/abciplus",
@@ -66,9 +53,6 @@ abciplus = [
 ibc-mocks = [
   "namada_core/ibc-mocks",
 ]
-ibc-mocks-abcipp = [
-  "namada_core/ibc-mocks-abcipp",
-]
 
 masp-tx-gen = [
   "rand",
@@ -108,8 +92,6 @@ data-encoding = "2.3.2"
 derivation-path = "0.2.0"
 derivative = "2.2.0"
 # TODO using the same version of tendermint-rs as we do here.
-ibc-abcipp = {package = "ibc", git = "https://github.com/heliaxdev/cosmos-ibc-rs", rev = "db14744bfba6239cc5f58345ff90f8b7d42637d6", features = ["serde"], optional = true}
-ibc-proto-abcipp = {package = "ibc-proto", git = "https://github.com/heliaxdev/ibc-proto-rs", rev = "dd8ba23110a144ffe2074a0b889676468266435a", default-features = false, optional = true}
 ibc = {version = "0.36.0", default-features = false, features = ["serde"], optional = true}
 ibc-proto = {version = "0.26.0", default-features = false, optional = true}
 itertools = "0.10.0"
@@ -131,9 +113,6 @@ tiny-bip39 = {git = "https://github.com/anoma/tiny-bip39.git", rev = "bf0f6d8713
 tiny-hderive = "0.3.0"
 # We switch off "blake2b" because it cannot be compiled to wasm
 tempfile = {version = "3.2.0", optional = true}
-tendermint-abcipp = {package = "tendermint", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", optional = true}
-tendermint-rpc-abcipp = {package = "tendermint-rpc", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", features = ["http-client"], optional = true}
-tendermint-proto-abcipp = {package = "tendermint-proto", git = "https://github.com/heliaxdev/tendermint-rs", rev = "02b256829e80f8cfecf3fa0d625c2a76c79cd043", optional = true}
 tendermint = {version = "0.23.6", optional = true}
 tendermint-rpc = {version = "0.23.6", default-features = false, features = ["trait-client"], optional = true}
 tendermint-proto = {version = "0.23.6", optional = true}