Upgrade to Polkadot-v1.7.2

libs/mocks/Cargo.toml

@@ -47,7 +47,6 @@ std = [
   "sp-runtime/std",
   "orml-traits/std",
   "staging-xcm/std",
-  "mock-builder/std",
 ]
 runtime-benchmarks = [
   "frame-support/runtime-benchmarks",

libs/mocks/src/asset_registry.rs

@@ -4,7 +4,7 @@ pub mod pallet {
 	use mock_builder::{execute_call, register_call};
 	use orml_traits::asset_registry::{AssetMetadata, Inspect, Mutate};
 	use sp_std::fmt::Debug;
-	use staging_xcm::{v3::prelude::MultiLocation, VersionedMultiLocation};
+	use staging_xcm::{v4::Location, VersionedLocation};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
@@ -21,7 +21,7 @@ pub mod pallet {
 	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
-		pub fn mock_asset_id(f: impl Fn(&MultiLocation) -> Option<T::AssetId> + 'static) {
+		pub fn mock_asset_id(f: impl Fn(&Location) -> Option<T::AssetId> + 'static) {
 			register_call!(f);
 		}
 
@@ -36,15 +36,15 @@ pub mod pallet {
 
 		pub fn mock_metadata_by_location(
 			f: impl Fn(
-					&MultiLocation,
+					&Location,
 				) -> Option<AssetMetadata<T::Balance, T::CustomMetadata, T::StringLimit>>
 				+ 'static,
 		) {
 			register_call!(f);
 		}
 
 		pub fn mock_location(
-			f: impl Fn(&T::AssetId) -> Result<Option<MultiLocation>, DispatchError> + 'static,
+			f: impl Fn(&T::AssetId) -> Result<Option<Location>, DispatchError> + 'static,
 		) {
 			register_call!(f);
 		}
@@ -66,7 +66,7 @@ pub mod pallet {
 					Option<BoundedVec<u8, T::StringLimit>>,
 					Option<BoundedVec<u8, T::StringLimit>>,
 					Option<T::Balance>,
-					Option<Option<VersionedMultiLocation>>,
+					Option<Option<VersionedLocation>>,
 					Option<T::CustomMetadata>,
 				) -> DispatchResult
 				+ 'static,
@@ -81,7 +81,7 @@ pub mod pallet {
 		type CustomMetadata = T::CustomMetadata;
 		type StringLimit = T::StringLimit;
 
-		fn asset_id(a: &MultiLocation) -> Option<Self::AssetId> {
+		fn asset_id(a: &Location) -> Option<Self::AssetId> {
 			execute_call!(a)
 		}
 
@@ -92,12 +92,12 @@ pub mod pallet {
 		}
 
 		fn metadata_by_location(
-			a: &MultiLocation,
+			a: &Location,
 		) -> Option<AssetMetadata<Self::Balance, Self::CustomMetadata, Self::StringLimit>> {
 			execute_call!(a)
 		}
 
-		fn location(a: &Self::AssetId) -> Result<Option<MultiLocation>, DispatchError> {
+		fn location(a: &Self::AssetId) -> Result<Option<Location>, DispatchError> {
 			execute_call!(a)
 		}
 	}
@@ -116,7 +116,7 @@ pub mod pallet {
 			c: Option<BoundedVec<u8, Self::StringLimit>>,
 			d: Option<BoundedVec<u8, Self::StringLimit>>,
 			e: Option<Self::Balance>,
-			g: Option<Option<VersionedMultiLocation>>,
+			g: Option<Option<VersionedLocation>>,
 			h: Option<Self::CustomMetadata>,
 		) -> DispatchResult {
 			execute_call!((a, b, c, d, e, g, h))

libs/mocks/src/lib.rs

@@ -57,11 +57,9 @@ macro_rules! make_runtime_for_mock {
 	($runtime_name:ident, $mock_name:ident, $pallet:ident, $externalities:ident) => {
 		use $crate::reexport::{
 			frame_support,
-			frame_support::traits::{ConstU16, ConstU32, ConstU64, Everything},
+            frame_support::derive_impl,
 			frame_system,
-			sp_core::H256,
 			sp_io,
-			sp_runtime::traits::{BlakeTwo256, IdentityLookup},
 		};
 
 		frame_support::construct_runtime!(
@@ -71,31 +69,10 @@ macro_rules! make_runtime_for_mock {
 			}
 		);
 
-		impl frame_system::Config for Runtime {
-			type AccountData = ();
-			type AccountId = u64;
-			type BaseCallFilter = Everything;
-			type Block = frame_system::mocking::MockBlock<Runtime>;
-			type BlockHashCount = ConstU64<250>;
-			type BlockLength = ();
-			type BlockWeights = ();
-			type DbWeight = ();
-			type Hash = H256;
-			type Hashing = BlakeTwo256;
-			type Lookup = IdentityLookup<Self::AccountId>;
-			type MaxConsumers = ConstU32<16>;
-			type Nonce = u64;
-			type OnKilledAccount = ();
-			type OnNewAccount = ();
-			type OnSetCode = ();
-			type PalletInfo = PalletInfo;
-			type RuntimeCall = RuntimeCall;
-			type RuntimeEvent = RuntimeEvent;
-			type RuntimeOrigin = RuntimeOrigin;
-			type SS58Prefix = ConstU16<42>;
-			type SystemWeightInfo = ();
-			type Version = ();
-		}
+        #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+        impl frame_system::Config for Runtime {
+            type Block = frame_system::mocking::MockBlock<Runtime>;
+        }
 
 		pub fn $externalities() -> sp_io::TestExternalities {
 			sp_io::TestExternalities::default()

libs/test-utils/src/mocks/orml_asset_registry.rs

@@ -12,8 +12,8 @@
 
 pub mod reexport {
 	pub use staging_xcm::{
-		v3::prelude::MultiLocation as __private_MultiLocation,
-		VersionedMultiLocation as __private_VersionedMultiLocation,
+		v4::prelude::Location as __private_Location,
+		VersionedLocation as __private_VersionedLocation,
 	};
 }
 
@@ -36,7 +36,7 @@ macro_rules! impl_mock_registry {
 			};
 			use sp_runtime::{BoundedVec, BuildStorage};
 			use $crate::mocks::orml_asset_registry::reexport::{
-				__private_MultiLocation, __private_VersionedMultiLocation,
+				__private_Location, __private_VersionedLocation,
 			};
 
 			use super::*;
@@ -49,7 +49,7 @@ macro_rules! impl_mock_registry {
 				type CustomMetadata = $custom_metadata;
 				type StringLimit = $string_limit;
 
-				fn asset_id(location: &__private_MultiLocation) -> Option<Self::AssetId> {
+				fn asset_id(location: &__private_Location) -> Option<Self::AssetId> {
 					__private::STATE.with(|s| s.borrow().get_asset_from_location(location))
 				}
 
@@ -62,7 +62,7 @@ macro_rules! impl_mock_registry {
 				}
 
 				fn metadata_by_location(
-					location: &__private_MultiLocation,
+					location: &__private_Location,
 				) -> Option<
 					__private_AssetMetadata<Self::Balance, Self::CustomMetadata, Self::StringLimit>,
 				> {
@@ -71,7 +71,7 @@ macro_rules! impl_mock_registry {
 
 				fn location(
 					asset_id: &Self::AssetId,
-				) -> Result<Option<__private_MultiLocation>, __private_DispatchError> {
+				) -> Result<Option<__private_Location>, __private_DispatchError> {
 					let maybe_location =
 						__private::STATE.with(|s| s.borrow().get_location(asset_id));
 
@@ -103,7 +103,7 @@ macro_rules! impl_mock_registry {
 					name: Option<BoundedVec<u8, Self::StringLimit>>,
 					symbol: Option<BoundedVec<u8, Self::StringLimit>>,
 					existential_deposit: Option<Self::Balance>,
-					location: Option<Option<__private_VersionedMultiLocation>>,
+					location: Option<Option<__private_VersionedLocation>>,
 					additional: Option<Self::CustomMetadata>,
 				) -> __private_DispatchResult {
 					__private::STATE.with(|s| {
@@ -192,7 +192,7 @@ macro_rules! impl_mock_registry {
 				use super::*;
 
 				pub struct RegistryState {
-					pub location_to_asset: Vec<(__private_MultiLocation, $asset_id)>,
+					pub location_to_asset: Vec<(__private_Location, $asset_id)>,
 					pub metadata: Vec<(
 						$asset_id,
 						__private_AssetMetadata<$balance, $custom_metadata, $string_limit>,
@@ -230,10 +230,7 @@ macro_rules! impl_mock_registry {
 						Ok(())
 					}
 
-					pub fn get_location(
-						&self,
-						asset_id: &$asset_id,
-					) -> Option<__private_MultiLocation> {
+					pub fn get_location(&self, asset_id: &$asset_id) -> Option<__private_Location> {
 						for (curr_id, meta) in &self.metadata {
 							if curr_id == asset_id {
 								return meta
@@ -249,7 +246,7 @@ macro_rules! impl_mock_registry {
 
 					pub fn get_asset_from_location(
 						&self,
-						location: &__private_MultiLocation,
+						location: &__private_Location,
 					) -> Option<$asset_id> {
 						for (curr_location, asset_id) in &self.location_to_asset {
 							if curr_location == location {
@@ -262,7 +259,7 @@ macro_rules! impl_mock_registry {
 
 					pub fn get_meta_from_location(
 						&self,
-						location: &__private_MultiLocation,
+						location: &__private_Location,
 					) -> Option<__private_AssetMetadata<$balance, $custom_metadata, $string_limit>>
 					{
 						let asset_id = self.get_asset_from_location(location)?;
@@ -276,7 +273,7 @@ macro_rules! impl_mock_registry {
 						name: Option<BoundedVec<u8, $string_limit>>,
 						symbol: Option<BoundedVec<u8, $string_limit>>,
 						existential_deposit: Option<$balance>,
-						location: Option<Option<__private_VersionedMultiLocation>>,
+						location: Option<Option<__private_VersionedLocation>>,
 						additional: Option<$custom_metadata>,
 					) -> __private_DispatchResult {
 						for (curr_id, curr_meta) in &mut self.metadata {

libs/types/src/locations.rs

@@ -16,7 +16,7 @@ use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::{crypto::AccountId32, H256};
 use sp_runtime::traits::{BlakeTwo256, Hash};
-use staging_xcm::VersionedMultiLocation;
+use staging_xcm::VersionedLocation;
 
 use crate::domain_address::DomainAddress;
 /// Location types for destinations that can receive restricted transfers
@@ -39,8 +39,8 @@ impl From<AccountId32> for Location {
 	}
 }
 
-impl From<VersionedMultiLocation> for Location {
-	fn from(vml: VersionedMultiLocation) -> Self {
+impl From<VersionedLocation> for Location {
+	fn from(vml: VersionedLocation) -> Self {
 		// using hash here as multilocation is significantly larger than any other enum
 		// type here -- 592 bytes, vs 40 bytes for domain address (next largest)
 		Self::XCM(BlakeTwo256::hash(&vml.encode()))
@@ -63,7 +63,8 @@ mod test {
 
 	#[test]
 	fn from_xcm_versioned_address_works() {
-		let xa = VersionedMultiLocation::V3(MultiLocation::default());
+		// TODO-1.7: Must be changed to V4?
+		let xa = VersionedLocation::V3(MultiLocation::default());
 		let l = Location::from(xa.clone());
 		assert_eq!(
 			l,

libs/types/src/portfolio.rs

@@ -25,7 +25,7 @@ use sp_std::{cmp::Ordering, marker::PhantomData, vec::Vec};
 /// The total NAV is based on the reserve, the assets under management (AUM) and
 /// pool fees:
 ///
-/// ```ignore
+/// ```text
 /// NAV = PoolReserve + AUM - PoolFees
 /// ```
 ///

node/Cargo.toml

@@ -121,7 +121,6 @@ pallet-evm = { workspace = true, default-features = true }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true, default-features = true }
-vergen = { workspace = true, default-features = true }
 
 [features]
 default = []

pallets/anchors/src/mock.rs

@@ -46,23 +46,11 @@ frame_support::construct_runtime!(
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type Block = frame_system::mocking::MockBlock<Runtime>;
-	type RuntimeEvent = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
-	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = ConstU64<1>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = ();
-	type RuntimeEvent = ();
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
 }
 
 impl pallet_timestamp::Config for Runtime {

pallets/block-rewards/src/benchmarking.rs

@@ -7,7 +7,6 @@ use frame_support::{
 };
 use frame_system::RawOrigin;
 use sp_runtime::traits::Zero;
-use sp_std::vec; // required for #[benchmarks]
 
 use super::*;
 use crate::{pallet::Config, Pallet as BlockRewards};

pallets/block-rewards/src/migrations.rs

@@ -20,7 +20,7 @@ use parity_scale_codec::{Decode, Encode};
 use sp_runtime::FixedPointNumber;
 #[cfg(feature = "try-runtime")]
 use sp_runtime::TryRuntimeError;
-use sp_std::{marker::PhantomData, vec::Vec};
+use sp_std::marker::PhantomData;
 
 use crate::{pallet, Config, Pallet, SessionData};
 
@@ -31,7 +31,7 @@ fn inflation_rate<T: Config>(percent: u32) -> T::Rate {
 pub mod init {
 	use cfg_traits::rewards::{AccountRewards, CurrencyGroupChange, GroupRewards};
 	use num_traits::Zero;
-	use sp_runtime::{BoundedVec, SaturatedConversion};
+	use sp_runtime::SaturatedConversion;
 
 	use super::*;
 
@@ -40,19 +40,6 @@ pub mod init {
 		PhantomData<(T, CollatorReward, AnnualTreasuryInflationPercent)>,
 	);
 
-	fn get_collators<T: pallet_collator_selection::Config>() -> Vec<T::AccountId> {
-		let candidates = BoundedVec::<
-			T::AccountId,
-			<T as pallet_collator_selection::Config>::MaxCandidates,
-		>::truncate_from(
-			pallet_collator_selection::Pallet::<T>::candidates()
-				.into_iter()
-				.map(|c| c.who)
-				.collect(),
-		);
-		pallet_collator_selection::Pallet::<T>::assemble_collators(candidates)
-	}
-
 	impl<T, CollatorReward, AnnualTreasuryInflationPercent> OnRuntimeUpgrade
 		for InitBlockRewards<T, CollatorReward, AnnualTreasuryInflationPercent>
 	where
@@ -63,7 +50,7 @@ pub mod init {
 	{
 		#[cfg(feature = "try-runtime")]
 		fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
-			let collators = get_collators::<T>();
+			let collators = pallet_collator_selection::Pallet::<T>::assemble_collators();
 			assert!(!collators.is_empty());
 
 			assert!(!CollatorReward::get().is_zero());
@@ -85,7 +72,7 @@ pub mod init {
 				pallet::ActiveSessionData::<T>::get() != Default::default();
 
 			log::info!("{LOG_PREFIX} Getting list of collators");
-			let collators = get_collators::<T>();
+			let collators = pallet_collator_selection::Pallet::<T>::assemble_collators();
 
 			let collators_are_staked = collators.clone().into_iter().all(|c| {
 				log::info!("{LOG_PREFIX} Checking stake of collator {c:?}");