From eca09a2289d8e27f25ecb2b2e258f804ee546e9f Mon Sep 17 00:00:00 2001
From: Daniel Shiposha <mrshiposha@gmail.com>
Date: Tue, 28 May 2024 09:50:23 +0000
Subject: [PATCH] fix: foreign flags


---
--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -40,8 +40,8 @@
 	AssetsInHolding,
 };
 use up_data_structs::{
-	budget::ZeroBudget, CollectionId, CollectionMode, CollectionName, CollectionTokenPrefix,
-	CreateCollectionData, CreateFungibleData, CreateItemData, TokenId,
+	budget::ZeroBudget, CollectionFlags, CollectionId, CollectionMode, CollectionName,
+	CollectionTokenPrefix, CreateCollectionData, CreateFungibleData, CreateItemData, TokenId,
 };
 
 pub mod weights;
@@ -224,6 +224,10 @@
 					token_prefix,
 					description,
 					mode: mode.into(),
+					flags: CollectionFlags {
+						foreign: true,
+						..Default::default()
+					},
 					..Default::default()
 				},
 			)?;
@@ -243,7 +247,19 @@
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		fn on_runtime_upgrade() -> Weight {
-			Self::migrate_v3_to_v4()
+			if Self::on_chain_storage_version() < staging_xcm::v4::VERSION as u16 {
+				let put_version_weight = T::DbWeight::get().writes(1);
+				let fix_foreign_flag_weight = Self::fix_foreign_flag();
+				let weight_v3_to_v4 = Self::migrate_v3_to_v4();
+
+				StorageVersion::new(staging_xcm::v4::VERSION as u16).put::<Self>();
+
+				put_version_weight
+					.saturating_add(fix_foreign_flag_weight)
+					.saturating_add(weight_v3_to_v4)
+			} else {
+				Weight::zero()
+			}
 		}
 	}
 }
@@ -283,24 +299,31 @@
 }
 
 impl<T: Config> Pallet<T> {
-	fn migrate_v3_to_v4() -> Weight {
-		if Self::on_chain_storage_version() < staging_xcm::v4::VERSION as u16 {
-			let put_version_weight = T::DbWeight::get().writes(1);
-			let event_weight = T::DbWeight::get().writes(1);
-			let collection_migration_weight = Self::migrate_collections();
-
-			StorageVersion::new(staging_xcm::v4::VERSION as u16).put::<Self>();
+	fn fix_foreign_flag() -> Weight {
+		let mut weight = Weight::zero();
 
-			Self::deposit_event(Event::<T>::MigrationStatus(MigrationStatus::V3ToV4(
-				MigrationStatusV3ToV4::Done,
-			)));
+		for (_, collection_id) in v3_storage::ForeignAssetToCollection::<T>::iter() {
+			pallet_common::CollectionById::<T>::mutate(collection_id, |collection| {
+				if let Some(collection) = collection {
+					collection.flags.foreign = true;
+				}
+			});
 
-			put_version_weight
-				.saturating_add(collection_migration_weight)
-				.saturating_add(event_weight)
-		} else {
-			Weight::zero()
+			weight = weight.saturating_add(T::DbWeight::get().reads_writes(2, 1));
 		}
+
+		weight
+	}
+
+	fn migrate_v3_to_v4() -> Weight {
+		let event_weight = T::DbWeight::get().writes(1);
+		let collection_migration_weight = Self::migrate_collections();
+
+		Self::deposit_event(Event::<T>::MigrationStatus(MigrationStatus::V3ToV4(
+			MigrationStatusV3ToV4::Done,
+		)));
+
+		collection_migration_weight.saturating_add(event_weight)
 	}
 
 	fn migrate_collections() -> Weight {

-- 
gitstuff