duniter
diff --git a/‎substrate/.maintain/frame-weight-template.hbs‎
Lines changed: 1 addition & 1 deletion b/‎substrate/.maintain/frame-weight-template.hbs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎substrate/bin/minimal/runtime/src/lib.rs‎
Lines changed: 2 additions & 2 deletions b/‎substrate/bin/minimal/runtime/src/lib.rs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎substrate/bin/node-template/node/Cargo.toml‎
Lines changed: 1 addition & 0 deletions b/‎substrate/bin/node-template/node/Cargo.toml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎substrate/bin/node-template/node/src/benchmarking.rs‎
Lines changed: 5 additions & 4 deletions b/‎substrate/bin/node-template/node/src/benchmarking.rs‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎substrate/bin/node-template/runtime/Cargo.toml‎
Lines changed: 1 addition & 0 deletions b/‎substrate/bin/node-template/runtime/Cargo.toml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎substrate/bin/node-template/runtime/src/lib.rs‎
Lines changed: 8 additions & 4 deletions b/‎substrate/bin/node-template/runtime/src/lib.rs‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎substrate/bin/node/cli/Cargo.toml‎
Lines changed: 2 additions & 0 deletions b/‎substrate/bin/node/cli/Cargo.toml‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎substrate/bin/node/cli/benches/block_production.rs‎
Lines changed: 1 addition & 1 deletion b/‎substrate/bin/node/cli/benches/block_production.rs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎substrate/bin/node/cli/benches/executor.rs‎
Lines changed: 3 additions & 3 deletions b/‎substrate/bin/node/cli/benches/executor.rs‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎substrate/bin/node/cli/src/service.rs‎
Lines changed: 44 additions & 33 deletions b/‎substrate/bin/node/cli/src/service.rs‎
Lines changed: 44 additions & 33 deletions
@@ -33,7 +33,7 @@ pub trait WeightInfo {
 
 /// Weights for `{{pallet}}` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
-{{#if (eq pallet "frame_system")}}
+{{#if (or (eq pallet "frame_system") (eq pallet "frame_system_extensions"))}}
 impl<T: crate::Config> WeightInfo for SubstrateWeight<T> {
 {{else}}
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 
@@ -52,7 +52,7 @@ pub fn native_version() -> NativeVersion {
 	NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
 }
 
-type SignedExtra = (
+type TxExtension = (
 	frame_system::CheckNonZeroSender<Runtime>,
 	frame_system::CheckSpecVersion<Runtime>,
 	frame_system::CheckTxVersion<Runtime>,
@@ -104,7 +104,7 @@ impl pallet_transaction_payment::Config for Runtime {
 	type LengthToFee = FixedFee<1, <Self as pallet_balances::Config>::Balance>;
 }
 
-type Block = frame::runtime::types_common::BlockOf<Runtime, SignedExtra>;
+type Block = frame::runtime::types_common::BlockOf<Runtime, TxExtension>;
 type Header = HeaderFor<Runtime>;
 
 type RuntimeExecutive =
 
@@ -78,6 +78,7 @@ runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"node-template-runtime/runtime-benchmarks",
+	"pallet-transaction-payment/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 
@@ -109,7 +109,7 @@ pub fn create_benchmark_extrinsic(
 		.checked_next_power_of_two()
 		.map(|c| c / 2)
 		.unwrap_or(2) as u64;
-	let extra: runtime::SignedExtra = (
+	let tx_ext: runtime::TxExtension = (
 		frame_system::CheckNonZeroSender::<runtime::Runtime>::new(),
 		frame_system::CheckSpecVersion::<runtime::Runtime>::new(),
 		frame_system::CheckTxVersion::<runtime::Runtime>::new(),
@@ -121,11 +121,12 @@ pub fn create_benchmark_extrinsic(
 		frame_system::CheckNonce::<runtime::Runtime>::from(nonce),
 		frame_system::CheckWeight::<runtime::Runtime>::new(),
 		pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
-	);
+	)
+		.into();
 
 	let raw_payload = runtime::SignedPayload::from_raw(
 		call.clone(),
-		extra.clone(),
+		tx_ext.clone(),
 		(
 			(),
 			runtime::VERSION.spec_version,
@@ -143,7 +144,7 @@ pub fn create_benchmark_extrinsic(
 		call,
 		sp_runtime::AccountId32::from(sender.public()).into(),
 		runtime::Signature::Sr25519(signature),
-		extra,
+		tx_ext,
 	)
 }
 
 
@@ -106,6 +106,7 @@ runtime-benchmarks = [
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-template/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-transaction-payment/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 
@@ -241,6 +241,7 @@ impl pallet_transaction_payment::Config for Runtime {
 	type WeightToFee = IdentityFee<Balance>;
 	type LengthToFee = IdentityFee<Balance>;
 	type FeeMultiplierUpdate = ConstFeeMultiplier<FeeMultiplier>;
+	type WeightInfo = pallet_transaction_payment::weights::SubstrateWeight<Runtime>;
 }
 
 impl pallet_sudo::Config for Runtime {
@@ -276,8 +277,8 @@ pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 /// Block type as expected by this runtime.
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-/// The SignedExtension to the basic transaction logic.
-pub type SignedExtra = (
+/// The extension to the basic transaction logic.
+pub type TxExtension = (
 	frame_system::CheckNonZeroSender<Runtime>,
 	frame_system::CheckSpecVersion<Runtime>,
 	frame_system::CheckTxVersion<Runtime>,
@@ -296,9 +297,9 @@ type Migrations = ();
 
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
+	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, TxExtension>;
 /// The payload being signed in transactions.
-pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
+pub type SignedPayload = generic::SignedPayload<RuntimeCall, TxExtension>;
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,
@@ -314,6 +315,7 @@ mod benches {
 	frame_benchmarking::define_benchmarks!(
 		[frame_benchmarking, BaselineBench::<Runtime>]
 		[frame_system, SystemBench::<Runtime>]
+		[frame_system_extensions, SystemExtensionsBench::<Runtime>]
 		[pallet_balances, Balances]
 		[pallet_timestamp, Timestamp]
 		[pallet_sudo, Sudo]
@@ -498,6 +500,7 @@ impl_runtime_apis! {
 			use frame_benchmarking::{baseline, Benchmarking, BenchmarkList};
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
+			use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
 			use baseline::Pallet as BaselineBench;
 
 			let mut list = Vec::<BenchmarkList>::new();
@@ -514,6 +517,7 @@ impl_runtime_apis! {
 			use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch};
 			use sp_storage::TrackedStorageKey;
 			use frame_system_benchmarking::Pallet as SystemBench;
+			use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
 			use baseline::Pallet as BaselineBench;
 
 			impl frame_system_benchmarking::Config for Runtime {}
 
@@ -196,6 +196,7 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"kitchensink-runtime/runtime-benchmarks",
 	"node-inspect?/runtime-benchmarks",
+	"pallet-asset-conversion-tx-payment/runtime-benchmarks",
 	"pallet-asset-tx-payment/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
@@ -205,6 +206,7 @@ runtime-benchmarks = [
 	"pallet-skip-feeless-payment/runtime-benchmarks",
 	"pallet-sudo/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-transaction-payment/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"sc-client-db/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 
@@ -110,7 +110,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 
 fn extrinsic_set_time(now: u64) -> OpaqueExtrinsic {
 	kitchensink_runtime::UncheckedExtrinsic {
-		signature: None,
+		preamble: sp_runtime::generic::Preamble::Bare,
 		function: kitchensink_runtime::RuntimeCall::Timestamp(pallet_timestamp::Call::set { now }),
 	}
 	.into()
 
@@ -29,7 +29,7 @@ use sp_core::{
 	storage::well_known_keys,
 	traits::{CallContext, CodeExecutor, RuntimeCode},
 };
-use sp_runtime::traits::BlakeTwo256;
+use sp_runtime::{generic::ExtrinsicFormat, traits::BlakeTwo256};
 use sp_state_machine::TestExternalities as CoreTestExternalities;
 use staging_node_cli::service::RuntimeExecutor;
 
@@ -144,11 +144,11 @@ fn test_blocks(
 ) -> Vec<(Vec<u8>, Hash)> {
 	let mut test_ext = new_test_ext(genesis_config);
 	let mut block1_extrinsics = vec![CheckedExtrinsic {
-		signed: None,
+		format: ExtrinsicFormat::Bare,
 		function: RuntimeCall::Timestamp(pallet_timestamp::Call::set { now: 0 }),
 	}];
 	block1_extrinsics.extend((0..20).map(|i| CheckedExtrinsic {
-		signed: Some((alice(), signed_extra(i, 0))),
+		format: ExtrinsicFormat::Signed(alice(), tx_ext(i, 0)),
 		function: RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death {
 			dest: bob().into(),
 			value: 1 * DOLLARS,
 
@@ -107,18 +107,21 @@ pub fn create_extrinsic(
 		.map(|c| c / 2)
 		.unwrap_or(2) as u64;
 	let tip = 0;
-	let extra: kitchensink_runtime::SignedExtra =
+	let tx_ext: kitchensink_runtime::TxExtension =
 		(
-			frame_system::CheckNonZeroSender::<kitchensink_runtime::Runtime>::new(),
-			frame_system::CheckSpecVersion::<kitchensink_runtime::Runtime>::new(),
-			frame_system::CheckTxVersion::<kitchensink_runtime::Runtime>::new(),
-			frame_system::CheckGenesis::<kitchensink_runtime::Runtime>::new(),
-			frame_system::CheckEra::<kitchensink_runtime::Runtime>::from(generic::Era::mortal(
-				period,
-				best_block.saturated_into(),
-			)),
-			frame_system::CheckNonce::<kitchensink_runtime::Runtime>::from(nonce),
-			frame_system::CheckWeight::<kitchensink_runtime::Runtime>::new(),
+			(
+				frame_system::CheckNonZeroSender::<kitchensink_runtime::Runtime>::new(),
+				frame_system::CheckSpecVersion::<kitchensink_runtime::Runtime>::new(),
+				frame_system::CheckTxVersion::<kitchensink_runtime::Runtime>::new(),
+				frame_system::CheckGenesis::<kitchensink_runtime::Runtime>::new(),
+				frame_system::CheckEra::<kitchensink_runtime::Runtime>::from(generic::Era::mortal(
+					period,
+					best_block.saturated_into(),
+				)),
+				frame_system::CheckNonce::<kitchensink_runtime::Runtime>::from(nonce),
+				frame_system::CheckWeight::<kitchensink_runtime::Runtime>::new(),
+			)
+				.into(),
 			pallet_skip_feeless_payment::SkipCheckIfFeeless::from(
 				pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<
 					kitchensink_runtime::Runtime,
@@ -128,15 +131,17 @@ pub fn create_extrinsic(
 
 	let raw_payload = kitchensink_runtime::SignedPayload::from_raw(
 		function.clone(),
-		extra.clone(),
+		tx_ext.clone(),
 		(
-			(),
-			kitchensink_runtime::VERSION.spec_version,
-			kitchensink_runtime::VERSION.transaction_version,
-			genesis_hash,
-			best_hash,
-			(),
-			(),
+			(
+				(),
+				kitchensink_runtime::VERSION.spec_version,
+				kitchensink_runtime::VERSION.transaction_version,
+				genesis_hash,
+				best_hash,
+				(),
+				(),
+			),
 			(),
 		),
 	);
@@ -146,7 +151,7 @@ pub fn create_extrinsic(
 		function,
 		sp_runtime::AccountId32::from(sender.public()).into(),
 		kitchensink_runtime::Signature::Sr25519(signature),
-		extra,
+		tx_ext,
 	)
 }
 
@@ -791,7 +796,7 @@ mod tests {
 	use codec::Encode;
 	use kitchensink_runtime::{
 		constants::{currency::CENTS, time::SLOT_DURATION},
-		Address, BalancesCall, RuntimeCall, UncheckedExtrinsic,
+		Address, BalancesCall, RuntimeCall, TxExtension, UncheckedExtrinsic,
 	};
 	use node_primitives::{Block, DigestItem, Signature};
 	use sc_client_api::BlockBackend;
@@ -993,25 +998,31 @@ mod tests {
 				let tx_payment = pallet_skip_feeless_payment::SkipCheckIfFeeless::from(
 					pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::from(0, None),
 				);
-				let extra = (
-					check_non_zero_sender,
-					check_spec_version,
-					check_tx_version,
-					check_genesis,
-					check_era,
-					check_nonce,
-					check_weight,
+				let tx_ext: TxExtension = (
+					(
+						check_non_zero_sender,
+						check_spec_version,
+						check_tx_version,
+						check_genesis,
+						check_era,
+						check_nonce,
+						check_weight,
+					)
+						.into(),
 					tx_payment,
 				);
 				let raw_payload = SignedPayload::from_raw(
 					function,
-					extra,
-					((), spec_version, transaction_version, genesis_hash, genesis_hash, (), (), ()),
+					tx_ext,
+					(
+						((), spec_version, transaction_version, genesis_hash, genesis_hash, (), ()),
+						(),
+					),
 				);
 				let signature = raw_payload.using_encoded(|payload| signer.sign(payload));
-				let (function, extra, _) = raw_payload.deconstruct();
+				let (function, tx_ext, _) = raw_payload.deconstruct();
 				index += 1;
-				UncheckedExtrinsic::new_signed(function, from.into(), signature.into(), extra)
+				UncheckedExtrinsic::new_signed(function, from.into(), signature.into(), tx_ext)
 					.into()
 			},
 		);
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ pub fn native_version() -> NativeVersion {`
`52`	`52`	`NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }`
`53`	`53`	`}`
`54`	`54`
`55`		`-type SignedExtra = (`
	`55`	`+type TxExtension = (`
`56`	`56`	`frame_system::CheckNonZeroSender<Runtime>,`
`57`	`57`	`frame_system::CheckSpecVersion<Runtime>,`
`58`	`58`	`frame_system::CheckTxVersion<Runtime>,`
`@@ -104,7 +104,7 @@ impl pallet_transaction_payment::Config for Runtime {`
`104`	`104`	`type LengthToFee = FixedFee<1, <Self as pallet_balances::Config>::Balance>;`
`105`	`105`	`}`
`106`	`106`
`107`		`-type Block = frame::runtime::types_common::BlockOf<Runtime, SignedExtra>;`
	`107`	`+type Block = frame::runtime::types_common::BlockOf<Runtime, TxExtension>;`
`108`	`108`	`type Header = HeaderFor<Runtime>;`
`109`	`109`
`110`	`110`	`type RuntimeExecutive =`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ runtime-benchmarks = [`
`78`	`78`	`"frame-benchmarking/runtime-benchmarks",`
`79`	`79`	`"frame-system/runtime-benchmarks",`
`80`	`80`	`"node-template-runtime/runtime-benchmarks",`
	`81`	`+ "pallet-transaction-payment/runtime-benchmarks",`
`81`	`82`	`"sc-service/runtime-benchmarks",`
`82`	`83`	`"sp-runtime/runtime-benchmarks",`
`83`	`84`	`]`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ runtime-benchmarks = [`
`106`	`106`	`"pallet-sudo/runtime-benchmarks",`
`107`	`107`	`"pallet-template/runtime-benchmarks",`
`108`	`108`	`"pallet-timestamp/runtime-benchmarks",`
	`109`	`+ "pallet-transaction-payment/runtime-benchmarks",`
`109`	`110`	`"sp-runtime/runtime-benchmarks",`
`110`	`111`	`]`
`111`	`112`	`try-runtime = [`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {`
`110`	`110`
`111`	`111`	`fn extrinsic_set_time(now: u64) -> OpaqueExtrinsic {`
`112`	`112`	`kitchensink_runtime::UncheckedExtrinsic {`
`113`		`- signature: None,`
	`113`	`+ preamble: sp_runtime::generic::Preamble::Bare,`
`114`	`114`	`function: kitchensink_runtime::RuntimeCall::Timestamp(pallet_timestamp::Call::set { now }),`
`115`	`115`	`}`
`116`	`116`	`.into()`