Skip to content

Commit 9f4b0cd

Browse files
authored
Fix Kurtosis doppelganger CI (#7343)
1 parent 80fe133 commit 9f4b0cd

File tree

1 file changed

+42
-24
lines changed

1 file changed

+42
-24
lines changed

scripts/tests/doppelganger_protection.sh

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,27 @@ if [[ "$BEHAVIOR" == "failure" ]]; then
7474
vc_1_keys_artifact_id="1-lighthouse-geth-$vc_1_range_start-$vc_1_range_end"
7575
service_name=vc-1-doppelganger
7676

77-
kurtosis service add \
78-
--files /validator_keys:$vc_1_keys_artifact_id,/testnet:el_cl_genesis_data \
79-
$ENCLAVE_NAME $service_name $LH_IMAGE_NAME -- lighthouse \
80-
vc \
81-
--debug-level info \
82-
--testnet-dir=/testnet \
83-
--validators-dir=/validator_keys/keys \
84-
--secrets-dir=/validator_keys/secrets \
85-
--init-slashing-protection \
86-
--beacon-nodes=http://$bn_2_url:$bn_2_port \
87-
--enable-doppelganger-protection \
88-
--suggested-fee-recipient 0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990
77+
kurtosis service add $ENCLAVE_NAME $service_name --json-service-config - << EOF
78+
{
79+
"image": "$LH_IMAGE_NAME",
80+
"files": {
81+
"/validator_keys": ["$vc_1_keys_artifact_id"],
82+
"/testnet": ["el_cl_genesis_data"]
83+
},
84+
"cmd": [
85+
"lighthouse",
86+
"vc",
87+
"--debug-level", "info",
88+
"--testnet-dir=/testnet",
89+
"--validators-dir=/validator_keys/keys",
90+
"--secrets-dir=/validator_keys/secrets",
91+
"--init-slashing-protection",
92+
"--beacon-nodes=http://$bn_2_url:$bn_2_port",
93+
"--enable-doppelganger-protection",
94+
"--suggested-fee-recipient", "0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990"
95+
]
96+
}
97+
EOF
8998

9099
# Check if doppelganger VC has stopped and exited. Exit code 1 means the check timed out and VC is still running.
91100
check_exit_cmd="until [ \$(get_service_status $service_name) != 'RUNNING' ]; do sleep 1; done"
@@ -110,18 +119,27 @@ if [[ "$BEHAVIOR" == "success" ]]; then
110119
vc_4_keys_artifact_id="4-lighthouse-geth-$vc_4_range_start-$vc_4_range_end"
111120
service_name=vc-4
112121

113-
kurtosis service add \
114-
--files /validator_keys:$vc_4_keys_artifact_id,/testnet:el_cl_genesis_data \
115-
$ENCLAVE_NAME $service_name $LH_IMAGE_NAME -- lighthouse \
116-
vc \
117-
--debug-level debug \
118-
--testnet-dir=/testnet \
119-
--validators-dir=/validator_keys/keys \
120-
--secrets-dir=/validator_keys/secrets \
121-
--init-slashing-protection \
122-
--beacon-nodes=http://$bn_2_url:$bn_2_port \
123-
--enable-doppelganger-protection \
124-
--suggested-fee-recipient 0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990
122+
kurtosis service add $ENCLAVE_NAME $service_name --json-service-config - << EOF
123+
{
124+
"image": "$LH_IMAGE_NAME",
125+
"files": {
126+
"/validator_keys": ["$vc_4_keys_artifact_id"],
127+
"/testnet": ["el_cl_genesis_data"]
128+
},
129+
"cmd": [
130+
"lighthouse",
131+
"vc",
132+
"--debug-level", "info",
133+
"--testnet-dir=/testnet",
134+
"--validators-dir=/validator_keys/keys",
135+
"--secrets-dir=/validator_keys/secrets",
136+
"--init-slashing-protection",
137+
"--beacon-nodes=http://$bn_2_url:$bn_2_port",
138+
"--enable-doppelganger-protection",
139+
"--suggested-fee-recipient", "0x690B9A9E9aa1C9dB991C7721a92d351Db4FaC990"
140+
]
141+
}
142+
EOF
125143

126144
doppelganger_failure=0
127145

0 commit comments

Comments
 (0)