feat: Expose vault swaps from ingress-egress-tracker

api/bin/chainflip-ingress-egress-tracker/Cargo.toml

@@ -14,6 +14,7 @@ async-trait = { workspace = true }
 bitcoin = { workspace = true, features = ["serde"] }
 futures = { workspace = true }
 hex = { workspace = true, default-features = true }
+log = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
 serde_json = { workspace = true }
 tokio = { workspace = true }
@@ -25,17 +26,21 @@ config = { workspace = true }
 redis = { workspace = true, features = ["tokio-comp"] }
 
 sp-core = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true, features = ["derive", "full"] }
+codec = { workspace = true, default-features = true, features = [
+    "derive",
+    "full",
+] }
 
 # Local dependencies
 chainflip-engine = { workspace = true }
 cf-utilities = { workspace = true, default-features = true }
-cf-primitives = { workspace = true, default-features = true }
 pallet-cf-environment = { workspace = true, default-features = true }
 pallet-cf-ingress-egress = { workspace = true, default-features = true }
 pallet-cf-broadcast = { workspace = true, default-features = true }
 state-chain-runtime = { workspace = true, default-features = true }
 cf-chains = { workspace = true, default-features = true }
+custom-rpc = { workspace = true }
+chainflip-api = { workspace = true }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true }
@@ -45,3 +50,4 @@ frame-support = { workspace = true, default-features = true }
 insta = { workspace = true, features = ["json"] }
 jsonrpsee = { workspace = true, features = ["full"] }
 mockall = { workspace = true }
+chainflip-engine = { workspace = true, features = ["client-mocks"] }

api/bin/chainflip-ingress-egress-tracker/src/main.rs

@@ -29,6 +29,7 @@ async fn start(
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+	chainflip_api::use_chainflip_account_id_encoding();
 	let settings = DepositTrackerSettings::load_settings_from_all_sources(
 		// Not using the config root or settings dir.
 		"".to_string(),

api/bin/chainflip-ingress-egress-tracker/src/store.rs

@@ -5,10 +5,8 @@ use std::time::Duration;
 
 #[async_trait]
 pub trait Store: Sync + Send + 'static {
-	type Output: Sync + Send + 'static;
-
-	async fn save_to_array<S: Storable>(&mut self, storable: &S) -> anyhow::Result<Self::Output>;
-	async fn save_singleton<S: Storable>(&mut self, storable: &S) -> anyhow::Result<Self::Output>;
+	async fn save_to_array<S: Storable>(&mut self, storable: &S) -> anyhow::Result<()>;
+	async fn save_singleton<S: Storable>(&mut self, storable: &S) -> anyhow::Result<()>;
 }
 
 #[derive(Clone)]
@@ -24,15 +22,13 @@ impl RedisStore {
 
 #[async_trait]
 impl Store for RedisStore {
-	type Output = ();
-
 	async fn save_to_array<S: Storable>(&mut self, storable: &S) -> anyhow::Result<()> {
-		let key = storable.get_key();
+		let key = storable.key();
 		self.con
 			.rpush::<String, String, ()>(key.clone(), serde_json::to_string(storable)?)
 			.await?;
 		self.con
-			.expire::<String, ()>(key, storable.get_expiry_duration().as_secs() as i64)
+			.expire::<String, ()>(key, storable.expiry_duration().as_secs() as i64)
 			.await?;
 
 		Ok(())
@@ -41,9 +37,9 @@ impl Store for RedisStore {
 	async fn save_singleton<S: Storable>(&mut self, storable: &S) -> anyhow::Result<()> {
 		self.con
 			.set_ex::<String, String, ()>(
-				storable.get_key(),
+				storable.key(),
 				serde_json::to_string(storable)?,
-				storable.get_expiry_duration().as_secs(),
+				storable.expiry_duration().as_secs(),
 			)
 			.await?;
 
@@ -54,9 +50,9 @@ impl Store for RedisStore {
 pub trait Storable: Serialize + Sized + Sync + 'static {
 	const DEFAULT_EXPIRY_DURATION: Duration = Duration::from_secs(3600);
 
-	fn get_key(&self) -> String;
+	fn key(&self) -> String;
 
-	fn get_expiry_duration(&self) -> Duration {
+	fn expiry_duration(&self) -> Duration {
 		Self::DEFAULT_EXPIRY_DURATION
 	}
 }

api/bin/chainflip-ingress-egress-tracker/src/utils.rs

@@ -1,17 +1,19 @@
 use cf_chains::instances::{ChainInstanceAlias, ChainInstanceFor};
-use cf_primitives::BroadcastId;
+use chainflip_api::primitives::BroadcastId;
 use chainflip_engine::state_chain_observer::client::{
 	chain_api::ChainApi, storage_api::StorageApi, STATE_CHAIN_CONNECTION,
 };
 use pallet_cf_broadcast::TransactionOutIdFor;
+use sp_core::bounded::alloc::sync::Arc;
+
 use tracing::log;
 
 pub fn hex_encode_bytes(bytes: &[u8]) -> String {
 	format!("0x{}", hex::encode(bytes))
 }
 
 pub async fn get_broadcast_id<I, StateChainClient>(
-	state_chain_client: &StateChainClient,
+	state_chain_client: Arc<StateChainClient>,
 	tx_out_id: &TransactionOutIdFor<state_chain_runtime::Runtime, ChainInstanceFor<I>>,
 ) -> Option<BroadcastId>
 where

api/bin/chainflip-ingress-egress-tracker/src/witnessing.rs

@@ -5,10 +5,11 @@ pub mod state_chain;
 
 use self::state_chain::handle_call;
 use crate::{settings::DepositTrackerSettings, store::RedisStore};
-use anyhow::anyhow;
 use cf_chains::dot::PolkadotHash;
-use cf_primitives::{chains::assets::eth::Asset, NetworkEnvironment};
 use cf_utilities::task_scope;
+use chainflip_api::primitives::{
+	chains::assets::eth::Asset as EthAsset, Asset, NetworkEnvironment,
+};
 use chainflip_engine::{
 	state_chain_observer::{
 		self,
@@ -18,8 +19,10 @@ use chainflip_engine::{
 	},
 	witness::common::epoch_source::EpochSource,
 };
+
+use anyhow::anyhow;
 use sp_core::H160;
-use std::{collections::HashMap, ops::Deref};
+use std::collections::HashMap;
 
 #[derive(Clone)]
 pub(super) struct EnvironmentParameters {
@@ -29,7 +32,7 @@ pub(super) struct EnvironmentParameters {
 	flip_contract_address: H160,
 	usdc_contract_address: H160,
 	usdt_contract_address: H160,
-	supported_erc20_tokens: HashMap<H160, cf_primitives::Asset>,
+	supported_erc20_tokens: HashMap<H160, Asset>,
 	dot_genesis_hash: PolkadotHash,
 	pub chainflip_network: NetworkEnvironment,
 }
@@ -66,15 +69,15 @@ async fn get_env_parameters(state_chain_client: &StateChainClient<()>) -> Enviro
 		.expect("Failed to fetch Ethereum supported assets");
 
 	let flip_contract_address =
-		*supported_erc20_tokens.get(&Asset::Flip).expect("FLIP not supported");
+		*supported_erc20_tokens.get(&EthAsset::Flip).expect("FLIP not supported");
 
 	let usdc_contract_address =
-		*supported_erc20_tokens.get(&Asset::Usdc).expect("USDC not supported");
+		*supported_erc20_tokens.get(&EthAsset::Usdc).expect("USDC not supported");
 
 	let usdt_contract_address =
-		*supported_erc20_tokens.get(&Asset::Usdt).expect("USDT not supported");
+		*supported_erc20_tokens.get(&EthAsset::Usdt).expect("USDT not supported");
 
-	let supported_erc20_tokens: HashMap<H160, cf_primitives::Asset> = supported_erc20_tokens
+	let supported_erc20_tokens: HashMap<H160, Asset> = supported_erc20_tokens
 		.into_iter()
 		.map(|(asset, address)| (address, asset.into()))
 		.collect();
@@ -112,7 +115,7 @@ pub(super) async fn start(
 	store: RedisStore,
 ) -> anyhow::Result<()> {
 	let (state_chain_stream, unfinalized_chain_stream, state_chain_client) = {
-		state_chain_observer::client::StateChainClient::connect_without_account(
+		state_chain_observer::client::StateChainClient::<(), _>::connect_without_account(
 			scope,
 			&settings.state_chain_ws_endpoint,
 		)
@@ -132,7 +135,7 @@ pub(super) async fn start(
 			let state_chain_client = state_chain_client.clone();
 
 			async move {
-				handle_call(call, &mut store, chainflip_network, state_chain_client.deref())
+				handle_call(call, &mut store, chainflip_network, state_chain_client)
 					.await
 					.map_err(|err| anyhow!("failed to handle call: {err:?}"))
 					.unwrap()

api/bin/chainflip-ingress-egress-tracker/src/witnessing/btc.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use cf_primitives::EpochIndex;
 use cf_utilities::task_scope::Scope;
+use chainflip_api::primitives::EpochIndex;
 use chainflip_engine::{
 	btc::retry_rpc::{BtcRetryRpcApi, BtcRetryRpcClient},
 	settings::NodeContainer,

api/bin/chainflip-ingress-egress-tracker/src/witnessing/dot.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use cf_primitives::EpochIndex;
 use cf_utilities::task_scope::Scope;
+use chainflip_api::primitives::EpochIndex;
 use chainflip_engine::{
 	dot::retry_rpc::DotRetryRpcClient,
 	settings::NodeContainer,

api/bin/chainflip-ingress-egress-tracker/src/witnessing/eth.rs

@@ -1,7 +1,9 @@
 use anyhow::Context;
 use cf_chains::{Chain, Ethereum};
-use cf_primitives::chains::assets::eth::Asset;
 use cf_utilities::task_scope;
+use chainflip_api::primitives::{
+	chains::assets::eth::Asset as EthAsset, Asset, EpochIndex, ForeignChain,
+};
 use std::sync::Arc;
 
 use chainflip_engine::{
@@ -37,7 +39,7 @@ pub(super) async fn start<ProcessCall, ProcessingFut>(
 	witness_call: ProcessCall,
 ) -> anyhow::Result<()>
 where
-	ProcessCall: Fn(state_chain_runtime::RuntimeCall, cf_primitives::EpochIndex) -> ProcessingFut
+	ProcessCall: Fn(state_chain_runtime::RuntimeCall, EpochIndex) -> ProcessingFut
 		+ Send
 		+ Sync
 		+ Clone
@@ -73,7 +75,7 @@ where
 		.erc20_deposits::<_, _, _, UsdcEvents>(
 			witness_call.clone(),
 			eth_client.clone(),
-			Asset::Usdc,
+			EthAsset::Usdc,
 			env_params.usdc_contract_address,
 		)
 		.await?
@@ -85,7 +87,7 @@ where
 		.erc20_deposits::<_, _, _, FlipEvents>(
 			witness_call.clone(),
 			eth_client.clone(),
-			Asset::Flip,
+			EthAsset::Flip,
 			env_params.flip_contract_address,
 		)
 		.await?
@@ -97,7 +99,7 @@ where
 		.erc20_deposits::<_, _, _, UsdtEvents>(
 			witness_call.clone(),
 			eth_client.clone(),
-			Asset::Usdt,
+			EthAsset::Usdt,
 			env_params.usdt_contract_address,
 		)
 		.await?
@@ -109,7 +111,7 @@ where
 		.ethereum_deposits(
 			witness_call.clone(),
 			eth_client.clone(),
-			Asset::Eth,
+			EthAsset::Eth,
 			env_params.eth_address_checker_address,
 			env_params.eth_vault_address,
 		)
@@ -123,8 +125,8 @@ where
 			witness_call.clone(),
 			eth_client.clone(),
 			env_params.eth_vault_address,
-			cf_primitives::Asset::Eth,
-			cf_primitives::ForeignChain::Ethereum,
+			Asset::Eth,
+			ForeignChain::Ethereum,
 			env_params.supported_erc20_tokens.clone(),
 		)
 		.logging("witnessing Vault")

api/bin/chainflip-ingress-egress-tracker/src/witnessing/snapshots/chainflip_ingress_egress_tracker__witnessing__state_chain__tests__handle_vault_deposit_calls.snap

@@ -0,0 +1,5 @@
+---
+source: api/bin/chainflip-ingress-egress-tracker/src/witnessing/state_chain.rs
+expression: "store.storage.get(\"vault_deposit:Ethereum:b5c8bd9430b6cc87a0e2fe110ece6bf527fa4f170a4bc8cd032f768fc5219838\").unwrap()"
+---
+{"affiliate_fees":[{"account":"cFHtoB6DrnqUVY4DwMHCVCtgCLsiHvv98oGw8k66tazF2ToFv","bps":10}],"amount":"0x64","boost_fee":5,"broker_fee":{"account":"cFHsUq1uK5opJudRDczhdPVj6LGoVTqYsfj71tbHfKsTAzkJJ","bps":10},"ccm_deposit_metadata":null,"dca_params":{"chunk_interval":100,"number_of_chunks":5},"deposit_chain_block_height":1,"deposit_details":null,"destination_address":"0x0000000000000000000000000000000000000000000000000000000000000000","input_asset":{"asset":"ETH","chain":"Ethereum"},"output_asset":{"asset":"FLIP","chain":"Ethereum"},"refund_params":{"min_price":"0x0","refund_address":{"Eth":"0x541f563237a309b3a61e33bdf07a8930bdba8d99"},"retry_duration":0}}