Skip to content

Commit

Permalink
Merge branch 'release/1.2.5-runtime' of github.com:paseo-network/runt…
Browse files Browse the repository at this point in the history 
…imes into release/1.2.5-runtime
  • Loading branch information
@al3mart
al3mart committed Aug 1, 2024
2 parents f5a0b5c + dcf20ea commit 6689ffe
Show file tree
Hide file tree
Showing 20 changed files with 510 additions and 498 deletions.
13 changes: 8 additions & 5 deletions chain-spec-generator/src/system_parachains_specs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ fn asset_hub_paseo_local_genesis(para_id: ParaId) -> serde_json::Value {

pub fn asset_hub_paseo_local_testnet_config() -> Result<Box<dyn ChainSpec>, String> {
let mut properties = sc_chain_spec::Properties::new();
properties.insert("ss58Format".into(), 0.into());
properties.insert("ss58Format".into(), 42.into());
properties.insert("tokenSymbol".into(), "DOT".into());
properties.insert("tokenDecimals".into(), 10.into());

Expand All @@ -147,6 +147,7 @@ pub fn asset_hub_paseo_local_testnet_config() -> Result<Box<dyn ChainSpec>, Stri
.with_name("Asset Hub Paseo Local")
.with_id("asset-hub-paseo-local")
.with_chain_type(ChainType::Local)
.with_protocol_id("ah-pas")
.with_genesis_config_patch(asset_hub_paseo_local_genesis(1000.into()))
.with_properties(properties)
.build(),
Expand Down Expand Up @@ -212,7 +213,7 @@ fn bridge_hub_paseo_local_genesis(para_id: ParaId) -> serde_json::Value {

pub fn bridge_hub_paseo_config() -> Result<Box<dyn ChainSpec>, String> {
let mut properties = sc_chain_spec::Properties::new();
properties.insert("ss58Format".into(), 0.into());
properties.insert("ss58Format".into(), 42.into());
properties.insert("tokenSymbol".into(), "PAS".into());
properties.insert("tokenDecimals".into(), 10.into());

Expand All @@ -222,8 +223,9 @@ pub fn bridge_hub_paseo_config() -> Result<Box<dyn ChainSpec>, String> {
Extensions { relay_chain: "paseo".into(), para_id: 1002 },
)
.with_name("Paseo Bridge Hub")
.with_id("bridge-hub-paseo")
.with_id("paseo-bridge-hub")
.with_chain_type(ChainType::Live)
.with_protocol_id("bh-pas")
.with_genesis_config_patch(bridge_hub_paseo_local_genesis(1002.into()))
.with_properties(properties)
.build(),
Expand All @@ -232,7 +234,7 @@ pub fn bridge_hub_paseo_config() -> Result<Box<dyn ChainSpec>, String> {

pub fn bridge_hub_paseo_local_testnet_config() -> Result<Box<dyn ChainSpec>, String> {
let mut properties = sc_chain_spec::Properties::new();
properties.insert("ss58Format".into(), 0.into());
properties.insert("ss58Format".into(), 42.into());
properties.insert("tokenSymbol".into(), "PAS".into());
properties.insert("tokenDecimals".into(), 10.into());

Expand All @@ -242,8 +244,9 @@ pub fn bridge_hub_paseo_local_testnet_config() -> Result<Box<dyn ChainSpec>, Str
Extensions { relay_chain: "paseo-local".into(), para_id: 1002 },
)
.with_name("Paseo Bridge Hub Local")
.with_id("bridge-hub-paseo-local")
.with_id("paseo-bridge-hub-local")
.with_chain_type(ChainType::Local)
.with_protocol_id("bh-pas")
.with_genesis_config_patch(bridge_hub_paseo_local_genesis(1002.into()))
.with_properties(properties)
.build(),
Expand Down
26 changes: 13 additions & 13 deletions chain-specs/bridge-hub-paseo.plain.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "Paseo Bridge Hub",
"id": "bridge-hub-paseo",
"id": "paseo-bridge-hub",
"chainType": "Live",
"bootNodes": [],
"telemetryEndpoints": null,
"protocolId": "bridge-hub-paseo",
"protocolId": "bh-pas",
"properties": {
"ss58Format": 0,
"ss58Format": 42,
"tokenDecimals": 10,
"tokenSymbol": "PAS"
},
Expand All @@ -24,11 +24,11 @@
16777216000000000
],
[
"5EhCFEY8Whb1czRDDbMurfrz1wfM6QAbFf4NwnMWEqhJwxMZ",
"5ECmPXn7K9Pe5MA1YoNSbfaBaRtDhTdYym4bgSipbW8XwByJ",
16777216000000000
],
[
"5C5e1jVFYvpURw53MWrB7AppmshZmmj1MTHPw6nHyjbfgP7j",
"5HKgozQHPG5K5XCFGEs1FKPEXKqZrQrymqBNncKbtBfGHPgT",
16777216000000000
]
]
Expand All @@ -37,8 +37,8 @@
"candidacyBond": 16000000000,
"desiredCandidates": 0,
"invulnerables": [
"5EhCFEY8Whb1czRDDbMurfrz1wfM6QAbFf4NwnMWEqhJwxMZ",
"5C5e1jVFYvpURw53MWrB7AppmshZmmj1MTHPw6nHyjbfgP7j"
"5ECmPXn7K9Pe5MA1YoNSbfaBaRtDhTdYym4bgSipbW8XwByJ",
"5HKgozQHPG5K5XCFGEs1FKPEXKqZrQrymqBNncKbtBfGHPgT"
]
},
"ethereumSystem": {
Expand All @@ -54,17 +54,17 @@
"session": {
"keys": [
[
"5C5e1jVFYvpURw53MWrB7AppmshZmmj1MTHPw6nHyjbfgP7j",
"5C5e1jVFYvpURw53MWrB7AppmshZmmj1MTHPw6nHyjbfgP7j",
"5HKgozQHPG5K5XCFGEs1FKPEXKqZrQrymqBNncKbtBfGHPgT",
"5HKgozQHPG5K5XCFGEs1FKPEXKqZrQrymqBNncKbtBfGHPgT",
{
"aura": "5C5e1jVFYvpURw53MWrB7AppmshZmmj1MTHPw6nHyjbfgP7j"
"aura": "5DWrXy8b93QUsd2NzLSFcAH3hVxE3bX3W9V6CZhzyf52JDBd"
}
],
[
"5EhCFEY8Whb1czRDDbMurfrz1wfM6QAbFf4NwnMWEqhJwxMZ",
"5EhCFEY8Whb1czRDDbMurfrz1wfM6QAbFf4NwnMWEqhJwxMZ",
"5ECmPXn7K9Pe5MA1YoNSbfaBaRtDhTdYym4bgSipbW8XwByJ",
"5ECmPXn7K9Pe5MA1YoNSbfaBaRtDhTdYym4bgSipbW8XwByJ",
{
"aura": "5EhCFEY8Whb1czRDDbMurfrz1wfM6QAbFf4NwnMWEqhJwxMZ"
"aura": "5EyfoszzhQnYpS4jqPDUm14XgqGtEWcRX5EBsGGbN3wQAcTd"
}
]
]
Expand Down
30 changes: 15 additions & 15 deletions chain-specs/bridge-hub-paseo.raw.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion system-parachains/bridge-hub-paseo/src/weights/block_weights.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub mod constants {
parameter_types! {
/// Importing a block with 0 Extrinsics.
pub const BlockExecutionWeight: Weight =
Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(5_000_000), 0);
Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(10_000_000), 0);
}

#[cfg(test)]
Expand Down
54 changes: 27 additions & 27 deletions system-parachains/bridge-hub-paseo/src/weights/cumulus_pallet_parachain_system.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
//! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ggwpez-ref-hw`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("./bridge-hub-polkadot-chain-spec.json")`, DB CACHE: 1024
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("./asset-hub-polkadot-chain-spec.json")`, DB CACHE: 1024

// Executed Command:
// ./target/production/polkadot
// benchmark
// pallet
// --chain=./bridge-hub-polkadot-chain-spec.json
// --chain=./asset-hub-polkadot-chain-spec.json
// --steps=50
// --repeat=20
// --pallet=cumulus_pallet_parachain_system
// --extrinsic=*
// --wasm-execution=compiled
// --heap-pages=4096
// --output=./bridge-hub-polkadot-weights/
// --output=./asset-hub-polkadot-weights/
// --header=./file_header.txt

#![cfg_attr(rustfmt, rustfmt_skip)]
Expand All @@ -46,28 +46,28 @@ use core::marker::PhantomData;
/// Weight functions for `cumulus_pallet_parachain_system`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
/// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1)
/// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
/// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1)
/// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `MessageQueue::Pages` (r:0 w:1000)
/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
/// The range of component `n` is `[0, 1000]`.
fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `49`
// Estimated: `3517`
// Minimum execution time: 2_140_000 picoseconds.
Weight::from_parts(2_185_000, 0)
.saturating_add(Weight::from_parts(0, 3517))
// Standard Error: 21_644
.saturating_add(Weight::from_parts(197_577_584, 0).saturating_mul(n.into()))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(4))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
}
/// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1)
/// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
/// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1)
/// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `MessageQueue::Pages` (r:0 w:1000)
/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
/// The range of component `n` is `[0, 1000]`.
fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `12`
// Estimated: `3517`
// Minimum execution time: 1_633_000 picoseconds.
Weight::from_parts(1_694_000, 0)
.saturating_add(Weight::from_parts(0, 3517))
// Standard Error: 39_295
.saturating_add(Weight::from_parts(195_057_429, 0).saturating_mul(n.into()))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(4))
.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
}
}
34 changes: 17 additions & 17 deletions system-parachains/bridge-hub-paseo/src/weights/cumulus_pallet_xcmp_queue.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
//! DATE: 2024-03-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `ggwpez-ref-hw`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("./bridge-hub-polkadot-chain-spec.json")`, DB CACHE: 1024
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("./asset-hub-polkadot-chain-spec.json")`, DB CACHE: 1024

// Executed Command:
// ./target/production/polkadot
// benchmark
// pallet
// --chain=./bridge-hub-polkadot-chain-spec.json
// --chain=./asset-hub-polkadot-chain-spec.json
// --steps=50
// --repeat=20
// --pallet=cumulus_pallet_xcmp_queue
// --extrinsic=*
// --wasm-execution=compiled
// --heap-pages=4096
// --output=./bridge-hub-polkadot-weights/
// --output=./asset-hub-polkadot-weights/
// --header=./file_header.txt

#![cfg_attr(rustfmt, rustfmt_skip)]
Expand All @@ -52,8 +52,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `1561`
// Minimum execution time: 3_732_000 picoseconds.
Weight::from_parts(3_909_000, 0)
// Minimum execution time: 4_667_000 picoseconds.
Weight::from_parts(4_869_000, 0)
.saturating_add(Weight::from_parts(0, 1561))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -72,8 +72,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `82`
// Estimated: `3517`
// Minimum execution time: 9_834_000 picoseconds.
Weight::from_parts(10_241_000, 0)
// Minimum execution time: 10_920_000 picoseconds.
Weight::from_parts(11_192_000, 0)
.saturating_add(Weight::from_parts(0, 3517))
.saturating_add(T::DbWeight::get().reads(4))
.saturating_add(T::DbWeight::get().writes(3))
Expand All @@ -84,8 +84,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `1561`
// Minimum execution time: 2_291_000 picoseconds.
Weight::from_parts(2_400_000, 0)
// Minimum execution time: 3_175_000 picoseconds.
Weight::from_parts(3_367_000, 0)
.saturating_add(Weight::from_parts(0, 1561))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -96,8 +96,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `111`
// Estimated: `1596`
// Minimum execution time: 3_158_000 picoseconds.
Weight::from_parts(3_394_000, 0)
// Minimum execution time: 4_046_000 picoseconds.
Weight::from_parts(4_365_000, 0)
.saturating_add(Weight::from_parts(0, 1596))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
Expand All @@ -106,8 +106,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 6_037_000 picoseconds.
Weight::from_parts(6_277_000, 0)
// Minimum execution time: 6_046_000 picoseconds.
Weight::from_parts(6_273_000, 0)
.saturating_add(Weight::from_parts(0, 0))
}
/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
Expand All @@ -128,8 +128,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `65711`
// Estimated: `69176`
// Minimum execution time: 114_520_000 picoseconds.
Weight::from_parts(115_984_000, 0)
// Minimum execution time: 112_973_000 picoseconds.
Weight::from_parts(114_995_000, 0)
.saturating_add(Weight::from_parts(0, 69176))
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(5))
Expand All @@ -142,8 +142,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
// Proof Size summary in bytes:
// Measured: `65710`
// Estimated: `69175`
// Minimum execution time: 52_150_000 picoseconds.
Weight::from_parts(53_802_000, 0)
// Minimum execution time: 49_829_000 picoseconds.
Weight::from_parts(51_599_000, 0)
.saturating_add(Weight::from_parts(0, 69175))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
Expand Down
2 changes: 1 addition & 1 deletion system-parachains/bridge-hub-paseo/src/weights/extrinsic_weights.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub mod constants {
parameter_types! {
/// Executing a NO-OP `System::remarks` Extrinsic.
pub const ExtrinsicBaseWeight: Weight =
Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000), 0);
Weight::from_parts(constants::WEIGHT_REF_TIME_PER_NANOS.saturating_mul(250_000), 0);
}

#[cfg(test)]
Expand Down
Loading

0 comments on commit 6689ffe

Please sign in to comment.