Merge pull request #532 from EspressoSystems/tw/more-cleanup

Add committee ID to node config.

Author: twittner

.github/workflows/build-and-test.yml

@@ -118,7 +118,7 @@ jobs:
     - name: Run tests with late-start node
       run: just run_demo -l --ignore-stamp --yapper -c test-configs/c0
     - name: Run sailfish demo
-      run: just run_sailfish_demo
+      run: just run-sailfish-demo
     - name: Test with block-maker
       run: just test-all
     - name: Test dynamic committee change

docker-compose.yml

@@ -20,7 +20,13 @@ services:
     image: timeboost:latest
     environment:
       - RUST_LOG=debug
-    entrypoint: ["/app/deploy-contract-docker"]
+    entrypoint: [
+      "/app/deploy-contract",
+      "-d", "/app/deploy",
+      "-r", "/app/register",
+      "-c", "committee.toml",
+      "-u", "http://172.20.0.11:8545"
+    ]
     depends_on:
       demo-l1-network:
         condition: service_healthy
@@ -95,7 +101,7 @@ services:
       - "8032:8001"
       - "8062:8002"
       - "8082:8003"
-      - "8102:8004"      
+      - "8102:8004"
       - "8802:8800"
       - "9002:9000"
     depends_on:
@@ -120,7 +126,7 @@ services:
       - "8033:8001"
       - "8063:8002"
       - "8083:8003"
-      - "8103:8004"      
+      - "8103:8004"
       - "8803:8800"
       - "9003:9000"
     depends_on:
@@ -145,7 +151,7 @@ services:
       - "8034:8001"
       - "8064:8002"
       - "8084:8003"
-      - "8104:8004"        
+      - "8104:8004"
       - "8804:8800"
       - "9004:9000"
     depends_on:
@@ -155,7 +161,7 @@ services:
     image: timeboost:latest
     ports:
       - "55000:55000"
-    command: 
+    command:
       [
         "/app/block-maker",
         "--port", "55000",

docker/timeboost.Dockerfile

@@ -30,7 +30,7 @@ COPY --from=builder /app/target/release/register .
 COPY --from=builder /app/target/release/deploy .
 COPY --from=builder /app/target/release/block-maker .
 COPY --from=builder /app/target/release/block-checker .
-COPY --from=builder /app/scripts/deploy-contract-docker .
+COPY --from=builder /app/scripts/deploy-contract .
 
 COPY --from=builder /app/test-configs/docker .
 
@@ -40,7 +40,14 @@ COPY --from=builder /root/.foundry/bin/cast /usr/local/bin/cast
 RUN chmod +x /usr/local/bin/forge /usr/local/bin/cast
 
 # Set ownership of application files and make binary executable
-RUN chown -R timeboostuser:appgroup /app && chmod +x /app/timeboost /app/yapper /app/register /app/deploy /app/deploy-contract-docker /app/block-maker /app/block-checker
+RUN chown -R timeboostuser:appgroup /app && chmod +x \
+    /app/timeboost \
+    /app/yapper \
+    /app/register \
+    /app/deploy \
+    /app/deploy-contract \
+    /app/block-maker \
+    /app/block-checker
 
 # Switch to non-root user
 USER timeboostuser

justfile

@@ -64,7 +64,7 @@ fix:
 ci_local:
   just build && just lint && just test_ci --release && \
   just run_demo --ignore-stamp --yapper -c test-configs/c0 && \
-  just run_sailfish_demo && just build_docker
+  just run-sailfish-demo && just build_docker
 
 bacon: clippy check fmt
 
@@ -88,8 +88,17 @@ stop_monitoring:
 run_demo *ARGS:
   scripts/run-timeboost-demo {{ARGS}}
 
-run_sailfish_demo *ARGS:
-  scripts/run-sailfish-demo {{ARGS}}
+run-sailfish-demo: build-test-utils build_release
+    env RUST_LOG=sailfish=info,warn \
+    target/release/run --verbose \
+        --spawn "1:anvil --port 8545" \
+        --run   "2:sleep 3" \
+        --run   "3:scripts/deploy-contract -c test-configs/c0/committee.toml -u http://localhost:8545" \
+        --spawn "4:target/release/sailfish -c test-configs/c0/node_0.toml --stamp /tmp/stamp-0.sf --ignore-stamp" \
+        --spawn "4:target/release/sailfish -c test-configs/c0/node_1.toml --stamp /tmp/stamp-1.sf --ignore-stamp" \
+        --spawn "4:target/release/sailfish -c test-configs/c0/node_2.toml --stamp /tmp/stamp-2.sf --ignore-stamp" \
+        --spawn "4:target/release/sailfish -c test-configs/c0/node_3.toml --stamp /tmp/stamp-3.sf --ignore-stamp" \
+        target/release/sailfish -- -c test-configs/c0/node_4.toml --stamp /tmp/stamp-4.sf --ignore-stamp --until 300
 
 run *ARGS:
   cargo run {{ARGS}}
@@ -99,6 +108,7 @@ bench *ARGS:
 
 mkconfig NUM_NODES DATETIME *ARGS:
   cargo run --release --bin mkconfig -- -n {{NUM_NODES}} \
+    --committee-id 0 \
     --public-addr "127.0.0.1:8000" \
     --internal-addr "127.0.0.1:8003" \
     --http-api "127.0.0.1:8004" \
@@ -114,22 +124,27 @@ mkconfig NUM_NODES DATETIME *ARGS:
 
 mkconfig_docker DATETIME *ARGS:
   cargo run --release --bin mkconfig -- -n 5 \
+    --committee-id 0 \
     --public-addr "172.20.0.2:8000" \
     --internal-addr "172.20.0.2:8003" \
     --http-api "172.20.0.2:8004" \
+    --nitro-addr "172.20.0.12:55000" \
     --mode "increment-address" \
     --chain-namespace 10101 \
-    --parent-rpc-url "http://172.20.0.12:8545" \
-    --parent-ws-url "ws://172.20.0.12:8545" \
+    --parent-rpc-url "http://172.20.0.11:8545" \
+    --parent-ws-url "ws://172.20.0.11:8546" \
     --parent-chain-id 31337 \
     --parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
     --key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
     --timestamp {{DATETIME}} \
     --stamp-dir "/tmp" \
+    --espresso-base-url "http://172.20.0.14:41000/v1/" \
+    --espresso-websocket-url "ws://172.20.0.14:41000/v1/" \
     --output "test-configs/docker" {{ARGS}}
 
 mkconfig_nitro DATETIME *ARGS:
   cargo run --release --bin mkconfig -- -n 2 \
+    --committee-id 0 \
     --public-addr "127.0.0.1:8000" \
     --internal-addr "0.0.0.0:8003" \
     --http-api "127.0.0.1:8004" \
@@ -181,7 +196,7 @@ test-all: build_release build-test-utils
     --timeout 120 \
     --spawn "1:anvil --port 8545" \
     --run   "2:sleep 3" \
-    --run   "3:scripts/deploy-contract-local test-configs/local/committee.toml http://localhost:8545" \
+    --run   "3:scripts/deploy-contract -c test-configs/local/committee.toml -u http://localhost:8545" \
     --spawn "4:target/release/block-maker --bind 127.0.0.1:55000 -c test-configs/local/committee.toml" \
     --spawn "4:target/release/yapper -c test-configs/local/committee.toml" \
     --spawn "5:target/release/run-committee -c test-configs/local/" \
@@ -193,7 +208,7 @@ test-dyn-comm: build_release_until build-test-utils
     --timeout 120 \
     --spawn "1:anvil --port 8545" \
     --run   "2:sleep 2" \
-    --run   "3:scripts/deploy-contract-local test-configs/local/committee.toml http://localhost:8545" \
+    --run   "3:scripts/deploy-contract -c test-configs/local/committee.toml -u http://localhost:8545" \
     --spawn "4:target/release/run-committee -c test-configs/c0/ --until 2000" \
     --run   "5:target/release/mkconfig -n 4 \
                  --committee-id 1 \
@@ -266,7 +281,7 @@ netsim: build_release build-test-utils
         --gid $(id -g) \
         --spawn "1:anvil --host 11.0.1.0 --port 8545" \
         --run   "2:sleep 3" \
-        --run   "3:scripts/deploy-contract-local test-configs/linux/committee.toml http://11.0.1.0:8545" \
+        --run   "3:scripts/deploy-contract -c test-configs/linux/committee.toml -u http://11.0.1.0:8545" \
         --spawn "4:target/release/block-maker --bind 11.0.1.0:55000 -c test-configs/linux/committee.toml" \
         --spawn "4:target/release/yapper -c test-configs/linux/committee.toml" \
         --spawn-as-root "5:target/release/run-committee -u $(id -u) -g $(id -g) -c test-configs/linux/" \

scripts/README.md

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+manager_mnemonic="attend year erase basket blind adapt stove broccoli isolate unveil acquire category"
+manager_account_index=0
+manager_address="0x36561082951eed7ffD59cFD82D70570C57072d02"
+faucet_private_key="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+
+deploy_cmd=target/release/deploy
+register_cmd=target/release/register
+committee=
+url=
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        -d|--deploy)
+            deploy_cmd="$2"
+            shift 2
+            ;;
+        -r|--register)
+            register_cmd="$2"
+            shift
+            ;;
+        -c|--committee)
+            committee="$2"
+            shift 2
+            ;;
+        -u|--url)
+            url="$2"
+            shift 2
+            ;;
+        *)
+            echo -e "Unknown: $1\n"
+            echo "Usage: $0 [Options] where
+
+Options:
+
+    -d | --deploy <PATH>
+        Path to deploy executable.
+
+    -r | --register <PATH>
+        Path to register executable.
+
+    -c | --committee <PATH>
+        Path to committee configuration.
+
+    -u | --url <URL>
+        Contract URL"
+            exit 1
+            ;;
+    esac
+done
+
+deployment_file=$(mktemp -t timeboost-deployment-XXXXX)
+
+# Fund manager account && create deployment file
+cast send --value 1ether -r "$url" --private-key "$faucet_private_key" "$manager_address"
+env RUST_LOG=info $deploy_cmd \
+    -m "$manager_mnemonic" \
+    -i "$manager_account_index" \
+    -u "$url" \
+    -o "$deployment_file"
+
+# Extract the deployed KeyManager address
+km_addr=$(sed -nr 's/^key_manager.*=.*"(.+)"/\1/p' "$deployment_file")
+
+# Update the contract
+env RUST_LOG=info $register_cmd \
+    -a new-committee \
+    -m "$manager_mnemonic" \
+    -i "$manager_account_index" \
+    -u "$url" \
+    -k "$km_addr" \
+    -c "$committee"
+
+# Clean up the temporary deployment file
+rm -f "$deployment_file"