Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Cumulus companion for substrate #10463 #870

Merged
merged 6 commits into from
Jan 5, 2022
Merged

Cumulus companion for substrate #10463 #870

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c63336a
Companion for substrate #10463
acatangiu Dec 20, 2021
0ff441b
Merge branch 'master' of github.com:paritytech/cumulus into companion…
acatangiu Jan 4, 2022
c841050
Merge branch 'master' of github.com:paritytech/cumulus into companion…
acatangiu Jan 5, 2022
3913bf8
Merge remote-tracking branch 'origin/master' into companion-10463
Jan 5, 2022
bd67a10
update lockfile for substrate
Jan 5, 2022
1e3dae7
update lockfile for polkadot
acatangiu Jan 5, 2022
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
3 changes: 3 additions & 0 deletions parachain-template/node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ pub fn development_config() -> ChainSpec {
None,
None,
None,
None,
Extensions {
relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
para_id: 1000,
Expand Down Expand Up @@ -161,6 +162,8 @@ pub fn local_testnet_config() -> ChainSpec {
None,
// Protocol ID
Some("template-local"),
// Fork ID
None,
// Properties
Some(properties),
// Extensions
Expand Down
12 changes: 12 additions & 0 deletions polkadot-parachains/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ pub fn get_chain_spec() -> ChainSpec {
None,
None,
None,
None,
Extensions { relay_chain: "westend".into(), para_id: 1000 },
)
}
Expand All @@ -112,6 +113,7 @@ pub fn get_shell_chain_spec() -> ShellChainSpec {
None,
None,
None,
None,
Extensions { relay_chain: "westend".into(), para_id: 1000 },
)
}
Expand All @@ -131,6 +133,7 @@ pub fn get_seedling_chain_spec() -> SeedlingChainSpec {
None,
None,
None,
None,
Extensions { relay_chain: "westend".into(), para_id: 2000 },
)
}
Expand Down Expand Up @@ -161,6 +164,7 @@ pub fn staging_test_net() -> ChainSpec {
None,
None,
None,
None,
Extensions { relay_chain: "westend".into(), para_id: 1000 },
)
}
Expand Down Expand Up @@ -295,6 +299,7 @@ pub fn statemint_development_config() -> StatemintChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "polkadot-dev".into(), para_id: 1000 },
)
Expand Down Expand Up @@ -344,6 +349,7 @@ pub fn statemint_local_config() -> StatemintChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "polkadot-local".into(), para_id: 1000 },
)
Expand Down Expand Up @@ -420,6 +426,7 @@ pub fn statemine_development_config() -> StatemineChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "kusama-dev".into(), para_id: 1000 },
)
Expand Down Expand Up @@ -470,6 +477,7 @@ pub fn statemine_local_config() -> StatemineChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "kusama-local".into(), para_id: 1000 },
)
Expand Down Expand Up @@ -523,6 +531,7 @@ pub fn statemine_config() -> StatemineChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "kusama".into(), para_id: 1000 },
)
Expand Down Expand Up @@ -601,6 +610,7 @@ pub fn westmint_development_config() -> WestmintChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "westend".into(), para_id: 1000 },
)
Expand Down Expand Up @@ -651,6 +661,7 @@ pub fn westmint_local_config() -> WestmintChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "westend-local".into(), para_id: 1000 },
)
Expand Down Expand Up @@ -705,6 +716,7 @@ pub fn westmint_config() -> WestmintChainSpec {
Vec::new(),
None,
None,
None,
Some(properties),
Extensions { relay_chain: "westend".into(), para_id: 1000 },
)
Expand Down
1 change: 1 addition & 0 deletions test/service/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ pub fn get_chain_spec(id: ParaId) -> ChainSpec {
None,
None,
None,
None,
Extensions { para_id: id.into() },
)
}
Expand Down