feat: Move bootstrap node into collator #727
Conversation
aidan46
added
ready for review
aidan46
added
ready for review
| #[clap(flatten)] | ||
| pub base: cumulus_client_cli::RunCmd, | ||
|
|
||
| /// P2P ED25519 private key |
There was a problem hiding this comment.
P2P is too generic, I'd say something like:
| /// P2P ED25519 private key | |
| /// Key identifying nodes in p2p network of Storage Providers and Collators. | |
| /// It must be ED25519 private key, supplied as a short format XXXX or XXX or XXX. |
(please fill the description of how it should look like)
| pub p2p_listen_address: Option<Multiaddr>, | ||
| } | ||
|
|
||
| impl std::ops::Deref for RunCmd { |
There was a problem hiding this comment.
Genuinely curious, why is it needed and how does this work?
There was a problem hiding this comment.
I took this from moonbeam. It is to prevent calling cli.run.base on collator_options and normalize which are used is the codebase.
|
|
||
| /// Parses a ED25519 private key into a Keypair. | ||
| /// Takes in a private key or the path to a PEM file, depending on the @ prefix. | ||
| pub(crate) fn keypair_value_parser(src: &str) -> Result<Keypair, String> { |
There was a problem hiding this comment.
We use similar functions across the codebase, should we put somewhere and reuse it?
| @@ -225,6 +225,17 @@ pub fn run() -> Result<()> { | |||
| let collator_options = cli.run.collator_options(); | |||
|
|
|||
| runner.run_node_until_exit(|config| async move { | |||
| let bootstrap_config = if config.role.is_authority() { | |||
| let p2p_key = cli.run.p2p_key.ok_or("Could not find p2p key")?; | |||
There was a problem hiding this comment.
| let p2p_key = cli.run.p2p_key.ok_or("Could not find p2p key")?; | |
| let p2p_key = cli.run.p2p_key.ok_or("This node is configured as authority, so it will be used as Bootstrap node for Storage Provider & Collator network, but the key is missing. Set --p2p--key argument of the node.")?; |
Let's try to make error messages which are shown to the user as concise and sufficient enough so they don't need to go to the source code to figure this one out.
| if parachain_config.role.is_authority() { | ||
| let bootstrap_config = bootstrap_config.ok_or("Could not find bootstrap config")?; | ||
| task_manager | ||
| .spawn_handle() | ||
| .spawn("p2p", None, run_bootstrap_node(bootstrap_config)); | ||
| } |
There was a problem hiding this comment.
| if parachain_config.role.is_authority() { | |
| let bootstrap_config = bootstrap_config.ok_or("Could not find bootstrap config")?; | |
| task_manager | |
| .spawn_handle() | |
| .spawn("p2p", None, run_bootstrap_node(bootstrap_config)); | |
| } | |
| if let Ok(cfg) = bootstrap_config { | |
| task_manager | |
| .spawn_handle() | |
| .spawn("p2p", None, run_bootstrap_node(bootstrap_config)); | |
| } |
We should be able assume that if bootstrap config is set, then the node is authority and is supposed to be the authority.
| "--detailed-log-output", | ||
| "--p2p-key=@zombienet/private.pem", | ||
| "--p2p-listen-address=/ip4/127.0.0.1/tcp/62649", | ||
| "--pool-type=fork-aware", | ||
| "-lparachain=debug,xcm=trace,runtime=trace,txpool=debug,basic-authorship=debug", | ||
| ] |
There was a problem hiding this comment.
It does also need changes to maat/src/lib.rs , we pass those args manually as well.
There was a problem hiding this comment.
Not sure whether it's a good idea to save any private keys on github.
There was a problem hiding this comment.
I agree with that. I don't know how to generate the key and then pass it into the zombienet configuration. Do you have any ideas?
There was a problem hiding this comment.
We could specify the path in the hard path zombienet and add generation of the .pem key as part of the Justfile 🤔
Description
Move the P2P bootstrap node from the polka-storage-provider-server into the collator. All the examples have been updated to reflect this change.
The zombienet setup has been updated to include the p2p key and the p2p listen address.