feat: Solana Vault Swaps Elections

engine/Cargo.toml

@@ -20,6 +20,11 @@ async-channel = { workspace = true }
 async-trait = { workspace = true }
 bincode = { workspace = true }
 bitcoin = { workspace = true, features = ["serde"] }
+borsh = { version = "1.2.1", default_features = false, features = [
+  "derive",
+  "unstable__schema",
+  "hashbrown",
+] }
 chrono = { workspace = true, features = ["clock"] }
 clap = { workspace = true, features = ["derive", "env"] }
 config = { workspace = true }
@@ -41,7 +46,10 @@ num-bigint = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 secp256k1 = { workspace = true, features = ["hashes"] }
-serde = { workspace = true, default-features = true, features = ["derive", "rc"] }
+serde = { workspace = true, default-features = true, features = [
+  "derive",
+  "rc",
+] }
 serde_json = { workspace = true }
 sha2 = { workspace = true, default-features = true }
 subxt = { workspace = true, features = ["substrate-compat"] }
@@ -51,7 +59,9 @@ tokio-stream = { workspace = true, features = ["sync"] }
 url = { workspace = true }
 web3 = { workspace = true, features = ["ws-tls-tokio"] }
 zeroize = { workspace = true }
-curve25519-dalek = { workspace = true, default-features = true, features = ["serde"] }
+curve25519-dalek = { workspace = true, default-features = true, features = [
+  "serde",
+] }
 ed25519-dalek = { workspace = true }
 pin-project = { workspace = true }
 rand = { workspace = true, default-features = true }
@@ -92,19 +102,26 @@ sol-prim = { workspace = true, features = ["pda", "str", "serde", "scale"] }
 
 # substrate deps
 cf-amm = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true, features = ["derive", "full"] }
+codec = { workspace = true, default-features = true, features = [
+  "derive",
+  "full",
+] }
 frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-scale-info = { workspace = true, default-features = true, features = ["derive"] }
+scale-info = { workspace = true, default-features = true, features = [
+  "derive",
+] }
 sp-core = { workspace = true, default-features = true }
 sp-rpc = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true }
 
-frame-metadata = { workspace = true, default-features = true, features = ["current"] }
+frame-metadata = { workspace = true, default-features = true, features = [
+  "current",
+] }
 serde_bytes = { workspace = true, default-features = true }
 bs58 = { workspace = true, default-features = true }
 base64 = { workspace = true }
@@ -117,7 +134,9 @@ mockall = { workspace = true, features = ["nightly"] }
 multisig = { workspace = true, features = ["test"] }
 rlp = { workspace = true, default-features = true }
 tempfile = { workspace = true }
-cf-utilities = { workspace = true, default-features = true, features = ["test-utils"] }
+cf-utilities = { workspace = true, default-features = true, features = [
+  "test-utils",
+] }
 serde_path_to_error = { workspace = true }
 
 [build-dependencies]

engine/src/elections/voter_api.rs

@@ -66,4 +66,4 @@ macro_rules! generate_voter_api_tuple_impls {
     }
 }
 
-generate_voter_api_tuple_impls!(tuple_6_impls: ((A, A0), (B, B0), (C, C0), (D, D0), (EE, E0), (FF, F0)));
+generate_voter_api_tuple_impls!(tuple_7_impls: ((A, A0), (B, B0), (C, C0), (D, D0), (EE, E0), (FF, F0), (GG, G0)));

engine/src/witness/sol.rs

@@ -1,6 +1,7 @@
 mod egress_witnessing;
 mod fee_tracking;
 mod nonce_witnessing;
+mod program_swaps_witnessing;
 mod sol_deposits;
 
 use crate::{
@@ -16,14 +17,21 @@ use crate::{
 	},
 };
 use anyhow::Result;
-use cf_chains::{sol::SolHash, Chain};
+use cf_chains::{
+	sol::{api::VaultSwapAccountAndSender, SolHash},
+	Chain,
+};
 use futures::FutureExt;
-use pallet_cf_elections::{electoral_system::ElectoralSystem, vote_storage::VoteStorage};
+use pallet_cf_elections::{
+	electoral_system::ElectoralSystem,
+	electoral_systems::solana_swap_accounts_tracking::SolanaVaultSwapsVote,
+	vote_storage::VoteStorage,
+};
 use state_chain_runtime::{
 	chainflip::solana_elections::{
 		SolanaBlockHeightTracking, SolanaEgressWitnessing, SolanaElectoralSystem,
 		SolanaFeeTracking, SolanaIngressTracking, SolanaLiveness, SolanaNonceTracking,
-		TransactionSuccessDetails,
+		SolanaVaultSwapTracking, TransactionSuccessDetails,
 	},
 	SolanaInstance,
 };
@@ -33,7 +41,7 @@ use cf_utilities::{
 	task_scope::{self, Scope},
 };
 use pallet_cf_elections::vote_storage::change::MonotonicChangeVote;
-use std::{str::FromStr, sync::Arc};
+use std::{collections::BTreeSet, str::FromStr, sync::Arc};
 
 #[derive(Clone)]
 struct SolanaBlockHeightTrackingVoter {
@@ -175,6 +183,41 @@ impl VoterApi<SolanaLiveness> for SolanaLivenessVoter {
 	}
 }
 
+#[allow(dead_code)]
+#[derive(Clone)]
+struct SolanaVaultSwapsVoter {
+	client: SolRetryRpcClient,
+}
+
+#[async_trait::async_trait]
+impl VoterApi<SolanaVaultSwapTracking> for SolanaVaultSwapsVoter {
+	async fn vote(
+		&self,
+		settings: <SolanaVaultSwapTracking as ElectoralSystem>::ElectoralSettings,
+		properties: <SolanaVaultSwapTracking as ElectoralSystem>::ElectionProperties,
+	) -> Result<
+		<<SolanaVaultSwapTracking as ElectoralSystem>::Vote as VoteStorage>::Vote,
+		anyhow::Error,
+	> {
+		program_swaps_witnessing::get_program_swaps(
+			&self.client,
+			settings.swap_endpoint_data_account_address,
+			properties
+				.witnessed_open_accounts
+				.into_iter()
+				.map(|VaultSwapAccountAndSender { vault_swap_account, .. }| vault_swap_account)
+				.collect(),
+			properties.closure_initiated_accounts,
+			settings.usdc_token_mint_pubkey,
+		)
+		.await
+		.map(|(new_accounts, confirm_closed_accounts)| SolanaVaultSwapsVote {
+			new_accounts: new_accounts.into_iter().collect::<BTreeSet<_>>(),
+			confirm_closed_accounts: confirm_closed_accounts.into_iter().collect::<BTreeSet<_>>(),
+		})
+	}
+}
+
 pub async fn start<StateChainClient>(
 	scope: &Scope<'_, anyhow::Error>,
 	client: SolRetryRpcClient,
@@ -201,6 +244,7 @@ where
 						SolanaIngressTrackingVoter { client: client.clone() },
 						SolanaNonceTrackingVoter { client: client.clone() },
 						SolanaEgressWitnessingVoter { client: client.clone() },
+						SolanaVaultSwapsVoter { client: client.clone() },
 						SolanaLivenessVoter { client },
 					)),
 				)