diff --git a/Cargo.lock b/Cargo.lock index 21c83fb770..ca54a4cbcf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3676,7 +3676,6 @@ version = "0.0.0" dependencies = [ "async-trait", "clap", - "cumulus-pallet-weight-reclaim", "cumulus-primitives-proof-size-hostfunction", "fc-api", "fc-cli", diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml index 3cd66ffdae..2f8e6b580f 100644 --- a/template/node/Cargo.toml +++ b/template/node/Cargo.toml @@ -81,7 +81,6 @@ fp-rpc = { workspace = true, features = ["default"] } frontier-template-runtime = { workspace = true, features = ["std"] } # Cumulus primitives -cumulus-pallet-weight-reclaim = { workspace = true } cumulus-primitives-proof-size-hostfunction = { workspace = true } [build-dependencies] diff --git a/template/node/src/benchmarking.rs b/template/node/src/benchmarking.rs index 4266533aaf..7803a7183a 100644 --- a/template/node/src/benchmarking.rs +++ b/template/node/src/benchmarking.rs @@ -121,7 +121,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 extra = runtime::SignedExtra::new(( frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), @@ -133,8 +133,7 @@ pub fn create_benchmark_extrinsic( frame_system::CheckNonce::::from(nonce), frame_system::CheckWeight::::new(), pallet_transaction_payment::ChargeTransactionPayment::::from(0), - cumulus_pallet_weight_reclaim::StorageWeightReclaim::::new(()), - ); + )); let raw_payload = runtime::SignedPayload::from_raw( call.clone(), @@ -148,7 +147,6 @@ pub fn create_benchmark_extrinsic( (), (), (), - (), ), ); let signature = raw_payload.using_encoded(|e| sender.sign(e)); diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index 16506135c9..f167ed6c16 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -109,17 +109,19 @@ pub type SignedBlock = generic::SignedBlock; pub type BlockId = generic::BlockId; /// The SignedExtension to the basic transaction logic. -pub type SignedExtra = ( - frame_system::CheckNonZeroSender, - frame_system::CheckSpecVersion, - frame_system::CheckTxVersion, - frame_system::CheckGenesis, - frame_system::CheckEra, - frame_system::CheckNonce, - frame_system::CheckWeight, - pallet_transaction_payment::ChargeTransactionPayment, - cumulus_pallet_weight_reclaim::StorageWeightReclaim, -); +pub type SignedExtra = cumulus_pallet_weight_reclaim::StorageWeightReclaim< + Runtime, + ( + frame_system::CheckNonZeroSender, + frame_system::CheckSpecVersion, + frame_system::CheckTxVersion, + frame_system::CheckGenesis, + frame_system::CheckEra, + frame_system::CheckNonce, + frame_system::CheckWeight, + pallet_transaction_payment::ChargeTransactionPayment, + ), +>; /// Unchecked extrinsic type as expected by this runtime. pub type UncheckedExtrinsic =