feat: upgrade to polkadot-v1.3.0

José Molina · José Molina · commit 8bd5d21b57bb · 2023-12-01T17:26:51.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -119,3 +119,4 @@ try-runtime = [
 	"trappist-runtime?/try-runtime",
 	"try-runtime-cli/try-runtime"
 ]
+parameterized-consensus-hook = []
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
@@ -23,7 +23,7 @@ use parachains_common::{AccountId, AssetIdForTrustBackedAssets as AssetId, Balan
 use sc_client_api::AuxStore;
 pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
 use sc_transaction_pool_api::TransactionPool;
-use sp_api::{CallApiAt, ProvideRuntimeApi};
+use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
@@ -53,7 +53,6 @@ where
 		+ Send
 		+ Sync
 		+ 'static,
-	C: CallApiAt<Block>,
 	C::Api: frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BlockBuilder<Block>,
diff --git a/node/src/service.rs b/node/src/service.rs
@@ -580,6 +580,7 @@ where
 				collator_service,
 				// Very limited proposal time.
 				authoring_duration: Duration::from_millis(500),
+				collation_request_receiver: None,
 			};
 
 			let fut =
diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs
@@ -98,8 +98,9 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
-	type MaxHolds = ConstU32<0>;
+	type MaxHolds = ConstU32<2>;
 	type MaxFreezes = ConstU32<0>;
+	type RuntimeFreezeReason = ();
 }
 
 impl pallet_assets::Config for Test {
diff --git a/pallets/benchmarks/Cargo.toml b/pallets/benchmarks/Cargo.toml
@@ -30,6 +30,6 @@ std = [
 	"frame-system/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"xcm-executor/std"
+	"xcm-executor/std",
 ]
-runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
diff --git a/pallets/lockdown-mode/src/mock.rs b/pallets/lockdown-mode/src/mock.rs
@@ -84,8 +84,9 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
-	type MaxHolds = ConstU32<0>;
+	type MaxHolds = ConstU32<2>;
 	type MaxFreezes = ConstU32<0>;
+	type RuntimeFreezeReason = ();
 }
 
 pub struct RuntimeBlackListedCalls;
diff --git a/pallets/lockdown-mode/src/tests.rs b/pallets/lockdown-mode/src/tests.rs
@@ -81,7 +81,8 @@ fn call_not_filtered_in_lockdown_mode() {
 fn call_filtered_in_lockdown_mode() {
 	new_test_ext(false).execute_with(|| {
 		assert_ok!(LockdownMode::activate_lockdown_mode(RuntimeOrigin::root()));
-		let balance_call = RuntimeCall::Balance(BalancesCall::transfer { dest: 1, value: 2 });
+		let balance_call =
+			RuntimeCall::Balance(BalancesCall::transfer_allow_death { dest: 1, value: 2 });
 
 		let result: bool = LockdownMode::contains(&balance_call);
 		assert!(!result);
@@ -93,7 +94,8 @@ fn call_not_filtered_in_normal_mode() {
 	new_test_ext(false).execute_with(|| {
 		let lockdown_mode = LockdownModeStatus::<Test>::get();
 		assert_eq!(lockdown_mode, DEACTIVATED);
-		let balance_call = RuntimeCall::Balance(BalancesCall::transfer { dest: 1, value: 2 });
+		let balance_call =
+			RuntimeCall::Balance(BalancesCall::transfer_allow_death { dest: 1, value: 2 });
 		let result: bool = LockdownMode::contains(&balance_call);
 		assert!(result);
 	});
diff --git a/pallets/withdraw-teleport/Cargo.toml b/pallets/withdraw-teleport/Cargo.toml
@@ -44,6 +44,10 @@ std = [
 	"frame-system/std",
 	"scale-info/std",
 	"log/std",
+	"xcm-executor/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
 ]
-runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/withdraw-teleport/src/lib.rs b/pallets/withdraw-teleport/src/lib.rs
@@ -207,7 +207,7 @@ impl<T: Config> Pallet<T> {
 
 		//Build the message to execute on origin.
 		let assets: MultiAssets = assets.into();
-		let mut message: Xcm<<T as frame_system::Config>::RuntimeCall> = Xcm(vec![
+		let mut message = Xcm(vec![
 			WithdrawAsset(assets.clone()),
 			SetFeesMode { jit_withdraw: true },
 			// Burn the native asset.
diff --git a/pallets/withdraw-teleport/src/mock.rs b/pallets/withdraw-teleport/src/mock.rs
@@ -133,8 +133,9 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
-	type MaxHolds = ConstU32<0>;
+	type MaxHolds = ConstU32<2>;
 	type MaxFreezes = ConstU32<0>;
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {
diff --git a/runtime/stout/Cargo.toml b/runtime/stout/Cargo.toml
@@ -83,7 +83,7 @@ parachain-info = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 
 # Polkadot Dependencies
-kusama-runtime-constants = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 polkadot-core-primitives = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
@@ -145,6 +145,7 @@ std = [
 	"pallet-uniques/std",
 	"pallet-utility/std",
 	"pallet-xcm/std",
+	"rococo-runtime-constants/std",
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcm/std",
@@ -160,7 +161,7 @@ std = [
 	"polkadot-runtime-common/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
-	"xcm/std"
+	"xcm/std",
 ]
 runtime-benchmarks = [
 	"hex-literal",
@@ -188,3 +189,6 @@ runtime-benchmarks = [
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 ]
+parameterized-consensus-hook = [
+	"cumulus-pallet-parachain-system/parameterized-consensus-hook",
+]
diff --git a/runtime/stout/src/constants.rs b/runtime/stout/src/constants.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 pub mod currency {
-	use kusama_runtime_constants as constants;
 	use polkadot_core_primitives::Balance;
+	use rococo_runtime_constants as constants;
 
 	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
 	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
diff --git a/runtime/stout/src/lib.rs b/runtime/stout/src/lib.rs
@@ -71,6 +71,7 @@ use sp_version::RuntimeVersion;
 use xcm_config::{CollatorSelectionUpdateOrigin, RelayLocation};
 
 pub use frame_system::Call as SystemCall;
+use pallet_identity::simple::IdentityInfo;
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 
@@ -227,8 +228,9 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
-	type MaxHolds = ConstU32<0>;
+	type MaxHolds = ConstU32<2>;
 	type MaxFreezes = ConstU32<0>;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 }
 
 parameter_types! {
@@ -285,6 +287,15 @@ parameter_types! {
 	pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
 }
 
+/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+/// into the relay chain.
+const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+/// How many parachain blocks are processed by the relay chain per parent. Limits the
+/// number of blocks authored per slot.
+const BLOCK_PROCESSING_VELOCITY: u32 = 1;
+/// Relay chain slot duration, in milliseconds.
+const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+
 impl cumulus_pallet_parachain_system::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type OnSystemEvent = ();
@@ -295,6 +306,13 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
+	#[cfg(feature = "parameterized-consensus-hook")]
+	type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+		Runtime,
+		RELAY_CHAIN_SLOT_DURATION_MILLIS,
+		BLOCK_PROCESSING_VELOCITY,
+		UNINCLUDED_SEGMENT_CAPACITY,
+	>;
 }
 
 impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
@@ -416,6 +434,7 @@ parameter_types! {
 	pub const BasicDeposit: Balance = deposit(1, 258);		// 258 bytes on-chain
 	pub const FieldDeposit: Balance = deposit(0, 66);  		// 66 bytes on-chain
 	pub const SubAccountDeposit: Balance = deposit(1, 53);	// 53 bytes on-chain
+	pub const MaxAdditionalFields: u32 = 100;
 }
 
 impl pallet_identity::Config for Runtime {
@@ -426,6 +445,7 @@ impl pallet_identity::Config for Runtime {
 	type SubAccountDeposit = SubAccountDeposit;
 	type MaxSubAccounts = ConstU32<100>;
 	type MaxAdditionalFields = ConstU32<100>;
+	type IdentityInformation = IdentityInfo<MaxAdditionalFields>;
 	type MaxRegistrars = ConstU32<20>;
 	type Slashed = ();
 	type ForceOrigin = EnsureRootOrHalfCouncil;
@@ -494,8 +514,7 @@ impl pallet_preimage::Config for Runtime {
 	type WeightInfo = pallet_preimage::weights::SubstrateWeight<Runtime>;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
+	type Consideration = ();
 }
 
 parameter_types! {
diff --git a/runtime/stout/src/xcm_config.rs b/runtime/stout/src/xcm_config.rs
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 use crate::AllPalletsWithSystem;
+use cumulus_primitives_core::ParaId;
 
 use super::{
 	AccountId, AssetRegistry, Assets, Balance, Balances, ParachainInfo, ParachainSystem,
@@ -36,6 +37,7 @@ use xcm_executor::traits::JustTry;
 
 use pallet_xcm::{EnsureXcm, IsMajorityOfBody, XcmPassthrough};
 use polkadot_parachain_primitives::primitives::Sibling;
+use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
 use xcm::latest::{prelude::*, MultiAsset, MultiLocation};
 use xcm_primitives::{AsAssetMultiLocation, ConvertedRegisteredAssetId};
 
@@ -354,7 +356,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Runtime>;
-	type PriceForSiblingDelivery = ();
+	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
 }
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {
diff --git a/runtime/trappist/Cargo.toml b/runtime/trappist/Cargo.toml
@@ -88,11 +88,12 @@ parachain-info = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 
 # Polkadot Dependencies
-kusama-runtime-constants = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 polkadot-core-primitives = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+polkadot-runtime-parachains = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
@@ -117,6 +118,7 @@ std = [
 	"scale-info/std",
 	"log/std",
 	"sp-api/std",
+	"sp-arithmetic/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
@@ -162,6 +164,7 @@ std = [
 	"pallet-uniques/std",
 	"pallet-utility/std",
 	"pallet-xcm/std",
+	"rococo-runtime-constants/std",
 	"assets-common/std",
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-parachain-system/std",
@@ -176,6 +179,7 @@ std = [
 	"parachains-common/std",
 	"polkadot-parachain-primitives/std",
 	"polkadot-runtime-common/std",
+	"polkadot-runtime-parachains/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std"
@@ -192,7 +196,6 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-asset-registry/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"trappist-runtime-benchmarks/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-contracts/runtime-benchmarks",
@@ -214,6 +217,7 @@ runtime-benchmarks = [
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"assets-common/runtime-benchmarks",
+	"polkadot-runtime-parachains/runtime-benchmarks"
 ]
 try-runtime = [
 	"frame-try-runtime/try-runtime",
@@ -252,4 +256,8 @@ try-runtime = [
 	"pallet-sudo/try-runtime",
 	"pallet-asset-tx-payment/try-runtime",
 	"pallet-withdraw-teleport/try-runtime",
+	"polkadot-runtime-parachains/try-runtime"
+]
+parameterized-consensus-hook = [
+	"cumulus-pallet-parachain-system/parameterized-consensus-hook",
 ]
diff --git a/runtime/trappist/src/constants.rs b/runtime/trappist/src/constants.rs
@@ -16,8 +16,8 @@
 // limitations under the License.
 
 pub mod currency {
-	use kusama_runtime_constants as constants;
 	use polkadot_core_primitives::Balance;
+	use rococo_runtime_constants as constants;
 
 	/// The existential deposit. Set to 1/10 of its parent Relay Chain.
 	pub const EXISTENTIAL_DEPOSIT: Balance = constants::currency::EXISTENTIAL_DEPOSIT / 10;
diff --git a/runtime/trappist/src/impls.rs b/runtime/trappist/src/impls.rs
diff --git a/runtime/trappist/src/lib.rs b/runtime/trappist/src/lib.rs
diff --git a/runtime/trappist/src/weights/mod.rs b/runtime/trappist/src/weights/mod.rs
diff --git a/runtime/trappist/src/weights/pallet_preimage.rs b/runtime/trappist/src/weights/pallet_preimage.rs
diff --git a/runtime/trappist/src/weights/pallet_treasury.rs b/runtime/trappist/src/weights/pallet_treasury.rs
diff --git a/runtime/trappist/src/xcm_config.rs b/runtime/trappist/src/xcm_config.rs

Original file line number	Diff line number	Diff line change
`@@ -119,3 +119,4 @@ try-runtime = [`
`119`	`119`	`"trappist-runtime?/try-runtime",`
`120`	`120`	`"try-runtime-cli/try-runtime"`
`121`	`121`	`]`
	`122`	`+parameterized-consensus-hook = []`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ std = [`
`30`	`30`	`"frame-system/std",`
`31`	`31`	`"sp-runtime/std",`
`32`	`32`	`"sp-std/std",`
`33`		`- "xcm-executor/std"`
	`33`	`+ "xcm-executor/std",`
`34`	`34`	`]`
`35`		`-runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]`
	`35`	`+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]`