allow withdrawing only relayer fees in pallet hyperbridge (#491)

Author: dharjeezy

modules/pallets/hyperbridge/src/lib.rs

@@ -155,13 +155,6 @@ pub mod pallet {
 			/// The withdrawal beneficiary
 			account: T::AccountId,
 		},
-		/// Hyperbridge has withdrawn it's protocol revenue
-		ProtocolRevenueWithdrawn {
-			/// The amount that was withdrawn
-			amount: <T as pallet_ismp::Config>::Balance,
-			/// The withdrawal beneficiary
-			account: T::AccountId,
-		},
 	}
 
 	// Errors encountered by pallet-hyperbridge
@@ -213,7 +206,7 @@ where
 				if fees != 0 {
 					T::Currency::transfer(
 						&fee.payer,
-						&PALLET_HYPERBRIDGE.into_account_truncating(),
+						&RELAYER_FEE_ACCOUNT.into_account_truncating(),
 						fees.into(),
 						Preservation::Expendable,
 					)
@@ -258,7 +251,7 @@ where
 		if fees != 0 {
 			T::Currency::transfer(
 				&fee.payer,
-				&PALLET_HYPERBRIDGE.into_account_truncating(),
+				&RELAYER_FEE_ACCOUNT.into_account_truncating(),
 				fees.into(),
 				Preservation::Expendable,
 			)
@@ -292,8 +285,6 @@ pub struct WithdrawalRequest<Account, Amount> {
 pub enum Message<Account, Balance> {
 	/// Set some new host params
 	UpdateHostParams(VersionedHostParams<Balance>),
-	/// Withdraw the hyperbridge protocol reveneue
-	WithdrawProtocolFees(WithdrawalRequest<Account, Balance>),
 	/// Withdraw the fees owed to a relayer
 	WithdrawRelayerFees(WithdrawalRequest<Account, Balance>),
 }
@@ -322,20 +313,6 @@ where
 				Self::deposit_event(Event::<T>::HostParamsUpdated { old, new });
 				T::DbWeight::get().reads_writes(0, 0)
 			},
-			Message::WithdrawProtocolFees(WithdrawalRequest { account, amount }) => {
-				T::Currency::transfer(
-					&PALLET_HYPERBRIDGE.into_account_truncating(),
-					&account,
-					amount,
-					Preservation::Expendable,
-				)
-				.map_err(|err| {
-					ismp::Error::Custom(format!("Error withdrawing protocol fees: {err:?}"))
-				})?;
-
-				Self::deposit_event(Event::<T>::ProtocolRevenueWithdrawn { account, amount });
-				T::DbWeight::get().reads_writes(0, 0)
-			},
 			Message::WithdrawRelayerFees(WithdrawalRequest { account, amount }) => {
 				T::Currency::transfer(
 					&RELAYER_FEE_ACCOUNT.into_account_truncating(),

modules/pallets/testsuite/src/tests/pallet_hyperbridge.rs

@@ -99,12 +99,7 @@ fn test_dispatch_fees() {
 		assert_eq!(Balances::balance(&account), Default::default());
 
 		// now pallet-ismp has it
-		assert_eq!(Balances::balance(&RELAYER_FEE_ACCOUNT.into_account_truncating()), 10 * UNIT);
-		// and pallet-hyperbridge
-		assert_eq!(
-			Balances::balance(&PALLET_HYPERBRIDGE.into_account_truncating()),
-			64 * 10 * UNIT
-		);
+		assert_eq!(Balances::balance(&RELAYER_FEE_ACCOUNT.into_account_truncating()),  65 * 10 * UNIT);
 	});
 }
 
@@ -115,29 +110,11 @@ fn test_can_withdraw_relayer_and_protocol_revenue() {
 	let hyperbridge = Hyperbridge::default();
 
 	ext.execute_with(|| {
-		// init the balances
-		Balances::mint_into(&PALLET_HYPERBRIDGE.into_account_truncating(), 65 * 10 * UNIT).unwrap();
 		Balances::mint_into(&RELAYER_FEE_ACCOUNT.into_account_truncating(), 65 * 10 * UNIT)
 			.unwrap();
 
 		let withdrawal = WithdrawalRequest { amount: 65 * 10 * UNIT, account: account.clone() };
 
-		let data = Message::<AccountId32, u128>::WithdrawProtocolFees(withdrawal.clone()).encode();
-		hyperbridge
-			.on_accept(PostRequest {
-				source: Coprocessor::get().unwrap(),
-				dest: StateMachine::Polkadot(2001),
-				nonce: 0,
-				from: vec![],
-				to: vec![],
-				timeout_timestamp: 0,
-				body: data,
-			})
-			.unwrap();
-
-		// protocol fees withdrawn
-		assert_eq!(Balances::balance(&account), 65 * 10 * UNIT);
-
 		let data = Message::<AccountId32, u128>::WithdrawRelayerFees(withdrawal.clone()).encode();
 		hyperbridge
 			.on_accept(PostRequest {
@@ -152,6 +129,6 @@ fn test_can_withdraw_relayer_and_protocol_revenue() {
 			.unwrap();
 
 		// relayer fees withdrawn
-		assert_eq!(Balances::balance(&account), 130 * 10 * UNIT);
+		assert_eq!(Balances::balance(&account), 65 * 10 * UNIT);
 	});
 }