Implement ValidateUnsigned as SignedExtension

bin/node-template/runtime/src/lib.rs

@@ -269,7 +269,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signatu
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Runtime, AllModules>;
+pub type Executive = frame_executive::Executive<Runtime, Block, system::ChainContext<Runtime>, AllModules>;
 
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {

bin/node/cli/src/factory_impl.rs

@@ -56,6 +56,7 @@ impl<Number> FactoryState<Number> {
 			frame_system::CheckEra::from(Era::mortal(256, phase)),
 			frame_system::CheckNonce::from(index),
 			frame_system::CheckWeight::new(),
+			frame_system::ValidateUnsigned::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::from(0),
 			Default::default(),
 		)
@@ -122,7 +123,7 @@ impl RuntimeAdapter for FactoryState<Number> {
 					(*amount).into()
 				)
 			)
-		}, key, (version, genesis_hash.clone(), prior_block_hash.clone(), (), (), (), ()))
+		}, key, (version, genesis_hash.clone(), prior_block_hash.clone(), (), (), (), (), ()))
 	}
 
 	fn inherent_extrinsics(&self) -> InherentData {

bin/node/cli/src/service.rs

@@ -608,20 +608,22 @@ mod tests {
 				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_unsigned = frame_system::ValidateUnsigned::new();
 				let payment = pallet_transaction_payment::ChargeTransactionPayment::from(0);
 				let extra = (
 					check_version,
 					check_genesis,
 					check_era,
 					check_nonce,
 					check_weight,
+					check_unsigned,
 					payment,
 					Default::default(),
 				);
 				let raw_payload = SignedPayload::from_raw(
 					function,
 					extra,
-					(version, genesis_hash, genesis_hash, (), (), (), ())
+					(version, genesis_hash, genesis_hash, (), (), (), (), ())
 				);
 				let signature = raw_payload.using_encoded(|payload|	{
 					signer.sign(payload)

bin/node/runtime/src/lib.rs

@@ -105,6 +105,7 @@ impl frame_system::offchain::CreateTransaction<Runtime, UncheckedExtrinsic> for
 			frame_system::CheckEra::<Runtime>::from(generic::Era::mortal(period, current_block)),
 			frame_system::CheckNonce::<Runtime>::from(index),
 			frame_system::CheckWeight::<Runtime>::new(),
+			frame_system::ValidateUnsigned::<Runtime>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
 			Default::default(),
 		);
@@ -127,8 +128,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 240,
-	impl_version: 1,
+	spec_version: 241,
+	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 };
 
@@ -708,6 +709,7 @@ pub type SignedExtra = (
 	frame_system::CheckEra<Runtime>,
 	frame_system::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
+	frame_system::ValidateUnsigned<Runtime>,
 	pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
 	pallet_contracts::CheckBlockGasLimit<Runtime>,
 );
@@ -718,7 +720,7 @@ pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = frame_executive::Executive<Runtime, Block, frame_system::ChainContext<Runtime>, Runtime, AllModules>;
+pub type Executive = frame_executive::Executive<Runtime, Block, frame_system::ChainContext<Runtime>, AllModules>;
 
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {

bin/node/testing/src/keyring.rs

@@ -73,6 +73,7 @@ pub fn signed_extra(nonce: Index, extra_fee: Balance) -> SignedExtra {
 		frame_system::CheckEra::from(Era::mortal(256, 0)),
 		frame_system::CheckNonce::from(nonce),
 		frame_system::CheckWeight::new(),
+		frame_system::ValidateUnsigned::new(),
 		pallet_transaction_payment::ChargeTransactionPayment::from(extra_fee),
 		Default::default(),
 	)

bin/utils/subkey/src/main.rs

@@ -688,6 +688,7 @@ fn create_extrinsic<C: Crypto>(
 			frame_system::CheckEra::<Runtime>::from(Era::Immortal),
 			frame_system::CheckNonce::<Runtime>::from(i),
 			frame_system::CheckWeight::<Runtime>::new(),
+			frame_system::ValidateUnsigned::<Runtime>::new(),
 			pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(f),
 			Default::default(),
 		)
@@ -703,6 +704,7 @@ fn create_extrinsic<C: Crypto>(
 			(),
 			(),
 			(),
+			(),
 		),
 	);
 	let signature = raw_payload.using_encoded(|payload| signer.sign(payload)).into_runtime();

frame/contracts/src/lib.rs

@@ -119,6 +119,7 @@ use sp_runtime::{
 	},
 	transaction_validity::{
 		ValidTransaction, InvalidTransaction, TransactionValidity, TransactionValidityError,
+		TransactionSource,
 	},
 	RuntimeDebug,
 };
@@ -1100,6 +1101,7 @@ impl<T: Trait + Send + Sync> SignedExtension for CheckBlockGasLimit<T> {
 	fn validate(
 		&self,
 		_: &Self::AccountId,
+		_: TransactionSource,
 		call: &Self::Call,
 		_: &DispatchInfoOf<Self::Call>,
 		_: usize,

frame/contracts/src/tests.rs

@@ -28,9 +28,10 @@ use assert_matches::assert_matches;
 use hex_literal::*;
 use codec::{Decode, Encode, KeyedVec};
 use sp_runtime::{
-	Perbill, BuildStorage, transaction_validity::{InvalidTransaction, ValidTransaction},
-	traits::{BlakeTwo256, Hash, IdentityLookup, SignedExtension},
+	Perbill, BuildStorage,
 	testing::{Digest, DigestItem, Header, UintAuthorityId, H256},
+	traits::{BlakeTwo256, Hash, IdentityLookup, SignedExtension},
+	transaction_validity::{InvalidTransaction, ValidTransaction, TransactionSource},
 };
 use frame_support::{
 	assert_ok, assert_err, impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types,
@@ -1632,16 +1633,21 @@ fn cannot_self_destruct_in_constructor() {
 #[test]
 fn check_block_gas_limit_works() {
 	ExtBuilder::default().block_gas_limit(50).build().execute_with(|| {
+		let source = TransactionSource::External;
 		let info = DispatchInfo { weight: 100, class: DispatchClass::Normal, pays_fee: true };
 		let check = CheckBlockGasLimit::<Test>(Default::default());
 		let call: Call = crate::Call::put_code(1000, vec![]).into();
 
 		assert_eq!(
-			check.validate(&0, &call, &info, 0), InvalidTransaction::ExhaustsResources.into(),
+			check.validate(&0, source, &call, &info, 0),
+			InvalidTransaction::ExhaustsResources.into(),
 		);
 
 		let call: Call = crate::Call::update_schedule(Default::default()).into();
-		assert_eq!(check.validate(&0, &call, &info, 0), Ok(Default::default()));
+		assert_eq!(
+			check.validate(&0, source, &call, &info, 0),
+			Ok(Default::default())
+		);
 	});
 }