Skip to content

Commit 25e06b3

Browse files
authored
Merge pull request #2905 from IntersectMBO/make_pv10_default
feat(testnets): make Protocol Version 10 the default
2 parents f08d416 + 632e2d6 commit 25e06b3

17 files changed

+192
-243
lines changed

.github/env_nightly_cli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
CLUSTER_ERA=conway
22
COMMAND_ERA=conway
33
CARDANO_CLI_REV=master
4-
PV10=true

.github/env_nightly_dbsync_pv10

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/env_nightly_pv10

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/node_upgrade_pytest.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if [ "$1" = "step1" ]; then
3333

3434
export UPGRADE_TESTS_STEP=1
3535
export ENABLE_LEGACY=1
36+
export PV9=1
3637

3738
if [ -n "${BASE_TAR_URL:-""}" ]; then
3839
# download and extract base revision binaries
@@ -106,6 +107,7 @@ elif [ "$1" = "step2" ]; then
106107

107108
export UPGRADE_TESTS_STEP=2
108109
export MIXED_P2P=1
110+
export PV9=1
109111
unset ENABLE_LEGACY
110112

111113
# Setup `cardano-cli` binary
@@ -267,7 +269,7 @@ elif [ "$1" = "step3" ]; then
267269
printf "STEP3 start: %(%H:%M:%S)T\n" -1
268270

269271
export UPGRADE_TESTS_STEP=3
270-
unset ENABLE_LEGACY MIXED_P2P
272+
unset ENABLE_LEGACY MIXED_P2P PV9
271273

272274
# Setup `cardano-cli` binary
273275
if [ -n "${UPGRADE_CLI_REVISION:-""}" ]; then

.github/regression.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ fi
5454

5555
CLUSTER_ERA="${CLUSTER_ERA:-"$DEFAULT_CLUSTER_ERA"}"
5656
if [ "$CLUSTER_ERA" = "conway 9" ]; then
57-
unset PV10
57+
export PV9=1
5858
CLUSTER_ERA="conway"
5959
elif [ "$CLUSTER_ERA" = "conway 10" ]; then
60-
export PV10=1
60+
unset PV9
6161
CLUSTER_ERA="conway"
6262
fi
6363
export CLUSTER_ERA

.github/workflows/nightly_dbsync_pv10.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/nightly_pv10.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.json

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,53 @@
276276
43623,
277277
251,
278278
0,
279-
1
279+
1,
280+
100181,
281+
726,
282+
719,
283+
0,
284+
1,
285+
100181,
286+
726,
287+
719,
288+
0,
289+
1,
290+
100181,
291+
726,
292+
719,
293+
0,
294+
1,
295+
107878,
296+
680,
297+
0,
298+
1,
299+
95336,
300+
1,
301+
281145,
302+
18848,
303+
0,
304+
1,
305+
180194,
306+
159,
307+
1,
308+
1,
309+
158519,
310+
8942,
311+
0,
312+
1,
313+
159378,
314+
8813,
315+
0,
316+
1,
317+
107490,
318+
3298,
319+
1,
320+
106057,
321+
655,
322+
1,
323+
1964219,
324+
24520,
325+
3
280326
],
281327
"constitution": {
282328
"anchor": {

cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.pv10.json renamed to cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.pv9.json

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -276,53 +276,7 @@
276276
43623,
277277
251,
278278
0,
279-
1,
280-
100181,
281-
726,
282-
719,
283-
0,
284-
1,
285-
100181,
286-
726,
287-
719,
288-
0,
289-
1,
290-
100181,
291-
726,
292-
719,
293-
0,
294-
1,
295-
107878,
296-
680,
297-
0,
298-
1,
299-
95336,
300-
1,
301-
281145,
302-
18848,
303-
0,
304-
1,
305-
180194,
306-
159,
307-
1,
308-
1,
309-
158519,
310-
8942,
311-
0,
312-
1,
313-
159378,
314-
8813,
315-
0,
316-
1,
317-
107490,
318-
3298,
319-
1,
320-
106057,
321-
655,
322-
1,
323-
1964219,
324-
24520,
325-
3
279+
1
326280
],
327281
"constitution": {
328282
"anchor": {

cardano_node_tests/cluster_scripts/conway/start-cluster

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# MIXED_P2P - if set, local cluster will use P2P for some nodes and legacy topology for others
77
# UTXO_BACKEND - 'mem' or 'disk', default is 'mem' (or legacy) if unset
88
# NO_CC - if set, will not create committee
9-
# PV10 - if set, will use protocol version 10
9+
# PV9 - if set, will use protocol version 9
1010
# DRY_RUN - if set, will not start the cluster
1111

1212
set -euo pipefail
@@ -210,9 +210,9 @@ cp "${SCRIPT_DIR}/submit-api-config.json" "$STATE_CLUSTER"
210210
cp "${SCRIPT_DIR}/supervisor.conf" "$STATE_CLUSTER"
211211
cp "$SCRIPT_DIR"/*genesis*.spec.json "${STATE_CLUSTER}/shelley/"
212212

213-
if [ -n "${PV10:-""}" ]; then
213+
if [ -n "${PV9:-""}" ]; then
214214
cp -f \
215-
"${SCRIPT_DIR}/genesis.conway.spec.pv10.json" \
215+
"${SCRIPT_DIR}/genesis.conway.spec.pv9.json" \
216216
"${STATE_CLUSTER}/shelley/genesis.conway.spec.json"
217217
fi
218218

@@ -523,18 +523,18 @@ for i in $(seq 1 "$NUM_POOLS"); do
523523
--stake-verification-key-file "${STATE_CLUSTER}/nodes/node-pool${i}/reward.vkey" \
524524
--always-abstain \
525525
--out-file "${STATE_CLUSTER}/nodes/node-pool${i}/stake-reward_vote_deleg.cert"
526-
if [ -n "${PV10:-""}" ]; then
526+
if [ -n "${PV9:-""}" ]; then
527+
ln \
528+
"${STATE_CLUSTER}/nodes/node-pool${i}/stake-reward.shelley_reg.cert" \
529+
"${STATE_CLUSTER}/nodes/node-pool${i}/stake-reward.reg.cert"
530+
else
527531
# stake reward address registration and vote delegation cert, to be used later in tests
528532
# when re-registering the reward address in Conway
529533
cardano_cli_log conway stake-address registration-and-vote-delegation-certificate \
530534
--stake-verification-key-file "${STATE_CLUSTER}/nodes/node-pool${i}/reward.vkey" \
531535
--always-abstain \
532536
--key-reg-deposit-amt "$KEY_DEPOSIT" \
533537
--out-file "${STATE_CLUSTER}/nodes/node-pool${i}/stake-reward.reg.cert"
534-
else
535-
ln \
536-
"${STATE_CLUSTER}/nodes/node-pool${i}/stake-reward.shelley_reg.cert" \
537-
"${STATE_CLUSTER}/nodes/node-pool${i}/stake-reward.reg.cert"
538538
fi
539539

540540
# pool keys
@@ -1292,7 +1292,7 @@ fi
12921292

12931293
# Hard fork to Conway protocol version 10
12941294

1295-
if [ -n "${PV10:-""}" ]; then
1295+
if [ -z "${PV9:-""}" ]; then
12961296
PV10_ACTION="${STATE_CLUSTER}/governance_data/hardfork_pv10_action"
12971297

12981298
echo "Submitting hard fork proposal to update to Conway PV10"

0 commit comments

Comments
 (0)