Merge branch 'feat/solana' into vaporif/bump-solana-deps

Author: vaporif

Cargo.lock

@@ -6,10 +6,14 @@ edition     = { workspace = true }
 repository  = { workspace = true }
 license     = { workspace = true }
 
+[features]
+solana = ["dep:tendermint-light-client-solana"]
+
 [dependencies]
 ibc-core-commitment-types     = { workspace = true }
 ibc-core-host-types           = { workspace = true }
 thiserror                     = { workspace = true }
+tendermint-light-client-solana = { workspace = true, optional = true }
 
 [dev-dependencies]
 serde                         = { workspace = true, features = ["derive"] }

packages/tendermint-light-client/membership/Cargo.toml

@@ -5,11 +5,15 @@
 use ibc_core_commitment_types::{
     commitment::CommitmentRoot,
     merkle::{MerklePath, MerkleProof},
-    proto::ics23::HostFunctionsManager,
     specs::ProofSpecs,
 };
 use ibc_core_host_types::path::PathBytes;
 
+#[cfg(feature = "solana")]
+type HostFunctions = tendermint_light_client_solana::SolanaHostFunctionsManager;
+#[cfg(not(feature = "solana"))]
+type HostFunctions = ibc_core_commitment_types::proto::ics23::HostFunctionsManager;
+
 /// Key-value pair for membership/non-membership proofs
 #[derive(Clone, Debug)]
 pub struct KVPair {
@@ -84,15 +88,15 @@ pub fn membership(
 
         if kv_pair.is_non_membership() {
             merkle_proof
-                .verify_non_membership::<HostFunctionsManager>(
+                .verify_non_membership::<HostFunctions>(
                     &ProofSpecs::cosmos(),
                     commitment_root.clone().into(),
                     merkle_path,
                 )
                 .map_err(|_| MembershipError::NonMembershipVerificationFailed)?;
         } else {
             merkle_proof
-                .verify_membership::<HostFunctionsManager>(
+                .verify_membership::<HostFunctions>(
                     &ProofSpecs::cosmos(),
                     commitment_root.clone().into(),
                     merkle_path,

packages/tendermint-light-client/membership/src/lib.rs

@@ -11,4 +11,6 @@ tendermint-light-client-verifier = { workspace = true }
 brine-ed25519 = { workspace = true, features = ["std"] }
 sha2 = { workspace = true }
 solana-program = { version = "2.3", default-features = false }
+ibc-core-commitment-types = { workspace = true }
+ics23 = { workspace = true }
 

packages/tendermint-light-client/solana/Cargo.toml

@@ -7,6 +7,7 @@
 //! 2. solana-ibc-types/src/borsh_header.rs `conversions::commit_to_borsh()`
 //!    Pre-sort signatures before serialization (saves ~60-80k CU on-chain for 100 validators)
 
+use ibc_core_commitment_types::proto::ics23::HostFunctionsManager;
 use tendermint::crypto::signature::Error;
 use tendermint::{PublicKey, Signature};
 use tendermint_light_client_verifier::{
@@ -195,3 +196,41 @@ impl tendermint::merkle::MerkleHash for SolanaSha256 {
         self.0.inner_hash(left, right)
     }
 }
+
+/// Solana-optimized host functions for ICS-23 Merkle proof verification
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct SolanaHostFunctionsManager;
+
+impl ics23::HostFunctionsProvider for SolanaHostFunctionsManager {
+    fn sha2_256(message: &[u8]) -> [u8; 32] {
+        solana_program::hash::hash(message).to_bytes()
+    }
+
+    fn sha2_512(message: &[u8]) -> [u8; 64] {
+        HostFunctionsManager::sha2_512(message)
+    }
+
+    fn sha2_512_truncated(message: &[u8]) -> [u8; 32] {
+        HostFunctionsManager::sha2_512_truncated(message)
+    }
+
+    fn keccak_256(message: &[u8]) -> [u8; 32] {
+        solana_program::keccak::hash(message).to_bytes()
+    }
+
+    fn ripemd160(message: &[u8]) -> [u8; 20] {
+        HostFunctionsManager::ripemd160(message)
+    }
+
+    fn blake2b_512(message: &[u8]) -> [u8; 64] {
+        HostFunctionsManager::blake2b_512(message)
+    }
+
+    fn blake2s_256(message: &[u8]) -> [u8; 32] {
+        HostFunctionsManager::blake2s_256(message)
+    }
+
+    fn blake3(message: &[u8]) -> [u8; 32] {
+        HostFunctionsManager::blake3(message)
+    }
+}

packages/tendermint-light-client/solana/src/lib.rs

@@ -35,7 +35,7 @@ solana-ibc-types = { workspace = true, features = ["light-client"] }
 solana-program.workspace = true
 
 tendermint-light-client-update-client = { workspace = true, features = ["solana"] }
-tendermint-light-client-membership.workspace = true
+tendermint-light-client-membership = { workspace = true, features = ["solana"] }
 tendermint-light-client-misbehaviour.workspace = true
 tendermint-light-client-solana = { workspace = true }