Merge pull request #481 from EspressoSystems/tw/timeboost-config

Add `timeboost-config` crate.

Author: twittner

Cargo.lock

@@ -12,6 +12,7 @@ members = [
     "tests",
     "timeboost",
     "timeboost-builder",
+    "timeboost-config",
     "timeboost-contract",
     "timeboost-crypto",
     "timeboost-proto",
@@ -67,6 +68,7 @@ ethereum_ssz = "0.9.0"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 generic-array = { version = "0.14.7", features = ["serde", "zeroize"] }
 http = "1.3.1"
+jiff = { version = "0.2", default-features = false, features = ["serde", "std"] }
 minicbor = { version = "2.1.1", features = ["full"] }
 nohash-hasher = "0.2"
 parking_lot = "0.12.3"

Cargo.toml

@@ -83,36 +83,42 @@ run *ARGS:
 bench *ARGS:
   cargo bench --benches {{ARGS}} -- --nocapture
 
-mkconfig NUM_NODES *ARGS:
+mkconfig NUM_NODES DATETIME *ARGS:
   cargo run --bin mkconfig -- -n {{NUM_NODES}} \
     --public-addr "127.0.0.1:8000" \
     --internal-addr "127.0.0.1:8003" \
+    --chain-namespace 10101 \
     --parent-rpc-url "http://127.0.0.1:8545" \
     --parent-chain-id 31337 \
     --parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
     --key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
+    --timestamp {{DATETIME}} \
     --output "test-configs/c0" {{ARGS}}
 
-mkconfig_docker *ARGS:
+mkconfig_docker DATETIME *ARGS:
   cargo run --bin mkconfig -- -n 5 \
     --public-addr "172.20.0.2:8000" \
     --internal-addr "172.20.0.2:8003" \
     --mode "increment-address" \
+    --chain-namespace 10101 \
     --parent-rpc-url "http://127.0.0.1:8545" \
     --parent-chain-id 31337 \
     --parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
     --key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
+    --timestamp {{DATETIME}} \
     --output "test-configs/docker" {{ARGS}}
 
-mkconfig_nitro *ARGS:
+mkconfig_nitro DATETIME *ARGS:
   cargo run --bin mkconfig -- -n 2 \
     --public-addr "127.0.0.1:8000" \
     --internal-addr "127.0.0.1:8003" \
     --nitro-addr "localhost:55000" \
+    --chain-namespace 412346 \
     --parent-rpc-url "http://127.0.0.1:8545" \
     --parent-chain-id 1337 \
     --parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
     --key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
+    --timestamp {{DATETIME}} \
     --output "test-configs/nitro-ci-committee" {{ARGS}}
 
 verify_blocks *ARGS:

justfile

@@ -4,3 +4,10 @@ description = "Metrics API types"
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
+
+[features]
+prometheus = ["dep:parking_lot", "dep:prometheus"]
+
+[dependencies]
+parking_lot = { workspace = true, optional = true }
+prometheus = { workspace = true, optional = true }

metrics/Cargo.toml

@@ -14,6 +14,9 @@
 //! - [`Histogram`]: stores multiple float values based for a graph (example usage: CPU %)
 //! - text: stores a constant string in the collected metrics
 
+#[cfg(feature = "prometheus")]
+pub mod prometheus;
+
 use std::fmt::Debug;
 
 /// The metrics type.

metrics/src/lib.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, sync::Arc};
 
-use metrics::{
+use crate::{
     Counter, CounterFamily, Gauge, GaugeFamily, Histogram, HistogramFamily, Metrics, TextFamily,
 };
 use parking_lot::RwLock;
@@ -64,7 +64,7 @@ impl TimeboostGauge {
 }
 
 #[derive(Debug)]
-pub struct PrometheusError(anyhow::Error);
+pub struct PrometheusError(Box<dyn std::error::Error + Send + Sync>);
 
 impl std::fmt::Display for PrometheusError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -80,7 +80,7 @@ impl std::error::Error for PrometheusError {
 
 impl From<prometheus::Error> for PrometheusError {
     fn from(source: prometheus::Error) -> Self {
-        Self(anyhow::anyhow!(source))
+        Self(Box::new(source))
     }
 }
 

timeboost-utils/src/types/prometheus.rs renamed to metrics/src/prometheus.rs

@@ -24,7 +24,6 @@ tps=1
 stamp=
 ignore_stamp=false
 nitro_enabled=false
-namespace=10101
 yapper=false
 
 while [[ $# -gt 0 ]]; do
@@ -33,10 +32,6 @@ while [[ $# -gt 0 ]]; do
             config_dir="$2"
             shift 2
             ;;
-        -n|--namespace)
-            namespace="$2"
-            shift 2
-            ;;
         -l|--late)
             late_start=true
             shift
@@ -74,9 +69,6 @@ Options:
     -l | --late
         Delayed startup of first node.
 
-    -n | --namespace <NUMBER>
-        Espresso transactions namespace ID.
-
     -c | --config-dir <PATH>
         Use a TOML file for node config (keys and network addresses).
 
@@ -141,8 +133,7 @@ for f in "$config_dir"/node_*.toml; do
         --http-port $((8800 + 10 * $i))
         --until $rounds
         --stamp "${stamp}-$i.sf"
-        --watchdog-timeout 120
-        --namespace $namespace)
+        --watchdog-timeout 120)
 
     if $ignore_stamp; then
         cmd+=(--ignore-stamp)

scripts/run-timeboost-demo

@@ -15,7 +15,6 @@ keyset_file=
 tps=1
 stamp=
 ignore_stamp=false
-namespace=10101
 
 while [[ $# -gt 0 ]]; do
     case "$1" in
@@ -27,10 +26,6 @@ while [[ $# -gt 0 ]]; do
             late_start=true
             shift
             ;;
-        -n|--namespace)
-            namespace="$2"
-            shift 2
-            ;;
         -r|--rounds)
             rounds="$2"
             shift 2
@@ -56,9 +51,6 @@ Options:
     -l | --late
         Delayed startup of first node.
 
-    -n | --namespace <NUMBER>
-        Espresso transactions namespace ID.
-
     -k | --keyset-file <PATH>
         Use a JSON file for node keys.
 
@@ -100,8 +92,7 @@ for (( i=0; i<$nodes; i++ )); do
         --until $rounds
         --keyset-file $keyset_file
         --stamp "${stamp}-$i.sf"
-        --watchdog-timeout $rounds
-        --namespace $namespace)
+        --watchdog-timeout $rounds)
 
     if $ignore_stamp; then
         cmd+=(--ignore-stamp)