Merge pull request #488 from EspressoSystems/tw/config-updates

Extend config file.

Author: twittner

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

@@ -134,9 +134,9 @@ jobs:
     - name: Install Foundry
       uses: foundry-rs/foundry-toolchain@v1
     - name: Run tests
-      run: just run_demo -s /tmp/stamp --ignore-stamp --yapper -c test-configs/c0
+      run: just run_demo --ignore-stamp --yapper -c test-configs/c0
     - name: Run tests with late-start node
-      run: just run_demo -l -s /tmp/stamp --ignore-stamp --yapper -c test-configs/c0
+      run: just run_demo -l --ignore-stamp --yapper -c test-configs/c0
     - name: Run sailfish demo
       run: just run_sailfish_demo
 
@@ -195,8 +195,7 @@ jobs:
           --init &
         cd ..
     - name: Run test timeboost with nitro sequencer
-      run: just run_demo -s /tmp/stamp --ignore-stamp -c test-configs/nitro-ci-committee --rounds 10000 --yapper --nitro
+      run: just run_demo --ignore-stamp -c test-configs/nitro-ci-committee --rounds 10000 --yapper --nitro http://localhost:8547
     - name: Verify sequencer blocks
       run: |
         RUST_LOG=info just verify_blocks
-

justfile

@@ -53,7 +53,7 @@ fix:
 
 ci_local:
   just build && just lint && just test_ci --release && \
-  just run_demo -s /tmp/stamp --ignore-stamp --yapper -c test-configs/c0 && \
+  just run_demo --ignore-stamp --yapper -c test-configs/c0 && \
   just run_sailfish_demo && just build_docker
 
 bacon: clippy check fmt
@@ -91,38 +91,44 @@ 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" \
+    --http-api "127.0.0.1:8004" \
     --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}} \
+    --stamp-dir "/tmp" \
     --output "test-configs/c0" {{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" \
+    --http-api "172.20.0.2:8004" \
     --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}} \
+    --stamp-dir "/tmp" \
     --output "test-configs/docker" {{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" \
+    --http-api "127.0.0.1:8004" \
     --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}} \
+    --stamp-dir "/tmp" \
     --output "test-configs/nitro-ci-committee" {{ARGS}}
 
 verify_blocks *ARGS:

scripts/run-timeboost-demo

@@ -21,9 +21,8 @@ rounds=300
 late_start=false
 config_dir=
 tps=1
-stamp=
 ignore_stamp=false
-nitro_enabled=false
+nitro_url=
 yapper=false
 
 while [[ $# -gt 0 ]]; do
@@ -44,12 +43,8 @@ while [[ $# -gt 0 ]]; do
             tps="$2"
             shift 2
             ;;
-        --nitro)
-            nitro_enabled=true
-            shift
-            ;;
-        -s|--stamp)
-            stamp="$2"
+        -n|--nitro)
+            nitro_url="$2"
             shift 2
             ;;
         --ignore-stamp)
@@ -78,11 +73,8 @@ Options:
     -t | --tps <number>
         number of transactions per second to generate.
 
-    -s | --stamp <PATH prefix>
-        Path prefix for the stamp files.
-
-    --nitro
-        Local Nitro node is running.
+    -n | --nitro <URL>
+        Address the local Nitro node is running.
 
     --yapper
         Run external transaction generator.
@@ -94,20 +86,15 @@ Options:
     esac
 done
 
-if [ ! $stamp ]; then
-    echo "Missing -s | --stamp <PATH prefix>"
-    exit 1
-fi
-
 if [ ! $config_dir ]; then
     echo "Missing -c | --config-dir <PATH>"
     exit 1
 fi
 
 just build_release --features="until"
 
-if $nitro_enabled; then
-    timeout 90 bash -c 'until curl -sSf http://localhost:8547 -o /dev/null; do sleep 1; done' || exit 1
+if [ $nitro_url ]; then
+    timeout 90 bash -c "until curl -sSf $nitro_url -o /dev/null; do sleep 1; done" || exit 1
 fi
 
 
@@ -118,7 +105,7 @@ if [ -z "$RUST_LOG" ]; then
 fi
 
 cmd=("test-contract-deploy" "--keep-anvil")
-if $nitro_enabled; then
+if [ $nitro_url ]; then
     cmd+=("--nitro-enabled")
 fi
 just "${cmd[@]}"
@@ -129,18 +116,21 @@ i=0
 for f in "$config_dir"/node_*.toml; do
     cmd=(target/release/timeboost
         --committee-id 0
+        --committee "$config_dir/committee.toml"
         --config "$f"
-        --http-port $((8800 + 10 * $i))
         --until $rounds
-        --stamp "${stamp}-$i.sf"
         --watchdog-timeout 120)
 
     if $ignore_stamp; then
         cmd+=(--ignore-stamp)
     fi
 
-    if $late_start; then
-        cmd+=(--late-start --late-start-node-id 0)
+    if $late_start && (( $i == 0 )); then
+        cmd+=(--start-delay 5)
+    fi
+
+    if $yapper; then
+        cmd+=(--required-decrypt-rounds 3)
     fi
 
     echo "${cmd[@]}"
@@ -154,8 +144,8 @@ if $yapper; then
     cmd=(target/release/yapper
         --tps $tps
         --keyset-file "$config_dir/committee.toml")
-    if $nitro_enabled; then
-        cmd+=(--nitro-integration)
+    if [ $nitro_url ]; then
+        cmd+=(--nitro-url "$nitro_url")
     fi
     "${cmd[@]}" &
 fi

scripts/test-contract-deploy

@@ -80,7 +80,7 @@ cast send --value 1ether --private-key "$FAUCET_PRIVATE_KEY" "$MANAGER_ADDRESS"
 RUST_LOG=info cargo run --bin deploy -- -m "$MANAGER_MNEMONIC" -i "$MANAGER_ACCOUNT_INDEX" -u "$URL" -o "$DEPLOYMENT_FILE"
 
 # Extract the deployed KeyManager address
-km_addr=$(yq -r ".deployments.key_manager" "$DEPLOYMENT_FILE")
+km_addr=$(sed -nr 's/^key_manager.*=.*"(.+)"/\1/p' "$DEPLOYMENT_FILE")
 
 # Update the contract
 committee_config="test-configs/$COMMITTEE_PATH/committee.toml"

test-configs/c0/committee.toml

@@ -5,27 +5,32 @@ signing_key = "eiwaGN1NNaQdbnR9FsjKzUeLghQZsTLPjiL4RcQgfLoX"
 dh_key = "AZrLbV37HAGhBWh49JHzup6Wfpu2AAGWGJJnxCDJibiY"
 dkg_enc_key = "7PdmfTS45d2hTXB8NcrTmvDwUVBimpYBbrBaGnu3i5Ne65krVfUpbe7bYRHS3AEg7H"
 public_address = "127.0.0.1:8000"
+http_api = "127.0.0.1:8004"
 
 [[members]]
 signing_key = "vGKKAxVNfkSCdn8qh36nXdSZqyhPq644sQBoeZtcEUCR"
 dh_key = "FHTJAk6oyt3jefEp1ZrPEn2MkqRt2LibEFd57AnEUZdb"
 dkg_enc_key = "7p1BtEz7WnFMt6Hr28X3Rngqza6i8hRoswhzZRFd6GzgkspLKHBfDocHP8DwzXiNiZ"
 public_address = "127.0.0.1:8010"
+http_api = "127.0.0.1:8014"
 
 [[members]]
 signing_key = "264jMLf85hfufg4ck97Hw2jiL6i1PHNoGUqxUqfhtssaE"
 dh_key = "63eYNKoW2PsWZFhHHj3eZwHTdPE7gEjEDM7gGeDf9Uaj"
 dkg_enc_key = "62bnAAbU58zZUcGqy9JKGZRZHkm3g7JZB2DtJGQyChXQBPGvXSS6fF21yoxiVuD1eb"
 public_address = "127.0.0.1:8020"
+http_api = "127.0.0.1:8024"
 
 [[members]]
 signing_key = "v6UBdLT5BvMhLW7iKv7M2xYeaW2SCAsnZ5PiSg6AaKfA"
 dh_key = "Do2GmAexW5MUdD8nToDiBWGbDgk1AwXoxtLTyirDtKQh"
 dkg_enc_key = "7aZBFZUEbXxFH9SiGJeUyjzas4mYJ1R13mTPsPeawVU7JFuocfvX9XsRT8qgr17RCe"
 public_address = "127.0.0.1:8030"
+http_api = "127.0.0.1:8034"
 
 [[members]]
 signing_key = "tV66KknkDH47hRSNzwJtt7Q7EZtxVxQsNnUGoAJdDn6J"
 dh_key = "HXaesvEGFiDgrVTix1fKzSLTarFexTZSJD6ymSrF7vPL"
 dkg_enc_key = "6R69TzDg3jo1MTex9Uter9XQud458YPpSvXirkYdS295PV81CRvgz5jVWQbkCpZnYV"
 public_address = "127.0.0.1:8040"
+http_api = "127.0.0.1:8044"

test-configs/c0/node_0.toml

@@ -1,5 +1,8 @@
+stamp = "/tmp/timeboost.0.stamp"
+
 [net.public]
 address = "127.0.0.1:8000"
+http_api = "127.0.0.1:8004"
 
 [net.internal]
 address = "127.0.0.1:8003"
@@ -25,3 +28,7 @@ rpc_url = "http://127.0.0.1:8545/"
 ibox_contract = "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"
+
+[espresso]
+base_url = "https://query.decaf.testnet.espresso.network/v1/"
+websockets_base_url = "wss://query.decaf.testnet.espresso.network/v1/"

test-configs/c0/node_1.toml

@@ -1,5 +1,8 @@
+stamp = "/tmp/timeboost.1.stamp"
+
 [net.public]
 address = "127.0.0.1:8010"
+http_api = "127.0.0.1:8014"
 
 [net.internal]
 address = "127.0.0.1:8013"
@@ -25,3 +28,7 @@ rpc_url = "http://127.0.0.1:8545/"
 ibox_contract = "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"
+
+[espresso]
+base_url = "https://query.decaf.testnet.espresso.network/v1/"
+websockets_base_url = "wss://query.decaf.testnet.espresso.network/v1/"

test-configs/c0/node_2.toml

@@ -1,5 +1,8 @@
+stamp = "/tmp/timeboost.2.stamp"
+
 [net.public]
 address = "127.0.0.1:8020"
+http_api = "127.0.0.1:8024"
 
 [net.internal]
 address = "127.0.0.1:8023"
@@ -25,3 +28,7 @@ rpc_url = "http://127.0.0.1:8545/"
 ibox_contract = "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"
+
+[espresso]
+base_url = "https://query.decaf.testnet.espresso.network/v1/"
+websockets_base_url = "wss://query.decaf.testnet.espresso.network/v1/"

test-configs/c0/node_3.toml

@@ -1,5 +1,8 @@
+stamp = "/tmp/timeboost.3.stamp"
+
 [net.public]
 address = "127.0.0.1:8030"
+http_api = "127.0.0.1:8034"
 
 [net.internal]
 address = "127.0.0.1:8033"
@@ -25,3 +28,7 @@ rpc_url = "http://127.0.0.1:8545/"
 ibox_contract = "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"
+
+[espresso]
+base_url = "https://query.decaf.testnet.espresso.network/v1/"
+websockets_base_url = "wss://query.decaf.testnet.espresso.network/v1/"

test-configs/c0/node_4.toml

@@ -1,5 +1,8 @@
+stamp = "/tmp/timeboost.4.stamp"
+
 [net.public]
 address = "127.0.0.1:8040"
+http_api = "127.0.0.1:8044"
 
 [net.internal]
 address = "127.0.0.1:8043"
@@ -25,3 +28,7 @@ rpc_url = "http://127.0.0.1:8545/"
 ibox_contract = "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"
+
+[espresso]
+base_url = "https://query.decaf.testnet.espresso.network/v1/"
+websockets_base_url = "wss://query.decaf.testnet.espresso.network/v1/"