diff --git a/Cargo.lock b/Cargo.lock
index d45551e26..bd8102fa3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1276,7 +1276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115e54d64eb62cdebad391c19efc9dce4981c690c85a33a12199d99bb9546fee"
 dependencies = [
  "borsh-derive 0.10.3",
- "hashbrown 0.13.2",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -5751,6 +5751,7 @@ dependencies = [
  "solana-signature-verifier",
  "solana-transaction-status",
  "solana-trie",
+ "solana-witnessed-trie",
  "solana-write-account",
  "stdx",
  "tendermint 0.33.2",
@@ -16025,6 +16026,22 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "solana-witnessed-trie"
+version = "0.0.3"
+source = "git+https://github.com/ComposableFi/emulated-light-client/#ba1046ead4232ee07a1db9b120f3035c983e0052"
+dependencies = [
+ "arrayvec 0.7.4",
+ "bytemuck",
+ "cf-solana 0.0.0",
+ "derive_more",
+ "lib",
+ "solana-program",
+ "solana-trie",
+ "stdx",
+ "strum 0.25.0",
+]
+
 [[package]]
 name = "solana-write-account"
 version = "0.0.3"
diff --git a/hyperspace/solana/Cargo.toml b/hyperspace/solana/Cargo.toml
index 37a79131b..b61577c56 100644
--- a/hyperspace/solana/Cargo.toml
+++ b/hyperspace/solana/Cargo.toml
@@ -96,7 +96,8 @@ cf-solana-og = { git = "https://github.com/ComposableFi/emulated-light-client/",
 
 #Contract
 solana-ibc = { git = "https://github.com/ComposableFi/emulated-light-client/" ,features = ["no-entrypoint"]}
-solana-write-account = { git = "https://github.com/ComposableFi/emulated-light-client/" ,features = ["library"] }
+solana-write-account = { git = "https://github.com/ComposableFi/emulated-light-client/", features = ["library"] }
+solana-witnessed-trie = { git = "https://github.com/ComposableFi/emulated-light-client/", default-features = false, features = ["api"] }
 solana-signature-verifier = { git = "https://github.com/ComposableFi/emulated-light-client/" }
 
 tracing = "0.1.36"
diff --git a/hyperspace/solana/src/client.rs b/hyperspace/solana/src/client.rs
index 04d6587dd..9ceed569a 100644
--- a/hyperspace/solana/src/client.rs
+++ b/hyperspace/solana/src/client.rs
@@ -213,7 +213,7 @@ impl SolanaClient {
 	}
 
 	pub fn get_witness_key(&self, trie_key: &Pubkey) -> Pubkey {
-		solana_witnessed_trie::api::find_program_address(
+		wittrie::api::find_witness_account(
 			&self.solana_ibc_program_id,
 			trie_key,
 		).unwrap().0