Some fixes.

Author: twittner

justfile

@@ -200,7 +200,7 @@ netsim: build_release build-test-utils
     set -eo pipefail
     function run_as_root {
         if [ "$CI" == "true" ]; then
-            sudo "$@"
+            sudo --preserve-env=RUST_LOG "$@"
         else
             run0 --setenv=PATH --setenv=HOME --setenv=RUST_LOG "$@"
         fi

scripts/run-timeboost-demo

@@ -115,6 +115,7 @@ pids=()
 i=0
 for f in "$config_dir"/node_*.toml; do
     cmd=(target/release/timeboost
+        --committee-id 0
         --committee "$config_dir/committee.toml"
         --config "$f"
         --until $rounds
@@ -142,7 +143,7 @@ done
 if $yapper; then
     cmd=(target/release/yapper
         --tps $tps
-        --keyset-file "$config_dir/committee.toml")
+        --config "$config_dir/committee.toml")
     if [ $nitro_url ]; then
         cmd+=(--nitro-url "$nitro_url")
     fi

test-utils/src/binaries/run-committee.rs

@@ -8,6 +8,7 @@ use std::{
 use anyhow::{Result, bail, ensure};
 use clap::Parser;
 use test_utils::net::Config;
+use timeboost::config::CommitteeConfig;
 use tokio::{
     fs::{self, read_dir},
     process::Command,
@@ -48,6 +49,8 @@ async fn main() -> Result<()> {
         bail!("{:?} is not a file", args.timeboost)
     }
 
+    let committee = CommitteeConfig::read(args.configs.join("committee.toml")).await?;
+
     let mut netconf: Option<Config> = None;
     let mut commands = BTreeMap::new();
     let mut entries = read_dir(&args.configs).await?;
@@ -61,7 +64,11 @@ async fn main() -> Result<()> {
             }
             ConfigType::Node(name) => {
                 let mut cmd = StdCommand::new(args.timeboost.as_os_str());
-                cmd.arg("--config").arg(entry.path()).arg("--ignore-stamp");
+                cmd.arg("--committee-id")
+                    .arg(committee.id.to_string())
+                    .arg("--config")
+                    .arg(entry.path())
+                    .arg("--ignore-stamp");
                 commands.insert(name.to_string(), cmd);
             }
             ConfigType::Committee | ConfigType::Unknown => continue,

timeboost/src/binaries/timeboost.rs

@@ -28,6 +28,10 @@ struct Cli {
     #[clap(long)]
     config: PathBuf,
 
+    /// CommitteeId for the committee in which this member belongs to
+    #[clap(long, short)]
+    committee_id: CommitteeId,
+
     /// Ignore any existing stamp file and start from genesis.
     #[clap(long, default_value_t = false)]
     ignore_stamp: bool,
@@ -84,15 +88,13 @@ async fn main() -> Result<()> {
 
     let contract = KeyManager::new(node_config.chain.parent.key_manager_contract, &provider);
 
-    let committee_id = CommitteeId::from(contract.currentCommitteeId().call().await?);
-
     let members: Vec<CommitteeMemberSol> = contract
-        .getCommitteeById(committee_id.into())
+        .getCommitteeById(cli.committee_id.into())
         .call()
         .await?
         .members;
 
-    info!(label = %sign_keypair.public_key(), %committee_id, "committee info synced");
+    info!(label = %sign_keypair.public_key(), committee_id = %cli.committee_id, "committee info synced");
 
     let peer_hosts_and_keys = members
         .iter()
@@ -131,7 +133,7 @@ async fn main() -> Result<()> {
 
     let sailfish_committee = {
         let c = Committee::new(
-            committee_id,
+            cli.committee_id,
             sailfish_peer_hosts_and_keys
                 .iter()
                 .enumerate()
@@ -142,7 +144,7 @@ async fn main() -> Result<()> {
 
     let decrypt_committee = {
         let c = Committee::new(
-            committee_id,
+            cli.committee_id,
             decrypt_peer_hosts_and_keys
                 .iter()
                 .enumerate()
@@ -153,7 +155,7 @@ async fn main() -> Result<()> {
 
     let certifier_committee = {
         let c = Committee::new(
-            committee_id,
+            cli.committee_id,
             certifier_peer_hosts_and_keys
                 .iter()
                 .enumerate()