Joshy Premerging for early access: Allow adjusting priority coming from Signed Extensions (paritytech#9596)

JoshOrndorff · JoshOrndorff · commit 2af6e2cc7bad · 2021-09-13T08:32:26.000-04:00
diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
@@ -803,7 +803,7 @@ mod tests {
 				let check_genesis = frame_system::CheckGenesis::new();
 				let check_era = frame_system::CheckEra::from(Era::Immortal);
 				let check_nonce = frame_system::CheckNonce::from(index);
-				let check_weight = frame_system::CheckWeight::new();
+				let check_weight = frame_system::CheckWeight::new().into();
 				let payment = pallet_transaction_payment::ChargeTransactionPayment::from(0);
 				let extra = (
 					check_spec_version,
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -25,6 +25,7 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	construct_runtime, parameter_types,
+	signed_extensions::{AdjustPriority, Divide},
 	traits::{
 		Currency, Everything, Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
 		Nothing, OnUnbalanced, U128CurrencyToVote,
@@ -912,7 +913,7 @@ where
 			frame_system::CheckGenesis::<Runtime>::new(),
 			frame_system::CheckEra::<Runtime>::from(era),
 			frame_system::CheckNonce::<Runtime>::from(nonce),
-			frame_system::CheckWeight::<Runtime>::new(),
+			frame_system::CheckWeight::<Runtime>::new().into(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
 		);
 		let raw_payload = SignedPayload::new(call, extra)
@@ -1248,7 +1249,7 @@ pub type SignedExtra = (
 	frame_system::CheckGenesis<Runtime>,
 	frame_system::CheckEra<Runtime>,
 	frame_system::CheckNonce<Runtime>,
-	frame_system::CheckWeight<Runtime>,
+	AdjustPriority<frame_system::CheckWeight<Runtime>, Divide, CHECK_WEIGHT_PRIORITY_DIVISOR>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 );
 /// Unchecked extrinsic type as expected by this runtime.
@@ -1277,6 +1278,22 @@ mod mmr {
 	pub type Hashing = <Runtime as pallet_mmr::Config>::Hashing;
 }
 
+/// There are two extnsions returning the priority:
+/// 1. The `CheckWeight` extension.
+/// 2. The `TransactionPayment` extension.
+///
+/// The first one gives a significant bump to `Operational` transactions, but for `Normal`
+/// it's within `[0..MAXIMUM_BLOCK_WEIGHT]` range.
+///
+/// The second one roughly represents the amount of fees being paid (and the tip) with
+/// size-adjustment coefficient. I.e. we are interested to maximize `fee/consumed_weight` or
+/// `fee/size_limit`. The returned value is potentially unbounded though.
+///
+/// The idea for the adjustment is scale the priority coming from `CheckWeight` for
+/// `Normal` transactions down to zero, leaving the priority bump for `Operational` and
+/// `Mandatory` though.
+const CHECK_WEIGHT_PRIORITY_DIVISOR: TransactionPriority = MAXIMUM_BLOCK_WEIGHT;
+
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
diff --git a/bin/node/test-runner-example/src/lib.rs b/bin/node/test-runner-example/src/lib.rs
@@ -68,7 +68,7 @@ impl ChainInfo for NodeTemplateChainInfo {
 			frame_system::CheckNonce::<Self::Runtime>::from(
 				frame_system::Pallet::<Self::Runtime>::account_nonce(from),
 			),
-			frame_system::CheckWeight::<Self::Runtime>::new(),
+			frame_system::CheckWeight::<Self::Runtime>::new().into(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Self::Runtime>::from(0),
 		)
 	}
diff --git a/bin/node/testing/src/keyring.rs b/bin/node/testing/src/keyring.rs
@@ -75,7 +75,7 @@ pub fn signed_extra(nonce: Index, extra_fee: Balance) -> SignedExtra {
 		frame_system::CheckGenesis::new(),
 		frame_system::CheckEra::from(Era::mortal(256, 0)),
 		frame_system::CheckNonce::from(nonce),
-		frame_system::CheckWeight::new(),
+		frame_system::CheckWeight::new().into(),
 		pallet_transaction_payment::ChargeTransactionPayment::from(extra_fee),
 	)
 }
diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs
@@ -60,6 +60,7 @@ pub mod inherent;
 pub mod error;
 pub mod instances;
 pub mod migrations;
+pub mod signed_extensions;
 pub mod traits;
 pub mod weights;
 
diff --git a/frame/support/src/signed_extensions.rs b/frame/support/src/signed_extensions.rs

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ impl ChainInfo for NodeTemplateChainInfo {`
`68`	`68`	`frame_system::CheckNonce::<Self::Runtime>::from(`
`69`	`69`	`frame_system::Pallet::<Self::Runtime>::account_nonce(from),`
`70`	`70`	`),`
`71`		`- frame_system::CheckWeight::<Self::Runtime>::new(),`
	`71`	`+ frame_system::CheckWeight::<Self::Runtime>::new().into(),`
`72`	`72`	`pallet_transaction_payment::ChargeTransactionPayment::<Self::Runtime>::from(0),`
`73`	`73`	`)`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ pub fn signed_extra(nonce: Index, extra_fee: Balance) -> SignedExtra {`
`75`	`75`	`frame_system::CheckGenesis::new(),`
`76`	`76`	`frame_system::CheckEra::from(Era::mortal(256, 0)),`
`77`	`77`	`frame_system::CheckNonce::from(nonce),`
`78`		`- frame_system::CheckWeight::new(),`
	`78`	`+ frame_system::CheckWeight::new().into(),`
`79`	`79`	`pallet_transaction_payment::ChargeTransactionPayment::from(extra_fee),`
`80`	`80`	`)`
`81`	`81`	`}`