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

Remove RuntimeApi dependency on system parachain runtime code #2455

Merged
merged 7 commits into from
Nov 24, 2023
Merged

Remove RuntimeApi dependency on system parachain runtime code #2455

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
72d3e2b
Remove polkadot-parachain dependency on RuntimeApi (WIP)
seadanda Nov 22, 2023
acaaad0
Introduce separate runtime for Polkadot Asset Hub due to different ke…
seadanda Nov 23, 2023
5ab0a41
Run zepter
seadanda Nov 23, 2023
1d97f2d
Add try-runtime to deps
seadanda Nov 23, 2023
3fc6b79
Remove `default-features = false` from toml
seadanda Nov 24, 2023
167f688
Merge branch 'master' into donal-sp-runtime-api
seadanda Nov 24, 2023
01946f1
Merge branch 'master' into donal-sp-runtime-api
seadanda Nov 24, 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
9 changes: 9 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions cumulus/polkadot-parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ sp-runtime = { path = "../../substrate/primitives/runtime", default-features = f
sp-io = { path = "../../substrate/primitives/io" }
sp-core = { path = "../../substrate/primitives/core" }
sp-session = { path = "../../substrate/primitives/session" }
frame-try-runtime = { path = "../../substrate/frame/try-runtime", default-features = false, optional = true}
seadanda marked this conversation as resolved.
Show resolved Hide resolved
sc-consensus = { path = "../../substrate/client/consensus/common" }
sp-tracing = { path = "../../substrate/primitives/tracing" }
frame-support = { path = "../../substrate/frame/support", default-features = false}
seadanda marked this conversation as resolved.
Show resolved Hide resolved
sc-cli = { path = "../../substrate/client/cli" }
sc-client-api = { path = "../../substrate/client/api" }
sc-executor = { path = "../../substrate/client/executor" }
Expand All @@ -63,12 +65,19 @@ sc-network-sync = { path = "../../substrate/client/network/sync" }
sc-basic-authorship = { path = "../../substrate/client/basic-authorship" }
sp-timestamp = { path = "../../substrate/primitives/timestamp" }
sp-blockchain = { path = "../../substrate/primitives/blockchain" }
sp-genesis-builder = { path = "../../substrate/primitives/genesis-builder", default-features = false }
sp-block-builder = { path = "../../substrate/primitives/block-builder" }
sp-keystore = { path = "../../substrate/primitives/keystore" }
sc-chain-spec = { path = "../../substrate/client/chain-spec" }
sc-rpc = { path = "../../substrate/client/rpc" }
sp-version = { path = "../../substrate/primitives/version" }
sc-tracing = { path = "../../substrate/client/tracing" }
sp-offchain = { path = "../../substrate/primitives/offchain" }
frame-system-rpc-runtime-api = { path = "../../substrate/frame/system/rpc/runtime-api", default-features = false}
seadanda marked this conversation as resolved.
Show resolved Hide resolved
pallet-transaction-payment = { path = "../../substrate/frame/transaction-payment", default-features = false}
seadanda marked this conversation as resolved.
Show resolved Hide resolved
pallet-transaction-payment-rpc-runtime-api = { path = "../../substrate/frame/transaction-payment/rpc/runtime-api", default-features = false}
seadanda marked this conversation as resolved.
Show resolved Hide resolved
sp-std = { path = "../../substrate/primitives/std", default-features = false}
seadanda marked this conversation as resolved.
Show resolved Hide resolved
sp-inherents = { path = "../../substrate/primitives/inherents", default-features = false}
seadanda marked this conversation as resolved.
Show resolved Hide resolved
sp-api = { path = "../../substrate/primitives/api" }
sp-consensus-aura = { path = "../../substrate/primitives/consensus/aura" }
sc-sysinfo = { path = "../../substrate/client/sysinfo" }
Expand Down Expand Up @@ -126,6 +135,7 @@ runtime-benchmarks = [
"cumulus-primitives-core/runtime-benchmarks",
"frame-benchmarking-cli/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"glutton-runtime/runtime-benchmarks",
"glutton-westend-runtime/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
Expand All @@ -149,8 +159,11 @@ try-runtime = [
"collectives-polkadot-runtime/try-runtime",
"collectives-westend-runtime/try-runtime",
"contracts-rococo-runtime/try-runtime",
"frame-support/try-runtime",
"frame-try-runtime/try-runtime",
"glutton-runtime/try-runtime",
"glutton-westend-runtime/try-runtime",
"pallet-transaction-payment/try-runtime",
"penpal-runtime/try-runtime",
"polkadot-cli/try-runtime",
"polkadot-service/try-runtime",
Expand Down
5 changes: 0 additions & 5 deletions cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ pub mod rococo {
/// Specialized `ChainSpec` for the normal parachain runtime.
pub type BridgeHubChainSpec = sc_service::GenericChainSpec<(), Extensions>;

pub type RuntimeApi = bridge_hub_rococo_runtime::RuntimeApi;

pub fn local_config<ModifyProperties: Fn(&mut sc_chain_spec::Properties)>(
id: &str,
chain_name: &str,
Expand Down Expand Up @@ -319,7 +317,6 @@ pub mod kusama {

/// Specialized `ChainSpec` for the normal parachain runtime.
pub type BridgeHubChainSpec = sc_service::GenericChainSpec<(), Extensions>;
pub type RuntimeApi = bridge_hub_kusama_runtime::RuntimeApi;

pub fn local_config(
id: &str,
Expand Down Expand Up @@ -429,7 +426,6 @@ pub mod westend {
/// Specialized `ChainSpec` for the normal parachain runtime.
pub type BridgeHubChainSpec =
sc_service::GenericChainSpec<bridge_hub_westend_runtime::RuntimeGenesisConfig, Extensions>;
pub type RuntimeApi = bridge_hub_westend_runtime::RuntimeApi;

pub fn local_config(
id: &str,
Expand Down Expand Up @@ -545,7 +541,6 @@ pub mod polkadot {

/// Specialized `ChainSpec` for the normal parachain runtime.
pub type BridgeHubChainSpec = sc_service::GenericChainSpec<(), Extensions>;
pub type RuntimeApi = bridge_hub_polkadot_runtime::RuntimeApi;

pub fn local_config(
id: &str,
Expand Down
Loading