Feat: Core DCA

api/bin/chainflip-broker-api/src/main.rs

@@ -1,7 +1,7 @@
 use cf_utilities::task_scope::{task_scope, Scope};
 use chainflip_api::{
 	self,
-	primitives::{AccountRole, Affiliates, Asset, BasisPoints, CcmChannelMetadata},
+	primitives::{AccountRole, Affiliates, Asset, BasisPoints, CcmChannelMetadata, DcaParameters},
 	settings::StateChain,
 	AccountId32, AddressString, BrokerApi, OperatorApi, RefundParameters, StateChainApi,
 	SwapDepositAddress, WithdrawFeesDetail,
@@ -32,6 +32,7 @@ pub trait Rpc {
 		boost_fee: Option<BasisPoints>,
 		affiliate_fees: Option<Affiliates<AccountId32>>,
 		refund_parameters: Option<RefundParameters>,
+		dca_parameters: Option<DcaParameters>,
 	) -> RpcResult<SwapDepositAddress>;
 
 	#[method(name = "withdraw_fees", aliases = ["broker_withdrawFees"])]
@@ -79,6 +80,7 @@ impl RpcServer for RpcServerImpl {
 		boost_fee: Option<BasisPoints>,
 		affiliate_fees: Option<Affiliates<AccountId32>>,
 		refund_parameters: Option<RefundParameters>,
+		dca_parameters: Option<DcaParameters>,
 	) -> RpcResult<SwapDepositAddress> {
 		Ok(self
 			.api
@@ -92,6 +94,7 @@ impl RpcServer for RpcServerImpl {
 				boost_fee,
 				affiliate_fees.unwrap_or_default(),
 				refund_parameters,
+				dca_parameters,
 			)
 			.await?)
 	}

api/bin/chainflip-cli/src/main.rs

@@ -71,6 +71,7 @@ async fn run_cli() -> Result<()> {
 								params.boost_fee,
 								Default::default(),
 								None,
+								None,
 							)
 							.await?;
 						println!("Deposit Address: {address}");

api/lib/src/lib.rs

@@ -10,7 +10,7 @@ use cf_chains::{
 	CcmChannelMetadata, ChannelRefundParameters, ForeignChain, ForeignChainAddress,
 };
 pub use cf_primitives::{AccountRole, Affiliates, Asset, BasisPoints, ChannelId, SemVer};
-use cf_primitives::{BlockNumber, NetworkEnvironment, Price};
+use cf_primitives::{BlockNumber, DcaParameters, NetworkEnvironment, Price};
 use futures::FutureExt;
 use pallet_cf_account_roles::MAX_LENGTH_FOR_VANITY_NAME;
 use pallet_cf_governance::ExecutionMode;
@@ -392,6 +392,7 @@ pub trait BrokerApi: SignedExtrinsicApi + StorageApi + Sized + Send + Sync + 'st
 		boost_fee: Option<BasisPoints>,
 		affiliate_fees: Affiliates<AccountId32>,
 		refund_parameters: Option<RefundParameters>,
+		dca_parameters: Option<DcaParameters>,
 	) -> Result<SwapDepositAddress> {
 		let destination_address =
 			destination_address.try_parse_to_encoded_address(destination_asset.into())?;
@@ -425,6 +426,7 @@ pub trait BrokerApi: SignedExtrinsicApi + StorageApi + Sized + Send + Sync + 'st
 							})
 						})
 						.transpose()?,
+					dca_parameters,
 				},
 			)
 			.await?

state-chain/cf-integration-tests/src/solana.rs

@@ -80,6 +80,7 @@ fn schedule_deposit_to_swap(
 		0u16,
 		Default::default(),
 		None,
+		None,
 	));
 
 	let deposit_address = <AddressDerivation as AddressDerivationApi<Solana>>::generate_address(
@@ -377,6 +378,7 @@ fn solana_ccm_fails_with_invalid_input() {
 					0u16,
 					Default::default(),
 					None,
+					None,
 				),
 				pallet_cf_swapping::Error::<Runtime>::InvalidCcm,
 			);

state-chain/cf-integration-tests/src/swapping.rs

@@ -269,6 +269,7 @@ fn basic_pool_setup_provision_and_swap() {
 				0u16,
 				Default::default(),
 				None,
+				None,
 			));
 
 			let deposit_address =
@@ -392,6 +393,7 @@ fn can_process_ccm_via_swap_deposit_address() {
 			0u16,
 			Default::default(),
 			None,
+			None,
 		));
 
 		// Deposit funds for the ccm.

state-chain/chains/src/lib.rs

@@ -691,7 +691,6 @@ impl RetryPolicy for DefaultRetryPolicy {
 )]
 pub struct SwapRefundParameters {
 	pub refund_block: cf_primitives::BlockNumber,
-	pub refund_address: ForeignChainAddress,
 	pub min_output: cf_primitives::AssetAmount,
 }
 

state-chain/pallets/cf-ingress-egress/src/lib.rs

@@ -31,8 +31,8 @@ use cf_chains::{
 };
 use cf_primitives::{
 	Asset, AssetAmount, BasisPoints, Beneficiaries, BlockNumber, BoostPoolTier, BroadcastId,
-	ChannelId, EgressCounter, EgressId, EpochIndex, ForeignChain, PrewitnessedDepositId,
-	SwapRequestId, ThresholdSignatureRequestId, SECONDS_PER_BLOCK,
+	ChannelId, DcaParameters, EgressCounter, EgressId, EpochIndex, ForeignChain,
+	PrewitnessedDepositId, SwapRequestId, ThresholdSignatureRequestId, SECONDS_PER_BLOCK,
 };
 use cf_runtime_utilities::log_or_panic;
 use cf_traits::{
@@ -144,7 +144,7 @@ impl<C: Chain> CrossChainMessage<C> {
 	}
 }
 
-pub const PALLET_VERSION: StorageVersion = StorageVersion::new(11);
+pub const PALLET_VERSION: StorageVersion = StorageVersion::new(12);
 
 impl_pallet_safe_mode! {
 	PalletSafeMode<I>;
@@ -294,6 +294,7 @@ pub mod pallet {
 			destination_address: ForeignChainAddress,
 			broker_fees: Beneficiaries<AccountId>,
 			refund_params: Option<ChannelRefundParameters>,
+			dca_params: Option<DcaParameters>,
 		},
 		LiquidityProvision {
 			lp_account: AccountId,
@@ -303,6 +304,7 @@ pub mod pallet {
 			destination_address: ForeignChainAddress,
 			channel_metadata: CcmChannelMetadata,
 			refund_params: Option<ChannelRefundParameters>,
+			dca_params: Option<DcaParameters>,
 		},
 	}
 
@@ -1577,6 +1579,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				destination_asset,
 				broker_fees,
 				refund_params,
+				dca_params,
 			} => {
 				if let Ok(swap_request_id) = T::SwapRequestHandler::init_swap_request(
 					asset.into(),
@@ -1585,6 +1588,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 					SwapRequestType::Regular { output_address: destination_address },
 					broker_fees,
 					refund_params,
+					dca_params,
 					swap_origin,
 				) {
 					DepositAction::Swap { swap_request_id }
@@ -1597,6 +1601,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				destination_address,
 				channel_metadata,
 				refund_params,
+				dca_params,
 			} => {
 				if let Ok(swap_request_id) = T::SwapRequestHandler::init_swap_request(
 					asset.into(),
@@ -1612,6 +1617,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 					},
 					Default::default(),
 					refund_params,
+					dca_params,
 					swap_origin,
 				) {
 					DepositAction::CcmTransfer { swap_request_id }
@@ -1939,7 +1945,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 					<T::TargetChain as Chain>::GAS_ASSET.into(),
 					SwapRequestType::IngressEgressFee,
 					Default::default(),
-					None, /* refund params */
+					None, /* no refund params */
+					None, /* no DCA */
 					SwapOrigin::Internal,
 				) {
 					log_or_panic!("Ingress-egress fee swap should never fail");
@@ -2078,13 +2085,14 @@ impl<T: Config<I>, I: 'static> DepositApi<T::TargetChain> for Pallet<T, I> {
 		channel_metadata: Option<CcmChannelMetadata>,
 		boost_fee: BasisPoints,
 		refund_params: Option<ChannelRefundParameters>,
+		dca_params: Option<DcaParameters>,
 	) -> Result<
 		(ChannelId, ForeignChainAddress, <T::TargetChain as Chain>::ChainBlockNumber, Self::Amount),
 		DispatchError,
 	> {
-		if let Some(refund_params) = &refund_params {
+		if let Some(params) = &refund_params {
 			ensure!(
-				refund_params.retry_duration <= MaxSwapRetryDurationBlocks::<T, I>::get(),
+				params.retry_duration <= MaxSwapRetryDurationBlocks::<T, I>::get(),
 				DispatchError::Other("Retry duration too long")
 			);
 		}
@@ -2093,17 +2101,19 @@ impl<T: Config<I>, I: 'static> DepositApi<T::TargetChain> for Pallet<T, I> {
 			&broker_id,
 			source_asset,
 			match channel_metadata {
-				Some(msg) => ChannelAction::CcmTransfer {
+				Some(channel_metadata) => ChannelAction::CcmTransfer {
 					destination_asset,
 					destination_address,
-					channel_metadata: msg,
+					channel_metadata,
 					refund_params,
+					dca_params,
 				},
 				None => ChannelAction::Swap {
 					destination_asset,
 					destination_address,
 					broker_fees,
 					refund_params,
+					dca_params,
 				},
 			},
 			boost_fee,

state-chain/pallets/cf-ingress-egress/src/migrations.rs

@@ -4,9 +4,12 @@ mod add_refund_params;
 pub mod remove_prewitnessed_deposits;
 pub mod withheld_transaction_fees;
 
+mod add_dca_params;
+
 pub type PalletMigration<T, I> = (
 	VersionedMigration<Pallet<T, I>, remove_prewitnessed_deposits::Migration<T, I>, 8, 9>,
 	VersionedMigration<Pallet<T, I>, add_refund_params::Migration<T, I>, 9, 10>,
 	VersionedMigration<Pallet<T, I>, withheld_transaction_fees::Migration<T, I>, 10, 11>,
-	PlaceholderMigration<Pallet<T, I>, 11>,
+	VersionedMigration<Pallet<T, I>, add_dca_params::Migration<T, I>, 11, 12>,
+	PlaceholderMigration<Pallet<T, I>, 12>,
 );