Skip to content

Commit 7af3c71

Browse files
bkonturseadanda
authored andcommitted
Added support for coretime-kusama/polkadot and people-kusama/polkadot (#3961)
## Running `./polkadot-parachain --chain coretime-kusama` works now: **Parachain genesis state and header** match expected ones from https://gist.github.com/bkontur/f74fc00fd726d09bc7f0f3a9f51ec113?permalink_comment_id=5009857#gistcomment-5009857 ``` 2024-04-03 12:03:58 [Parachain] 🔨 Initializing Genesis block/state (state: 0xc418…889c, header-hash: 0x638c…d050) ... 2024-04-03 12:04:04 [Parachain] 💤 Idle (0 peers), best: #0 (0x638c…d050), finalized #0 (0x638c…d050) ``` **Relaychain genesis state and header** match expected ones: https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fkusama-rpc.polkadot.io#/explorer/query/0 ``` 2024-04-03 12:03:59 [Relaychain] 🔨 Initializing Genesis block/state (state: 0xb000…ef6b, header-hash: 0xb0a8…dafe) ``` **Full logs:** ``` bparity@bkontur-ThinkPad-P14s-Gen-2i:~/parity/polkadot-sdk$ ./target/debug/polkadot-parachain --chain coretime-kusama 2024-04-03 12:03:52 Polkadot parachain 2024-04-03 12:03:52 ✌️ version 4.0.0-665e3654cec 2024-04-03 12:03:52 ❤️ by Parity Technologies <[email protected]>, 2017-2024 2024-04-03 12:03:52 📋 Chain specification: Kusama Coretime 2024-04-03 12:03:52 🏷 Node name: subsequent-quicksand-2382 2024-04-03 12:03:52 👤 Role: FULL 2024-04-03 12:03:52 💾 Database: RocksDb at /home/bparity/.local/share/polkadot-parachain/chains/coretime-kusama/db/full 2024-04-03 12:03:54 Parachain id: Id(1005) 2024-04-03 12:03:54 Parachain Account: 5Ec4AhPakEiNWFbAd26nRrREnaGQZo3uukPDC5xLr6314Dwg 2024-04-03 12:03:54 Is collating: no 2024-04-03 12:03:58 [Parachain] 🔨 Initializing Genesis block/state (state: 0xc418…889c, header-hash: 0x638c…d050) 2024-04-03 12:03:59 [Relaychain] 🔨 Initializing Genesis block/state (state: 0xb000…ef6b, header-hash: 0xb0a8…dafe) 2024-04-03 12:03:59 [Relaychain] 👴 Loading GRANDPA authority set from genesis on what appears to be first startup. 2024-04-03 12:03:59 [Relaychain] 👶 Creating empty BABE epoch changes on what appears to be first startup. 2024-04-03 12:03:59 [Relaychain] 🏷 Local node identity is: 12D3KooWSfXNBZYimwSKBqfKf7F1X6adNQQD5HVQbdnvSyBFn8Wd 2024-04-03 12:03:59 [Relaychain] 💻 Operating system: linux 2024-04-03 12:03:59 [Relaychain] 💻 CPU architecture: x86_64 2024-04-03 12:03:59 [Relaychain] 💻 Target environment: gnu 2024-04-03 12:03:59 [Relaychain] 💻 CPU: 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz 2024-04-03 12:03:59 [Relaychain] 💻 CPU cores: 4 2024-04-03 12:03:59 [Relaychain] 💻 Memory: 31797MB 2024-04-03 12:03:59 [Relaychain] 💻 Kernel: 5.15.0-101-generic 2024-04-03 12:03:59 [Relaychain] 💻 Linux distribution: Ubuntu 20.04.6 LTS 2024-04-03 12:03:59 [Relaychain] 💻 Virtual machine: no 2024-04-03 12:03:59 [Relaychain] 📦 Highest known block at #0 2024-04-03 12:03:59 [Relaychain] 〽️ Prometheus exporter started at 127.0.0.1:9616 2024-04-03 12:03:59 [Relaychain] Running JSON-RPC server: addr=127.0.0.1:9945, allowed origins=["http://localhost:*", "http://127.0.0.1:*", "https://localhost:*", "https://127.0.0.1:*", "https://polkadot.js.org"] 2024-04-03 12:03:59 [Relaychain] 🏁 CPU score: 1.40 GiBs 2024-04-03 12:03:59 [Relaychain] 🏁 Memory score: 15.42 GiBs 2024-04-03 12:03:59 [Relaychain] 🏁 Disk score (seq. writes): 1.39 GiBs 2024-04-03 12:03:59 [Relaychain] 🏁 Disk score (rand. writes): 690.56 MiBs 2024-04-03 12:03:59 [Parachain] Using default protocol ID "sup" because none is configured in the chain specs 2024-04-03 12:03:59 [Parachain] 🏷 Local node identity is: 12D3KooWAAvNqXn8WPmvnEj36j7HsdbtpRpmWDPT9xtp4CuphvxW 2024-04-03 12:03:59 [Parachain] 💻 Operating system: linux 2024-04-03 12:03:59 [Parachain] 💻 CPU architecture: x86_64 2024-04-03 12:03:59 [Parachain] 💻 Target environment: gnu 2024-04-03 12:03:59 [Parachain] 💻 CPU: 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz 2024-04-03 12:03:59 [Parachain] 💻 CPU cores: 4 2024-04-03 12:03:59 [Parachain] 💻 Memory: 31797MB 2024-04-03 12:03:59 [Parachain] 💻 Kernel: 5.15.0-101-generic 2024-04-03 12:03:59 [Parachain] 💻 Linux distribution: Ubuntu 20.04.6 LTS 2024-04-03 12:03:59 [Parachain] 💻 Virtual machine: no 2024-04-03 12:03:59 [Parachain] 📦 Highest known block at #0 2024-04-03 12:03:59 [Parachain] 〽️ Prometheus exporter started at 127.0.0.1:9615 2024-04-03 12:03:59 [Parachain] Running JSON-RPC server: addr=127.0.0.1:9944, allowed origins=["http://localhost:*", "http://127.0.0.1:*", "https://localhost:*", "https://127.0.0.1:*", "https://polkadot.js.org"] 2024-04-03 12:03:59 [Parachain] 🏁 CPU score: 1.40 GiBs 2024-04-03 12:03:59 [Parachain] 🏁 Memory score: 15.42 GiBs 2024-04-03 12:03:59 [Parachain] 🏁 Disk score (seq. writes): 1.39 GiBs 2024-04-03 12:03:59 [Parachain] 🏁 Disk score (rand. writes): 690.56 MiBs 2024-04-03 12:03:59 [Parachain] discovered: 12D3KooWSfXNBZYimwSKBqfKf7F1X6adNQQD5HVQbdnvSyBFn8Wd /ip4/192.168.1.100/tcp/30334/ws 2024-04-03 12:03:59 [Relaychain] discovered: 12D3KooWAAvNqXn8WPmvnEj36j7HsdbtpRpmWDPT9xtp4CuphvxW /ip4/192.168.1.100/tcp/30333/ws 2024-04-03 12:03:59 [Relaychain] discovered: 12D3KooWAAvNqXn8WPmvnEj36j7HsdbtpRpmWDPT9xtp4CuphvxW /ip4/172.18.0.1/tcp/30333/ws 2024-04-03 12:03:59 [Parachain] discovered: 12D3KooWSfXNBZYimwSKBqfKf7F1X6adNQQD5HVQbdnvSyBFn8Wd /ip4/172.17.0.1/tcp/30334/ws 2024-04-03 12:03:59 [Relaychain] discovered: 12D3KooWAAvNqXn8WPmvnEj36j7HsdbtpRpmWDPT9xtp4CuphvxW /ip4/172.17.0.1/tcp/30333/ws 2024-04-03 12:03:59 [Parachain] discovered: 12D3KooWSfXNBZYimwSKBqfKf7F1X6adNQQD5HVQbdnvSyBFn8Wd /ip4/172.18.0.1/tcp/30334/ws 2024-04-03 12:04:00 [Relaychain] 🔍 Discovered new external address for our node: /ip4/178.41.176.246/tcp/30334/ws/p2p/12D3KooWSfXNBZYimwSKBqfKf7F1X6adNQQD5HVQbdnvSyBFn8Wd 2024-04-03 12:04:00 [Relaychain] Sending fatal alert BadCertificate 2024-04-03 12:04:00 [Relaychain] Sending fatal alert BadCertificate 2024-04-03 12:04:04 [Relaychain] ⚙️ Syncing, target=#22575321 (7 peers), best: #738 (0x1803…bbef), finalized #512 (0xb9b6…7014), ⬇ 328.5kiB/s ⬆ 102.9kiB/s 2024-04-03 12:04:04 [Parachain] 💤 Idle (0 peers), best: #0 (0x638c…d050), finalized #0 (0x638c…d050), ⬇ 0 ⬆ 0 2024-04-03 12:04:09 [Relaychain] ⚙️ Syncing 169.5 bps, target=#22575322 (8 peers), best: #1586 (0x405b…a8aa), finalized #1536 (0x55d1…fb04), ⬇ 232.3kiB/s ⬆ 55.9kiB/s 2024-04-03 12:04:09 [Parachain] 💤 Idle (0 peers), best: #0 (0x638c…d050), finalized #0 (0x638c…d050), ⬇ 0 ⬆ 0 2024-04-03 12:04:14 [Relaychain] ⚙️ Syncing 168.0 bps, target=#22575323 (8 peers), best: #2426 (0x155f…d083), finalized #2048 (0xede6…f879), ⬇ 235.8kiB/s ⬆ 67.2kiB/s 2024-04-03 12:04:14 [Parachain] 💤 Idle (0 peers), best: #0 (0x638c…d050), finalized #0 (0x638c…d050), ⬇ 0 ⬆ 0 2024-04-03 12:04:19 [Relaychain] ⚙️ Syncing 170.0 bps, target=#22575324 (8 peers), best: #3276 (0x94d8…097e), finalized #3072 (0x0e4c…f587), ⬇ 129.0kiB/s ⬆ 34.0kiB/s ... ``` ## Running `./polkadot-parachain --chain people-kusama` works now: **Parachain genesis state and header** match expected ones from https://gist.github.com/bkontur/f74fc00fd726d09bc7f0f3a9f51ec113?permalink_comment_id=5011798#gistcomment-5011798 ``` 2024-04-04 10:26:24 [Parachain] 🔨 Initializing Genesis block/state (state: 0x023a…2733, header-hash: 0x07b8…2645) ... 2024-04-04 10:26:30 [Parachain] 💤 Idle (0 peers), best: #0 (0x07b8…2645), finalized #0 (0x07b8…2645), ⬇ 0 ⬆ 0 ``` **Relaychain genesis state and header** match expected ones: https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fkusama-rpc.polkadot.io#/explorer/query/0 ``` 2024-04-04 10:26:25 [Relaychain] 🔨 Initializing Genesis block/state (state: 0xb000…ef6b, header-hash: 0xb0a8…dafe) ``` **Full logs:** ``` bparity@bkontur-ThinkPad-P14s-Gen-2i:~/parity/aaa/polkadot-sdk$ ./target/debug/polkadot-parachain --chain people-kusama 2024-04-04 10:26:18 Polkadot parachain 2024-04-04 10:26:18 ✌️ version 4.0.0-39274bb75fc 2024-04-04 10:26:18 ❤️ by Parity Technologies <[email protected]>, 2017-2024 2024-04-04 10:26:18 📋 Chain specification: Kusama People 2024-04-04 10:26:18 🏷 Node name: knotty-flight-5398 2024-04-04 10:26:18 👤 Role: FULL 2024-04-04 10:26:18 💾 Database: RocksDb at /home/bparity/.local/share/polkadot-parachain/chains/people-kusama/db/full 2024-04-04 10:26:21 Parachain id: Id(1004) 2024-04-04 10:26:21 Parachain Account: 5Ec4AhPaYcfBz8fMoPd4EfnAgwbzRS7np3APZUnnFo12qEYk 2024-04-04 10:26:21 Is collating: no 2024-04-04 10:26:24 [Parachain] 🔨 Initializing Genesis block/state (state: 0x023a…2733, header-hash: 0x07b8…2645) 2024-04-04 10:26:25 [Relaychain] 🔨 Initializing Genesis block/state (state: 0xb000…ef6b, header-hash: 0xb0a8…dafe) 2024-04-04 10:26:25 [Relaychain] 👴 Loading GRANDPA authority set from genesis on what appears to be first startup. 2024-04-04 10:26:25 [Relaychain] 👶 Creating empty BABE epoch changes on what appears to be first startup. 2024-04-04 10:26:25 [Relaychain] 🏷 Local node identity is: 12D3KooWPoTVhnrFNzVYJPR42HE9rYjXhkKHFDL9ut5nafDqJHKB 2024-04-04 10:26:25 [Relaychain] 💻 Operating system: linux 2024-04-04 10:26:25 [Relaychain] 💻 CPU architecture: x86_64 2024-04-04 10:26:25 [Relaychain] 💻 Target environment: gnu 2024-04-04 10:26:25 [Relaychain] 💻 CPU: 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz 2024-04-04 10:26:25 [Relaychain] 💻 CPU cores: 4 2024-04-04 10:26:25 [Relaychain] 💻 Memory: 31797MB 2024-04-04 10:26:25 [Relaychain] 💻 Kernel: 5.15.0-101-generic 2024-04-04 10:26:25 [Relaychain] 💻 Linux distribution: Ubuntu 20.04.6 LTS 2024-04-04 10:26:25 [Relaychain] 💻 Virtual machine: no 2024-04-04 10:26:25 [Relaychain] 📦 Highest known block at #0 2024-04-04 10:26:25 [Relaychain] 〽️ Prometheus exporter started at 127.0.0.1:9616 2024-04-04 10:26:25 [Relaychain] Running JSON-RPC server: addr=127.0.0.1:9945, allowed origins=["http://localhost:*", "http://127.0.0.1:*", "https://localhost:*", "https://127.0.0.1:*", "https://polkadot.js.org"] 2024-04-04 10:26:25 [Relaychain] 🏁 CPU score: 1.18 GiBs 2024-04-04 10:26:25 [Relaychain] 🏁 Memory score: 15.61 GiBs 2024-04-04 10:26:25 [Relaychain] 🏁 Disk score (seq. writes): 1.49 GiBs 2024-04-04 10:26:25 [Relaychain] 🏁 Disk score (rand. writes): 650.01 MiBs 2024-04-04 10:26:25 [Parachain] Using default protocol ID "sup" because none is configured in the chain specs 2024-04-04 10:26:25 [Parachain] 🏷 Local node identity is: 12D3KooWS2WPQgtiZZYT6bLGjwGcJU7QVd5EeQvb4jHN3NVSWDdj 2024-04-04 10:26:25 [Parachain] 💻 Operating system: linux 2024-04-04 10:26:25 [Parachain] 💻 CPU architecture: x86_64 2024-04-04 10:26:25 [Parachain] 💻 Target environment: gnu 2024-04-04 10:26:25 [Parachain] 💻 CPU: 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz 2024-04-04 10:26:25 [Parachain] 💻 CPU cores: 4 2024-04-04 10:26:25 [Parachain] 💻 Memory: 31797MB 2024-04-04 10:26:25 [Parachain] 💻 Kernel: 5.15.0-101-generic 2024-04-04 10:26:25 [Parachain] 💻 Linux distribution: Ubuntu 20.04.6 LTS 2024-04-04 10:26:25 [Parachain] 💻 Virtual machine: no 2024-04-04 10:26:25 [Parachain] 📦 Highest known block at #0 2024-04-04 10:26:25 [Parachain] 〽️ Prometheus exporter started at 127.0.0.1:9615 2024-04-04 10:26:25 [Parachain] Running JSON-RPC server: addr=127.0.0.1:9944, allowed origins=["http://localhost:*", "http://127.0.0.1:*", "https://localhost:*", "https://127.0.0.1:*", "https://polkadot.js.org"] 2024-04-04 10:26:25 [Parachain] 🏁 CPU score: 1.18 GiBs 2024-04-04 10:26:25 [Parachain] 🏁 Memory score: 15.61 GiBs 2024-04-04 10:26:25 [Parachain] 🏁 Disk score (seq. writes): 1.49 GiBs 2024-04-04 10:26:25 [Parachain] 🏁 Disk score (rand. writes): 650.01 MiBs 2024-04-04 10:26:25 [Parachain] discovered: 12D3KooWPoTVhnrFNzVYJPR42HE9rYjXhkKHFDL9ut5nafDqJHKB /ip4/172.17.0.1/tcp/30334/ws 2024-04-04 10:26:25 [Relaychain] discovered: 12D3KooWS2WPQgtiZZYT6bLGjwGcJU7QVd5EeQvb4jHN3NVSWDdj /ip4/172.18.0.1/tcp/30333/ws 2024-04-04 10:26:25 [Relaychain] discovered: 12D3KooWS2WPQgtiZZYT6bLGjwGcJU7QVd5EeQvb4jHN3NVSWDdj /ip4/192.168.1.100/tcp/30333/ws 2024-04-04 10:26:25 [Parachain] discovered: 12D3KooWPoTVhnrFNzVYJPR42HE9rYjXhkKHFDL9ut5nafDqJHKB /ip4/172.18.0.1/tcp/30334/ws 2024-04-04 10:26:25 [Relaychain] discovered: 12D3KooWS2WPQgtiZZYT6bLGjwGcJU7QVd5EeQvb4jHN3NVSWDdj /ip4/172.17.0.1/tcp/30333/ws 2024-04-04 10:26:25 [Parachain] discovered: 12D3KooWPoTVhnrFNzVYJPR42HE9rYjXhkKHFDL9ut5nafDqJHKB /ip4/192.168.1.100/tcp/30334/ws 2024-04-04 10:26:26 [Relaychain] 🔍 Discovered new external address for our node: /ip4/178.41.176.246/tcp/30334/ws/p2p/12D3KooWPoTVhnrFNzVYJPR42HE9rYjXhkKHFDL9ut5nafDqJHKB 2024-04-04 10:26:27 [Relaychain] Sending fatal alert BadCertificate 2024-04-04 10:26:27 [Relaychain] Sending fatal alert BadCertificate 2024-04-04 10:26:30 [Relaychain] ⚙️ Syncing, target=#22588722 (8 peers), best: #638 (0xa9cd…7c30), finalized #512 (0xb9b6…7014), ⬇ 345.6kiB/s ⬆ 108.7kiB/s 2024-04-04 10:26:30 [Parachain] 💤 Idle (0 peers), best: #0 (0x07b8…2645), finalized #0 (0x07b8…2645), ⬇ 0 ⬆ 0 2024-04-04 10:26:35 [Relaychain] ⚙️ Syncing 174.4 bps, target=#22588722 (9 peers), best: #1510 (0xec0b…72f0), finalized #1024 (0x3f17…fd7f), ⬇ 203.1kiB/s ⬆ 45.0kiB/s 2024-04-04 10:26:35 [Parachain] 💤 Idle (0 peers), best: #0 (0x07b8…2645), finalized #0 (0x07b8…2645), ⬇ 0 ⬆ 0 2024-04-04 10:26:40 [Relaychain] ⚙️ Syncing 168.9 bps, target=#22588723 (9 peers), best: #2355 (0xa68b…3a64), finalized #2048 (0xede6…f879), ⬇ 201.6kiB/s ⬆ 47.4kiB/s 2024-04-04 10:26:40 [Parachain] 💤 Idle (0 peers), best: #0 (0x07b8…2645), finalized #0 (0x07b8…2645), ⬇ 0 ⬆ 0 ``` ## TODO - [x] double check `cumulus/polkadot-parachain/chain-specs/coretime-kusama.json` (safeXcmVersion=3) see [comment](#3961 (comment)) - [x] check if ~~`start_generic_aura_node`~~ or `start_generic_aura_lookahead_node` - [x] generate chain-spec for `people-kusama` --------- Co-authored-by: Dónal Murray <[email protected]>
1 parent ca2767c commit 7af3c71

File tree

8 files changed

+317
-3
lines changed

8 files changed

+317
-3
lines changed

cumulus/parachains/chain-specs/coretime-kusama.json

+111
Large diffs are not rendered by default.

cumulus/parachains/chain-specs/people-kusama.json

+119
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../parachains/chain-specs/coretime-kusama.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../parachains/chain-specs/people-kusama.json

cumulus/polkadot-parachain/src/chain_spec/coretime.rs

+41-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ use std::{borrow::Cow, str::FromStr};
2222
/// Collects all supported Coretime configurations.
2323
#[derive(Debug, PartialEq, Clone, Copy)]
2424
pub enum CoretimeRuntimeType {
25+
Kusama,
26+
KusamaLocal,
27+
28+
Polkadot,
29+
PolkadotLocal,
30+
2531
// Live
2632
Rococo,
2733
// Local
@@ -42,6 +48,10 @@ impl FromStr for CoretimeRuntimeType {
4248

4349
fn from_str(value: &str) -> Result<Self, Self::Err> {
4450
match value {
51+
kusama::CORETIME_KUSAMA => Ok(CoretimeRuntimeType::Kusama),
52+
kusama::CORETIME_KUSAMA_LOCAL => Ok(CoretimeRuntimeType::KusamaLocal),
53+
polkadot::CORETIME_POLKADOT => Ok(CoretimeRuntimeType::Polkadot),
54+
polkadot::CORETIME_POLKADOT_LOCAL => Ok(CoretimeRuntimeType::PolkadotLocal),
4555
rococo::CORETIME_ROCOCO => Ok(CoretimeRuntimeType::Rococo),
4656
rococo::CORETIME_ROCOCO_LOCAL => Ok(CoretimeRuntimeType::RococoLocal),
4757
rococo::CORETIME_ROCOCO_DEVELOPMENT => Ok(CoretimeRuntimeType::RococoDevelopment),
@@ -56,6 +66,10 @@ impl FromStr for CoretimeRuntimeType {
5666
impl From<CoretimeRuntimeType> for &str {
5767
fn from(runtime_type: CoretimeRuntimeType) -> Self {
5868
match runtime_type {
69+
CoretimeRuntimeType::Kusama => kusama::CORETIME_KUSAMA,
70+
CoretimeRuntimeType::KusamaLocal => kusama::CORETIME_KUSAMA_LOCAL,
71+
CoretimeRuntimeType::Polkadot => polkadot::CORETIME_POLKADOT,
72+
CoretimeRuntimeType::PolkadotLocal => polkadot::CORETIME_POLKADOT_LOCAL,
5973
CoretimeRuntimeType::Rococo => rococo::CORETIME_ROCOCO,
6074
CoretimeRuntimeType::RococoLocal => rococo::CORETIME_ROCOCO_LOCAL,
6175
CoretimeRuntimeType::RococoDevelopment => rococo::CORETIME_ROCOCO_DEVELOPMENT,
@@ -69,9 +83,14 @@ impl From<CoretimeRuntimeType> for &str {
6983
impl From<CoretimeRuntimeType> for ChainType {
7084
fn from(runtime_type: CoretimeRuntimeType) -> Self {
7185
match runtime_type {
72-
CoretimeRuntimeType::Rococo | CoretimeRuntimeType::Westend => ChainType::Live,
73-
CoretimeRuntimeType::RococoLocal | CoretimeRuntimeType::WestendLocal =>
74-
ChainType::Local,
86+
CoretimeRuntimeType::Kusama |
87+
CoretimeRuntimeType::Polkadot |
88+
CoretimeRuntimeType::Rococo |
89+
CoretimeRuntimeType::Westend => ChainType::Live,
90+
CoretimeRuntimeType::KusamaLocal |
91+
CoretimeRuntimeType::PolkadotLocal |
92+
CoretimeRuntimeType::RococoLocal |
93+
CoretimeRuntimeType::WestendLocal => ChainType::Local,
7594
CoretimeRuntimeType::RococoDevelopment | CoretimeRuntimeType::WestendDevelopment =>
7695
ChainType::Development,
7796
}
@@ -85,6 +104,11 @@ impl CoretimeRuntimeType {
85104

86105
pub fn load_config(&self) -> Result<Box<dyn ChainSpec>, String> {
87106
match self {
107+
CoretimeRuntimeType::Kusama => Ok(Box::new(GenericChainSpec::from_json_bytes(
108+
&include_bytes!("../../chain-specs/coretime-kusama.json")[..],
109+
)?)),
110+
CoretimeRuntimeType::Polkadot =>
111+
todo!("Generate chain-spec: ../../chain-specs/coretime-polkadot.json"),
88112
CoretimeRuntimeType::Rococo => Ok(Box::new(GenericChainSpec::from_json_bytes(
89113
&include_bytes!("../../chain-specs/coretime-rococo.json")[..],
90114
)?)),
@@ -99,6 +123,10 @@ impl CoretimeRuntimeType {
99123
Ok(Box::new(westend::local_config(*self, "westend-local"))),
100124
CoretimeRuntimeType::WestendDevelopment =>
101125
Ok(Box::new(westend::local_config(*self, "westend-dev"))),
126+
other => Err(std::format!(
127+
"No default config present for {:?}, you should provide a chain-spec as json file!",
128+
other
129+
)),
102130
}
103131
}
104132
}
@@ -296,3 +324,13 @@ pub mod westend {
296324
})
297325
}
298326
}
327+
328+
pub mod kusama {
329+
pub(crate) const CORETIME_KUSAMA: &str = "coretime-kusama";
330+
pub(crate) const CORETIME_KUSAMA_LOCAL: &str = "coretime-kusama-local";
331+
}
332+
333+
pub mod polkadot {
334+
pub(crate) const CORETIME_POLKADOT: &str = "coretime-polkadot";
335+
pub(crate) const CORETIME_POLKADOT_LOCAL: &str = "coretime-polkadot-local";
336+
}

cumulus/polkadot-parachain/src/chain_spec/people.rs

+26
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ use std::str::FromStr;
2323
/// Collects all supported People configurations.
2424
#[derive(Debug, PartialEq)]
2525
pub enum PeopleRuntimeType {
26+
Kusama,
27+
KusamaLocal,
28+
Polkadot,
29+
PolkadotLocal,
2630
Rococo,
2731
RococoLocal,
2832
RococoDevelopment,
@@ -36,6 +40,10 @@ impl FromStr for PeopleRuntimeType {
3640

3741
fn from_str(value: &str) -> Result<Self, Self::Err> {
3842
match value {
43+
kusama::PEOPLE_KUSAMA => Ok(PeopleRuntimeType::Kusama),
44+
kusama::PEOPLE_KUSAMA_LOCAL => Ok(PeopleRuntimeType::KusamaLocal),
45+
polkadot::PEOPLE_POLKADOT => Ok(PeopleRuntimeType::Polkadot),
46+
polkadot::PEOPLE_POLKADOT_LOCAL => Ok(PeopleRuntimeType::PolkadotLocal),
3947
rococo::PEOPLE_ROCOCO => Ok(PeopleRuntimeType::Rococo),
4048
rococo::PEOPLE_ROCOCO_LOCAL => Ok(PeopleRuntimeType::RococoLocal),
4149
rococo::PEOPLE_ROCOCO_DEVELOPMENT => Ok(PeopleRuntimeType::RococoDevelopment),
@@ -52,6 +60,10 @@ impl PeopleRuntimeType {
5260

5361
pub fn load_config(&self) -> Result<Box<dyn ChainSpec>, String> {
5462
match self {
63+
PeopleRuntimeType::Kusama =>
64+
todo!("Update chain-spec: ../../chain-specs/people-kusama.json - https://github.com/paritytech/polkadot-sdk/pull/3961#issuecomment-2037438431"),
65+
PeopleRuntimeType::Polkadot =>
66+
todo!("Generate chain-spec: ../../chain-specs/people-polkadot.json"),
5567
PeopleRuntimeType::Rococo => Ok(Box::new(GenericChainSpec::from_json_bytes(
5668
&include_bytes!("../../chain-specs/people-rococo.json")[..],
5769
)?)),
@@ -82,6 +94,10 @@ impl PeopleRuntimeType {
8294
"westend-development",
8395
ParaId::new(1004),
8496
))),
97+
other => Err(std::format!(
98+
"No default config present for {:?}, you should provide a chain-spec as json file!",
99+
other
100+
)),
85101
}
86102
}
87103
}
@@ -318,3 +334,13 @@ pub mod westend {
318334
})
319335
}
320336
}
337+
338+
pub mod kusama {
339+
pub(crate) const PEOPLE_KUSAMA: &str = "people-kusama";
340+
pub(crate) const PEOPLE_KUSAMA_LOCAL: &str = "people-kusama-local";
341+
}
342+
343+
pub mod polkadot {
344+
pub(crate) const PEOPLE_POLKADOT: &str = "people-polkadot";
345+
pub(crate) const PEOPLE_POLKADOT_LOCAL: &str = "people-polkadot-local";
346+
}

cumulus/polkadot-parachain/src/command.rs

+8
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,10 @@ pub fn run() -> Result<()> {
759759
.map_err(Into::into),
760760

761761
Coretime(coretime_runtime_type) => match coretime_runtime_type {
762+
chain_spec::coretime::CoretimeRuntimeType::Kusama |
763+
chain_spec::coretime::CoretimeRuntimeType::KusamaLocal |
764+
chain_spec::coretime::CoretimeRuntimeType::Polkadot |
765+
chain_spec::coretime::CoretimeRuntimeType::PolkadotLocal |
762766
chain_spec::coretime::CoretimeRuntimeType::Rococo |
763767
chain_spec::coretime::CoretimeRuntimeType::RococoLocal |
764768
chain_spec::coretime::CoretimeRuntimeType::RococoDevelopment |
@@ -790,6 +794,10 @@ pub fn run() -> Result<()> {
790794
.map_err(Into::into),
791795

792796
People(people_runtime_type) => match people_runtime_type {
797+
chain_spec::people::PeopleRuntimeType::Kusama |
798+
chain_spec::people::PeopleRuntimeType::KusamaLocal |
799+
chain_spec::people::PeopleRuntimeType::Polkadot |
800+
chain_spec::people::PeopleRuntimeType::PolkadotLocal |
793801
chain_spec::people::PeopleRuntimeType::Rococo |
794802
chain_spec::people::PeopleRuntimeType::RococoLocal |
795803
chain_spec::people::PeopleRuntimeType::RococoDevelopment |

prdoc/pr_3961.prdoc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
title: Added support for coretime-kusama/polkadot and people-kusama/polkadot
2+
3+
doc:
4+
- audience: Node Operator
5+
description: |
6+
The support for running `coretime-kusama` and `people-kusama` collators with `polkadot-parachain-bin` have been added.
7+
8+
crates:
9+
- name: polkadot-parachain-bin
10+
bump: minor

0 commit comments

Comments
 (0)