Merge remote-tracking branch 'origin' into joe-instantiate-assets-pal…

…lets

README.md

@@ -120,7 +120,7 @@ cargo build --release --bin polkadot-parachain
 
 This repository also contains the Statemint runtime (as well as the canary runtime Statemine and the
 test runtime Westmint).
-Statemint is a common good parachain providing an asset store for the Polkadot ecosystem.
+Statemint is a system parachain providing an asset store for the Polkadot ecosystem.
 
 ### Build & Launch a Node
 

parachains/README.md

@@ -11,11 +11,11 @@ The general internal structure is:
 - `pallets`: FRAME pallets that are specific to parachains.
 - `runtimes`: The entry point for parachain runtimes.
 
-## Common Good Parachains
+## System Parachains
 
 The `runtimes` directory includes many, but is not limited to,
-[common good parachains](https://wiki.polkadot.network/docs/learn-common-goods). Likewise, not all
-common good parachains are in this repo.
+[system parachains](https://wiki.polkadot.network/docs/learn-system-chains). Likewise, not all
+system parachains are in this repo.
 
 ## Releases
 

parachains/runtimes/assets/statemine/src/lib.rs

@@ -666,6 +666,8 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, Si
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = ();
 
+pub type Migrations = ();
+
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,

parachains/runtimes/assets/statemint/src/lib.rs

@@ -663,6 +663,8 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, Si
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = ();
 
+pub type Migrations = ();
+
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,

parachains/runtimes/assets/westmint/src/lib.rs

@@ -674,6 +674,8 @@ pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, Si
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = ();
 
+pub type Migrations = ();
+
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,

parachains/runtimes/contracts/contracts-rococo/src/lib.rs

@@ -97,10 +97,7 @@ pub type UncheckedExtrinsic =
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 
-pub type Migrations = (
-	pallet_contracts::Migration<Runtime>,
-	pallet_balances::migration::MigrateToTrackInactive<Runtime, xcm_config::CheckingAccount>,
-);
+pub type Migrations = (pallet_contracts::Migration<Runtime>,);
 
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<