ics-cf-solana light-client: header verification & client update; protobuf impl

Cargo.toml

@@ -72,6 +72,8 @@ ibc-core-host = { git = "https://github.com/mina86/ibc-rs", rev = "2b50319f3460d
 ibc-core-host-types = { git = "https://github.com/mina86/ibc-rs", rev = "2b50319f3460d03e8781e5a834c4b56bdcfdc5bc", default-features = false }
 ibc-primitives = { git = "https://github.com/mina86/ibc-rs", rev = "2b50319f3460d03e8781e5a834c4b56bdcfdc5bc", default-features = false }
 ibc-testkit = { git = "https://github.com/mina86/ibc-rs", rev = "2b50319f3460d03e8781e5a834c4b56bdcfdc5bc", default-features = false }
+solana-sdk = { git = "https://github.com/ComposableFi/mantis-solana", rev = "d92c52575aaf430ca1f06bc2589f26b0fedde7bf" }
+
 # ibc-testkit               = { git = "https://github.com/mina86/ibc-rs", rev = "6015aea441d4660f7f7ecd89b5e770a993448089" }
 #ibc = { path = "../ibc-rs-mina/ibc" }
 #ibc-app-nft-transfer = { path = "../ibc-rs-mina/ibc-apps/ics721-nft-transfer" }

contracts/pallet-ibc/Cargo.toml

@@ -4,34 +4,34 @@ homepage = "https://composable.finance"
 name = "pallet-ibc"
 version = "0.0.1"
 authors = [
-	"Seun Lanlege <[email protected]>",
-	"David Salami <[email protected]>",
+    "Seun Lanlege <[email protected]>",
+    "David Salami <[email protected]>",
 ]
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [package.metadata.cargo-udeps.ignore]
 normal = [
-	"frame-benchmarking",
-	"pallet-ibc-ping",
-	"balances",
-	"pallet-assets",
-	"simple-iavl",
+    "frame-benchmarking",
+    "pallet-ibc-ping",
+    "balances",
+    "pallet-assets",
+    "simple-iavl",
 ]
 
 [dependencies]
 # crates.io
 log = { version = "0.4.0", default-features = false }
 serde = { version = "1.0.136", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.1", default-features = false, features = [
-	"derive",
+    "derive",
 ] }
 serde_json = { version = "1.0.45", default-features = false }
 sha2 = { version = "0.10.2", default-features = false }
 derive_more = { version = "0.99.17", default-features = false, features = [
-	"from",
-	"display",
+    "from",
+    "display",
 ] }
 borsh = { version = "0.10.3", default-features = false }
 # substrate
@@ -52,7 +52,8 @@ ics23 = { git = "https://github.com/cosmos/ics23", rev = "74ce807b7be39a7e0afb4e
 
 #guest-chain
 cf-guest = { path = "../../light-clients/cf-guest" }
-guestchain = { git = "https://github.com/composableFi/emulated-light-client/" , default-features = false }
+icsxx-cf-solana = { path = "../../light-clients/icsxx-cf-solana" }
+guestchain = { git = "https://github.com/composableFi/emulated-light-client/", default-features = false }
 ed25519-dalek = { version = "2.1.1", default-features = false, features = ["pkcs8"] }
 
 grandpa-client-primitives = { package = "grandpa-light-client-primitives", path = "../../algorithms/grandpa/primitives", default-features = false }
@@ -81,7 +82,7 @@ sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch =
 simple-iavl = { path = "simple-iavl", default-features = false }
 sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
 finality-grandpa = { version = "0.16.2", features = [
-	"derive-codec",
+    "derive-codec",
 ], default-features = false, optional = true }
 
 [dependencies.ibc]
@@ -131,79 +132,79 @@ features = ["mocks"]
 default = ["std"]
 testing = ["ibc/mocks"]
 std = [
-	"codec/std",
-	"log/std",
-	"scale-info/std",
-	"serde/std",
-	"serde_json/std",
-	"sha2/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
-	"sp-runtime/std",
-	"sp-core/std",
-	"sp-std/std",
-	"sp-io/std",
-	"sp-trie/std",
-	"balances/std",
-	"cumulus-primitives-core/std",
-	"pallet-assets/std",
-	"ibc/std",
-	"ibc-proto/std",
-	"ibc-primitives/std",
-	"parachain-info/std",
-	"grandpa-client-primitives/std",
-	"beefy-client-primitives/std",
-	"light-client-common/std",
-	"ics10-grandpa/std",
-	"ics11-beefy/std",
-	"ics07-tendermint/std",
-	"sp-consensus-grandpa/std",
-	"sp-consensus-grandpa/std",
-	"finality-grandpa/std",
-	"hex/std",
-	"pallet-timestamp/std",
-	"ics08-wasm/std",
-	"pallet-ibc-ping?/std",
-	"simple-iavl/std",
-	"chrono/std",
-	"ics23/std",
-	"orml-tokens/std",
-	"orml-traits/std",
-	"pallet-aura?/std",
-	"pallet-membership?/std",
-	"prost/std",
-	"sp-consensus-aura?/std",
-	"sp-consensus-slots?/std",
-	"sp-keystore/std",
-	"tendermint/std",
+    "codec/std",
+    "log/std",
+    "scale-info/std",
+    "serde/std",
+    "serde_json/std",
+    "sha2/std",
+    "frame-benchmarking/std",
+    "frame-support/std",
+    "frame-system/std",
+    "sp-runtime/std",
+    "sp-core/std",
+    "sp-std/std",
+    "sp-io/std",
+    "sp-trie/std",
+    "balances/std",
+    "cumulus-primitives-core/std",
+    "pallet-assets/std",
+    "ibc/std",
+    "ibc-proto/std",
+    "ibc-primitives/std",
+    "parachain-info/std",
+    "grandpa-client-primitives/std",
+    "beefy-client-primitives/std",
+    "light-client-common/std",
+    "ics10-grandpa/std",
+    "ics11-beefy/std",
+    "ics07-tendermint/std",
+    "sp-consensus-grandpa/std",
+    "sp-consensus-grandpa/std",
+    "finality-grandpa/std",
+    "hex/std",
+    "pallet-timestamp/std",
+    "ics08-wasm/std",
+    "pallet-ibc-ping?/std",
+    "simple-iavl/std",
+    "chrono/std",
+    "ics23/std",
+    "orml-tokens/std",
+    "orml-traits/std",
+    "pallet-aura?/std",
+    "pallet-membership?/std",
+    "prost/std",
+    "sp-consensus-aura?/std",
+    "sp-consensus-slots?/std",
+    "sp-keystore/std",
+    "tendermint/std",
 ]
 
 runtime-benchmarks = [
-	"frame-benchmarking",
-	"pallet-ibc-ping",
-	"frame-system/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"hex-literal",
-	"pallet-assets/runtime-benchmarks",
-	"pallet-timestamp/runtime-benchmarks",
-	"pallet-aura",
-	"pallet-membership",
-	"pallet-assets",
-	"balances",
-	"sp-consensus-slots",
-	"sp-consensus-aura/serde",
-	"sp-consensus-aura/std",
-	"ibc-primitives/runtime-benchmarks",
-	"sp-consensus-grandpa",
-	"finality-grandpa",
-	"pallet-ibc-ping/runtime-benchmarks",
-	"frame-benchmarking?/runtime-benchmarks",
-	"orml-tokens/runtime-benchmarks",
-	"pallet-assets?/runtime-benchmarks",
-	"balances?/runtime-benchmarks",
-	"pallet-membership?/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks"
+    "frame-benchmarking",
+    "pallet-ibc-ping",
+    "frame-system/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "hex-literal",
+    "pallet-assets/runtime-benchmarks",
+    "pallet-timestamp/runtime-benchmarks",
+    "pallet-aura",
+    "pallet-membership",
+    "pallet-assets",
+    "balances",
+    "sp-consensus-slots",
+    "sp-consensus-aura/serde",
+    "sp-consensus-aura/std",
+    "ibc-primitives/runtime-benchmarks",
+    "sp-consensus-grandpa",
+    "finality-grandpa",
+    "pallet-ibc-ping/runtime-benchmarks",
+    "frame-benchmarking?/runtime-benchmarks",
+    "orml-tokens/runtime-benchmarks",
+    "pallet-assets?/runtime-benchmarks",
+    "balances?/runtime-benchmarks",
+    "pallet-membership?/runtime-benchmarks",
+    "sp-runtime/runtime-benchmarks"
 ]
 
 try-runtime = ["frame-support/try-runtime"]

contracts/pallet-ibc/src/light_clients.rs

@@ -43,6 +43,10 @@ use ics11_beefy::{
 	client_message::BEEFY_CLIENT_MESSAGE_TYPE_URL, client_state::BEEFY_CLIENT_STATE_TYPE_URL,
 	consensus_state::BEEFY_CONSENSUS_STATE_TYPE_URL,
 };
+use icsxx_cf_solana::{
+	CF_SOLANA_CLIENT_MESSAGE_TYPE_URL, CF_SOLANA_CLIENT_STATE_TYPE_URL,
+	CF_SOLANA_CONSENSUS_STATE_TYPE_URL, CF_SOLANA_HEADER_TYPE_URL, CF_SOLANA_MISBEHAVIOUR_TYPE_URL,
+};
 use prost::Message;
 use sp_core::{crypto::ByteArray, ed25519, H256};
 use sp_runtime::{
@@ -333,6 +337,7 @@ pub enum AnyClient {
 	Tendermint(ics07_tendermint::client_def::TendermintClient<HostFunctionsManager>),
 	Wasm(ics08_wasm::client_def::WasmClient<AnyClient, AnyClientState, AnyConsensusState>),
 	Guest(cf_guest::client_def::GuestClient<PubKey>),
+	CfSolana(icsxx_cf_solana::client_def::CfSolanaClient<PubKey>),
 	#[cfg(any(test, feature = "testing"))]
 	Mock(ibc::mock::client_def::MockClient),
 }
@@ -344,6 +349,7 @@ pub enum AnyUpgradeOptions {
 	Tendermint(ics07_tendermint::client_state::UpgradeOptions),
 	Wasm(Box<Self>),
 	Guest(cf_guest::client::UpgradeOptions),
+	CfSolana(icsxx_cf_solana::client::UpgradeOptions),
 	#[cfg(any(test, feature = "testing"))]
 	Mock(()),
 }
@@ -360,6 +366,8 @@ pub enum AnyClientState {
 	Wasm(ics08_wasm::client_state::ClientState<AnyClient, Self, AnyConsensusState>),
 	#[ibc(proto_url = "GUEST_CLIENT_STATE_TYPE_URL")]
 	Guest(cf_guest::ClientState<PubKey>),
+	#[ibc(proto_url = "CF_SOLANA_CLIENT_STATE_TYPE_URL")]
+	CfSolana(icsxx_cf_solana::ClientState<PubKey>),
 	#[cfg(any(test, feature = "testing"))]
 	#[ibc(proto_url = "MOCK_CLIENT_STATE_TYPE_URL")]
 	Mock(ibc::mock::client_state::MockClientState),
@@ -435,6 +443,8 @@ pub enum AnyConsensusState {
 	Wasm(ics08_wasm::consensus_state::ConsensusState<Self>),
 	#[ibc(proto_url = "GUEST_CONSENSUS_STATE_TYPE_URL")]
 	Guest(cf_guest::ConsensusState),
+	#[ibc(proto_url = "CF_SOLANA_CONSENSUS_STATE_TYPE_URL")]
+	CfSolana(icsxx_cf_solana::ConsensusState),
 	#[cfg(any(test, feature = "testing"))]
 	#[ibc(proto_url = "MOCK_CONSENSUS_STATE_TYPE_URL")]
 	Mock(ibc::mock::client_state::MockConsensusState),
@@ -462,6 +472,8 @@ pub enum AnyClientMessage {
 	Wasm(ics08_wasm::client_message::ClientMessage<Self>),
 	#[ibc(proto_url = "GUEST_CLIENT_MESSAGE_TYPE_URL")]
 	Guest(cf_guest::ClientMessage<PubKey>),
+	#[ibc(proto_url = "CF_SOLANA_CLIENT_MESSAGE_TYPE_URL")]
+	CfSolana(icsxx_cf_solana::ClientMessage<PubKey>),
 	#[cfg(any(test, feature = "testing"))]
 	#[ibc(proto_url = "MOCK_CLIENT_MESSAGE_TYPE_URL")]
 	Mock(ibc::mock::header::MockClientMessage),
@@ -573,6 +585,10 @@ impl From<AnyClientMessage> for Any {
 				type_url: GUEST_CLIENT_MESSAGE_TYPE_URL.to_string(),
 				value: msg.encode_vec().expect("encode_vec failed"),
 			},
+			AnyClientMessage::CfSolana(msg) => Any {
+				type_url: CF_SOLANA_CLIENT_MESSAGE_TYPE_URL.to_string(),
+				value: msg.encode_to_vec().expect("encode_vec failed"),
+			},
 			#[cfg(any(test, feature = "testing"))]
 			AnyClientMessage::Mock(_msg) => panic!("MockHeader can't be serialized"),
 		}

light-clients/ics07-tendermint/src/client_state.rs

@@ -44,6 +44,7 @@ use ibc::{
 };
 
 pub const TENDERMINT_CLIENT_STATE_TYPE_URL: &str = "/ibc.lightclients.tendermint.v1.ClientState";
+
 #[derive(PartialEq, Eq, Debug, Clone, Serialize, Deserialize)]
 pub struct ClientState<H> {
 	pub chain_id: ChainId,

light-clients/icsxx-cf-solana/Cargo.toml

@@ -8,10 +8,16 @@ edition = "2021"
 borsh = "0.10"
 bytemuck = { version = "1.14", default-features = false, features = ["must_cast"] }
 derive_more = { version = "0.99", features = ["from"], default-features = false }
-prost = { version = "0.11", features = ["prost-derive"], default-features = false }
-prost-12 = { package = "prost", version = "0.12", default-features = false }
+prost = { version = "0.12", features = ["prost-derive"], default-features = false }
+prost-11 = { package = "prost", version = "0.11", default-features = false }
 ed25519-consensus = { version = "2", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
+proto-utils = { git = "https://github.com/composableFi/emulated-light-client", default-features = false }
+num_enum = { version = "0.7.3", default-features = false }
+static_assertions = "1.1.0"
+assert_matches = "1.5.0"
+rand_chacha = { version = "0.3.1", default-features = false }
+rand = { version = "0.8.5", default-features = false }
 
 # New IBC
 ibc-core-client-context = { git = "https://github.com/mina86/ibc-rs", rev = "6015aea441d4660f7f7ecd89b5e770a993448089", default-features = false }
@@ -33,9 +39,13 @@ trie-ids = { git = "https://github.com/ComposableFi/emulated-light-client/", def
 sealable-trie = { git = "https://github.com/ComposableFi/emulated-light-client/", features = ["borsh"], default-features = false }
 stdx = { git = "https://github.com/ComposableFi/emulated-light-client/", default-features = false }
 cf-guest-upstream = { package = "cf-guest", git = "https://github.com/ComposableFi/emulated-light-client/", default-features = false }
+bitflags = "2.4.2"
+solana-sdk = { git = "https://github.com/ComposableFi/mantis-solana", rev = "d92c52575aaf430ca1f06bc2589f26b0fedde7bf" }
+itertools = "0.11.0"
+bincode = "1.3.3"
 
 [build-dependencies]
-prost-build = { version = "0.11", default-features = false }
+prost-build = { version = "0.12", default-features = false }
 
 [dev-dependencies]
 insta = { version = "1.34.0" }

light-clients/icsxx-cf-solana/build.rs

@@ -0,0 +1,6 @@
+fn main() -> std::io::Result<()> {
+	prost_build::Config::new()
+		.enable_type_names()
+		.include_file("messages.rs")
+		.compile_protos(&["src/proto/cf-solana.proto"], &["src/proto/"])
+}