Change requests applied

Author: nicolad

Cargo.lock

@@ -71,79 +71,31 @@ fn populate_oracle_for_dot() {
 }
 
 #[test]
-fn remove_token_should_clear_dynamic_fees_storage() {
+fn remove_token_should_clear_both_fees_and_oracle_entries() {
 	TestNet::reset();
 
 	Hydra::execute_with(|| {
 		// Arrange
 		init_omnipool_with_oracle();
 		populate_oracle_for_dot();
 
-		// Verify dynamic fees are set for DOT
-		let dot_fees_before = hydradx_runtime::DynamicFees::current_fees(DOT);
-		assert!(
-			dot_fees_before.is_some(),
-			"DOT should have dynamic fees entries before removal"
-		);
-
-		// Get position and remove all liquidity
-		let position_id = 2; // DOT position (HDX=0, DAI=1, DOT=2)
-		let position = pallet_omnipool::Pallet::<hydradx_runtime::Runtime>::load_position(
-			position_id,
-			hydradx_runtime::Omnipool::protocol_account(),
-		)
-		.unwrap();
-
-		// Freeze the asset
-		assert_ok!(hydradx_runtime::Omnipool::set_asset_tradable_state(
-			RuntimeOrigin::root(),
-			DOT,
-			Tradability::FROZEN
-		));
-
-		// Sacrifice the position to remove all shares
-		assert_ok!(hydradx_runtime::Omnipool::sacrifice_position(
-			RuntimeOrigin::signed(hydradx_runtime::Omnipool::protocol_account()),
-			position_id
-		));
-
-		// Act - Remove token from omnipool
-		assert_ok!(hydradx_runtime::Omnipool::remove_token(
-			RuntimeOrigin::root(),
-			DOT,
-			AccountId::from(BOB),
-		));
-
-		// Assert - Dynamic fees should be cleared
-		let dot_fees_after = hydradx_runtime::DynamicFees::current_fees(DOT);
+		// Verify both dynamic fees and oracle entries exist
 		assert!(
-			dot_fees_after.is_none(),
-			"DOT dynamic fees should be cleared after token removal"
+			hydradx_runtime::DynamicFees::current_fees(DOT).is_some(),
+			"DOT should have dynamic fees before removal"
 		);
 
-		// Verify AssetFee storage is cleared
+		// Verify AssetFee storage exists
 		let asset_fee = pallet_dynamic_fees::AssetFee::<hydradx_runtime::Runtime>::get(DOT);
-		assert!(asset_fee.is_none(), "DOT AssetFee storage should be cleared");
+		assert!(asset_fee.is_some(), "DOT AssetFee storage should exist before removal");
 
-		// Verify AssetFeeConfiguration storage is cleared
+		// Verify AssetFeeConfiguration storage exists
 		let asset_fee_config = pallet_dynamic_fees::AssetFeeConfiguration::<hydradx_runtime::Runtime>::get(DOT);
 		assert!(
-			asset_fee_config.is_none(),
-			"DOT AssetFeeConfiguration storage should be cleared"
+			asset_fee_config.is_some(),
+			"DOT AssetFeeConfiguration storage should exist before removal"
 		);
-	});
-}
 
-#[test]
-fn remove_token_should_clear_oracle_entries() {
-	TestNet::reset();
-
-	Hydra::execute_with(|| {
-		// Arrange
-		init_omnipool_with_oracle();
-		populate_oracle_for_dot();
-
-		// Verify oracle entries exist for DOT before removal
 		let hub_asset = LRNA;
 		let assets = if DOT < hub_asset {
 			(DOT, hub_asset)
@@ -163,35 +115,53 @@ fn remove_token_should_clear_oracle_entries() {
 			);
 		}
 
-		// Get position and remove all liquidity
-		let position_id = 2; // DOT position
-		let position = pallet_omnipool::Pallet::<hydradx_runtime::Runtime>::load_position(
-			position_id,
-			hydradx_runtime::Omnipool::protocol_account(),
-		)
-		.unwrap();
+		// Verify whitelist entry exists
+		let whitelist = pallet_ema_oracle::WhitelistedAssets::<hydradx_runtime::Runtime>::get();
+		assert!(
+			whitelist.contains(&(*b"omnipool", assets)),
+			"DOT should be in oracle whitelist before removal"
+		);
 
-		// Freeze the asset
+		// Act
+		// Prepare for token removal
+		let position_id = 2;
 		assert_ok!(hydradx_runtime::Omnipool::set_asset_tradable_state(
 			RuntimeOrigin::root(),
 			DOT,
 			Tradability::FROZEN
 		));
 
-		// Sacrifice the position
 		assert_ok!(hydradx_runtime::Omnipool::sacrifice_position(
 			RuntimeOrigin::signed(hydradx_runtime::Omnipool::protocol_account()),
 			position_id
 		));
 
-		// Act - Remove token from omnipool
+		// Remove token
 		assert_ok!(hydradx_runtime::Omnipool::remove_token(
 			RuntimeOrigin::root(),
 			DOT,
 			AccountId::from(BOB),
 		));
 
-		// Assert - Oracle entries should be cleared
+		// Assert
+		// Verify dynamic fees are cleared
+		assert!(
+			hydradx_runtime::DynamicFees::current_fees(DOT).is_none(),
+			"DOT dynamic fees should be cleared"
+		);
+
+		// Verify AssetFee storage is cleared
+		let asset_fee_after = pallet_dynamic_fees::AssetFee::<hydradx_runtime::Runtime>::get(DOT);
+		assert!(asset_fee_after.is_none(), "DOT AssetFee storage should be cleared");
+
+		// Verify AssetFeeConfiguration storage is cleared
+		let asset_fee_config_after = pallet_dynamic_fees::AssetFeeConfiguration::<hydradx_runtime::Runtime>::get(DOT);
+		assert!(
+			asset_fee_config_after.is_none(),
+			"DOT AssetFeeConfiguration storage should be cleared"
+		);
+
+		// Verify oracle entries are cleared for all periods
 		for period in supported_periods.iter() {
 			let oracle_entry =
 				pallet_ema_oracle::Oracles::<hydradx_runtime::Runtime>::get((*b"omnipool", assets, period));
@@ -203,74 +173,19 @@ fn remove_token_should_clear_oracle_entries() {
 		}
 
 		// Verify whitelist entry is removed
-		let whitelist = pallet_ema_oracle::WhitelistedAssets::<hydradx_runtime::Runtime>::get();
+		let whitelist_after = pallet_ema_oracle::WhitelistedAssets::<hydradx_runtime::Runtime>::get();
 		assert!(
-			!whitelist.contains(&(*b"omnipool", assets)),
+			!whitelist_after.contains(&(*b"omnipool", assets)),
 			"DOT should be removed from oracle whitelist"
 		);
-	});
-}
-
-#[test]
-fn remove_token_should_clear_both_fees_and_oracle_entries() {
-	TestNet::reset();
-
-	Hydra::execute_with(|| {
-		// Arrange
-		init_omnipool_with_oracle();
-		populate_oracle_for_dot();
 
-		// Verify both dynamic fees and oracle entries exist
+		// Verify Accumulator storage is cleared
+		let accumulator = pallet_ema_oracle::Accumulator::<hydradx_runtime::Runtime>::get();
 		assert!(
-			hydradx_runtime::DynamicFees::current_fees(DOT).is_some(),
-			"DOT should have dynamic fees before removal"
+			!accumulator.contains_key(&(*b"omnipool", assets)),
+			"DOT should be removed from oracle accumulator"
 		);
 
-		let hub_asset = LRNA;
-		let assets = if DOT < hub_asset {
-			(DOT, hub_asset)
-		} else {
-			(hub_asset, DOT)
-		};
-
-		let period = OraclePeriod::LastBlock;
-		let oracle_entry_before =
-			pallet_ema_oracle::Oracles::<hydradx_runtime::Runtime>::get((*b"omnipool", assets, period));
-		assert!(
-			oracle_entry_before.is_some(),
-			"Oracle entry should exist for DOT before removal"
-		);
-
-		// Prepare for token removal
-		let position_id = 2;
-		assert_ok!(hydradx_runtime::Omnipool::set_asset_tradable_state(
-			RuntimeOrigin::root(),
-			DOT,
-			Tradability::FROZEN
-		));
-
-		assert_ok!(hydradx_runtime::Omnipool::sacrifice_position(
-			RuntimeOrigin::signed(hydradx_runtime::Omnipool::protocol_account()),
-			position_id
-		));
-
-		// Act - Remove token
-		assert_ok!(hydradx_runtime::Omnipool::remove_token(
-			RuntimeOrigin::root(),
-			DOT,
-			AccountId::from(BOB),
-		));
-
-		// Assert - Both should be cleared
-		assert!(
-			hydradx_runtime::DynamicFees::current_fees(DOT).is_none(),
-			"DOT dynamic fees should be cleared"
-		);
-
-		let oracle_entry_after =
-			pallet_ema_oracle::Oracles::<hydradx_runtime::Runtime>::get((*b"omnipool", assets, period));
-		assert!(oracle_entry_after.is_none(), "Oracle entry should be cleared for DOT");
-
 		// Verify the asset itself is removed
 		let asset_state = hydradx_runtime::Omnipool::assets(DOT);
 		assert!(asset_state.is_none(), "DOT asset should be removed from omnipool");
@@ -301,6 +216,7 @@ fn remove_token_should_not_affect_other_assets() {
 		let hdx_oracle_before =
 			pallet_ema_oracle::Oracles::<hydradx_runtime::Runtime>::get((*b"omnipool", hdx_assets, period));
 
+		// Act
 		// Remove DOT
 		let position_id = 2;
 		assert_ok!(hydradx_runtime::Omnipool::set_asset_tradable_state(
@@ -320,7 +236,8 @@ fn remove_token_should_not_affect_other_assets() {
 			AccountId::from(BOB),
 		));
 
-		// Assert - Other assets' fees and oracle entries should remain
+		// Assert
+		// Other assets' fees and oracle entries should remain
 		let hdx_fees_after = hydradx_runtime::DynamicFees::current_fees(HDX);
 		let dai_fees_after = hydradx_runtime::DynamicFees::current_fees(DAI);
 

integration-tests/src/omnipool_remove_token.rs

@@ -1,6 +1,6 @@
 [package]
 name =  "pallet-dynamic-fees"
-version = "4.0.1"
+version = "4.1.0"
 description = "A pallet to provide support for dynamic fees"
 authors = ["GalacticCouncil"]
 edition = "2021"

pallets/dynamic-fees/Cargo.toml

@@ -426,6 +426,25 @@ where
 		log::trace!(target: "dynamic-fees", "new fees: {:?} {:?}", asset_fee, protocol_fee);
 		(asset_fee, protocol_fee)
 	}
+
+	/// Clears all fee-related storage for an asset
+	///
+	/// This function removes both the asset fee and asset fee configuration entries for the specified asset.
+	/// It emits an `AssetFeeConfigRemoved` event.
+	///
+	/// # Arguments
+	/// * `asset_id` - The asset ID to clear fees for
+	///
+	/// # Returns
+	/// Weight of the operation
+	pub fn clear_asset_fees(asset_id: T::AssetId) -> Weight {
+		AssetFee::<T>::remove(asset_id);
+		AssetFeeConfiguration::<T>::remove(asset_id);
+
+		Self::deposit_event(Event::AssetFeeConfigRemoved { asset_id });
+
+		T::WeightInfo::remove_asset_fee()
+	}
 }
 
 /// Main interface for retrieving dynamic fees

pallets/dynamic-fees/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-ema-oracle"
-version = "1.8.1"
+version = "1.9.0"
 description = "Exponential moving average oracle for AMM pools"
 authors = ["GalacticCouncil"]
 edition = "2021"

pallets/ema-oracle/Cargo.toml

@@ -539,6 +539,47 @@ impl<T: Config> Pallet<T> {
 
 		new_value >= lower_bound && new_value <= upper_bound
 	}
+
+	/// Clears all oracle-related storage for a given asset paired with hub asset
+	///
+	/// This function removes:
+	/// - Oracle entries for all supported periods
+	/// - Whitelist entry
+	/// - Accumulator entry (if present)
+	///
+	/// It emits a `RemovedFromWhitelist` event.
+	///
+	/// # Arguments
+	/// * `source` - The source of the oracle data
+	/// * `asset_id` - The asset ID to clear oracle data for
+	/// * `hub_asset` - The hub asset that `asset_id` is paired with
+	///
+	/// # Returns
+	/// Weight of the operation
+	pub fn clear_asset_oracle(source: Source, asset_id: AssetId, hub_asset: AssetId) -> Weight {
+		let assets = ordered_pair(asset_id, hub_asset);
+
+		// Remove from whitelist
+		WhitelistedAssets::<T>::mutate(|list| {
+			list.remove(&(source, assets));
+		});
+
+		// Remove oracle storage entries for all supported periods
+		let supported_periods = T::SupportedPeriods::get();
+		for period in supported_periods.into_iter() {
+			Oracles::<T>::remove((source, assets, period));
+		}
+
+		// Remove from accumulator if present
+		let _ = Accumulator::<T>::mutate(|accumulator| {
+			accumulator.remove(&(source, assets));
+			Ok::<(), ()>(())
+		});
+
+		Self::deposit_event(Event::RemovedFromWhitelist { source, assets });
+
+		T::WeightInfo::remove_oracle()
+	}
 }
 
 /// A callback handler for trading and liquidity activity that schedules oracle updates.

pallets/ema-oracle/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-omnipool"
-version = "5.1.10"
+version = "5.2.0"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"