Skip to content

Commit

Permalink
Merge branch 'main' into develop-v0.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
maltekliemann committed Aug 11, 2024
2 parents 98e976a + 838d67f commit c171906
Show file tree
Hide file tree
Showing 35 changed files with 4,469 additions and 4,455 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ try-runtime-upgrade-zeitgeist:
@$(MAKE) TRYRUNTIME_URL="wss://zeitgeist-rpc.dwellir.com:443" \
RUNTIME_PATH="./target/release/wbuild/zeitgeist-runtime/zeitgeist_runtime.compact.compressed.wasm" \
-- \
-execute--try-runtime
--execute-try-runtime

build:
SKIP_WASM_BUILD= cargo build
Expand Down
6 changes: 2 additions & 4 deletions integration-tests/configs/zeitgeist.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# endpoint: wss://main.rpc.zeitgeist.pm/ws
endpoint: wss://zeitgeist-rpc.dwellir.com
# endpoint: wss://zeitgeist.api.onfinality.io/public-ws
endpoint: wss://main.rpc.zeitgeist.pm/ws
mock-signature-host: true
db: ./tmp/ztg_db_mba.sqlite
# wasm-override: zeitgeist-runtime.compact.compressed.wasm
Expand All @@ -26,4 +24,4 @@ import-storage:
Members: [5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY]
AuthorFilter:
EligibleRatio: 100
EligibleCount: 100
EligibleCount: 100
28 changes: 14 additions & 14 deletions runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
//! Autogenerated weights for cumulus_pallet_xcmp_queue
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: `2024-04-15`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: `2024-07-25`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `zeitgeist-benchmark`, CPU: `AMD EPYC 7601 32-Core Processor`
//! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`

// Executed Command:
// ./target/production/zeitgeist
Expand Down Expand Up @@ -52,25 +52,25 @@ use frame_support::{
/// Weight functions for cumulus_pallet_xcmp_queue (automatically generated)
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::weights::WeightInfo for WeightInfo<T> {
/// Storage: XcmpQueue QueueConfig (r:1 w:1)
/// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
fn set_config_with_u32() -> Weight {
// Proof Size summary in bytes:
// Measured: `175`
// Estimated: `670`
// Minimum execution time: 8_140 nanoseconds.
Weight::from_parts(9_770_000, 670)
// Measured: `142`
// Estimated: `1627`
// Minimum execution time: 11_060 nanoseconds.
Weight::from_parts(11_850_000, 1627)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
/// Storage: XcmpQueue QueueConfig (r:1 w:1)
/// Proof Skipped: XcmpQueue QueueConfig (max_values: Some(1), max_size: None, mode: Measured)
/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
fn set_config_with_weight() -> Weight {
// Proof Size summary in bytes:
// Measured: `175`
// Estimated: `670`
// Minimum execution time: 9_680 nanoseconds.
Weight::from_parts(10_780_000, 670)
// Measured: `142`
// Estimated: `1627`
// Minimum execution time: 10_990 nanoseconds.
Weight::from_parts(11_590_000, 1627)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand Down
91 changes: 46 additions & 45 deletions runtime/common/src/weights/frame_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
//! Autogenerated weights for frame_system
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: `2024-04-15`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: `2024-07-24`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `zeitgeist-benchmark`, CPU: `AMD EPYC 7601 32-Core Processor`
//! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`

// Executed Command:
// ./target/production/zeitgeist
Expand Down Expand Up @@ -57,84 +57,85 @@ impl<T: frame_system::Config> frame_system::weights::WeightInfo for WeightInfo<T
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_660 nanoseconds.
Weight::from_parts(4_100_000, 0)
// Standard Error: 0
.saturating_add(Weight::from_parts(841, 0).saturating_mul(b.into()))
// Minimum execution time: 5_090 nanoseconds.
Weight::from_parts(5_340_000, 0)
// Standard Error: 1
.saturating_add(Weight::from_parts(583, 0).saturating_mul(b.into()))
}
/// The range of component `b` is `[0, 3932160]`.
fn remark_with_event(b: u32) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 12_910 nanoseconds.
Weight::from_parts(13_250_000, 0)
// Standard Error: 1
.saturating_add(Weight::from_parts(2_749, 0).saturating_mul(b.into()))
// Minimum execution time: 14_690 nanoseconds.
Weight::from_parts(15_620_000, 0)
// Standard Error: 3
.saturating_add(Weight::from_parts(2_207, 0).saturating_mul(b.into()))
}
/// Storage: System Digest (r:1 w:1)
/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
/// Storage: unknown `0x3a686561707061676573` (r:0 w:1)
/// Proof Skipped: unknown `0x3a686561707061676573` (r:0 w:1)
/// Storage: `System::Digest` (r:1 w:1)
/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
/// Proof: UNKNOWN KEY `0x3a686561707061676573` (r:0 w:1)
fn set_heap_pages() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `495`
// Minimum execution time: 7_800 nanoseconds.
Weight::from_parts(8_620_000, 495)
// Estimated: `1485`
// Minimum execution time: 9_360 nanoseconds.
Weight::from_parts(10_110_000, 1485)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(2))
}
/// Storage: System Digest (r:1 w:1)
/// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
/// Storage: unknown `0x3a636f6465` (r:0 w:1)
/// Proof Skipped: unknown `0x3a636f6465` (r:0 w:1)
/// Storage: `System::Digest` (r:1 w:1)
/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: UNKNOWN KEY `0x3a636f6465` (r:0 w:1)
/// Proof: UNKNOWN KEY `0x3a636f6465` (r:0 w:1)
fn set_code() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `1485`
// Minimum execution time: 84_000_503_000 picoseconds.
Weight::from_parts(87_586_619_000, 1485)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
// Minimum execution time: 134_361_003 nanoseconds.
Weight::from_parts(137_733_640_000, 1485)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(2))
}
/// Storage: Skipped Metadata (r:0 w:0)
/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
/// Storage: `Skipped::Metadata` (r:0 w:0)
/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// The range of component `i` is `[0, 1000]`.
fn set_storage(i: u32) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_320 nanoseconds.
Weight::from_parts(3_950_000, 0)
// Standard Error: 4_796
.saturating_add(Weight::from_parts(1_328_378, 0).saturating_mul(i.into()))
// Minimum execution time: 4_480 nanoseconds.
Weight::from_parts(4_680_000, 0)
// Standard Error: 6_558
.saturating_add(Weight::from_parts(1_695_684, 0).saturating_mul(i.into()))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
}
/// Storage: Skipped Metadata (r:0 w:0)
/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
/// Storage: `Skipped::Metadata` (r:0 w:0)
/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// The range of component `i` is `[0, 1000]`.
fn kill_storage(i: u32) -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 3_720 nanoseconds.
Weight::from_parts(3_950_000, 0)
// Standard Error: 4_270
.saturating_add(Weight::from_parts(1_057_635, 0).saturating_mul(i.into()))
// Minimum execution time: 5_440 nanoseconds.
Weight::from_parts(5_580_000, 0)
// Standard Error: 3_056
.saturating_add(Weight::from_parts(1_212_696, 0).saturating_mul(i.into()))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
}
/// Storage: Skipped Metadata (r:0 w:0)
/// Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
/// Storage: `Skipped::Metadata` (r:0 w:0)
/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// The range of component `p` is `[0, 1000]`.
fn kill_prefix(p: u32) -> Weight {
// Proof Size summary in bytes:
// Measured: `46 + p * (69 ±0)`
// Estimated: `51 + p * (70 ±0)`
// Minimum execution time: 8_230 nanoseconds.
Weight::from_parts(8_620_000, 51)
// Standard Error: 8_739
.saturating_add(Weight::from_parts(2_466_850, 0).saturating_mul(p.into()))
// Measured: `48 + p * (69 ±0)`
// Estimated: `52 + p * (70 ±0)`
// Minimum execution time: 9_840 nanoseconds.
Weight::from_parts(10_450_000, 52)
// Standard Error: 8_838
.saturating_add(Weight::from_parts(2_581_563, 0).saturating_mul(p.into()))
.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
}
Expand Down
82 changes: 39 additions & 43 deletions runtime/common/src/weights/orml_currencies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
//! Autogenerated weights for orml_currencies
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: `2024-04-15`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: `2024-07-24`, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `zeitgeist-benchmark`, CPU: `AMD EPYC 7601 32-Core Processor`
//! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`

// Executed Command:
// ./target/production/zeitgeist
Expand All @@ -49,68 +49,64 @@ use frame_support::{traits::Get, weights::Weight};
/// Weight functions for orml_currencies (automatically generated)
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> orml_currencies::WeightInfo for WeightInfo<T> {
/// Storage: MarketAssets Asset (r:1 w:0)
/// Proof: MarketAssets Asset (max_values: None, max_size: Some(225), added: 2700, mode: MaxEncodedLen)
/// Storage: Tokens Accounts (r:2 w:2)
/// Proof: Tokens Accounts (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
/// Storage: System Account (r:1 w:1)
/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
/// Storage: `Tokens::Accounts` (r:2 w:2)
/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
/// Storage: `System::Account` (r:1 w:1)
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
fn transfer_non_native_currency() -> Weight {
// Proof Size summary in bytes:
// Measured: `1862`
// Estimated: `10503`
// Minimum execution time: 87_580 nanoseconds.
Weight::from_parts(106_781_000, 10503)
.saturating_add(T::DbWeight::get().reads(4))
// Measured: `1690`
// Estimated: `6186`
// Minimum execution time: 100_000 nanoseconds.
Weight::from_parts(101_700_000, 6186)
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(3))
}
/// Storage: System Account (r:1 w:1)
/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
/// Storage: `System::Account` (r:1 w:1)
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
fn transfer_native_currency() -> Weight {
// Proof Size summary in bytes:
// Measured: `1461`
// Estimated: `2607`
// Minimum execution time: 66_860 nanoseconds.
Weight::from_parts(81_550_000, 2607)
// Measured: `1545`
// Estimated: `3597`
// Minimum execution time: 155_790 nanoseconds.
Weight::from_parts(158_660_000, 3597)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
/// Storage: MarketAssets Asset (r:1 w:0)
/// Proof: MarketAssets Asset (max_values: None, max_size: Some(225), added: 2700, mode: MaxEncodedLen)
/// Storage: Tokens Accounts (r:1 w:1)
/// Proof: Tokens Accounts (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen)
/// Storage: Tokens TotalIssuance (r:1 w:1)
/// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen)
/// Storage: System Account (r:1 w:1)
/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
/// Storage: `Tokens::Accounts` (r:1 w:1)
/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(43), added: 2518, mode: `MaxEncodedLen`)
/// Storage: `System::Account` (r:1 w:1)
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
fn update_balance_non_native_currency() -> Weight {
// Proof Size summary in bytes:
// Measured: `1470`
// Estimated: `10423`
// Minimum execution time: 62_900 nanoseconds.
Weight::from_parts(76_321_000, 10423)
.saturating_add(T::DbWeight::get().reads(4))
// Measured: `1361`
// Estimated: `3597`
// Minimum execution time: 68_300 nanoseconds.
Weight::from_parts(70_270_000, 3597)
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(3))
}
/// Storage: System Account (r:1 w:1)
/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
/// Storage: `System::Account` (r:1 w:1)
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
fn update_balance_native_currency_creating() -> Weight {
// Proof Size summary in bytes:
// Measured: `1401`
// Estimated: `2607`
// Minimum execution time: 56_990 nanoseconds.
Weight::from_parts(69_680_000, 2607)
// Estimated: `3597`
// Minimum execution time: 73_931 nanoseconds.
Weight::from_parts(86_350_000, 3597)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
/// Storage: System Account (r:1 w:1)
/// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen)
/// Storage: `System::Account` (r:1 w:1)
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
fn update_balance_native_currency_killing() -> Weight {
// Proof Size summary in bytes:
// Measured: `1525`
// Estimated: `2607`
// Minimum execution time: 65_630 nanoseconds.
Weight::from_parts(66_850_000, 2607)
// Measured: `1493`
// Estimated: `3597`
// Minimum execution time: 73_620 nanoseconds.
Weight::from_parts(86_350_000, 3597)
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
Expand Down
Loading

0 comments on commit c171906

Please sign in to comment.