Skip to content

Commit ea81d63

Browse files
committed
Tweak configuration.
1. Make config file reading async. 2. Support human-readable timestamps. 3. Add namespace to chain config.
1 parent d930435 commit ea81d63

File tree

33 files changed

+319
-269
lines changed

33 files changed

+319
-269
lines changed

Cargo.lock

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ ethereum_ssz = "0.9.0"
6767
futures = { version = "0.3", default-features = false, features = ["alloc"] }
6868
generic-array = { version = "0.14.7", features = ["serde", "zeroize"] }
6969
http = "1.3.1"
70+
jiff = { version = "0.2", default-features = false, features = ["serde", "std"] }
7071
minicbor = { version = "2.1.1", features = ["full"] }
7172
nohash-hasher = "0.2"
7273
parking_lot = "0.12.3"

justfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,36 +83,42 @@ run *ARGS:
8383
bench *ARGS:
8484
cargo bench --benches {{ARGS}} -- --nocapture
8585

86-
mkconfig NUM_NODES *ARGS:
86+
mkconfig NUM_NODES DATETIME *ARGS:
8787
cargo run --bin mkconfig -- -n {{NUM_NODES}} \
8888
--public-addr "127.0.0.1:8000" \
8989
--internal-addr "127.0.0.1:8003" \
90+
--chain-namespace 10101 \
9091
--parent-rpc-url "http://127.0.0.1:8545" \
9192
--parent-chain-id 31337 \
9293
--parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
9394
--key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
95+
--timestamp {{DATETIME}} \
9496
--output "test-configs/c0" {{ARGS}}
9597

96-
mkconfig_docker *ARGS:
98+
mkconfig_docker DATETIME *ARGS:
9799
cargo run --bin mkconfig -- -n 5 \
98100
--public-addr "172.20.0.2:8000" \
99101
--internal-addr "172.20.0.2:8003" \
100102
--mode "increment-address" \
103+
--chain-namespace 10101 \
101104
--parent-rpc-url "http://127.0.0.1:8545" \
102105
--parent-chain-id 31337 \
103106
--parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
104107
--key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
108+
--timestamp {{DATETIME}} \
105109
--output "test-configs/docker" {{ARGS}}
106110

107-
mkconfig_nitro *ARGS:
111+
mkconfig_nitro DATETIME *ARGS:
108112
cargo run --bin mkconfig -- -n 2 \
109113
--public-addr "127.0.0.1:8000" \
110114
--internal-addr "127.0.0.1:8003" \
111115
--nitro-addr "localhost:55000" \
116+
--chain-namespace 10101 \
112117
--parent-rpc-url "http://127.0.0.1:8545" \
113118
--parent-chain-id 1337 \
114119
--parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
115120
--key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
121+
--timestamp {{DATETIME}} \
116122
--output "test-configs/nitro-ci-committee" {{ARGS}}
117123

118124
verify_blocks *ARGS:

scripts/run-timeboost-demo

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ tps=1
2424
stamp=
2525
ignore_stamp=false
2626
nitro_enabled=false
27-
namespace=10101
2827
yapper=false
2928

3029
while [[ $# -gt 0 ]]; do
@@ -33,10 +32,6 @@ while [[ $# -gt 0 ]]; do
3332
config_dir="$2"
3433
shift 2
3534
;;
36-
-n|--namespace)
37-
namespace="$2"
38-
shift 2
39-
;;
4035
-l|--late)
4136
late_start=true
4237
shift
@@ -74,9 +69,6 @@ Options:
7469
-l | --late
7570
Delayed startup of first node.
7671
77-
-n | --namespace <NUMBER>
78-
Espresso transactions namespace ID.
79-
8072
-c | --config-dir <PATH>
8173
Use a TOML file for node config (keys and network addresses).
8274
@@ -141,8 +133,7 @@ for f in "$config_dir"/node_*.toml; do
141133
--http-port $((8800 + 10 * $i))
142134
--until $rounds
143135
--stamp "${stamp}-$i.sf"
144-
--watchdog-timeout 120
145-
--namespace $namespace)
136+
--watchdog-timeout 120)
146137

147138
if $ignore_stamp; then
148139
cmd+=(--ignore-stamp)

scripts/runit

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ keyset_file=
1515
tps=1
1616
stamp=
1717
ignore_stamp=false
18-
namespace=10101
1918

2019
while [[ $# -gt 0 ]]; do
2120
case "$1" in
@@ -27,10 +26,6 @@ while [[ $# -gt 0 ]]; do
2726
late_start=true
2827
shift
2928
;;
30-
-n|--namespace)
31-
namespace="$2"
32-
shift 2
33-
;;
3429
-r|--rounds)
3530
rounds="$2"
3631
shift 2
@@ -56,9 +51,6 @@ Options:
5651
-l | --late
5752
Delayed startup of first node.
5853
59-
-n | --namespace <NUMBER>
60-
Espresso transactions namespace ID.
61-
6254
-k | --keyset-file <PATH>
6355
Use a JSON file for node keys.
6456
@@ -100,8 +92,7 @@ for (( i=0; i<$nodes; i++ )); do
10092
--until $rounds
10193
--keyset-file $keyset_file
10294
--stamp "${stamp}-$i.sf"
103-
--watchdog-timeout $rounds
104-
--namespace $namespace)
95+
--watchdog-timeout $rounds)
10596

10697
if $ignore_stamp; then
10798
cmd+=(--ignore-stamp)

test-configs/c0/committee.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
effective_timestamp = 1756181061
1+
effective_timestamp = "2025-09-01T10:00:00Z"
22

33
[[members]]
4-
signing_key = "eiwaGN1NNaQdbnR9FsjKzUeLghQZsTLPjiL4RcQgfLoX"
5-
dh_key = "AZrLbV37HAGhBWh49JHzup6Wfpu2AAGWGJJnxCDJibiY"
6-
dkg_enc_key = "7PdmfTS45d2hTXB8NcrTmvDwUVBimpYBbrBaGnu3i5Ne65krVfUpbe7bYRHS3AEg7H"
4+
signing_key = "poThxe8T1mSVzWHEeKRQwWGimHRPZpgR1vxi8QnoM3HW"
5+
dh_key = "5hpgYEByvpZKFH65jAHkqYNVrK8SGaa9AkvPaHh1MJBm"
6+
dkg_enc_key = "7c5gxYq7KNSeXrAhwKsA8ZappWLzaQ1kXzBkctx58JnT9EpJ5EFDhWg1ne7gfMaJUe"
77
public_address = "127.0.0.1:8000"
88

99
[[members]]
10-
signing_key = "vGKKAxVNfkSCdn8qh36nXdSZqyhPq644sQBoeZtcEUCR"
11-
dh_key = "FHTJAk6oyt3jefEp1ZrPEn2MkqRt2LibEFd57AnEUZdb"
12-
dkg_enc_key = "7p1BtEz7WnFMt6Hr28X3Rngqza6i8hRoswhzZRFd6GzgkspLKHBfDocHP8DwzXiNiZ"
10+
signing_key = "m4QcHdpXX4e8qHTw2GCWF965yXpiUwmRjZ7Fn6CJzqEv"
11+
dh_key = "AFp9Z4m6HFWYa3vwED4aJcmvbyMTPr8J6uDRoat8HzmT"
12+
dkg_enc_key = "7Kp6Bin6pAV7y2LZpS1sS7CUjopksLx2SdbDzEHGUebLFY9WzS6dMGJijXVXzqNMZr"
1313
public_address = "127.0.0.1:8010"
1414

1515
[[members]]
16-
signing_key = "264jMLf85hfufg4ck97Hw2jiL6i1PHNoGUqxUqfhtssaE"
17-
dh_key = "63eYNKoW2PsWZFhHHj3eZwHTdPE7gEjEDM7gGeDf9Uaj"
18-
dkg_enc_key = "62bnAAbU58zZUcGqy9JKGZRZHkm3g7JZB2DtJGQyChXQBPGvXSS6fF21yoxiVuD1eb"
16+
signing_key = "2BniRRYZa6kc553V7r8vrDU9DCPqxqpd9Dtts9kqQ41au"
17+
dh_key = "Ct5iNL597GbAChFLqKCPB8ovqR5FhBq2ddGRpx2APkFz"
18+
dkg_enc_key = "7hG6b4oKJL5peZQnn3NmDrk7Z4Fjq3oHt8Z4gGeRfTtrUJjy2ySXxZ7ZvSWUKfAapo"
1919
public_address = "127.0.0.1:8020"
2020

2121
[[members]]
22-
signing_key = "v6UBdLT5BvMhLW7iKv7M2xYeaW2SCAsnZ5PiSg6AaKfA"
23-
dh_key = "Do2GmAexW5MUdD8nToDiBWGbDgk1AwXoxtLTyirDtKQh"
24-
dkg_enc_key = "7aZBFZUEbXxFH9SiGJeUyjzas4mYJ1R13mTPsPeawVU7JFuocfvX9XsRT8qgr17RCe"
22+
signing_key = "26n53jEoReGbvPmrcL2zSr4F7M63YKd678kiELw7JVbpP"
23+
dh_key = "3W5jcz2gWXEdyhCM7e21iKesbaCJwApdogTDcDrPyXyx"
24+
dkg_enc_key = "5p982gXbBB1W7WrygApz3PGut9EDNJ5RCt6HmE38197o4C9YUSvFv3pn48gkjkGc3s"
2525
public_address = "127.0.0.1:8030"
2626

2727
[[members]]
28-
signing_key = "tV66KknkDH47hRSNzwJtt7Q7EZtxVxQsNnUGoAJdDn6J"
29-
dh_key = "HXaesvEGFiDgrVTix1fKzSLTarFexTZSJD6ymSrF7vPL"
30-
dkg_enc_key = "6R69TzDg3jo1MTex9Uter9XQud458YPpSvXirkYdS295PV81CRvgz5jVWQbkCpZnYV"
28+
signing_key = "coujEMRGJtY7jRGymdmGD5W1MWctJ1e8r4jw5BuX8Mua"
29+
dh_key = "FAT7vE6EKz8EWrc4kaGMwhvtbE8BVRVwT6t8XoUnx2eh"
30+
dkg_enc_key = "5ozY7G3gsA7YeepPk4DUk2RSd4pHTewwohFH7TaCaJB9xTJZMtrkgmkqR6JUwPP9AD"
3131
public_address = "127.0.0.1:8040"

test-configs/c0/node_0.toml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ address = "127.0.0.1:8000"
55
address = "127.0.0.1:8003"
66

77
[keys.signing]
8-
secret = "3hzb3bRzn3dXSV1iEVE6mU4BF2aS725s8AboRxLwULPp"
9-
public = "eiwaGN1NNaQdbnR9FsjKzUeLghQZsTLPjiL4RcQgfLoX"
8+
secret = "C8fTG6JZPFVRajV4rSN7oZPCnSAdG3UsFji2tCEXeRWj"
9+
public = "poThxe8T1mSVzWHEeKRQwWGimHRPZpgR1vxi8QnoM3HW"
1010

1111
[keys.dh]
12-
secret = "BB3zUfFQGfw3sL6bpp1JH1HozK6ehEDmRGoiCpQH62rZ"
13-
public = "AZrLbV37HAGhBWh49JHzup6Wfpu2AAGWGJJnxCDJibiY"
12+
secret = "2iq6LKC5gLpUzoMDtPPDkUhaJFo2XbutaXR2eRrTa9JG"
13+
public = "5hpgYEByvpZKFH65jAHkqYNVrK8SGaa9AkvPaHh1MJBm"
1414

1515
[keys.dkg]
16-
secret = "BW8gq8MARtDkSJL6daobPtGQm22TKkXdbLNrNGngNGTB"
17-
public = "7PdmfTS45d2hTXB8NcrTmvDwUVBimpYBbrBaGnu3i5Ne65krVfUpbe7bYRHS3AEg7H"
16+
secret = "8JGUfoBxFd2pf1tqxubDdM2StTnLoRHiev4kJVS99FLz"
17+
public = "7c5gxYq7KNSeXrAhwKsA8ZappWLzaQ1kXzBkctx58JnT9EpJ5EFDhWg1ne7gfMaJUe"
18+
19+
[chain]
20+
namespace = 10101
1821

1922
[chain.parent]
2023
id = 31337

test-configs/c0/node_1.toml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ address = "127.0.0.1:8010"
55
address = "127.0.0.1:8013"
66

77
[keys.signing]
8-
secret = "FWJzNGvEjFS3h1N1sSMkcvvroWwjT5LQuGkGHu9JMAYs"
9-
public = "vGKKAxVNfkSCdn8qh36nXdSZqyhPq644sQBoeZtcEUCR"
8+
secret = "Erv5ALswtmZkMadqqpMVwTCEy96xhJFfYcq4FF4JPojT"
9+
public = "m4QcHdpXX4e8qHTw2GCWF965yXpiUwmRjZ7Fn6CJzqEv"
1010

1111
[keys.dh]
12-
secret = "4hjtciEvuoFVT55nAzvdP9E76r18QwntWwFoeginCGnP"
13-
public = "FHTJAk6oyt3jefEp1ZrPEn2MkqRt2LibEFd57AnEUZdb"
12+
secret = "6TqxGQz7ySPdv1GfznbLgPpeHjyk2idzznTYCirffpwc"
13+
public = "AFp9Z4m6HFWYa3vwED4aJcmvbyMTPr8J6uDRoat8HzmT"
1414

1515
[keys.dkg]
16-
secret = "ARtqWGmRWrBqZUr4MmiLaPgzjsiKp5USsC9iQNRMZYy4"
17-
public = "7p1BtEz7WnFMt6Hr28X3Rngqza6i8hRoswhzZRFd6GzgkspLKHBfDocHP8DwzXiNiZ"
16+
secret = "FisBmSTAgEXDo2iHw3bCTyeKFMtXt3zkLztNBLxyMgz8"
17+
public = "7Kp6Bin6pAV7y2LZpS1sS7CUjopksLx2SdbDzEHGUebLFY9WzS6dMGJijXVXzqNMZr"
18+
19+
[chain]
20+
namespace = 10101
1821

1922
[chain.parent]
2023
id = 31337

test-configs/c0/node_2.toml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ address = "127.0.0.1:8020"
55
address = "127.0.0.1:8023"
66

77
[keys.signing]
8-
secret = "2yWTaC6MWvNva97t81cd9QX5qph68NnB1wRVwAChtuGr"
9-
public = "264jMLf85hfufg4ck97Hw2jiL6i1PHNoGUqxUqfhtssaE"
8+
secret = "75rKppu6EB7DY7vMHkiJb5dzGstAkcHDcWXV45izcUeW"
9+
public = "2BniRRYZa6kc553V7r8vrDU9DCPqxqpd9Dtts9kqQ41au"
1010

1111
[keys.dh]
12-
secret = "Fo2nYV4gE9VfoVW9bSySAJ1ZuKT461x6ovZnr3EecCZg"
13-
public = "63eYNKoW2PsWZFhHHj3eZwHTdPE7gEjEDM7gGeDf9Uaj"
12+
secret = "Hsi7APZFGhi1rM1my9RmNWMWMQRqNjQndrPAwjaFDqoy"
13+
public = "Ct5iNL597GbAChFLqKCPB8ovqR5FhBq2ddGRpx2APkFz"
1414

1515
[keys.dkg]
16-
secret = "77r7T3En7NNQvRA81G5hLhJD3VpnigJdkPonX3oAwWkX"
17-
public = "62bnAAbU58zZUcGqy9JKGZRZHkm3g7JZB2DtJGQyChXQBPGvXSS6fF21yoxiVuD1eb"
16+
secret = "3XTJHQsUFsxpj4PdDgUR7ewjX6Az71NHy5Dj564Spd6H"
17+
public = "7hG6b4oKJL5peZQnn3NmDrk7Z4Fjq3oHt8Z4gGeRfTtrUJjy2ySXxZ7ZvSWUKfAapo"
18+
19+
[chain]
20+
namespace = 10101
1821

1922
[chain.parent]
2023
id = 31337

test-configs/c0/node_3.toml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ address = "127.0.0.1:8030"
55
address = "127.0.0.1:8033"
66

77
[keys.signing]
8-
secret = "CUpkbkn8bix7ZrbztPKJwu66MRpJrc1Wr2JfdrhetASk"
9-
public = "v6UBdLT5BvMhLW7iKv7M2xYeaW2SCAsnZ5PiSg6AaKfA"
8+
secret = "2kPSc8rZZkVvoL2gMWhkz9UJK5b8ndxeozRqY8sSCfCg"
9+
public = "26n53jEoReGbvPmrcL2zSr4F7M63YKd678kiELw7JVbpP"
1010

1111
[keys.dh]
12-
secret = "5KpixkV7czZTDVh7nV7VL1vGk4uf4kjKidDWq34CJx1T"
13-
public = "Do2GmAexW5MUdD8nToDiBWGbDgk1AwXoxtLTyirDtKQh"
12+
secret = "6Zh9vMXRbsAaYuTLVYHZcAmZ3Fut5yqAtBPNLxt5CrTm"
13+
public = "3W5jcz2gWXEdyhCM7e21iKesbaCJwApdogTDcDrPyXyx"
1414

1515
[keys.dkg]
16-
secret = "7vWcVJDAhfSvmtm1L7KZvoD9agx6hyy9FvA75xWpjxK7"
17-
public = "7aZBFZUEbXxFH9SiGJeUyjzas4mYJ1R13mTPsPeawVU7JFuocfvX9XsRT8qgr17RCe"
16+
secret = "7xQ58rsHbfSvTdevAFeXyWGJi4p6x6JefEva3oFEiKiZ"
17+
public = "5p982gXbBB1W7WrygApz3PGut9EDNJ5RCt6HmE38197o4C9YUSvFv3pn48gkjkGc3s"
18+
19+
[chain]
20+
namespace = 10101
1821

1922
[chain.parent]
2023
id = 31337

0 commit comments

Comments
 (0)