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.

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

Test deployments fixes #2057

Merged
merged 2 commits into from
Apr 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions bin/rialto/node/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,25 @@ pub enum Subcommand {
Inspect(node_inspect::cli::InspectCmd),

/// Benchmark runtime pallets.
#[clap(subcommand)]
#[command(subcommand)]
Benchmark(frame_benchmarking_cli::BenchmarkCmd),

/// FOR INTERNAL USE: analog of the "prepare-worker" command of the polkadot binary.
#[clap(name = "prepare-worker", hide = true)]
#[command(name = "prepare-worker", hide = true)]
PvfPrepareWorker(ValidationWorkerCommand),

/// FOR INTERNAL USE: analog of the "execute-worker" command of the polkadot binary.
#[clap(name = "execute-worker", hide = true)]
#[command(name = "execute-worker", hide = true)]
PvfExecuteWorker(ValidationWorkerCommand),
}

/// Validation worker command.
#[derive(Debug, Parser)]
pub struct ValidationWorkerCommand {
/// The path to the validation host's socket.
#[arg(long)]
pub socket_path: String,
/// Calling node implementation version
#[arg(long)]
pub node_impl_version: String,
}
10 changes: 8 additions & 2 deletions bin/rialto/node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,21 @@ pub fn run() -> sc_cli::Result<()> {
builder.with_colors(false);
let _ = builder.init();

polkadot_node_core_pvf::prepare_worker_entrypoint(&cmd.socket_path, None);
polkadot_node_core_pvf::prepare_worker_entrypoint(
&cmd.socket_path,
Some(&cmd.node_impl_version),
);
Ok(())
},
Some(crate::cli::Subcommand::PvfExecuteWorker(cmd)) => {
let mut builder = sc_cli::LoggerBuilder::new("");
builder.with_colors(false);
let _ = builder.init();

polkadot_node_core_pvf::execute_worker_entrypoint(&cmd.socket_path, None);
polkadot_node_core_pvf::execute_worker_entrypoint(
&cmd.socket_path,
Some(&cmd.node_impl_version),
);
Ok(())
},
None => {
Expand Down
1 change: 1 addition & 0 deletions deployments/bridges/rialto-millau/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ services:
- rialto-node-charlie
- rialto-node-dave
- rialto-node-eve
- rialto-node-ferdie

relay-messages-millau-to-rialto-generator:
<<: *sub-bridge-relay
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
- rialto-node-charlie:9615
- rialto-node-dave:9615
- rialto-node-eve:9615
- rialto-node-ferdie:9615
19 changes: 19 additions & 0 deletions deployments/networks/rialto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,24 @@ services:
- "10344:9944"
- "10315:9615"

rialto-node-ferdie:
<<: *rialto-bridge-node
entrypoint:
- /home/user/rialto-bridge-node
- --execution=Native
- --chain=local
- --bootnodes=/dns4/rialto-node-alice/tcp/30333/p2p/12D3KooWMF6JvV319a7kJn5pqkKbhR3fcM2cvK5vCbYZHeQhYzFE
- --ferdie
- --rpc-cors=all
- --enable-offchain-indexing=true
- --unsafe-rpc-external
- --unsafe-ws-external
- --prometheus-external
ports:
- "10433:9933"
- "10444:9944"
- "10415:9615"

rialto-chainspec-exporter:
image: ${RIALTO_BRIDGE_NODE_IMAGE:-paritytech/rialto-bridge-node}
entrypoint: /entrypoints/rialto-chainspec-exporter-entrypoint.sh
Expand All @@ -118,6 +136,7 @@ services:
- rialto-node-charlie
- rialto-node-dave
- rialto-node-eve
- rialto-node-ferdie

# we're using `/rialto-share` to expose Rialto chain spec to those who are interested. Right
# now it is Rialto Parachain collator nodes. Local + tmpfs combination allows sharing writable
Expand Down