Merge branch 'master' into perm-client-v0.42.1

moonbeam-foundation · Dec 6, 2024 · a98e670 · a98e670
2 parents 0048ad5 + 20119cd
commit a98e670
Show file tree

Hide file tree

Showing 32 changed files with 1,054 additions and 562 deletions.
diff --git a/.github/workflows/subxt-diff.yml b/.github/workflows/subxt-diff.yml
@@ -30,7 +30,7 @@ jobs:
 
   local-diff:
     needs: build
-    runs-on: bare-metal
+    runs-on: moonbeam-release-medium
     permissions:
       contents: read
     strategy:
@@ -48,7 +48,7 @@ jobs:
         run: |
           rustup override unset
           rustup show
-          cargo install subxt-cli --locked
+          cargo install subxt-cli@0.37.0 --locked
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
       - name: Run last_release node via Docker
         run: |
@@ -139,5 +139,5 @@ jobs:
           commit-message: "runtime diff: v0.${{ github.event.inputs.spec_version }}.0"
           draft: true
           title: "Notorize runtime upgrade differences: runtime-${{ github.event.inputs.spec_version }}"
-          reviewers: "librelois,noandrea"
+          reviewers: "RomarQ,stiiifff"
           labels: "B0-silent,D2-notlive"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/service/src/lazy_loading/mod.rs b/node/service/src/lazy_loading/mod.rs
@@ -337,7 +337,7 @@ where
 		create_inherent_data_providers,
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
-		None,
+		false,
 	)?;
 	let block_import = BlockImportPipeline::Dev(frontier_block_import);
 

diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
@@ -568,29 +568,27 @@ where
 				create_inherent_data_providers,
 				&task_manager.spawn_essential_handle(),
 				config.prometheus_registry(),
-				if experimental_block_import_strategy {
-					None
-				} else {
-					Some(!dev_service)
-				},
+				!experimental_block_import_strategy,
 			)?,
 			BlockImportPipeline::Dev(frontier_block_import),
 		)
 	} else {
-		let parachain_block_import =
-			ParachainBlockImport::new(frontier_block_import, backend.clone());
+		let parachain_block_import = if experimental_block_import_strategy {
+			ParachainBlockImport::new(frontier_block_import, backend.clone())
+		} else {
+			ParachainBlockImport::new_with_delayed_best_block(
+				frontier_block_import,
+				backend.clone(),
+			)
+		};
 		(
 			nimbus_consensus::import_queue(
 				client.clone(),
 				parachain_block_import.clone(),
 				create_inherent_data_providers,
 				&task_manager.spawn_essential_handle(),
 				config.prometheus_registry(),
-				if experimental_block_import_strategy {
-					None
-				} else {
-					Some(!dev_service)
-				},
+				!experimental_block_import_strategy,
 			)?,
 			BlockImportPipeline::Parachain(parachain_block_import),
 		)

diff --git a/pallets/asset-manager/src/benchmarks.rs b/pallets/asset-manager/src/benchmarks.rs
@@ -37,54 +37,42 @@ benchmarks! {
 	}
 
 	change_existing_asset_type {
-		let x in 5..100;
-		for i in 0..x {
-			let asset_type: T::ForeignAssetType = Location::new(0, X1(GeneralIndex(i as u128))).into();
-			let metadata = T::AssetRegistrarMetadata::default();
-			let amount = 1u32.into();
-			Pallet::<T>::register_foreign_asset(
-				RawOrigin::Root.into(),
-				asset_type.clone(),
-				metadata,
-				amount,
-				true
-			)?;
-		}
+		let asset_type: T::ForeignAssetType = Location::new(0, X1(GeneralIndex(1 as u128))).into();
+		let metadata = T::AssetRegistrarMetadata::default();
+		let amount = 1u32.into();
+		Pallet::<T>::register_foreign_asset(
+			RawOrigin::Root.into(),
+			asset_type.clone(),
+			metadata,
+			amount,
+			true
+		)?;
 
 		let new_asset_type = T::ForeignAssetType::default();
-		let asset_type_to_be_changed: T::ForeignAssetType = Location::new(
-			0,
-			X1(GeneralIndex((x-1) as u128))
-		).into();
-		let asset_id_to_be_changed = asset_type_to_be_changed.into();
-	}: _(RawOrigin::Root, asset_id_to_be_changed, new_asset_type.clone(), x)
+		let asset_id_to_be_changed = asset_type.clone().into();
+	}: _(RawOrigin::Root, asset_id_to_be_changed, new_asset_type.clone(), 1)
 	verify {
 		assert_eq!(Pallet::<T>::asset_id_type(asset_id_to_be_changed), Some(new_asset_type.clone()));
+		assert_eq!(Pallet::<T>::asset_type_id(new_asset_type.clone()), Some(asset_id_to_be_changed));
+		assert!(Pallet::<T>::asset_type_id(asset_type).is_none());
 	}
 
 	remove_existing_asset_type {
-		let x in 5..100;
-		for i in 0..x {
-			let asset_type: T::ForeignAssetType = Location::new(0, X1(GeneralIndex(i as u128))).into();
-			let metadata = T::AssetRegistrarMetadata::default();
-			let amount = 1u32.into();
-			Pallet::<T>::register_foreign_asset(
-				RawOrigin::Root.into(),
-				asset_type.clone(),
-				metadata,
-				amount,
-				true
-			)?;
-		}
-
-		let asset_type_to_be_removed: T::ForeignAssetType = Location::new(
-			0,
-			X1(GeneralIndex((x-1) as u128))
-		).into();
-		let asset_id: T::AssetId = asset_type_to_be_removed.clone().into();
-	}: _(RawOrigin::Root, asset_id, x)
+		let asset_type: T::ForeignAssetType = Location::new(0, X1(GeneralIndex(1 as u128))).into();
+		let metadata = T::AssetRegistrarMetadata::default();
+		let amount = 1u32.into();
+		Pallet::<T>::register_foreign_asset(
+			RawOrigin::Root.into(),
+			asset_type.clone(),
+			metadata,
+			amount,
+			true
+		)?;
+		let asset_id: T::AssetId = asset_type.clone().into();
+	}: _(RawOrigin::Root, asset_id, 1)
 	verify {
 		assert!(Pallet::<T>::asset_id_type(asset_id).is_none());
+		assert!(Pallet::<T>::asset_type_id(asset_type).is_none());
 	}
 }
 

diff --git a/runtime-diffs/moonbase/3400.txt b/runtime-diffs/moonbase/3400.txt
@@ -0,0 +1,57 @@
+Pallets:
+    ~ MoonbeamLazyMigrations
+        Calls:
+            + approve_assets_to_migrate
+            - clear_suicided_storage
+            + finish_foreign_assets_migration
+            + migrate_foreign_asset_approvals
+            + migrate_foreign_asset_balances
+            + start_foreign_assets_migration
+        Storage Entries:
+            + ApprovedForeignAssets
+            + ForeignAssetMigrationStatusValue
+            - SuicidedContractsRemoved
+    ~ Multisig
+        Calls:
+            ~ as_multi
+            ~ as_multi_threshold_1
+    ~ OpenTechCommitteeCollective
+        Calls:
+            ~ execute
+            ~ propose
+        Storage Entries:
+            ~ ProposalOf (Changed: )
+    ~ Proxy
+        Calls:
+            ~ proxy
+            ~ proxy_announced
+    ~ Scheduler
+        Calls:
+            ~ schedule
+            ~ schedule_after
+            ~ schedule_named
+            ~ schedule_named_after
+    ~ Sudo
+        Calls:
+            ~ sudo
+            ~ sudo_as
+            ~ sudo_unchecked_weight
+    ~ TreasuryCouncilCollective
+        Calls:
+            ~ execute
+            ~ propose
+        Storage Entries:
+            ~ ProposalOf (Changed: )
+    ~ Utility
+        Calls:
+            ~ as_derivative
+            ~ batch
+            ~ batch_all
+            ~ dispatch_as
+            ~ force_batch
+            ~ with_weight
+    ~ Whitelist
+        Calls:
+            ~ dispatch_whitelisted_call_with_preimage
+Runtime APIs:
+    ~ DryRunApi