Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fast runtime #89

Merged
merged 4 commits into from
Dec 22, 2023
Merged

Fast runtime #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5416a74
Refactoring with fast-runtime
yrong Dec 22, 2023
5773355
Fix ForkVersions for sepolia
yrong Dec 22, 2023
30dba3d
beacon-spec-minimal
yrong Dec 22, 2023
6cdb750
Use fast-runtime in BH
yrong Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ std = [
]

runtime-benchmarks = [
"beacon-spec-mainnet",
"bridge-hub-common/runtime-benchmarks",
"bridge-runtime-common/runtime-benchmarks",
"cumulus-pallet-parachain-system/runtime-benchmarks",
Expand Down Expand Up @@ -299,8 +298,8 @@ try-runtime = [
]

experimental = ["pallet-aura/experimental"]
beacon-spec-mainnet = [
"snowbridge-ethereum-beacon-client/beacon-spec-mainnet",
fast-runtime = [
"snowbridge-ethereum-beacon-client/beacon-spec-minimal",
]

# A feature that should be enabled when the runtime should be built for on-chain
Expand Down
26 changes: 15 additions & 11 deletions cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ use parachains_common::{
HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION,
};

use polkadot_runtime_common::prod_or_fast;

#[cfg(feature = "runtime-benchmarks")]
use crate::xcm_config::benchmark_helpers::DoNothingRouter;
#[cfg(feature = "runtime-benchmarks")]
Expand Down Expand Up @@ -566,7 +568,7 @@ impl snowbridge_outbound_queue::Config for Runtime {
type Channels = EthereumSystem;
}

#[cfg(not(feature = "beacon-spec-mainnet"))]
#[cfg(feature = "fast-runtime")]
parameter_types! {
pub const ChainForkVersions: ForkVersions = ForkVersions {
genesis: Fork {
Expand All @@ -586,30 +588,32 @@ parameter_types! {
epoch: 0,
},
};
pub const MaxExecutionHeadersToKeep:u32 = 1000;
}

#[cfg(feature = "beacon-spec-mainnet")]
#[cfg(not(feature = "fast-runtime"))]
parameter_types! {
pub const ChainForkVersions: ForkVersions = ForkVersions {
genesis: Fork {
version: [0, 0, 16, 32], // 0x00001020
version: [144, 0, 0, 111], // 0x90000069
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh no, I missed updating the fork versions for Sepolia. 😞 Thanks for catching this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we need this fix for the launch.

epoch: 0,
},
altair: Fork {
version: [1, 0, 16, 32], // 0x01001020
epoch: 36660,
version: [144, 0, 0, 112], // 0x90000070
epoch: 50,
},
bellatrix: Fork {
version: [2, 0, 16, 32], // 0x02001020
epoch: 112260,
version: [144, 0, 0, 113], // 0x90000071
epoch: 100,
},
capella: Fork {
version: [3, 0, 16, 32], // 0x03001020
epoch: 162304,
version: [144, 0, 0, 114], // 0x90000072
epoch: 56832,
},
};
pub const MaxExecutionHeadersToKeep:u32 = 8192 * 2;
}

parameter_types! {
pub const MaxExecutionHeadersToKeep: u32 = prod_or_fast!(8192 * 2, 1000);
}
Comment on lines +615 to 617
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Macro prod_or_fast for fast-runtime feature


impl snowbridge_ethereum_beacon_client::Config for Runtime {
Expand Down
9 changes: 3 additions & 6 deletions cumulus/polkadot-parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,10 @@ tokio = { version = "1.32.0", features = ["macros", "parking_lot", "time"] }
wait-timeout = "0.2"

[features]
default = [
"beacon-spec-mainnet",
]
default = []
runtime-benchmarks = [
"asset-hub-rococo-runtime/runtime-benchmarks",
"asset-hub-westend-runtime/runtime-benchmarks",
"beacon-spec-mainnet",
"bridge-hub-rococo-runtime/runtime-benchmarks",
"bridge-hub-westend-runtime/runtime-benchmarks",
"collectives-westend-runtime/runtime-benchmarks",
Expand Down Expand Up @@ -164,6 +161,6 @@ try-runtime = [
"shell-runtime/try-runtime",
"sp-runtime/try-runtime",
]
beacon-spec-mainnet = [
"bridge-hub-rococo-runtime/beacon-spec-mainnet",
fast-runtime = [
"bridge-hub-rococo-runtime/fast-runtime",
]
Loading