chore: fix vault_swap_request

chainflip-io · Nov 8, 2024 · fab6ad1 · fab6ad1
1 parent c607c8e
commit fab6ad1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/engine/src/witness/arb.rs b/engine/src/witness/arb.rs
@@ -177,7 +177,8 @@ struct ArbCallBuilder {}
 
 use cf_chains::{address::EncodedAddress, CcmDepositMetadata, ChannelRefundParameters};
 use cf_primitives::{
-	Asset, AssetAmount, BasisPoints, Beneficiaries, DcaParameters, TransactionHash,
+	AccountId, Affiliates, Asset, AssetAmount, BasisPoints, Beneficiary, DcaParameters,
+	TransactionHash,
 };
 
 impl super::evm::vault::IngressCallBuilder for ArbCallBuilder {
@@ -190,7 +191,8 @@ impl super::evm::vault::IngressCallBuilder for ArbCallBuilder {
 		destination_address: EncodedAddress,
 		deposit_metadata: Option<CcmDepositMetadata>,
 		tx_hash: TransactionHash,
-		_broker_fees: Beneficiaries<ShortId>,
+		_broker_fees: Beneficiary<AccountId>,
+		_affiliate_fees: Affiliates<ShortId>,
 		refund_params: Option<ChannelRefundParameters>,
 		dca_params: Option<DcaParameters>,
 		// This is only to be checked in the pre-witnessed version
@@ -205,8 +207,9 @@ impl super::evm::vault::IngressCallBuilder for ArbCallBuilder {
 				deposit_metadata,
 				tx_hash,
 				deposit_details: Box::new(DepositDetails { tx_hashes: Some(vec![tx_hash.into()]) }),
-				// Defaulting to no broker fees until PRO-1743 is completed.
+				// TODO: To update after PRO-1751 for both broker_fees and affiliate_fees
 				broker_fees: Default::default(),
+				// affiliate_fees: Default::default(),
 				boost_fee: boost_fee.unwrap_or_default(),
 				dca_params,
 				refund_params: refund_params.map(Box::new),

diff --git a/engine/src/witness/common/cf_parameters.rs b/engine/src/witness/common/cf_parameters.rs
@@ -25,8 +25,9 @@ pub struct VaultSwapParameters {
 	pub refund_params: ChannelRefundParameters,
 	pub dca_params: Option<DcaParameters>,
 	pub boost_fee: Option<BasisPoints>,
-	// TODO: Should we use u8 instead of BasisPoints for fees as in Bitcoin?
+	// TODO: Create BrokerAndFee instead so fee is also a u8?
 	pub broker_fees: Beneficiary<AccountId>,
+	// TODO: Use AffiliateAndFee in PRO-1751
 	pub affiliate_fees: Affiliates<ShortId>,
 }
 

diff --git a/engine/src/witness/eth.rs b/engine/src/witness/eth.rs
@@ -223,7 +223,8 @@ where
 
 use cf_chains::{address::EncodedAddress, CcmDepositMetadata, ChannelRefundParameters};
 use cf_primitives::{
-	Asset, AssetAmount, BasisPoints, Beneficiaries, DcaParameters, TransactionHash,
+	AccountId, Affiliates, Asset, AssetAmount, BasisPoints, Beneficiary, DcaParameters,
+	TransactionHash,
 };
 
 pub struct EthCallBuilder {}
@@ -238,7 +239,8 @@ impl super::evm::vault::IngressCallBuilder for EthCallBuilder {
 		destination_address: EncodedAddress,
 		deposit_metadata: Option<CcmDepositMetadata>,
 		tx_hash: TransactionHash,
-		_broker_fees: Beneficiaries<ShortId>,
+		_broker_fees: Beneficiary<AccountId>,
+		_affiliate_fees: Affiliates<ShortId>,
 		refund_params: Option<ChannelRefundParameters>,
 		dca_params: Option<DcaParameters>,
 		// This is only to be checked in the pre-witnessed version
@@ -253,8 +255,9 @@ impl super::evm::vault::IngressCallBuilder for EthCallBuilder {
 				deposit_metadata,
 				tx_hash,
 				deposit_details: Box::new(DepositDetails { tx_hashes: Some(vec![tx_hash.into()]) }),
-				// Defaulting to no broker fees until PRO-1743 is completed.
+				// TODO: To update after PRO-1751 for both broker_fees and affiliate_fees
 				broker_fees: Default::default(),
+				// affiliate_fees: Default::default(),
 				boost_fee: boost_fee.unwrap_or_default(),
 				dca_params,
 				refund_params: refund_params.map(Box::new),

diff --git a/engine/src/witness/evm/vault.rs b/engine/src/witness/evm/vault.rs
@@ -22,7 +22,9 @@ use cf_chains::{
 	evm::DepositDetails,
 	CcmChannelMetadata, CcmDepositMetadata, Chain, ChannelRefundParameters,
 };
-use cf_primitives::{Asset, BasisPoints, DcaParameters, ForeignChain};
+use cf_primitives::{
+	AccountId, Affiliates, Asset, BasisPoints, Beneficiary, DcaParameters, ForeignChain,
+};
 use ethers::prelude::*;
 use state_chain_runtime::{EthereumInstance, Runtime, RuntimeCall};
 
@@ -78,8 +80,8 @@ where
 				try_into_encoded_address(try_into_primitive(dst_chain)?, dst_address.to_vec())?,
 				None,
 				event.tx_hash.into(),
-				// TODO: To update after PRO-1751 for both broker_fees and affiliate_fees
-				Default::default(),
+				vault_swap_parameters.broker_fees,
+				vault_swap_parameters.affiliate_fees,
 				Some(vault_swap_parameters.refund_params),
 				vault_swap_parameters.dca_params,
 				vault_swap_parameters.boost_fee,
@@ -108,8 +110,8 @@ where
 				try_into_encoded_address(try_into_primitive(dst_chain)?, dst_address.to_vec())?,
 				None,
 				event.tx_hash.into(),
-				// TODO: To update after PRO-1751 for both broker_fees and affiliate_fees
-				Default::default(),
+				vault_swap_parameters.broker_fees,
+				vault_swap_parameters.affiliate_fees,
 				Some(vault_swap_parameters.refund_params),
 				vault_swap_parameters.dca_params,
 				vault_swap_parameters.boost_fee,
@@ -152,8 +154,8 @@ where
 					},
 				}),
 				event.tx_hash.into(),
-				// TODO: To update after PRO-1751 for both broker_fees and affiliate_fees
-				Default::default(),
+				vault_swap_parameters.broker_fees,
+				vault_swap_parameters.affiliate_fees,
 				Some(vault_swap_parameters.refund_params),
 				vault_swap_parameters.dca_params,
 				vault_swap_parameters.boost_fee,
@@ -199,8 +201,8 @@ where
 					},
 				}),
 				event.tx_hash.into(),
-				// TODO: To update after PRO-1751 for both broker_fees and affiliate_fees
-				Default::default(),
+				vault_swap_parameters.broker_fees,
+				vault_swap_parameters.affiliate_fees,
 				Some(vault_swap_parameters.refund_params),
 				vault_swap_parameters.dca_params,
 				vault_swap_parameters.boost_fee,
@@ -247,7 +249,8 @@ pub trait IngressCallBuilder {
 		destination_address: EncodedAddress,
 		deposit_metadata: Option<CcmDepositMetadata>,
 		tx_hash: cf_primitives::TransactionHash,
-		broker_fees: cf_primitives::Beneficiaries<ShortId>,
+		broker_fees: Beneficiary<AccountId>,
+		affiliate_fees: Affiliates<ShortId>,
 		refund_params: Option<ChannelRefundParameters>,
 		dca_params: Option<DcaParameters>,
 		boost_fee: Option<BasisPoints>,