Allow multiple transaction extension version in UncheckedExtrinsic type.

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,54 @@
+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: `ExtensionOtherVersion`.
+        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()`
+
+        The type inference for those types may fail because of this PR, to update the code, write some partial type: `UncheckedExtrinsic<_, _, _, _>`, `Preamble<_, _, _>`, `ExtrinsicFormat<_, _> and `CheckedExtrinsic<_, _, _>`.
+
+        # 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/testing/src/bench.rs

@@ -601,8 +601,8 @@ impl BenchKeyring {
 				function: xt.function,
 			}
 			.into(),
-			ExtrinsicFormat::General(ext_version, tx_ext) => generic::UncheckedExtrinsic {
-				preamble: sp_runtime::generic::Preamble::General(ext_version, tx_ext),
+			ExtrinsicFormat::General(tx_ext) => generic::UncheckedExtrinsic {
+				preamble: sp_runtime::generic::Preamble::General(tx_ext),
 				function: xt.function,
 			}
 			.into(),

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

@@ -135,8 +135,8 @@ pub fn sign(
 			function: xt.function,
 		}
 		.into(),
-		ExtrinsicFormat::General(ext_version, tx_ext) => generic::UncheckedExtrinsic {
-			preamble: sp_runtime::generic::Preamble::General(ext_version, tx_ext),
+		ExtrinsicFormat::General(tx_ext) => generic::UncheckedExtrinsic {
+			preamble: sp_runtime::generic::Preamble::General(tx_ext),
 			function: xt.function,
 		}
 		.into(),

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

@@ -99,6 +99,12 @@ impl<Address, Signature, E: EthExtra> ExtrinsicMetadata
 		E::Extension,
 	>::VERSIONS;
 	type TransactionExtensions = E::Extension;
+	type TransactionExtensionsVersions = <generic::UncheckedExtrinsic<
+		Address,
+		CallOf<E::Config>,
+		Signature,
+		E::Extension,
+	> as ExtrinsicMetadata>::TransactionExtensionsVersions;
 }
 
 impl<Address: TypeInfo, Signature: TypeInfo, E: EthExtra> ExtrinsicCall

substrate/frame/support/procedural/src/construct_runtime/expand/metadata.rs

@@ -115,6 +115,20 @@ pub fn expand_runtime_metadata(
 
 				use #scrate::__private::metadata_ir::InternalImplRuntimeApis;
 
+
+				let mut versioned_extensions_metadata =
+					#scrate::sp_runtime::traits::VersTxExtLineMetadataBuilder::new();
+
+				<
+					<
+						#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata
+					>::TransactionExtensionsVersions
+					as
+					#scrate::sp_runtime::traits::VersTxExtLine::<
+						<#runtime as #system_path::Config>::RuntimeCall
+					>
+				>::build_metadata(&mut versioned_extensions_metadata);
+
 				#scrate::__private::metadata_ir::MetadataIR {
 					pallets: #scrate::__private::vec![ #(#pallets),* ],
 					extrinsic: #scrate::__private::metadata_ir::ExtrinsicMetadataIR {
@@ -140,6 +154,15 @@ pub fn expand_runtime_metadata(
 									implicit: meta.implicit,
 								})
 								.collect(),
+						extensions_by_version: versioned_extensions_metadata.by_version,
+						extensions_in_versions: versioned_extensions_metadata.in_versions
+								.into_iter()
+								.map(|meta| #scrate::__private::metadata_ir::TransactionExtensionMetadataIR {
+									identifier: meta.identifier,
+									ty: meta.ty,
+									implicit: meta.implicit,
+								})
+								.collect(),
 					},
 					ty: #scrate::__private::scale_info::meta_type::<#runtime>(),
 					apis: (&rt).runtime_metadata(),

substrate/frame/support/src/dispatch.rs

@@ -393,10 +393,12 @@ where
 }
 
 /// Implementation for unchecked extrinsic.
-impl<Address, Call: Dispatchable, Signature, Extension: TransactionExtension<Call>> GetDispatchInfo
-	for UncheckedExtrinsic<Address, Call, Signature, Extension>
+impl<Address, Call, Signature, ExtensionV0, ExtensionOtherVersions> GetDispatchInfo
+	for UncheckedExtrinsic<Address, Call, Signature, ExtensionV0, ExtensionOtherVersions>
 where
 	Call: GetDispatchInfo + Dispatchable,
+	ExtensionV0: TransactionExtension<Call>,
+	ExtensionOtherVersions: sp_runtime::traits::VersTxExtLineWeight<Call>,
 {
 	fn get_dispatch_info(&self) -> DispatchInfo {
 		let mut info = self.function.get_dispatch_info();
@@ -406,10 +408,12 @@ where
 }
 
 /// Implementation for checked extrinsic.
-impl<AccountId, Call: Dispatchable, Extension: TransactionExtension<Call>> GetDispatchInfo
-	for CheckedExtrinsic<AccountId, Call, Extension>
+impl<AccountId, Call, ExtensionV0, ExtensionOtherVersions> GetDispatchInfo
+	for CheckedExtrinsic<AccountId, Call, ExtensionV0, ExtensionOtherVersions>
 where
-	Call: GetDispatchInfo,
+	Call: GetDispatchInfo + Dispatchable,
+	ExtensionV0: TransactionExtension<Call>,
+	ExtensionOtherVersions: sp_runtime::traits::VersTxExtLineWeight<Call>,
 {
 	fn get_dispatch_info(&self) -> DispatchInfo {
 		let mut info = self.function.get_dispatch_info();
@@ -1549,7 +1553,7 @@ mod extension_weight_tests {
 			// First testcase
 			let ext: TxExtension = (HalfCostIf(false), FreeIfUnder(2000), ActualWeightIs(0));
 			let xt = CheckedExtrinsic {
-				format: ExtrinsicFormat::Signed(0, ext.clone()),
+				format: ExtrinsicFormat::<_, _>::Signed(0, ext.clone()),
 				function: call.clone(),
 			};
 			assert_eq!(xt.extension_weight(), Weight::from_parts(600, 0));
@@ -1564,7 +1568,7 @@ mod extension_weight_tests {
 			// Second testcase
 			let ext: TxExtension = (HalfCostIf(false), FreeIfUnder(1100), ActualWeightIs(200));
 			let xt = CheckedExtrinsic {
-				format: ExtrinsicFormat::Signed(0, ext),
+				format: ExtrinsicFormat::<_, _>::Signed(0, ext),
 				function: call.clone(),
 			};
 			let post_info = xt.apply::<ExtRuntime>(&info, 0).unwrap().unwrap();
@@ -1574,7 +1578,7 @@ mod extension_weight_tests {
 			// Third testcase
 			let ext: TxExtension = (HalfCostIf(true), FreeIfUnder(1060), ActualWeightIs(200));
 			let xt = CheckedExtrinsic {
-				format: ExtrinsicFormat::Signed(0, ext),
+				format: ExtrinsicFormat::<_, _>::Signed(0, ext),
 				function: call.clone(),
 			};
 			let post_info = xt.apply::<ExtRuntime>(&info, 0).unwrap().unwrap();
@@ -1584,7 +1588,7 @@ mod extension_weight_tests {
 			// Fourth testcase
 			let ext: TxExtension = (HalfCostIf(false), FreeIfUnder(100), ActualWeightIs(300));
 			let xt = CheckedExtrinsic {
-				format: ExtrinsicFormat::Signed(0, ext),
+				format: ExtrinsicFormat::<_, _>::Signed(0, ext),
 				function: call.clone(),
 			};
 			let post_info = xt.apply::<ExtRuntime>(&info, 0).unwrap().unwrap();

substrate/frame/support/src/traits/misc.rs

@@ -926,13 +926,14 @@ pub trait ExtrinsicCall: sp_runtime::traits::ExtrinsicLike {
 	fn call(&self) -> &Self::Call;
 }
 
-impl<Address, Call, Signature, Extra> ExtrinsicCall
-	for sp_runtime::generic::UncheckedExtrinsic<Address, Call, Signature, Extra>
-where
-	Address: TypeInfo,
-	Call: TypeInfo,
-	Signature: TypeInfo,
-	Extra: TypeInfo,
+impl<Address, Call, Signature, ExtensionV0, ExtensionOtherVersions> ExtrinsicCall
+	for sp_runtime::generic::UncheckedExtrinsic<
+		Address,
+		Call,
+		Signature,
+		ExtensionV0,
+		ExtensionOtherVersions,
+	>
 {
 	type Call = Call;
 
@@ -947,13 +948,14 @@ pub trait InherentBuilder: ExtrinsicCall {
 	fn new_inherent(call: Self::Call) -> Self;
 }
 
-impl<Address, Call, Signature, Extra> InherentBuilder
-	for sp_runtime::generic::UncheckedExtrinsic<Address, Call, Signature, Extra>
-where
-	Address: TypeInfo,
-	Call: TypeInfo,
-	Signature: TypeInfo,
-	Extra: TypeInfo,
+impl<Address, Call, Signature, ExtensionV0, ExtensionOtherVersions> InherentBuilder
+	for sp_runtime::generic::UncheckedExtrinsic<
+		Address,
+		Call,
+		Signature,
+		ExtensionV0,
+		ExtensionOtherVersions,
+	>
 {
 	fn new_inherent(call: Self::Call) -> Self {
 		Self::new_bare(call)
@@ -976,23 +978,24 @@ pub trait SignedTransactionBuilder: ExtrinsicCall {
 	) -> Self;
 }
 
-impl<Address, Call, Signature, Extension> SignedTransactionBuilder
-	for sp_runtime::generic::UncheckedExtrinsic<Address, Call, Signature, Extension>
-where
-	Address: TypeInfo,
-	Call: TypeInfo,
-	Signature: TypeInfo,
-	Extension: TypeInfo,
+impl<Address, Call, Signature, ExtensionV0, ExtensionOtherVersions> SignedTransactionBuilder
+	for sp_runtime::generic::UncheckedExtrinsic<
+		Address,
+		Call,
+		Signature,
+		ExtensionV0,
+		ExtensionOtherVersions,
+	>
 {
 	type Address = Address;
 	type Signature = Signature;
-	type Extension = Extension;
+	type Extension = ExtensionV0;
 
 	fn new_signed_transaction(
 		call: Self::Call,
 		signed: Address,
 		signature: Signature,
-		tx_ext: Extension,
+		tx_ext: ExtensionV0,
 	) -> Self {
 		Self::new_signed(call, signed, signature, tx_ext)
 	}