Allow multiple transaction extension version in UncheckedExtrinsic type.

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -1439,9 +1439,10 @@ pub struct EthExtraImpl;
 
 impl EthExtra for EthExtraImpl {
 	type Config = Runtime;
-	type Extension = TxExtension;
+	type ExtensionV0 = TxExtension;
+	type ExtensionOtherVersions = sp_runtime::traits::InvalidVersion;
 
-	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension {
+	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::ExtensionV0 {
 		(
 			frame_system::AuthorizeCall::<Runtime>::new(),
 			frame_system::CheckNonZeroSender::<Runtime>::new(),

cumulus/parachains/runtimes/testing/penpal/src/lib.rs

@@ -154,9 +154,10 @@ pub struct EthExtraImpl;
 
 impl EthExtra for EthExtraImpl {
 	type Config = Runtime;
-	type Extension = TxExtension;
+	type ExtensionV0 = TxExtension;
+	type ExtensionOtherVersions = sp_runtime::traits::InvalidVersion;
 
-	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension {
+	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::ExtensionV0 {
 		(
 			frame_system::AuthorizeCall::<Runtime>::new(),
 			frame_system::CheckNonZeroSender::<Runtime>::new(),

docs/mermaid/extrinsics.mmd

@@ -1,5 +1,6 @@
 flowchart TD
-    E(Extrinsic) ---> I(Inherent);
-    E --> T(Transaction)
-    T --> ST("Signed (aka. Transaction)")
-    T --> UT(Unsigned)
+    E(Extrinsic) ---> B(Bare);
+    E --> S(Signed Transaction)
+    E --> G(General Transaction)
+    B --> I(Inherent);
+    B --> U(Unsigned Transaction (deprecated))

prdoc/pr_7035.prdoc

@@ -0,0 +1,57 @@
+title: Allow declaration and usage of multiple transaction extension version in FRAME and primitives
+
+doc:
+  - audience: Runtime Dev
+    description: |
+        This PR enhance `UncheckedExtrinsic` type with a new optional generic: `ExtensionOtherVersions`.
+        This generic defaults to `InvalidVersion` meaning there is not other version than the regular version 0. This is the same behavior as before this PR.
+
+        # Breaking change
+
+        The types `Preamble`, `CheckedExtrinsic` and `ExtrinsicFormat` also have this new optional generic. Their type definition also have changed a bit, the `General` variant was 2 fields, the version and the extension, it is now only one field, the extension, and the version can be retrieve by calling `extension.version()`
+
+        Some trait such as `ExtrinsicMetadata` and `EthExtraImpl` changed their associated type named `Extension` to `ExtensionV0` and have new associated type `ExtensionOtherVersions`. This is because multiple version are now supported.
+        You can always use `InvalidVersions` for `ExtensionOtherVersions` and keep the old `Extension` for `ExtensionV0` to keep the same behavior as before this PR.
+
+        The type inference for those types may fail because of this PR, to update the code by writing the concrete types.
+
+        # New feature
+
+        To use this new feature, you can use the new types `TxExtLineAtVers` and `MultiVersion` to define a transaction extension with multiple version:
+
+        ```rust
+        pub type TransactionExtensionV0 = ();
+        pub type TransactionExtensionV4 = ();
+        pub type TransactionExtensionV7 = ();
+
+        pub type OtherVersions = MultiVersion<
+            TxExtLineAtVers<4, TransactionExtensionV4>;
+            TxExtLineAtVers<7, TransactionExtensionV7>;
+        >;
+
+        pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<
+            AccountId,
+            RuntimeCall,
+            UintAuthorityId,
+            TransactionExtensionV0, // The version 0, same as before
+            OtherVersions, // The other versions.
+        >;
+        ```
+
+crates:
+  - name: node-testing
+    bump: major
+  - name: pallet-revive
+    bump: major
+  - name: frame-support-procedural
+    bump: major
+  - name: frame-support
+    bump: major
+  - name: frame-support-test
+    bump: major
+  - name: sp-runtime
+    bump: major
+  - name: sp-metadata-ir
+    bump: major
+  - name: pallet-transaction-payment
+    bump: major

substrate/bin/node/runtime/src/lib.rs

@@ -2910,9 +2910,10 @@ pub struct EthExtraImpl;
 
 impl EthExtra for EthExtraImpl {
 	type Config = Runtime;
-	type Extension = TxExtension;
+	type ExtensionV0 = TxExtension;
+	type ExtensionOtherVersions = sp_runtime::traits::InvalidVersion;
 
-	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension {
+	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::ExtensionV0 {
 		(
 			frame_system::AuthorizeCall::<Runtime>::new(),
 			frame_system::CheckNonZeroSender::<Runtime>::new(),

substrate/bin/node/testing/src/bench.rs

@@ -600,12 +600,9 @@ impl BenchKeyring {
 				.into()
 			},
 			ExtrinsicFormat::Bare => generic::UncheckedExtrinsic::new_bare(xt.function).into(),
-			ExtrinsicFormat::General(ext_version, tx_ext) =>
-				generic::UncheckedExtrinsic::from_parts(
-					xt.function,
-					Preamble::General(ext_version, tx_ext),
-				)
-				.into(),
+			ExtrinsicFormat::General(tx_ext) =>
+				generic::UncheckedExtrinsic::from_parts(xt.function, Preamble::General(tx_ext))
+					.into(),
 		}
 	}
 

substrate/bin/node/testing/src/keyring.rs

@@ -131,10 +131,8 @@ pub fn sign(
 			.into()
 		},
 		ExtrinsicFormat::Bare => generic::UncheckedExtrinsic::new_bare(xt.function).into(),
-		ExtrinsicFormat::General(ext_version, tx_ext) => generic::UncheckedExtrinsic::from_parts(
-			xt.function,
-			generic::Preamble::General(ext_version, tx_ext),
-		)
-		.into(),
+		ExtrinsicFormat::General(tx_ext) =>
+			generic::UncheckedExtrinsic::from_parts(xt.function, generic::Preamble::General(tx_ext))
+				.into(),
 	}
 }

substrate/frame/revive/dev-node/runtime/src/lib.rs

@@ -189,9 +189,10 @@ pub struct EthExtraImpl;
 
 impl EthExtra for EthExtraImpl {
 	type Config = Runtime;
-	type Extension = TxExtension;
+	type ExtensionV0 = TxExtension;
+	type ExtensionOtherVersions = sp_runtime::traits::InvalidVersion;
 
-	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension {
+	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::ExtensionV0 {
 		(
 			frame_system::CheckNonZeroSender::<Runtime>::new(),
 			frame_system::CheckSpecVersion::<Runtime>::new(),

substrate/frame/revive/src/evm/fees.rs

@@ -209,8 +209,15 @@ where
 	<E::Config as frame_system::Config>::RuntimeCall:
 		Dispatchable<Info = DispatchInfo, PostInfo = PostDispatchInfo>,
 	CallOf<E::Config>: SetWeightLimit,
-	<<E::Config as SysConfig>::Block as BlockT>::Extrinsic:
-		From<UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>>,
+	<<E::Config as SysConfig>::Block as BlockT>::Extrinsic: From<
+		UncheckedExtrinsic<
+			Address,
+			CallOf<E::Config>,
+			Signature,
+			E::ExtensionV0,
+			E::ExtensionOtherVersions,
+		>,
+	>,
 	<<E::Config as TxConfig>::OnChargeTransaction as TxCreditHold<E::Config>>::Credit:
 		SuppressedDrop<Inner = CreditOf<E::Config>>,
 {

substrate/frame/revive/src/evm/runtime.rs

@@ -39,7 +39,7 @@ use sp_runtime::{
 	generic::{self, CheckedExtrinsic, ExtrinsicFormat},
 	traits::{
 		Checkable, ExtrinsicCall, ExtrinsicLike, ExtrinsicMetadata, LazyExtrinsic,
-		TransactionExtension,
+		TransactionExtension, VersTxExtLine,
 	},
 	transaction_validity::{InvalidTransaction, TransactionValidityError},
 	Debug, OpaqueExtrinsic, Weight,
@@ -57,28 +57,58 @@ pub trait SetWeightLimit {
 /// [`crate::Call::eth_transact`] extrinsic.
 #[derive(Encode, Decode, DecodeWithMemTracking, Clone, PartialEq, Eq, Debug)]
 pub struct UncheckedExtrinsic<Address, Signature, E: EthExtra>(
-	pub generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>,
+	pub  generic::UncheckedExtrinsic<
+		Address,
+		CallOf<E::Config>,
+		Signature,
+		E::ExtensionV0,
+		E::ExtensionOtherVersions,
+	>,
 );
 
 impl<Address, Signature, E: EthExtra> TypeInfo for UncheckedExtrinsic<Address, Signature, E>
 where
 	Address: StaticTypeInfo,
 	Signature: StaticTypeInfo,
-	E::Extension: StaticTypeInfo,
+	E::ExtensionV0: StaticTypeInfo,
 {
-	type Identity =
-		generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>;
+	type Identity = generic::UncheckedExtrinsic<
+		Address,
+		CallOf<E::Config>,
+		Signature,
+		E::ExtensionV0,
+		E::ExtensionOtherVersions,
+	>;
 	fn type_info() -> scale_info::Type {
-		generic::UncheckedExtrinsic::<Address, CallOf<E::Config>, Signature, E::Extension>::type_info()
+		generic::UncheckedExtrinsic::<
+			Address,
+			CallOf<E::Config>,
+			Signature,
+			E::ExtensionV0,
+			E::ExtensionOtherVersions,
+		>::type_info()
 	}
 }
 
 impl<Address, Signature, E: EthExtra>
-	From<generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>>
-	for UncheckedExtrinsic<Address, Signature, E>
+	From<
+		generic::UncheckedExtrinsic<
+			Address,
+			CallOf<E::Config>,
+			Signature,
+			E::ExtensionV0,
+			E::ExtensionOtherVersions,
+		>,
+	> for UncheckedExtrinsic<Address, Signature, E>
 {
 	fn from(
-		utx: generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>,
+		utx: generic::UncheckedExtrinsic<
+			Address,
+			CallOf<E::Config>,
+			Signature,
+			E::ExtensionV0,
+			E::ExtensionOtherVersions,
+		>,
 	) -> Self {
 		Self(utx)
 	}
@@ -99,9 +129,17 @@ impl<Address, Signature, E: EthExtra> ExtrinsicMetadata
 		Address,
 		CallOf<E::Config>,
 		Signature,
-		E::Extension,
+		E::ExtensionV0,
+		E::ExtensionOtherVersions,
 	>::VERSIONS;
-	type TransactionExtensions = E::Extension;
+	type TransactionExtensionsV0 = E::ExtensionV0;
+	type TransactionExtensionsVersions = <generic::UncheckedExtrinsic<
+		Address,
+		CallOf<E::Config>,
+		Signature,
+		E::ExtensionV0,
+		E::ExtensionOtherVersions,
+	> as ExtrinsicMetadata>::TransactionExtensionsVersions;
 }
 
 impl<Address: TypeInfo, Signature: TypeInfo, E: EthExtra> ExtrinsicCall
@@ -126,13 +164,28 @@ where
 	<E::Config as frame_system::Config>::Nonce: TryFrom<U256>,
 	CallOf<E::Config>: SetWeightLimit,
 	// required by Checkable for `generic::UncheckedExtrinsic`
-	generic::UncheckedExtrinsic<LookupSource, CallOf<E::Config>, Signature, E::Extension>:
-		Checkable<
-			Lookup,
-			Checked = CheckedExtrinsic<AccountIdOf<E::Config>, CallOf<E::Config>, E::Extension>,
+	generic::UncheckedExtrinsic<
+		LookupSource,
+		CallOf<E::Config>,
+		Signature,
+		E::ExtensionV0,
+		E::ExtensionOtherVersions,
+	>: Checkable<
+		Lookup,
+		Checked = CheckedExtrinsic<
+			AccountIdOf<E::Config>,
+			CallOf<E::Config>,
+			E::ExtensionV0,
+			E::ExtensionOtherVersions,
 		>,
+	>,
 {
-	type Checked = CheckedExtrinsic<AccountIdOf<E::Config>, CallOf<E::Config>, E::Extension>;
+	type Checked = CheckedExtrinsic<
+		AccountIdOf<E::Config>,
+		CallOf<E::Config>,
+		E::ExtensionV0,
+		E::ExtensionOtherVersions,
+	>;
 
 	fn check(self, lookup: &Lookup) -> Result<Self::Checked, TransactionValidityError> {
 		if !self.0.is_signed() {
@@ -190,17 +243,17 @@ impl<Address, Signature, E: EthExtra> SignedTransactionBuilder
 where
 	Address: TypeInfo,
 	Signature: TypeInfo,
-	E::Extension: TypeInfo,
+	E::ExtensionV0: TypeInfo,
 {
 	type Address = Address;
 	type Signature = Signature;
-	type Extension = E::Extension;
+	type Extension = E::ExtensionV0;
 
 	fn new_signed_transaction(
 		call: Self::Call,
 		signed: Address,
 		signature: Signature,
-		tx_ext: E::Extension,
+		tx_ext: E::ExtensionV0,
 	) -> Self {
 		generic::UncheckedExtrinsic::new_signed(call, signed, signature, tx_ext).into()
 	}
@@ -210,7 +263,7 @@ impl<Address, Signature, E: EthExtra> InherentBuilder for UncheckedExtrinsic<Add
 where
 	Address: TypeInfo,
 	Signature: TypeInfo,
-	E::Extension: TypeInfo,
+	E::ExtensionV0: TypeInfo,
 {
 	fn new_inherent(call: Self::Call) -> Self {
 		generic::UncheckedExtrinsic::new_bare(call).into()
@@ -222,7 +275,7 @@ impl<Address, Signature, E: EthExtra> From<UncheckedExtrinsic<Address, Signature
 where
 	Address: Encode,
 	Signature: Encode,
-	E::Extension: Encode,
+	E::ExtensionV0: Encode,
 {
 	fn from(extrinsic: UncheckedExtrinsic<Address, Signature, E>) -> Self {
 		extrinsic.0.into()
@@ -231,7 +284,13 @@ where
 
 impl<Address, Signature, E: EthExtra> LazyExtrinsic for UncheckedExtrinsic<Address, Signature, E>
 where
-	generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>: LazyExtrinsic,
+	generic::UncheckedExtrinsic<
+		Address,
+		CallOf<E::Config>,
+		Signature,
+		E::ExtensionV0,
+		E::ExtensionOtherVersions,
+	>: LazyExtrinsic,
 {
 	fn decode_unprefixed(data: &[u8]) -> Result<Self, codec::Error> {
 		Ok(Self(LazyExtrinsic::decode_unprefixed(data)?))
@@ -243,11 +302,16 @@ pub trait EthExtra {
 	/// The Runtime configuration.
 	type Config: Config + TxConfig;
 
-	/// The Runtime's transaction extension.
+	/// The Runtime's transaction extension version 0.
 	/// It should include at least:
 	/// - [`frame_system::CheckNonce`] to ensure that the nonce from the Ethereum transaction is
 	///   correct.
-	type Extension: TransactionExtension<CallOf<Self::Config>>;
+	type ExtensionV0: TransactionExtension<CallOf<Self::Config>>;
+
+	/// The Runtime's transaction extension versions other than 0.
+	///
+	/// Use [`sp_runtime::traits::InvalidVersion`] if no other versions should be supported.
+	type ExtensionOtherVersions: VersTxExtLine<CallOf<Self::Config>>;
 
 	/// Get the transaction extension to apply to an unsigned [`crate::Call::eth_transact`]
 	/// extrinsic.
@@ -258,7 +322,7 @@ pub trait EthExtra {
 	fn get_eth_extension(
 		nonce: <Self::Config as frame_system::Config>::Nonce,
 		tip: BalanceOf<Self::Config>,
-	) -> Self::Extension;
+	) -> Self::ExtensionV0;
 
 	/// Convert the unsigned [`crate::Call::eth_transact`] into a [`CheckedExtrinsic`].
 	/// and ensure that the fees from the Ethereum transaction correspond to the fees computed from
@@ -271,7 +335,12 @@ pub trait EthExtra {
 		payload: &[u8],
 		encoded_len: usize,
 	) -> Result<
-		CheckedExtrinsic<AccountIdOf<Self::Config>, CallOf<Self::Config>, Self::Extension>,
+		CheckedExtrinsic<
+			AccountIdOf<Self::Config>,
+			CallOf<Self::Config>,
+			Self::ExtensionV0,
+			Self::ExtensionOtherVersions,
+		>,
 		InvalidTransaction,
 	>
 	where