Revert "FRAME: Create TransactionExtension as a replacement for SignedExtension (#2280)" (#3665)

This PR reverts #2280 which introduced `TransactionExtension` to replace
`SignedExtension`.

As a result of the discussion
[here](https://github.com/paritytech/polkadot-sdk/pull/3623#issuecomment-1986789700),
the changes will be reverted for now with plans to reintroduce the
concept in the future.

---------

Signed-off-by: georgepisaltu <george.pisaltu@parity.io>
This commit is contained in:
georgepisaltu
2024-03-13 16:10:59 +02:00
committed by GitHub
parent 60ac5a723c
commit bbd51ce867
350 changed files with 15826 additions and 24304 deletions
+89 -96
View File
@@ -15,16 +15,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//! Autogenerated weights for `pallet_transaction_storage`
//! Autogenerated weights for pallet_transaction_storage
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-03-01, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `runner-bn-ce5rx-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
// Executed Command:
// ./target/production/substrate-node
// ./target/production/substrate
// benchmark
// pallet
// --chain=dev
@@ -35,11 +35,12 @@
// --no-median-slopes
// --no-min-squares
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --output=./substrate/frame/transaction-storage/src/weights.rs
// --header=./substrate/HEADER-APACHE2
// --template=./substrate/.maintain/frame-weight-template.hbs
// --output=./frame/transaction-storage/src/weights.rs
// --header=./HEADER-APACHE2
// --template=./.maintain/frame-weight-template.hbs
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
@@ -49,133 +50,125 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use core::marker::PhantomData;
/// Weight functions needed for `pallet_transaction_storage`.
/// Weight functions needed for pallet_transaction_storage.
pub trait WeightInfo {
fn store(l: u32, ) -> Weight;
fn renew() -> Weight;
fn check_proof_max() -> Weight;
}
/// Weights for `pallet_transaction_storage` using the Substrate node and recommended hardware.
/// Weights for pallet_transaction_storage using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
/// Storage: `TransactionStorage::ByteFee` (r:1 w:0)
/// Proof: `TransactionStorage::ByteFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::EntryFee` (r:1 w:0)
/// Proof: `TransactionStorage::EntryFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::BlockTransactions` (r:1 w:1)
/// Proof: `TransactionStorage::BlockTransactions` (`max_values`: Some(1), `max_size`: Some(36866), added: 37361, mode: `MaxEncodedLen`)
/// Storage: TransactionStorage ByteFee (r:1 w:0)
/// Proof: TransactionStorage ByteFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage EntryFee (r:1 w:0)
/// Proof: TransactionStorage EntryFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage BlockTransactions (r:1 w:1)
/// Proof: TransactionStorage BlockTransactions (max_values: Some(1), max_size: Some(36866), added: 37361, mode: MaxEncodedLen)
/// The range of component `l` is `[1, 8388608]`.
fn store(l: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `242`
// Measured: `176`
// Estimated: `38351`
// Minimum execution time: 57_912_000 picoseconds.
Weight::from_parts(58_642_000, 38351)
// Minimum execution time: 34_844_000 picoseconds.
Weight::from_parts(35_489_000, 38351)
// Standard Error: 11
.saturating_add(Weight::from_parts(6_778, 0).saturating_mul(l.into()))
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
.saturating_add(Weight::from_parts(6_912, 0).saturating_mul(l.into()))
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: `TransactionStorage::Transactions` (r:1 w:0)
/// Proof: `TransactionStorage::Transactions` (`max_values`: None, `max_size`: Some(36886), added: 39361, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::ByteFee` (r:1 w:0)
/// Proof: `TransactionStorage::ByteFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::EntryFee` (r:1 w:0)
/// Proof: `TransactionStorage::EntryFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::BlockTransactions` (r:1 w:1)
/// Proof: `TransactionStorage::BlockTransactions` (`max_values`: Some(1), `max_size`: Some(36866), added: 37361, mode: `MaxEncodedLen`)
/// Storage: TransactionStorage Transactions (r:1 w:0)
/// Proof: TransactionStorage Transactions (max_values: None, max_size: Some(36886), added: 39361, mode: MaxEncodedLen)
/// Storage: TransactionStorage ByteFee (r:1 w:0)
/// Proof: TransactionStorage ByteFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage EntryFee (r:1 w:0)
/// Proof: TransactionStorage EntryFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage BlockTransactions (r:1 w:1)
/// Proof: TransactionStorage BlockTransactions (max_values: Some(1), max_size: Some(36866), added: 37361, mode: MaxEncodedLen)
fn renew() -> Weight {
// Proof Size summary in bytes:
// Measured: `430`
// Measured: `326`
// Estimated: `40351`
// Minimum execution time: 72_571_000 picoseconds.
Weight::from_parts(74_832_000, 40351)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
// Minimum execution time: 48_244_000 picoseconds.
Weight::from_parts(50_939_000, 40351)
.saturating_add(T::DbWeight::get().reads(4_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: `TransactionStorage::ProofChecked` (r:1 w:1)
/// Proof: `TransactionStorage::ProofChecked` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::StoragePeriod` (r:1 w:0)
/// Proof: `TransactionStorage::StoragePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::ChunkCount` (r:1 w:0)
/// Proof: `TransactionStorage::ChunkCount` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
/// Storage: `System::ParentHash` (r:1 w:0)
/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::Transactions` (r:1 w:0)
/// Proof: `TransactionStorage::Transactions` (`max_values`: None, `max_size`: Some(36886), added: 39361, mode: `MaxEncodedLen`)
/// Storage: TransactionStorage ProofChecked (r:1 w:1)
/// Proof: TransactionStorage ProofChecked (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
/// Storage: TransactionStorage StoragePeriod (r:1 w:0)
/// Proof: TransactionStorage StoragePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
/// Storage: TransactionStorage ChunkCount (r:1 w:0)
/// Proof: TransactionStorage ChunkCount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
/// Storage: System ParentHash (r:1 w:0)
/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
/// Storage: TransactionStorage Transactions (r:1 w:0)
/// Proof: TransactionStorage Transactions (max_values: None, max_size: Some(36886), added: 39361, mode: MaxEncodedLen)
fn check_proof_max() -> Weight {
// Proof Size summary in bytes:
// Measured: `37211`
// Measured: `37145`
// Estimated: `40351`
// Minimum execution time: 65_985_000 picoseconds.
Weight::from_parts(72_960_000, 40351)
// Minimum execution time: 80_913_000 picoseconds.
Weight::from_parts(84_812_000, 40351)
.saturating_add(T::DbWeight::get().reads(5_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
}
// For backwards compatibility and tests.
// For backwards compatibility and tests
impl WeightInfo for () {
/// Storage: `TransactionStorage::ByteFee` (r:1 w:0)
/// Proof: `TransactionStorage::ByteFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::EntryFee` (r:1 w:0)
/// Proof: `TransactionStorage::EntryFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::BlockTransactions` (r:1 w:1)
/// Proof: `TransactionStorage::BlockTransactions` (`max_values`: Some(1), `max_size`: Some(36866), added: 37361, mode: `MaxEncodedLen`)
/// Storage: TransactionStorage ByteFee (r:1 w:0)
/// Proof: TransactionStorage ByteFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage EntryFee (r:1 w:0)
/// Proof: TransactionStorage EntryFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage BlockTransactions (r:1 w:1)
/// Proof: TransactionStorage BlockTransactions (max_values: Some(1), max_size: Some(36866), added: 37361, mode: MaxEncodedLen)
/// The range of component `l` is `[1, 8388608]`.
fn store(l: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `242`
// Measured: `176`
// Estimated: `38351`
// Minimum execution time: 57_912_000 picoseconds.
Weight::from_parts(58_642_000, 38351)
// Minimum execution time: 34_844_000 picoseconds.
Weight::from_parts(35_489_000, 38351)
// Standard Error: 11
.saturating_add(Weight::from_parts(6_778, 0).saturating_mul(l.into()))
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
.saturating_add(Weight::from_parts(6_912, 0).saturating_mul(l.into()))
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: `TransactionStorage::Transactions` (r:1 w:0)
/// Proof: `TransactionStorage::Transactions` (`max_values`: None, `max_size`: Some(36886), added: 39361, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::ByteFee` (r:1 w:0)
/// Proof: `TransactionStorage::ByteFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::EntryFee` (r:1 w:0)
/// Proof: `TransactionStorage::EntryFee` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(193), added: 2668, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::BlockTransactions` (r:1 w:1)
/// Proof: `TransactionStorage::BlockTransactions` (`max_values`: Some(1), `max_size`: Some(36866), added: 37361, mode: `MaxEncodedLen`)
/// Storage: TransactionStorage Transactions (r:1 w:0)
/// Proof: TransactionStorage Transactions (max_values: None, max_size: Some(36886), added: 39361, mode: MaxEncodedLen)
/// Storage: TransactionStorage ByteFee (r:1 w:0)
/// Proof: TransactionStorage ByteFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage EntryFee (r:1 w:0)
/// Proof: TransactionStorage EntryFee (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: TransactionStorage BlockTransactions (r:1 w:1)
/// Proof: TransactionStorage BlockTransactions (max_values: Some(1), max_size: Some(36866), added: 37361, mode: MaxEncodedLen)
fn renew() -> Weight {
// Proof Size summary in bytes:
// Measured: `430`
// Measured: `326`
// Estimated: `40351`
// Minimum execution time: 72_571_000 picoseconds.
Weight::from_parts(74_832_000, 40351)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
// Minimum execution time: 48_244_000 picoseconds.
Weight::from_parts(50_939_000, 40351)
.saturating_add(RocksDbWeight::get().reads(4_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: `TransactionStorage::ProofChecked` (r:1 w:1)
/// Proof: `TransactionStorage::ProofChecked` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::StoragePeriod` (r:1 w:0)
/// Proof: `TransactionStorage::StoragePeriod` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::ChunkCount` (r:1 w:0)
/// Proof: `TransactionStorage::ChunkCount` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
/// Storage: `System::ParentHash` (r:1 w:0)
/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
/// Storage: `TransactionStorage::Transactions` (r:1 w:0)
/// Proof: `TransactionStorage::Transactions` (`max_values`: None, `max_size`: Some(36886), added: 39361, mode: `MaxEncodedLen`)
/// Storage: TransactionStorage ProofChecked (r:1 w:1)
/// Proof: TransactionStorage ProofChecked (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
/// Storage: TransactionStorage StoragePeriod (r:1 w:0)
/// Proof: TransactionStorage StoragePeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
/// Storage: TransactionStorage ChunkCount (r:1 w:0)
/// Proof: TransactionStorage ChunkCount (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
/// Storage: System ParentHash (r:1 w:0)
/// Proof: System ParentHash (max_values: Some(1), max_size: Some(32), added: 527, mode: MaxEncodedLen)
/// Storage: TransactionStorage Transactions (r:1 w:0)
/// Proof: TransactionStorage Transactions (max_values: None, max_size: Some(36886), added: 39361, mode: MaxEncodedLen)
fn check_proof_max() -> Weight {
// Proof Size summary in bytes:
// Measured: `37211`
// Measured: `37145`
// Estimated: `40351`
// Minimum execution time: 65_985_000 picoseconds.
Weight::from_parts(72_960_000, 40351)
// Minimum execution time: 80_913_000 picoseconds.
Weight::from_parts(84_812_000, 40351)
.saturating_add(RocksDbWeight::get().reads(5_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}