fix trait

tangle-network · Jan 13, 2025 · 3a90ba4 · 3a90ba4
1 parent f20d3ed
commit 3a90ba4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 10 deletions.
diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs
@@ -1451,11 +1451,7 @@ pub type Executive = frame_executive::Executive<
 		// 1000 - 50000 (reserved for LST pools)
 		// 50000 - 1000000 (reserved for native assets)
 		// set user start at 50_000, everything below is reserved for system use
-		pallet_assets::migration::next_asset_id::SetNextAssetId<
-			ConstU32<50_000>,
-			Runtime,
-			TrustBackedAssetsInstance,
-		>,
+		migrations::SetNextAssetId<ConstU128<50_000>, Runtime>,
 	),
 >;
 

diff --git a/runtime/mainnet/src/migrations.rs b/runtime/mainnet/src/migrations.rs
@@ -1,5 +1,7 @@
 use super::*;
+use frame_support::traits::Incrementable;
 use frame_support::traits::OnRuntimeUpgrade;
+use pallet_assets::NextAssetId;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use sp_runtime::{BoundToRuntimeAppPublic, RuntimeAppPublic, RuntimeDebug};
 
@@ -69,3 +71,20 @@ impl<T: pallet_session::Config> OnRuntimeUpgrade for MigrateSessionKeys<T> {
 		T::DbWeight::get().reads_writes(10, 10)
 	}
 }
+
+/// Set [`NextAssetId`] to the value of `ID` if [`NextAssetId`] does not exist yet.
+pub struct SetNextAssetId<ID, T: pallet_assets::Config>(core::marker::PhantomData<(ID, T)>);
+impl<ID, T: pallet_assets::Config> OnRuntimeUpgrade for SetNextAssetId<ID, T>
+where
+	T::AssetId: Incrementable,
+	ID: Get<T::AssetId>,
+{
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		if !NextAssetId::<T>::exists() {
+			NextAssetId::<T>::put(ID::get());
+			T::DbWeight::get().reads_writes(1, 1)
+		} else {
+			T::DbWeight::get().reads(1)
+		}
+	}
+}
diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs
@@ -1362,11 +1362,7 @@ pub type Executive = frame_executive::Executive<
 		// 1000 - 50000 (reserved for LST pools)
 		// 50000 - 1000000 (reserved for native assets)
 		// set user start at 50_000, everything below is reserved for system use
-		pallet_assets::migration::next_asset_id::SetNextAssetId<
-			ConstU32<50_000>,
-			Runtime,
-			TrustBackedAssetsInstance,
-		>,
+		migrations::SetNextAssetId<ConstU128<50_000>, Runtime>,
 	),
 >;
 

diff --git a/runtime/testnet/src/migrations.rs b/runtime/testnet/src/migrations.rs
@@ -1,5 +1,7 @@
 use super::*;
+use frame_support::traits::Incrementable;
 use frame_support::traits::OnRuntimeUpgrade;
+use pallet_assets::NextAssetId;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use sp_runtime::{BoundToRuntimeAppPublic, RuntimeAppPublic, RuntimeDebug};
 
@@ -69,3 +71,20 @@ impl<T: pallet_session::Config> OnRuntimeUpgrade for MigrateSessionKeys<T> {
 		T::DbWeight::get().reads_writes(10, 10)
 	}
 }
+
+/// Set [`NextAssetId`] to the value of `ID` if [`NextAssetId`] does not exist yet.
+pub struct SetNextAssetId<ID, T: pallet_assets::Config>(core::marker::PhantomData<(ID, T)>);
+impl<ID, T: pallet_assets::Config> OnRuntimeUpgrade for SetNextAssetId<ID, T>
+where
+	T::AssetId: Incrementable,
+	ID: Get<T::AssetId>,
+{
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		if !NextAssetId::<T>::exists() {
+			NextAssetId::<T>::put(ID::get());
+			T::DbWeight::get().reads_writes(1, 1)
+		} else {
+			T::DbWeight::get().reads(1)
+		}
+	}
+}