Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix/nfi-updates' into fix/nfi-up…
Browse files Browse the repository at this point in the history 
…dates
  • Loading branch information
@JasonTulp
JasonTulp committed Dec 3, 2024
2 parents c10e45f + 3ac8d0f commit 35c9b55
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 58 deletions.
72 changes: 42 additions & 30 deletions pallet/nfi/src/weights.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//! Autogenerated weights for pallet_nfi
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2024-08-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-12-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `ip-172-31-102-147`, CPU: `Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz`
//! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
Expand Down Expand Up @@ -50,7 +50,7 @@ pub trait WeightInfo {
fn set_relayer() -> Weight;
fn set_fee_to() -> Weight;
fn set_fee_details() -> Weight;
fn enable_nfi() -> Weight;
fn enable_nfi_for_trn_collection() -> Weight;
fn manual_data_request() -> Weight;
fn submit_nfi_data() -> Weight;
}
Expand All @@ -61,51 +61,57 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
// Storage: `Nfi::Relayer` (r:0 w:1)
// Proof: `Nfi::Relayer` (`max_values`: Some(1), `max_size`: Some(20), added: 515, mode: `MaxEncodedLen`)
fn set_relayer() -> Weight {
Weight::from_all(23_662_000 as u64)
Weight::from_all(25_147_000 as u64)
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: `Nfi::FeeTo` (r:0 w:1)
// Proof: `Nfi::FeeTo` (`max_values`: Some(1), `max_size`: Some(20), added: 515, mode: `MaxEncodedLen`)
fn set_fee_to() -> Weight {
Weight::from_all(23_372_000 as u64)
Weight::from_all(25_256_000 as u64)
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: `Nfi::MintFee` (r:0 w:1)
// Proof: `Nfi::MintFee` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
fn set_fee_details() -> Weight {
Weight::from_all(26_093_000 as u64)
Weight::from_all(27_830_000 as u64)
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: `Nft::CollectionInfo` (r:1 w:0)
// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
// Storage: `EVMChainId::ChainId` (r:1 w:0)
// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiEnabled` (r:0 w:1)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
fn enable_nfi() -> Weight {
Weight::from_all(43_540_000 as u64)
.saturating_add(T::DbWeight::get().reads(1 as u64))
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
fn enable_nfi_for_trn_collection() -> Weight {
Weight::from_all(51_927_000 as u64)
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: `EVMChainId::ChainId` (r:1 w:0)
// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiEnabled` (r:1 w:0)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
// Storage: `Nft::CollectionInfo` (r:1 w:0)
// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
// Storage: `Nfi::MintFee` (r:1 w:0)
// Proof: `Nfi::MintFee` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
fn manual_data_request() -> Weight {
Weight::from_all(52_152_000 as u64)
.saturating_add(T::DbWeight::get().reads(3 as u64))
Weight::from_all(62_326_000 as u64)
.saturating_add(T::DbWeight::get().reads(4 as u64))
}
// Storage: `Nfi::Relayer` (r:1 w:0)
// Proof: `Nfi::Relayer` (`max_values`: Some(1), `max_size`: Some(20), added: 515, mode: `MaxEncodedLen`)
// Storage: `EVMChainId::ChainId` (r:1 w:0)
// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiEnabled` (r:1 w:0)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
// Storage: `Nft::CollectionInfo` (r:1 w:0)
// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiData` (r:0 w:1)
// Proof: `Nfi::NfiData` (`max_values`: None, `max_size`: Some(160), added: 2635, mode: `MaxEncodedLen`)
// Proof: `Nfi::NfiData` (`max_values`: None, `max_size`: Some(1166), added: 3641, mode: `MaxEncodedLen`)
fn submit_nfi_data() -> Weight {
Weight::from_all(61_650_000 as u64)
.saturating_add(T::DbWeight::get().reads(3 as u64))
Weight::from_all(71_428_000 as u64)
.saturating_add(T::DbWeight::get().reads(4 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
}
Expand All @@ -115,51 +121,57 @@ impl WeightInfo for () {
// Storage: `Nfi::Relayer` (r:0 w:1)
// Proof: `Nfi::Relayer` (`max_values`: Some(1), `max_size`: Some(20), added: 515, mode: `MaxEncodedLen`)
fn set_relayer() -> Weight {
Weight::from_all(23_662_000 as u64)
Weight::from_all(25_147_000 as u64)
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
// Storage: `Nfi::FeeTo` (r:0 w:1)
// Proof: `Nfi::FeeTo` (`max_values`: Some(1), `max_size`: Some(20), added: 515, mode: `MaxEncodedLen`)
fn set_fee_to() -> Weight {
Weight::from_all(23_372_000 as u64)
Weight::from_all(25_256_000 as u64)
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
// Storage: `Nfi::MintFee` (r:0 w:1)
// Proof: `Nfi::MintFee` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
fn set_fee_details() -> Weight {
Weight::from_all(26_093_000 as u64)
Weight::from_all(27_830_000 as u64)
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
// Storage: `Nft::CollectionInfo` (r:1 w:0)
// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
// Storage: `EVMChainId::ChainId` (r:1 w:0)
// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiEnabled` (r:0 w:1)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
fn enable_nfi() -> Weight {
Weight::from_all(43_540_000 as u64)
.saturating_add(RocksDbWeight::get().reads(1 as u64))
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
fn enable_nfi_for_trn_collection() -> Weight {
Weight::from_all(51_927_000 as u64)
.saturating_add(RocksDbWeight::get().reads(2 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
// Storage: `EVMChainId::ChainId` (r:1 w:0)
// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiEnabled` (r:1 w:0)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
// Storage: `Nft::CollectionInfo` (r:1 w:0)
// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
// Storage: `Nfi::MintFee` (r:1 w:0)
// Proof: `Nfi::MintFee` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
fn manual_data_request() -> Weight {
Weight::from_all(52_152_000 as u64)
.saturating_add(RocksDbWeight::get().reads(3 as u64))
Weight::from_all(62_326_000 as u64)
.saturating_add(RocksDbWeight::get().reads(4 as u64))
}
// Storage: `Nfi::Relayer` (r:1 w:0)
// Proof: `Nfi::Relayer` (`max_values`: Some(1), `max_size`: Some(20), added: 515, mode: `MaxEncodedLen`)
// Storage: `EVMChainId::ChainId` (r:1 w:0)
// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiEnabled` (r:1 w:0)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
// Storage: `Nft::CollectionInfo` (r:1 w:0)
// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
// Storage: `Nfi::NfiData` (r:0 w:1)
// Proof: `Nfi::NfiData` (`max_values`: None, `max_size`: Some(160), added: 2635, mode: `MaxEncodedLen`)
// Proof: `Nfi::NfiData` (`max_values`: None, `max_size`: Some(1166), added: 3641, mode: `MaxEncodedLen`)
fn submit_nfi_data() -> Weight {
Weight::from_all(61_650_000 as u64)
.saturating_add(RocksDbWeight::get().reads(3 as u64))
Weight::from_all(71_428_000 as u64)
.saturating_add(RocksDbWeight::get().reads(4 as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
}
Expand Down
62 changes: 34 additions & 28 deletions runtime/src/weights/pallet_nfi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//! Autogenerated weights for `pallet_nfi`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2024-08-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-12-02, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ip-172-31-102-147`, CPU: `Intel(R) Xeon(R) CPU E5-2686 v4 @ 2.30GHz`
//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
Expand Down Expand Up @@ -38,8 +38,8 @@ impl<T: frame_system::Config> pallet_nfi::WeightInfo for WeightInfo<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 22_536_000 picoseconds.
Weight::from_parts(23_118_000, 0)
// Minimum execution time: 24_465_000 picoseconds.
Weight::from_parts(25_357_000, 0)
.saturating_add(Weight::from_parts(0, 0))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand All @@ -49,8 +49,8 @@ impl<T: frame_system::Config> pallet_nfi::WeightInfo for WeightInfo<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 21_901_000 picoseconds.
Weight::from_parts(22_519_000, 0)
// Minimum execution time: 24_227_000 picoseconds.
Weight::from_parts(24_765_000, 0)
.saturating_add(Weight::from_parts(0, 0))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand All @@ -60,56 +60,62 @@ impl<T: frame_system::Config> pallet_nfi::WeightInfo for WeightInfo<T> {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 24_766_000 picoseconds.
Weight::from_parts(25_241_000, 0)
// Minimum execution time: 26_756_000 picoseconds.
Weight::from_parts(27_521_000, 0)
.saturating_add(Weight::from_parts(0, 0))
.saturating_add(T::DbWeight::get().writes(1))
}
/// Storage: `Nft::CollectionInfo` (r:1 w:0)
/// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
/// Storage: `EVMChainId::ChainId` (r:1 w:0)
/// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
/// Storage: `Nfi::NfiEnabled` (r:0 w:1)
/// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
fn enable_nfi() -> Weight {
/// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
fn enable_nfi_for_trn_collection() -> Weight {
// Proof Size summary in bytes:
// Measured: `728`
// Measured: `770`
// Estimated: `3464`
// Minimum execution time: 42_111_000 picoseconds.
Weight::from_parts(42_610_000, 0)
// Minimum execution time: 51_623_000 picoseconds.
Weight::from_parts(52_812_000, 0)
.saturating_add(Weight::from_parts(0, 3464))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
}
/// Storage: `EVMChainId::ChainId` (r:1 w:0)
/// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
/// Storage: `Nfi::NfiEnabled` (r:1 w:0)
/// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
/// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
/// Storage: `Nft::CollectionInfo` (r:1 w:0)
/// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
/// Storage: `Nfi::MintFee` (r:1 w:0)
/// Proof: `Nfi::MintFee` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
fn manual_data_request() -> Weight {
// Proof Size summary in bytes:
// Measured: `779`
// Estimated: `3514`
// Minimum execution time: 50_980_000 picoseconds.
Weight::from_parts(51_980_000, 0)
.saturating_add(Weight::from_parts(0, 3514))
.saturating_add(T::DbWeight::get().reads(3))
// Measured: `830`
// Estimated: `3994`
// Minimum execution time: 61_703_000 picoseconds.
Weight::from_parts(62_889_000, 0)
.saturating_add(Weight::from_parts(0, 3994))
.saturating_add(T::DbWeight::get().reads(4))
}
/// Storage: `Nfi::Relayer` (r:1 w:0)
/// Proof: `Nfi::Relayer` (`max_values`: Some(1), `max_size`: Some(20), added: 515, mode: `MaxEncodedLen`)
/// Storage: `EVMChainId::ChainId` (r:1 w:0)
/// Proof: `EVMChainId::ChainId` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
/// Storage: `Nfi::NfiEnabled` (r:1 w:0)
/// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(22), added: 2497, mode: `MaxEncodedLen`)
/// Proof: `Nfi::NfiEnabled` (`max_values`: None, `max_size`: Some(529), added: 3004, mode: `MaxEncodedLen`)
/// Storage: `Nft::CollectionInfo` (r:1 w:0)
/// Proof: `Nft::CollectionInfo` (`max_values`: None, `max_size`: Some(4294967295), added: 2474, mode: `MaxEncodedLen`)
/// Storage: `Nfi::NfiData` (r:0 w:1)
/// Proof: `Nfi::NfiData` (`max_values`: None, `max_size`: Some(160), added: 2635, mode: `MaxEncodedLen`)
/// Proof: `Nfi::NfiData` (`max_values`: None, `max_size`: Some(1166), added: 3641, mode: `MaxEncodedLen`)
fn submit_nfi_data() -> Weight {
// Proof Size summary in bytes:
// Measured: `819`
// Estimated: `3487`
// Minimum execution time: 59_640_000 picoseconds.
Weight::from_parts(60_634_000, 0)
.saturating_add(Weight::from_parts(0, 3487))
.saturating_add(T::DbWeight::get().reads(3))
// Measured: `870`
// Estimated: `3994`
// Minimum execution time: 71_439_000 picoseconds.
Weight::from_parts(72_542_000, 0)
.saturating_add(Weight::from_parts(0, 3994))
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(1))
}
}

0 comments on commit 35c9b55

Please sign in to comment.