Snowbridge: Remove snowbridge-pallet-system::NativeToForeignId (#730)

Co-authored-by: Branislav Kontur <[email protected]>
Co-authored-by: Adrian Catangiu <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Slash and disable lazy and spammy validators as part of the new validator disabling strategy ([SDK #6827](https://github.com/paritytech/polkadot-sdk/pull/6827), [polkadot-fellows/runtimes/pull/782](https://github.com/polkadot-fellows/runtimes/pull/782))
 - Switch to UpToLimitWithReEnablingDisablingStrategy (Polkadot & Kusama) which always prioritises highest offenders for disabling instead of stopping when limit is reached ([polkadot-fellows/runtimes/pull/781](https://github.com/polkadot-fellows/runtimes/pull/781))
+- Snowbridge: Remove `snowbridge-pallet-system::NativeToForeignId` which is unused. ([#730](https://github.com/polkadot-fellows/runtimes/pull/730))
 
 ## [1.6.0] 19.06.2025
 
@@ -24,7 +25,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - [[#711](https://github.com/polkadot-fellows/runtimes/pull/711)] Pallet-broker: add extrinsic to remove a lease ([SDK stable2503 #7026](https://github.com/paritytech/polkadot-sdk/pull/7026)).
   - [[#711](https://github.com/polkadot-fellows/runtimes/pull/711)] Pallet-broker: add extrinsic to remove an assignment ([SDK stable2503 #7080](https://github.com/paritytech/polkadot-sdk/pull/7080)).
   - [[#711](https://github.com/polkadot-fellows/runtimes/pull/711)] Pallet-broker: add extrinsic to reserve a system core without having to wait two sale boundaries ([SDK stable2503 #4273](https://github.com/paritytech/polkadot-sdk/pull/4273)).
-
 - [[#755](https://github.com/polkadot-fellows/runtimes/pull/755)] Added `pallet_revive` to Kusama AssetHub.
 
 ### Changed

system-parachains/bridge-hubs/bridge-hub-polkadot/src/lib.rs

@@ -143,8 +143,8 @@ pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, TxExtension>;
 
 parameter_types! {
-	pub const BridgeKusamaMessagesPalletName: &'static str = "BridgeKusamaMessages";
-	pub const OutboundLanesCongestedSignalsKey: &'static str = "OutboundLanesCongestedSignals";
+	pub const EthereumSystemPalletName: &'static str = "EthereumSystem";
+	pub const NativeToForeignIdKey: &'static str = "NativeToForeignId";
 }
 
 /// Migrations to apply on runtime upgrade.
@@ -154,7 +154,11 @@ pub type Migrations = (
 		Runtime,
 		bridge_to_kusama_config::XcmOverBridgeHubKusamaInstance,
 	>,
-	snowbridge_pallet_system::migration::FeePerGasMigrationV0ToV1<Runtime>,
+	frame_support::migrations::RemoveStorage<
+		EthereumSystemPalletName,
+		NativeToForeignIdKey,
+		RocksDbWeight,
+	>,
 	pallet_session::migrations::v1::MigrateV0ToV1<
 		Runtime,
 		pallet_session::migrations::v1::InitOffenceSeverity<Runtime>,

system-parachains/bridge-hubs/bridge-hub-polkadot/tests/snowbridge.rs

@@ -16,27 +16,35 @@
 
 #![cfg(test)]
 
+use bp_bridge_hub_polkadot::{snowbridge::EthereumLocation, BRIDGE_HUB_POLKADOT_PARACHAIN_ID};
 use bp_polkadot_core::Signature;
 use bridge_hub_polkadot_runtime::{
 	bridge_to_ethereum_config::{EthereumGatewayAddress, EthereumNetwork},
 	bridge_to_kusama_config::OnBridgeHubPolkadotRefundBridgeHubKusamaMessages,
-	xcm_config::{GovernanceLocation, XcmConfig, XcmFeeManagerFromComponentsBridgeHub},
+	xcm_config::{
+		GovernanceLocation, UniversalLocation, XcmConfig, XcmFeeManagerFromComponentsBridgeHub,
+	},
 	AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages, Executive,
 	MessageQueueServiceWeight, Runtime, RuntimeCall, RuntimeEvent, SessionKeys, TxExtension,
 	UncheckedExtrinsic,
 };
 use bridge_hub_test_utils::GovernanceOrigin;
 use codec::{Decode, Encode};
-use cumulus_primitives_core::XcmError::{FailedToTransactAsset, TooExpensive};
+use cumulus_primitives_core::{
+	ParaId,
+	XcmError::{FailedToTransactAsset, TooExpensive},
+};
 use frame_support::{
 	assert_err, assert_ok, parameter_types,
 	traits::{fungible::Mutate, Contains},
 };
+use hex_literal::hex;
 use parachains_common::{AccountId, AuraId, Balance};
 pub use parachains_runtimes_test_utils::test_cases::change_storage_constant_by_governance_works;
 use parachains_runtimes_test_utils::{
 	AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder, ValidatorIdOf,
 };
+use snowbridge_core::{TokenId, TokenIdOf};
 use snowbridge_pallet_ethereum_client::WeightInfo;
 use snowbridge_pallet_ethereum_client_fixtures::*;
 use sp_core::{Get, H160};
@@ -47,7 +55,8 @@ use sp_runtime::{
 };
 use xcm::latest::prelude::*;
 use xcm_builder::HandleFee;
-use xcm_executor::traits::{FeeManager, FeeReason};
+use xcm_executor::traits::{ConvertLocation, FeeManager, FeeReason};
+
 parameter_types! {
 	pub const DefaultBridgeHubEthereumBaseFee: Balance = 3_833_568_200_000;
 }
@@ -416,3 +425,111 @@ fn construct_and_apply_extrinsic(
 	let r = Executive::apply_extrinsic(xt);
 	r.unwrap()
 }
+
+// Check compatibility for `token_id` stored on ethereum. If this test starts to fail, the [TokenIdOf](https://github.com/paritytech/polkadot-sdk/blob/20510c488198e8ee72b241fd2d0f6d1784982734/bridges/snowbridge/primitives/core/src/location.rs#L38-L43)
+// converter should be updated to ensure the generated token ID remains consistent and unchanged.
+#[test]
+fn check_compatibility_for_token_id_stored_on_ethereum() {
+	pub struct RegisterTokenTestCase {
+		/// Input: Location of Polkadot-native token relative to BH
+		pub native: Location,
+		/// Output: Reanchored, canonicalized location
+		pub reanchored: Location,
+		/// Output: Stable hash of reanchored location
+		pub foreign: TokenId,
+	}
+	let test_cases = vec![
+		// DOT
+		RegisterTokenTestCase {
+			native: Location::parent(),
+			reanchored: Location::new(1, GlobalConsensus(Polkadot)),
+			foreign: hex!("4e241583d94b5d48a27a22064cd49b2ed6f5231d2d950e432f9b7c2e0ade52b2")
+				.into(),
+		},
+		// KSM
+		RegisterTokenTestCase {
+			native: Location::new(2, [GlobalConsensus(Kusama)]),
+			reanchored: Location::new(1, [GlobalConsensus(Kusama)]),
+			foreign: hex!("03b6054d0c576dd8391e34e1609cf398f68050c23009d19ce93c000922bcd852")
+				.into(),
+		},
+		// PINK
+		RegisterTokenTestCase {
+			native: Location::new(1, [Parachain(1000), PalletInstance(50), GeneralIndex(23)]),
+			reanchored: Location::new(
+				1,
+				[GlobalConsensus(Polkadot), Parachain(1000), PalletInstance(50), GeneralIndex(23)],
+			),
+			foreign: hex!("bc8785969587ef3d22739d3385cb519a9e0133dd5da8d320c376772468c19be6")
+				.into(),
+		},
+		// TEER
+		RegisterTokenTestCase {
+			native: Location::new(1, [Parachain(2039)]),
+			reanchored: Location::new(1, [GlobalConsensus(Polkadot), Parachain(2039)]),
+			foreign: hex!("3b7f577715347bdcde4739a1bf1a7f1dec71e8ff4dbe23a6a49348ebf920c658")
+				.into(),
+		},
+		// Hydration
+		RegisterTokenTestCase {
+			native: Location::new(1, [Parachain(2034), GeneralIndex(0)]),
+			reanchored: Location::new(
+				1,
+				[GlobalConsensus(Polkadot), Parachain(2034), GeneralIndex(0)],
+			),
+			foreign: hex!("d5678e3bb6486c4fef73dc109cf23d5648654edd4b41fb32e1ce9f9a984a3d59")
+				.into(),
+		},
+		// Voucher DOT
+		RegisterTokenTestCase {
+			native: Location::new(
+				1,
+				[
+					Parachain(2030),
+					GeneralKey {
+						length: 2,
+						data: hex!(
+							"0900000000000000000000000000000000000000000000000000000000000000"
+						),
+					},
+				],
+			),
+			reanchored: Location::new(
+				1,
+				[
+					GlobalConsensus(Polkadot),
+					Parachain(2030),
+					GeneralKey {
+						length: 2,
+						data: hex!(
+							"0900000000000000000000000000000000000000000000000000000000000000"
+						),
+					},
+				],
+			),
+			foreign: hex!("2a8080362874bbfeb585d676eba3f06e3b878d7c5d5f98d2a092ebb375bd484c")
+				.into(),
+		},
+	];
+	for tc in test_cases.iter() {
+		ExtBuilder::<Runtime>::default()
+			.with_collators(collator_session_keys().collators())
+			.with_session_keys(collator_session_keys().session_keys())
+			.with_para_id(ParaId::from(BRIDGE_HUB_POLKADOT_PARACHAIN_ID))
+			.with_tracing()
+			.build()
+			.execute_with(|| {
+				let ethereum_location = EthereumLocation::get();
+				// reanchor to Ethereum context
+				let location = tc
+					.native
+					.clone()
+					.reanchored(&ethereum_location, &UniversalLocation::get())
+					.unwrap();
+				assert_eq!(location, tc.reanchored);
+
+				let token_id = TokenIdOf::convert_location(&location).unwrap();
+				assert_eq!(token_id, tc.foreign);
+			})
+	}
+}