Merge pull request #1179 from galacticcouncil/feat/hsm-improve

feat: hsm - account whitelisting, arb profit receiver

Author: enthusiastmartin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.52.2"
+version = "1.52.3"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

integration-tests/Cargo.toml

@@ -11,7 +11,8 @@ use hydradx_runtime::{
 		precompiles::{handle::EvmDataWriter, Bytes},
 		Executor,
 	},
-	AccountId, Currencies, EVMAccounts, FixedU128, Liquidation, Router, Runtime, Tokens, Treasury, HSM,
+	AccountId, Currencies, EVMAccounts, FixedU128, Liquidation, Router, Runtime, Tokens, Treasury, TreasuryAccount,
+	HSM,
 };
 use hydradx_runtime::{OriginCaller, RuntimeCall, RuntimeEvent, RuntimeOrigin, Stableswap};
 use hydradx_traits::evm::{CallContext, EvmAddress, InspectEvmAccounts, EVM};
@@ -120,21 +121,6 @@ fn check_flash_borrower(borrower: EvmAddress) -> bool {
 	!value.is_empty() && value.iter().any(|&x| x != 0)
 }
 
-fn get_max_flash_loan(minter: EvmAddress) -> U256 {
-	//let acl_manager = hex!["c54dcFaEB75F56907E8B1De931dB4E37Bd0Afbb4"].into();
-	let data = EvmDataWriter::new_with_selector(Function::MaxFlashLoan)
-		.write(hollar_contract_address())
-		.build();
-	let context = CallContext::new_view(minter);
-	let (res, value) = Executor::<hydradx_runtime::Runtime>::view(context, data, 100_000);
-	std::assert_eq!(res, Succeed(Returned), "{:?}", hex::encode(value));
-	if value.is_empty() {
-		return U256::zero();
-	} else {
-		return U256::from_big_endian(&value[..]);
-	}
-}
-
 fn mint(facilitator: EvmAddress, to: EvmAddress, amount: u128) {
 	let context = CallContext::new_call(hollar_contract_address(), facilitator);
 	let data = EvmDataWriter::new_with_selector(Function::Mint)
@@ -1642,11 +1628,14 @@ fn arbitrage_should_work_when_hollar_amount_is_less_in_the_pool() {
 			flash_minter,
 		));
 
+		let treasury_balance_initial = Tokens::free_balance(2, &TreasuryAccount::get());
 		let hsm_dai_balance = Tokens::free_balance(2, &hsm_address);
 		assert_ok!(HSM::execute_arbitrage(hydradx_runtime::RuntimeOrigin::none(), 2, None));
 		let final_hsm_dai_balance = Tokens::free_balance(2, &hsm_address);
 		let received = final_hsm_dai_balance - hsm_dai_balance;
-		assert_eq!(received, 65746999678827350701713);
+		let treasury_balance_final = Tokens::free_balance(2, &TreasuryAccount::get());
+		let profit = treasury_balance_final - treasury_balance_initial;
+		assert_eq!(received + profit, 65746999678827350701713);
 	});
 }
 

integration-tests/src/hsm.rs

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-hsm"
-version = "1.2.3"
+version = "1.3.0"
 edition = "2021"
 description = "Hollar stability module"
 authors = ["GalacticCouncil"]

pallets/hsm/Cargo.toml

@@ -145,6 +145,9 @@ pub mod pallet {
 		/// GHO contract address - EVM address of GHO token contract
 		type GhoContractAddress: BoundErc20<AssetId = Self::AssetId>;
 
+		/// Arbitrage profit receiver
+		type ArbitrageProfitReceiver: Get<Self::AccountId>;
+
 		/// Currency - fungible tokens trait to access token transfers
 		type Currency: Mutate<Self::AccountId, Balance = Balance, AssetId = Self::AssetId>;
 
@@ -243,8 +246,10 @@ pub mod pallet {
 		/// - `asset_id`: The collateral asset used in the arbitrage
 		/// - `hollar_amount`: Amount of Hollar that was included in the arbitrage operation
 		ArbitrageExecuted {
+			arbitrage: u8,
 			asset_id: T::AssetId,
 			hollar_amount: Balance,
+			profit: Balance,
 		},
 
 		/// Flash minter address set
@@ -860,14 +865,25 @@ pub mod pallet {
 
 			let (exit_reason, value) = T::Evm::call(context, data, U256::zero(), T::GasLimit::get());
 
+			let receiver_balance_initial = <T as crate::pallet::Config>::Currency::total_balance(
+				collateral_asset_id,
+				&T::ArbitrageProfitReceiver::get(),
+			);
 			if exit_reason != ExitReason::Succeed(ExitSucceed::Returned) {
 				log::error!(target: "hsm", "Flash loan Hollar EVM execution failed - {:?}. Reason: {:?}", exit_reason, value);
 				return Err(Error::<T>::InvalidEVMInteraction.into());
 			}
+			let receiver_balance_final = <T as crate::pallet::Config>::Currency::total_balance(
+				collateral_asset_id,
+				&T::ArbitrageProfitReceiver::get(),
+			);
+			let profit = receiver_balance_final.saturating_sub(receiver_balance_initial);
 
 			Self::deposit_event(Event::<T>::ArbitrageExecuted {
+				arbitrage: arb_direction,
 				asset_id: collateral_asset_id,
 				hollar_amount: flash_loan_amount,
+				profit,
 			});
 
 			Ok(())
@@ -1642,11 +1658,10 @@ where
 				log::trace!(target: "hsm", "Collateral remaining : {:?}", remaining);
 				// In case there is some collateral left after the buy,
 				// we transfer it to the HSM account
-				let hsm_account = Self::account_id();
 				<T as Config>::Currency::transfer(
 					collateral_asset_id,
 					&flash_loan_account,
-					&hsm_account,
+					&T::ArbitrageProfitReceiver::get(),
 					remaining,
 					Preservation::Expendable,
 				)?;
@@ -1681,11 +1696,10 @@ where
 
 			if remaining > 0 {
 				log::trace!(target: "hsm", "Collateral remaining : {:?}", remaining);
-				let hsm_account = Self::account_id();
 				<T as Config>::Currency::transfer(
 					collateral_asset_id,
 					&flash_loan_account,
-					&hsm_account,
+					&T::ArbitrageProfitReceiver::get(),
 					remaining,
 					Preservation::Expendable,
 				)?;
@@ -1753,6 +1767,12 @@ where
 			capacity.saturating_sub(level)
 		}
 	}
+
+	pub fn is_flash_loan_account(account: &T::AccountId) -> bool {
+		GetFlashMinterSupport::<T>::get().map_or(false, |(_, loan_receiver)| {
+			T::EvmAccounts::account_id(loan_receiver) == *account
+		})
+	}
 }
 
 pub struct GetFlashMinterSupport<T>(sp_std::marker::PhantomData<T>);

pallets/hsm/src/lib.rs

@@ -123,8 +123,9 @@ fn arbitrage_should_work_when_less_hollar_in_the_pool_and_arb_amount_given() {
 			assert_eq!(arb_amount, 500_005_437_502_633_106_476);
 
 			let hsm_balance_dai_after = Tokens::free_balance(DAI, &HSM::account_id());
-			assert_eq!(hsm_balance_dai_after - hsm_balance_dai_before, arb_amount);
-			assert_eq!(hsm_balance_dai_after, arb_amount);
+			let profit = Tokens::free_balance(DAI, &HsmArbProfitReceiver::get());
+			assert_eq!(profit, 10_875_005_266_593_893);
+			assert_eq!(hsm_balance_dai_after - hsm_balance_dai_before + profit, arb_amount);
 		});
 }
 
@@ -181,8 +182,9 @@ fn arbitrage_should_work_when_less_hollar_in_the_pool() {
 			assert_eq!(arb_amount, 500_005_437_502_633_106_476);
 
 			let hsm_balance_dai_after = Tokens::free_balance(DAI, &HSM::account_id());
-			assert_eq!(hsm_balance_dai_after - hsm_balance_dai_before, arb_amount);
-			assert_eq!(hsm_balance_dai_after, arb_amount);
+			let profit = Tokens::free_balance(DAI, &HsmArbProfitReceiver::get());
+			assert_eq!(profit, 10_875_005_266_593_893);
+			assert_eq!(hsm_balance_dai_after - hsm_balance_dai_before + profit, arb_amount);
 		});
 }
 

pallets/hsm/src/tests/arb.rs

@@ -72,6 +72,7 @@ pub const CHARLIE: AccountId = AccountId::new([3; 32]);
 pub const PROVIDER: AccountId = AccountId::new([4; 32]);
 
 pub const ARB_ACCOUNT: AccountId = AccountId::new([22; 32]);
+pub const PROFIT_RECEIVER: AccountId = AccountId::new([23; 32]);
 
 pub const ONE: Balance = 1_000_000_000_000_000_000;
 
@@ -193,6 +194,7 @@ parameter_types! {
 	pub PalletId: frame_support::PalletId = frame_support::PalletId(*b"py/hsmdx");
 	pub const GasLimit: u64 = 1_000_000;
 	pub AmplificationRange: RangeInclusive<NonZeroU16> = RangeInclusive::new(NonZeroU16::new(2).unwrap(), NonZeroU16::new(10_000).unwrap());
+	pub HsmArbProfitReceiver: AccountId =  PROFIT_RECEIVER.into();
 }
 
 pub struct DummyRegistry;
@@ -554,6 +556,7 @@ impl Config for Test {
 	type WeightInfo = ();
 	#[cfg(feature = "runtime-benchmarks")]
 	type BenchmarkHelper = for_benchmark_tests::MockHSMBenchmarkHelper;
+	type ArbitrageProfitReceiver = HsmArbProfitReceiver;
 }
 
 pub struct Whitelist;

pallets/hsm/src/tests/mock.rs

@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "345.0.0"
+version = "346.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 license = "Apache 2.0"

runtime/hydradx/Cargo.toml

@@ -672,7 +672,9 @@ pub struct DustRemovalWhitelist;
 
 impl Contains<AccountId> for DustRemovalWhitelist {
 	fn contains(a: &AccountId) -> bool {
-		get_all_module_accounts().contains(a) || pallet_duster::DusterWhitelist::<Runtime>::contains(a)
+		get_all_module_accounts().contains(a)
+			|| HSM::is_flash_loan_account(a)
+			|| pallet_duster::DusterWhitelist::<Runtime>::contains(a)
 	}
 }
 
@@ -1797,6 +1799,7 @@ impl pallet_hsm::Config for Runtime {
 	type PalletId = HsmPalletId;
 	type AuthorityOrigin = EitherOf<EnsureRoot<Self::AccountId>, EitherOf<EconomicParameters, GeneralAdmin>>;
 	type GhoContractAddress = AssetRegistry;
+	type ArbitrageProfitReceiver = TreasuryAccount;
 	type Currency = FungibleCurrencies<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Evm = helpers::benchmark_helpers::DummyEvmForHsm;

runtime/hydradx/src/assets.rs

@@ -120,7 +120,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("hydradx"),
 	impl_name: create_runtime_str!("hydradx"),
 	authoring_version: 1,
-	spec_version: 345,
+	spec_version: 346,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -142,6 +142,7 @@ pub fn get_all_module_accounts() -> Vec<AccountId> {
 		VestingPalletId::get().into_account_truncating(),
 		ReferralsPalletId::get().into_account_truncating(),
 		BondsPalletId::get().into_account_truncating(),
+		HsmPalletId::get().into_account_truncating(),
 		pallet_route_executor::Pallet::<Runtime>::router_account(),
 	]
 }