diff --git a/bin/rialto/node/src/cli.rs b/bin/rialto/node/src/cli.rs index 98323c9d9c..c39efed4ce 100644 --- a/bin/rialto/node/src/cli.rs +++ b/bin/rialto/node/src/cli.rs @@ -68,15 +68,15 @@ 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), } @@ -84,5 +84,9 @@ pub enum Subcommand { #[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, } diff --git a/bin/rialto/node/src/command.rs b/bin/rialto/node/src/command.rs index 0bff2e523b..a21b3a88d2 100644 --- a/bin/rialto/node/src/command.rs +++ b/bin/rialto/node/src/command.rs @@ -164,7 +164,10 @@ 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)) => { @@ -172,7 +175,10 @@ pub fn run() -> sc_cli::Result<()> { 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 => { diff --git a/deployments/bridges/rialto-millau/docker-compose.yml b/deployments/bridges/rialto-millau/docker-compose.yml index 5d15a0398b..7ce33da67c 100644 --- a/deployments/bridges/rialto-millau/docker-compose.yml +++ b/deployments/bridges/rialto-millau/docker-compose.yml @@ -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 diff --git a/deployments/networks/dashboard/prometheus/rialto-targets.yml b/deployments/networks/dashboard/prometheus/rialto-targets.yml index 0c89926e8c..7ec194f99d 100644 --- a/deployments/networks/dashboard/prometheus/rialto-targets.yml +++ b/deployments/networks/dashboard/prometheus/rialto-targets.yml @@ -4,3 +4,4 @@ - rialto-node-charlie:9615 - rialto-node-dave:9615 - rialto-node-eve:9615 + - rialto-node-ferdie:9615 diff --git a/deployments/networks/rialto.yml b/deployments/networks/rialto.yml index fab85b89c0..ebd8393fca 100644 --- a/deployments/networks/rialto.yml +++ b/deployments/networks/rialto.yml @@ -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 @@ -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