Peregrine runtime compiling

pallets/parachain-staking/src/lib.rs

@@ -2493,10 +2493,6 @@ pub mod pallet {
 				DispatchClass::Mandatory,
 			);
 		}
-
-		fn note_uncle(_author: T::AccountId, _age: T::BlockNumber) {
-			// we too are not caring.
-		}
 	}
 
 	impl<T: Config> pallet_session::SessionManager<T::AccountId> for Pallet<T> {

runtimes/common/src/constants.rs

@@ -70,7 +70,7 @@ pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 /// We allow for 0.5 seconds of compute with a 12 second average block time.
 pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND)
 	.saturating_div(2)
-	.set_proof_size(cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64);
+	.set_proof_size(cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64);
 
 pub const INFLATION_CONFIG: (Perquintill, Perquintill, Perquintill, Perquintill) = (
 	// max collator staking rate

runtimes/common/src/xcm_config.rs

@@ -19,19 +19,17 @@
 use core::marker::PhantomData;
 use frame_support::{log, match_types, parameter_types};
 use polkadot_parachain::primitives::Sibling;
-use xcm::latest::prelude::*;
-use xcm_builder::{
-	AccountId32Aliases, AllowUnpaidExecutionFrom, CurrencyAdapter, IsConcrete, ParentIsPreset,
-	SiblingParachainConvertsVia,
-};
+use xcm::latest::{prelude::*, Weight};
+use xcm_builder::{AccountId32Aliases, CurrencyAdapter, IsConcrete, ParentIsPreset, SiblingParachainConvertsVia};
 use xcm_executor::traits::ShouldExecute;
 
 use crate::AccountId;
 
 parameter_types! {
 	// One XCM operation is 1_000_000_000 weight, almost certainly a conservative estimate.
-	pub UnitWeightCost: u64 = 1_000_000_000;
+	pub UnitWeightCost: Weight = Weight::from_parts(1_000_000_000, 64 * 1024);
 	pub const MaxInstructions: u32 = 100;
+	pub const MaxAssetsIntoHolding: u32 = 64;
 }
 
 match_types! {
@@ -54,41 +52,25 @@ where
 {
 	fn should_execute<Call>(
 		origin: &MultiLocation,
-		message: &mut Xcm<Call>,
-		max_weight: u64,
-		weight_credit: &mut u64,
+		instructions: &mut [Instruction<Call>],
+		max_weight: Weight,
+		weight_credit: &mut Weight,
 	) -> Result<(), ()> {
-		Deny::should_execute(origin, message, max_weight, weight_credit)?;
-		Allow::should_execute(origin, message, max_weight, weight_credit)
+		Deny::should_execute(origin, instructions, max_weight, weight_credit)?;
+		Allow::should_execute(origin, instructions, max_weight, weight_credit)
 	}
 }
 
-/// Explicitly deny ReserveTransfer to the relay chain. Allow calls from the
-/// relay chain governance.
-pub type XcmBarrier = DenyThenTry<
-	DenyReserveTransferToRelayChain,
-	(
-		// We don't allow anything from any sibling chain, therefore the following is not included here:
-		// * TakeWeightCredit
-		// * AllowTopLevelPaidExecutionFrom<Everything>
-
-		// We allow everything from the relay chain if it was sent by the relay chain legislative (i.e., democracy
-		// vote). Since the relaychain doesn't own KILTs and missing fees shouldn't prevent calls from the relaychain
-		// legislative, we allow unpaid execution.
-		AllowUnpaidExecutionFrom<ParentLegislative>,
-	),
->;
-
 /// Reserved funds to the relay chain can't return. See https://github.com/paritytech/polkadot/issues/5233
 pub struct DenyReserveTransferToRelayChain;
 impl ShouldExecute for DenyReserveTransferToRelayChain {
 	fn should_execute<Call>(
 		origin: &MultiLocation,
-		message: &mut Xcm<Call>,
-		_max_weight: u64,
-		_weight_credit: &mut u64,
+		instructions: &mut [Instruction<Call>],
+		_max_weight: Weight,
+		_weight_credit: &mut Weight,
 	) -> Result<(), ()> {
-		if message.0.iter().any(|inst| {
+		if instructions.iter().any(|inst| {
 			matches!(
 				inst,
 				InitiateReserveWithdraw {
@@ -122,8 +104,7 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
 				parents: 1,
 				interior: Here
 			}
-		) && message
-			.0
+		) && instructions
 			.iter()
 			.any(|inst| matches!(inst, ReserveAssetDeposited { .. }))
 		{

runtimes/peregrine/src/lib.rs

@@ -96,7 +96,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_version: 11000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 5,
+	transaction_version: 6,
 	state_version: 0,
 };
 
@@ -259,6 +259,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ControllerOrigin = EnsureRoot<AccountId>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Self>;
+	type PriceForSiblingDelivery = ();
 }
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {
@@ -284,8 +285,6 @@ parameter_types! {
 
 impl pallet_authorship::Config for Runtime {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Aura>;
-	type UncleGenerations = UncleGenerations;
-	type FilterUncle = ();
 	type EventHandler = ParachainStaking;
 }
 
@@ -742,7 +741,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 			ProxyType::NonTransfer => matches!(
 				c,
 				RuntimeCall::Attestation(..)
-					| RuntimeCall::Authorship(..)
 					// Excludes `Balances`
 					| RuntimeCall::Council(..)
 					| RuntimeCall::Ctype(..)
@@ -787,7 +785,6 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 							| attestation::Call::change_deposit_owner { .. }
 							| attestation::Call::update_deposit { .. }
 					)
-					| RuntimeCall::Authorship(..)
 					// Excludes `Balances`
 					| RuntimeCall::Council(..)
 					| RuntimeCall::Ctype(..)
@@ -936,7 +933,7 @@ construct_runtime! {
 		Aura: pallet_aura = 23,
 		Session: pallet_session = 22,
 		ParachainStaking: parachain_staking = 21,
-		Authorship: pallet_authorship::{Pallet, Call, Storage} = 20,
+		Authorship: pallet_authorship::{Pallet, Storage} = 20,
 		AuraExt: cumulus_pallet_aura_ext = 24,
 
 		// Governance stuff
@@ -1159,6 +1156,13 @@ impl_runtime_apis! {
 		fn query_fee_details(uxt: <Block as BlockT>::Extrinsic, len: u32) -> pallet_transaction_payment::FeeDetails<Balance> {
 			TransactionPayment::query_fee_details(uxt, len)
 		}
+
+		fn query_weight_to_fee(weight: Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
 	}
 
 	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi<Block, Balance, RuntimeCall>
@@ -1176,6 +1180,13 @@ impl_runtime_apis! {
 		) -> pallet_transaction_payment::FeeDetails<Balance> {
 			TransactionPayment::query_call_fee_details(call, len)
 		}
+
+		fn query_weight_to_fee(weight: Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
 	}
 
 	impl sp_block_builder::BlockBuilder<Block> for Runtime {

runtimes/peregrine/src/weights/mod.rs

@@ -38,5 +38,6 @@ pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;
 pub mod pallet_web3_names;
+pub mod pallet_xcm;
 pub mod parachain_staking;
 pub mod public_credentials;

runtimes/peregrine/src/weights/pallet_xcm.rs

@@ -0,0 +1,174 @@
+// Copyright 2021 Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Cumulus is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_xcm`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2022-12-22, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024
+
+// Executed Command:
+// /home/benchbot/cargo_target_dir/production/polkadot-parachain
+// benchmark
+// pallet
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/cumulus/.git/.artifacts/bench.json
+// --pallet=pallet_xcm
+// --chain=statemine-dev
+// --header=./file_header.txt
+// --output=./parachains/runtimes/assets/statemine/src/weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use frame_support::{traits::Get, weights::Weight};
+use sp_std::marker::PhantomData;
+
+/// Weight functions for `pallet_xcm`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_xcm::WeightInfo for WeightInfo<T> {
+	// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
+	// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
+	// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
+	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
+	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
+	fn send() -> Weight {
+		// Minimum execution time: 26_577 nanoseconds.
+		Weight::from_ref_time(27_239_000)
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	// Storage: ParachainInfo ParachainId (r:1 w:0)
+	fn teleport_assets() -> Weight {
+		// Minimum execution time: 32_703 nanoseconds.
+		Weight::from_ref_time(33_200_000)
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
+	// Storage: ParachainInfo ParachainId (r:1 w:0)
+	fn reserve_transfer_assets() -> Weight {
+		// Minimum execution time: 25_142 nanoseconds.
+		Weight::from_ref_time(25_808_000)
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
+	// Storage: Benchmark Override (r:0 w:0)
+	fn execute() -> Weight {
+		// Minimum execution time: 18_446_744_073_709_551 nanoseconds.
+		Weight::from_ref_time(18_446_744_073_709_551_000)
+	}
+	// Storage: PolkadotXcm SupportedVersion (r:0 w:1)
+	fn force_xcm_version() -> Weight {
+		// Minimum execution time: 15_036 nanoseconds.
+		Weight::from_ref_time(15_456_000)
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	// Storage: PolkadotXcm SafeXcmVersion (r:0 w:1)
+	fn force_default_xcm_version() -> Weight {
+		// Minimum execution time: 4_404 nanoseconds.
+		Weight::from_ref_time(4_598_000)
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
+	// Storage: PolkadotXcm QueryCounter (r:1 w:1)
+	// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
+	// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
+	// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
+	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
+	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
+	// Storage: PolkadotXcm Queries (r:0 w:1)
+	fn force_subscribe_version_notify() -> Weight {
+		// Minimum execution time: 30_942 nanoseconds.
+		Weight::from_ref_time(31_608_000)
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	// Storage: PolkadotXcm VersionNotifiers (r:1 w:1)
+	// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
+	// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
+	// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
+	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
+	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
+	// Storage: PolkadotXcm Queries (r:0 w:1)
+	fn force_unsubscribe_version_notify() -> Weight {
+		// Minimum execution time: 32_327 nanoseconds.
+		Weight::from_ref_time(32_698_000)
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	// Storage: PolkadotXcm SupportedVersion (r:4 w:2)
+	fn migrate_supported_version() -> Weight {
+		// Minimum execution time: 13_522 nanoseconds.
+		Weight::from_ref_time(13_862_000)
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	// Storage: PolkadotXcm VersionNotifiers (r:4 w:2)
+	fn migrate_version_notifiers() -> Weight {
+		// Minimum execution time: 13_621 nanoseconds.
+		Weight::from_ref_time(14_028_000)
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	// Storage: PolkadotXcm VersionNotifyTargets (r:5 w:0)
+	fn already_notified_target() -> Weight {
+		// Minimum execution time: 15_511 nanoseconds.
+		Weight::from_ref_time(15_825_000)
+			.saturating_add(T::DbWeight::get().reads(5))
+	}
+	// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1)
+	// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
+	// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
+	// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
+	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
+	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
+	fn notify_current_targets() -> Weight {
+		// Minimum execution time: 27_062 nanoseconds.
+		Weight::from_ref_time(27_514_000)
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	// Storage: PolkadotXcm VersionNotifyTargets (r:3 w:0)
+	fn notify_target_migration_fail() -> Weight {
+		// Minimum execution time: 7_062 nanoseconds.
+		Weight::from_ref_time(7_325_000)
+			.saturating_add(T::DbWeight::get().reads(3))
+	}
+	// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
+	fn migrate_version_notify_targets() -> Weight {
+		// Minimum execution time: 14_362 nanoseconds.
+		Weight::from_ref_time(14_724_000)
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2)
+	// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
+	// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
+	// Storage: PolkadotXcm SafeXcmVersion (r:1 w:0)
+	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
+	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
+	fn migrate_and_notify_old_targets() -> Weight {
+		// Minimum execution time: 32_435 nanoseconds.
+		Weight::from_ref_time(33_042_000)
+			.saturating_add(T::DbWeight::get().reads(9))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+}