Skip to content

Commit 2a2c156

Browse files
akonringakonring
authored
Merge branch 'main' into dependabot/cargo/criterion-0.7
2 parents 37f1747 + 760333c commit 2a2c156

File tree

23 files changed

+606
-189
lines changed

23 files changed

+606
-189
lines changed

‎docker-compose.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ services:
88
"--rpc-port", "8800",
99
"--metrics-port", "9000",
1010
"--keyset-file", "docker.json",
11-
"--stamp", "/tmp/timeboost.stamp"
11+
"--stamp", "/tmp/timeboost.stamp",
12+
"--namespace", "10101",
1213
]
1314
networks:
1415
timeboost:
@@ -35,7 +36,8 @@ services:
3536
"--rpc-port", "8800",
3637
"--metrics-port", "9000",
3738
"--keyset-file", "docker.json",
38-
"--stamp", "/tmp/timeboost.stamp"
39+
"--stamp", "/tmp/timeboost.stamp",
40+
"--namespace", "10101",
3941
]
4042
networks:
4143
timeboost:
@@ -62,7 +64,8 @@ services:
6264
"--rpc-port", "8800",
6365
"--metrics-port", "9000",
6466
"--keyset-file", "docker.json",
65-
"--stamp", "/tmp/timeboost.stamp"
67+
"--stamp", "/tmp/timeboost.stamp",
68+
"--namespace", "10101",
6669
]
6770
networks:
6871
timeboost:
@@ -89,7 +92,8 @@ services:
8992
"--rpc-port", "8800",
9093
"--metrics-port", "9000",
9194
"--keyset-file", "docker.json",
92-
"--stamp", "/tmp/timeboost.stamp"
95+
"--stamp", "/tmp/timeboost.stamp",
96+
"--namespace", "10101",
9397
]
9498
networks:
9599
timeboost:
@@ -116,7 +120,8 @@ services:
116120
"--rpc-port", "8800",
117121
"--metrics-port", "9000",
118122
"--keyset-file", "docker.json",
119-
"--stamp", "/tmp/timeboost.stamp"
123+
"--stamp", "/tmp/timeboost.stamp",
124+
"--namespace", "10101",
120125
]
121126
networks:
122127
timeboost:

‎docker/yapper.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ FROM debian:bullseye-slim
1212

1313
WORKDIR /app
1414

15+
RUN apt update && apt-get install -y libcurl4
16+
1517
# Create non-root user and group
1618
RUN groupadd -r appgroup && useradd -r -g appgroup yapperuser
1719

‎justfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,27 @@ run *ARGS:
8181
bench *ARGS:
8282
cargo bench --benches {{ARGS}} -- --nocapture
8383

84-
mkconfig_local NUM_NODES *ARGS:
84+
mkconfig_local NUM_NODES RPC_URL PARENT_CHAIN_ID PARENT_INBOX_ADDRESS *ARGS:
8585
cargo run --bin mkconfig -- -n {{NUM_NODES}} \
8686
--sailfish-base-addr "127.0.0.1:8000" \
8787
--decrypt-base-addr "127.0.0.1:10000" \
8888
--certifier-base-addr "127.0.0.1:11000" \
8989
--internal-base-addr "127.0.0.1:5000" \
90+
--parent-rpc-url {{RPC_URL}} \
91+
--parent-chain-id {{PARENT_CHAIN_ID}} \
92+
--parent-ibox-contr-addr {{PARENT_INBOX_ADDRESS}} \
9093
--mode "increment-port" {{ARGS}} | jq
94+
9195

92-
mkconfig_docker NUM_NODES *ARGS:
96+
mkconfig_docker NUM_NODES RPC_URL PARENT_CHAIN_ID PARENT_INBOX_ADDRESS *ARGS:
9397
cargo run --bin mkconfig -- -n {{NUM_NODES}} \
9498
--sailfish-base-addr "172.20.0.2:8000" \
9599
--decrypt-base-addr "172.20.0.2:8001" \
96100
--certifier-base-addr "172.20.0.2:8002" \
97101
--internal-base-addr "172.20.0.2:5000" \
102+
--parent-rpc-url {{RPC_URL}} \
103+
--parent-chain-id {{PARENT_CHAIN_ID}} \
104+
--parent-ibox-contr-addr {{PARENT_INBOX_ADDRESS}} \
98105
--mode "increment-address" {{ARGS}} | jq
99106

100107
####################

‎test-configs/docker.json‎

Lines changed: 68 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,79 +5,109 @@
55
"decrypt_address": "172.20.0.2:8001",
66
"certifier_address": "172.20.0.2:8002",
77
"internal_address": "172.20.0.2:5000",
8-
"signing_key": "mabJfy2xVRAFtHjESot4L94B6rXnnC3PJt45JTaFxMaE",
9-
"dh_key": "EJNBd8TbipWa7KTUxeRhRG38AVmHpugEfGZaD5BmLfbk",
10-
"enc_key": "8tBQZfJHAHx6jjSSWbP3Y332mGZd3Zf2xyNchCANTFYNYRqPMnaPTkHVdK8zcJ9BEqs",
8+
"signing_key": "cFWjP2VX3nr1xiCLNVfPPePcSe8Yq2iFUeceWVm4sRfR",
9+
"dh_key": "BfKCc3miLCnHmyQ3bsJjnqL2W46gLGmua8LaspFLw774",
10+
"chain_config": {
11+
"parent_chain_id": 1,
12+
"parent_chain_rpc_url": "https://theserversroom.com/ethereum/54cmzzhcj1o/",
13+
"parent_ibox_contr_addr": "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f",
14+
"parent_block_tag": "finalized"
15+
},
16+
"enc_key": "8t8u3oUC4Eq2LCMqkEBePPHd9DcMjXjEEmTCVJps3XAbT6SyHHbVQpbebRtpBkshbdX",
1117
"private": {
12-
"signing_key": "8Z37mrH658eN89GSecRLfyxNNKZMH782du7M3XYP2X6U",
13-
"dh_key": "5L5AaqFYZVDKAgb9zjj9G9MpPuA2c9LheRWTSzUPBynV",
14-
"dec_share": "j8TwNjSeTV4zQuWpQt1mzSriNpoxAB47fj6Traqm6bGPUs",
15-
"dec_key": "AYfiNqLSeVgvadjhfeqGSQhVYgbiW5BYqmaBwBNSPXQuQ"
18+
"signing_key": "GLHjASHgoV6nYosAW7BPFzw5HcbL6FDsGnGE6mSFz3So",
19+
"dh_key": "3Cg1BYXBCEHEw8VgNS6wNUpHRDb2K7SYW5i1Vx9t4d4A",
20+
"dec_share": "jtpPGMk388FeDDGDbuWz54QdieLaafK9nVjPajkfK1oV8B",
21+
"dec_key": "AhyJxurLFNmAfG3FC7d3vVcYBMYHmXrWBLxm1ZhLdt15s"
1622
}
1723
},
1824
{
1925
"sailfish_address": "172.20.0.3:8000",
2026
"decrypt_address": "172.20.0.3:8001",
2127
"certifier_address": "172.20.0.3:8002",
2228
"internal_address": "172.20.0.3:5000",
23-
"signing_key": "rutfSyh5UWrijiYZqCKTWa7BnoZpyb9grbWFqcyR1Q2d",
24-
"dh_key": "Gx95VSY3eXaUK8HQmhGWooonDsx8Mn7RJ6Zcx4hsLTdh",
25-
"enc_key": "8s6ZT3ewef135iprpmUPxQWKXQfSPLig8rhHV4n9UBXbhwThX4Zfb6vii3h5LYE3xoh",
29+
"signing_key": "t6zZYEsKxvLJ5nTmc3o89TsgiHXhcDRzp7awiQe1VarF",
30+
"dh_key": "HpyaTF3W9ojLXnhXp45yX6hRv84kEcL6DdCXqMjWyx9H",
31+
"chain_config": {
32+
"parent_chain_id": 1,
33+
"parent_chain_rpc_url": "https://theserversroom.com/ethereum/54cmzzhcj1o/",
34+
"parent_ibox_contr_addr": "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f",
35+
"parent_block_tag": "finalized"
36+
},
37+
"enc_key": "8sqvMrt4fLi17XuNaop4EtYDLWVZKriVwZvC3oRWZqPHfhG21REuYCqD7Qs2Uxxkjmt",
2638
"private": {
27-
"signing_key": "DVZ8rAB6XYyvmXHimaUAhFR6Rp3hkcYPUYWrMEorx9hB",
28-
"dh_key": "6F6jMUgJKGbDskXJftqGdKz3e1Z5v58L9KSxFkz5y16p",
29-
"dec_share": "k86XXDcJHoCpNswo9uUqfz3TjubgyJDVu13YphkPSQHXAp",
30-
"dec_key": "AYAZyCqddyB1zrtJVkkepDgcFqsCY1fMgj3SVVtNt2rqx"
39+
"signing_key": "5DXo2QBDRkvytUNU7E8bP3RTFt4bAVMbLo6NwG5BCxwf",
40+
"dh_key": "F1Fhpfg9iaEcyLgV2gTjEhV49Ca765ZrmSNRr35CLyTc",
41+
"dec_share": "jvXcefZBVD4ZrPzGkbs6U4RFNJXfn5Pvr8uz7ftDUT2B2x",
42+
"dec_key": "AY9fDz8szrVP5Jn6TWUpPF4NsjgJtyiDpDqy4pVEwcPHG"
3143
}
3244
},
3345
{
3446
"sailfish_address": "172.20.0.4:8000",
3547
"decrypt_address": "172.20.0.4:8001",
3648
"certifier_address": "172.20.0.4:8002",
3749
"internal_address": "172.20.0.4:5000",
38-
"signing_key": "29qEaVvt87rxxyAHZ4NRf3JunuAPDhvmrcp1R1MXGAqiU",
39-
"dh_key": "2ejy4LEdETjHSGb8TyB9BQGAtjkFryCkRu6P8fzYmDPJ",
40-
"enc_key": "8sKWDkvTz9isARzTwuoYuGZqq9W79XV4rF3cmymCQn1RQNDzcwCLoFumb72Mi4e5qMV",
50+
"signing_key": "hSUkBdDbsQYXSo61a16ooTpKMNoXa6jHVCxQRFQsgA6K",
51+
"dh_key": "8MqFhjj7MCLd9aBnNxcxYL3MNWXTrGnZPAQmiS9rZwkj",
52+
"chain_config": {
53+
"parent_chain_id": 1,
54+
"parent_chain_rpc_url": "https://theserversroom.com/ethereum/54cmzzhcj1o/",
55+
"parent_ibox_contr_addr": "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f",
56+
"parent_block_tag": "finalized"
57+
},
58+
"enc_key": "8sNzQskLRfaqZFNXvQBVELxcvwWanbK163kCzEWbPPXuCXmdFJxiRtebgDFGY9C3BQ2",
4159
"private": {
42-
"signing_key": "5eePPupbhTkbL6LhkMEMVch2X31U8LJPVUbVBccbdY15",
43-
"dh_key": "HqhMHhfMZCDzCsWD3TqfndoyJCCkopRWQzXDcfvBv98U",
44-
"dec_share": "jAfEdJ6VBd47g1FBpaENRyJvdQRGr9mAXMPhsN73QcMoBP",
45-
"dec_key": "AjbUxitqpbrKLSazegdRJgfZQLqzZDfCvSob3w4Q928jb"
60+
"signing_key": "4t3spjdo65wuLotqbprCuqZkc9vKeX1vG42WXcQVxB7n",
61+
"dh_key": "HP6rcYxjJJZRU977j451b14pVFsKhA1jQS67xMnmJzwb",
62+
"dec_share": "k5WWS4c84DRQcYNnCD52EHze3BN1atCeZaDDBZDAj4ygh7",
63+
"dec_key": "AoGYqobfy3LdmQCJYvwa5qgzNuQZJAkv8kpXS11yVBTct"
4664
}
4765
},
4866
{
4967
"sailfish_address": "172.20.0.5:8000",
5068
"decrypt_address": "172.20.0.5:8001",
5169
"certifier_address": "172.20.0.5:8002",
5270
"internal_address": "172.20.0.5:5000",
53-
"signing_key": "2AMEFVNCANpdauEh59emL2oPtcQYdn8qqNbTBYDGGrKsW",
54-
"dh_key": "F3TaCT3u4jVNi825XgV3J7LxXyCFtkL7BkwbRSFG5JGb",
55-
"enc_key": "8s1vYUWqyZxUokRNq38AK63dkJ2kgritDpEHbt3diy24v31RDdsKdRwjhyai11AyboP",
71+
"signing_key": "24cTPvzRpFg66MgLBVgVweBbBYfBXSsvKkDMVGn3emrBX",
72+
"dh_key": "3DV38qeRns1HMGnunM5nh43VT6Gem5RWcfhR8WsCF4md",
73+
"chain_config": {
74+
"parent_chain_id": 1,
75+
"parent_chain_rpc_url": "https://theserversroom.com/ethereum/54cmzzhcj1o/",
76+
"parent_ibox_contr_addr": "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f",
77+
"parent_block_tag": "finalized"
78+
},
79+
"enc_key": "8rgbWzpAr4XQ6kPujBGu7Rtd4446yie6veyPibQ3siwPi2nZ7GmPQyPtrpjYM1KMfmA",
5680
"private": {
57-
"signing_key": "AwcuSRqcPwP9Ndjt662Vbe3g2vh583sX7YJDhjBuALTk",
58-
"dh_key": "9KLJY1ajLULibT5Kf5oUjtGEezB8ZGvK2wj8WcJdjBde",
59-
"dec_share": "jVpgaAMtNEiSAqmCXzP2qJ2tV76cfQ4DVyBRQKta1xjR9L",
60-
"dec_key": "AjbCfqk49STyaHEwwesBCaScnMZdabvGuceZgxhHTESe9"
81+
"signing_key": "HaAZSPmqXU7WeSV4GHRrKxAbQbfavjdKMsNNr3iokBKQ",
82+
"dh_key": "4fkTjw5Wc8QJ7XvBrpC9e2FVabQWh8pyApPsftYNWoNK",
83+
"dec_share": "kFnSX9ZrtSwni4qJnj11hVGRgJPPGGNJzWJzFGo3TRAkrv",
84+
"dec_key": "AhNdCUJJ2SQpk7QXaQPSTxLXPwJ3RYsPyCC2gxmK89amJ"
6185
}
6286
},
6387
{
6488
"sailfish_address": "172.20.0.6:8000",
6589
"decrypt_address": "172.20.0.6:8001",
6690
"certifier_address": "172.20.0.6:8002",
6791
"internal_address": "172.20.0.6:5000",
68-
"signing_key": "yoqYPL1jTuRBYA1qybsVGMhNxupKnNbUpww1sVyZTDri",
69-
"dh_key": "B1QAv777X99KG2xQEZCSk8iEHZsJT7sx7NhSBCuXdg9U",
70-
"enc_key": "8sNCrh45MBdubPvZPuEvvqGHVpsWEhFZukyBG6g2cgjPEkRgxGtj7YDeCvMxmz76gRt",
92+
"signing_key": "sEQowoeC6wmspaRtdnwuUsJJSjDjbLfeJ91NahakP8UL",
93+
"dh_key": "CaQtrMfF9jYkaqojXNXvQarpdidqKC6EBsp2encSGUEJ",
94+
"chain_config": {
95+
"parent_chain_id": 1,
96+
"parent_chain_rpc_url": "https://theserversroom.com/ethereum/54cmzzhcj1o/",
97+
"parent_ibox_contr_addr": "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f",
98+
"parent_block_tag": "finalized"
99+
},
100+
"enc_key": "8szoc1NpsEJ9yrSWkACD4AsgCRWAECk6t3aHJiG6jhbDPvGPXhDT4VvNT1qNbwY46oT",
71101
"private": {
72-
"signing_key": "BSbbhNKYgs7urSMZ82fyDEKzwDnJG4DPjjQWJbRmqYuR",
73-
"dh_key": "4ArVbho57oh7GTtR71o95jPokLq9CUvZVGQjSo1VN8rU",
74-
"dec_share": "j46WwQT5Ln3So6ewcUACXMEPmwHnAQCXqiZwyQinugEzUj",
75-
"dec_key": "AdWqv2U6amCuhVzzPzWTGkJUySWh2tCGu6KGcd83qnQ67"
102+
"signing_key": "83ukobY6K8bez7sKygeny77pUtVxpysv9iShg9XciYJw",
103+
"dh_key": "PLzz2H312hro83W5dPafH5U8KV6CYFRWK3TkG2JQ8zM",
104+
"dec_share": "jfNdD2jUd7C7YPJM8UdxsXYp6nmBvtDsiGpyBZWfmLTqaB",
105+
"dec_key": "AZy7zjJYeC3SrFnAW6rQbfGibaoGK3oWDUSK6aoqoh1Yf"
76106
}
77107
}
78108
],
79109
"dec_keyset": {
80-
"pubkey": "8sKeY3xQMXkxEhrJarDxwPwnfeNX4dadFZLtrt2gRv9By8aUTkY59LHvvbC1fd6ydEg",
81-
"combkey": "y7AnuKz7QtPWJvW5iWCWCcrWuNj1BoWj4skXFYvo9z5mBM5z4RTpiyc6a5of9KDnfBfv2Y5Lv2vVRvuJmR8764D4S9PhfSRJ1FhXK9ECDznyLG6SxY8iH4qCG67f8aazR7G1zonZnTTchZ3a32mdCrHTpF5ApZ2hzYMtyKWFuah6QZTGxk1Q95Fi5Vbm399LJFjwVpaDFJcyQ5wdnxkwzzCbVrmQtXe8RVF9CudZbgyEdspRx3p9pLbUp7Z1Suvn943UiE8WcwDrjrwDa8j9c6oDQeSxa3pEa5eUeV3MKCgGsLuTjj1WyTq3tCLZ3zfXyoeNKtAjQfjTj8X"
110+
"pubkey": "8s1BnVvpDyjMBFQ4GaxZaTXqMM6GfXPH3GvNvRF1WRM9YjGX7aq9cB2yzpEp441mzGL",
111+
"combkey": "y73TXULnigrNdJ4L2XHSVwdMVYm7pER7CmXJEbbCLNrsdfgHY9mCEU6ZzHRLunCZbdp5Ge8Z6e14Tjq6AUrZZs5xfT2VjAPkH7tpfoYxHcfn85DshZPDxhagecoTkGPRQVY2UgZ5wW8QsVZNtLNyJbKDpuebrnDCJ5iPYVX8SGHfUkVXr84vwCyZCXDtNNddzHvqFqpoZitCagV7afrED5A4Rg3vznmZnLYBDsKg35hrzCsd4YiKyy4GxbrhZHWUyufDfoSi9YjADkf7tdtbQWk7VYTo1ahKevuJhnGScJsg4GJm1gMjYxFyEgf3jwDY8s5zMcmzw7a38Jf"
82112
}
83-
}
113+
}

0 commit comments

Comments
 (0)