Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes needed for testing node 8.11.0 #2417

Merged
merged 1 commit into from
May 16, 2024
Merged

Changes needed for testing node 8.11.0 #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .github/regression.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ export SCHEDULING_LOG=scheduling.log
true > "$SCHEDULING_LOG"

MARKEXPR="${MARKEXPR:-""}"
if [ "${MARKEXPR:-""}" = "all" ]; then
if [ "$MARKEXPR" = "all" ]; then
unset MARKEXPR
elif [ "${MARKEXPR:-""}" = "conway only" ]; then
elif [ "$MARKEXPR" = "conway only" ]; then
unset MARKEXPR
export TESTS_DIR="cardano_node_tests/tests/tests_conway"
fi
Expand All @@ -89,11 +89,20 @@ if [ -n "${CLUSTERS_COUNT:-""}" ]; then
export CLUSTERS_COUNT
fi

export CLUSTER_ERA="${CLUSTER_ERA:-"$DEFAULT_CLUSTER_ERA"}"
CLUSTER_ERA="${CLUSTER_ERA:-"$DEFAULT_CLUSTER_ERA"}"
if [ "$CLUSTER_ERA" = "conway 9" ]; then
unset PV10
CLUSTER_ERA="conway"
elif [ "$CLUSTER_ERA" = "conway 10" ]; then
export PV10=1
CLUSTER_ERA="conway"
fi
export CLUSTER_ERA

if [ "${TX_ERA:-""}" = "default" ]; then
TX_ERA="${TX_ERA:-""}"
if [ "$TX_ERA" = "default" ]; then
export TX_ERA=""
elif [ "${TX_ERA:-""}" = "conway" ]; then
elif [ "$TX_ERA" = "conway" ]; then
unset TX_ERA
export COMMAND_ERA="conway"
fi
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/regression.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:
description: "Cluster era"
options:
- babbage
- conway
- conway 9
- conway 10
default: babbage
tx_era:
type: choice
Expand Down
2 changes: 1 addition & 1 deletion cardano_node_tests/cluster_scripts/babbage/genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"constitution": {
"anchor": {
"url": "",
Expand All @@ -34,7 +35,6 @@
"committee": {
"members": {
},
"quorum": 0.0,
"threshold": 0.0
}
}
40 changes: 40 additions & 0 deletions cardano_node_tests/cluster_scripts/babbage/release_8_9-genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"poolVotingThresholds": {
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"hardForkInitiation": 0.51,
"ppSecurityGroup": 0.51
},
"dRepVotingThresholds": {
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"updateToConstitution": 0.51,
"hardForkInitiation": 0.51,
"ppNetworkGroup": 0.51,
"ppEconomicGroup": 0.51,
"ppTechnicalGroup": 0.51,
"ppGovGroup": 0.51,
"treasuryWithdrawal": 0.51
},
"committeeMinSize": 0,
"committeeMaxTermLength": 11000,
"govActionLifetime": 2,
"govActionDeposit": 100000000,
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"constitution": {
"anchor": {
"url": "",
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
}
},
"committee": {
"members": {
},
"quorum": 0.0,
"threshold": 0.0
}
}
9 changes: 9 additions & 0 deletions cardano_node_tests/cluster_scripts/babbage/start-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,15 @@ if [ "$genesis_created" -eq 0 ] ; then
echo "Failed to generate genesis files, retrying with a different genesis.conway.spec.json"
mv "$STATE_CLUSTER/shelley/genesis.conway.spec.json" \
"$STATE_CLUSTER/shelley/master-genesis.conway.spec.json"
mv "$STATE_CLUSTER/shelley/release_8_9-genesis.conway.spec.json" \
"$STATE_CLUSTER/shelley/genesis.conway.spec.json"
gen_genesis && genesis_created=1 || genesis_created=0
fi

if [ "$genesis_created" -eq 0 ] ; then
echo "Failed to generate genesis files, retrying with a different genesis.conway.spec.json"
mv "$STATE_CLUSTER/shelley/genesis.conway.spec.json" \
"$STATE_CLUSTER/shelley/release_8_9-genesis.conway.spec.json"
mv "$STATE_CLUSTER/shelley/release-genesis.conway.spec.json" \
"$STATE_CLUSTER/shelley/genesis.conway.spec.json"
gen_genesis && genesis_created=1 || genesis_created=0
Expand Down
2 changes: 1 addition & 1 deletion cardano_node_tests/cluster_scripts/babbage_fast/genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"constitution": {
"anchor": {
"url": "",
Expand All @@ -34,7 +35,6 @@
"committee": {
"members": {
},
"quorum": 0.0,
"threshold": 0.0
}
}
40 changes: 40 additions & 0 deletions cardano_node_tests/cluster_scripts/babbage_fast/release_8_9-genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"poolVotingThresholds": {
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"hardForkInitiation": 0.51,
"ppSecurityGroup": 0.51
},
"dRepVotingThresholds": {
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"updateToConstitution": 0.51,
"hardForkInitiation": 0.51,
"ppNetworkGroup": 0.51,
"ppEconomicGroup": 0.51,
"ppTechnicalGroup": 0.51,
"ppGovGroup": 0.51,
"treasuryWithdrawal": 0.51
},
"committeeMinSize": 0,
"committeeMaxTermLength": 11000,
"govActionLifetime": 2,
"govActionDeposit": 100000000,
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"constitution": {
"anchor": {
"url": "",
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
}
},
"committee": {
"members": {
},
"quorum": 0.0,
"threshold": 0.0
}
}
9 changes: 9 additions & 0 deletions cardano_node_tests/cluster_scripts/babbage_fast/start-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,15 @@ if [ "$genesis_created" -eq 0 ] ; then
echo "Failed to generate genesis files, retrying with a different genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/master-genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/release_8_9-genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/genesis.conway.spec.json"
gen_genesis && genesis_created=1 || genesis_created=0
fi

if [ "$genesis_created" -eq 0 ] ; then
echo "Failed to generate genesis files, retrying with a different genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/release_8_9-genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/release-genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/genesis.conway.spec.json"
gen_genesis && genesis_created=1 || genesis_created=0
Expand Down
4 changes: 4 additions & 0 deletions cardano_node_tests/cluster_scripts/conway/genesis.alonzo.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,8 @@
"equalsByteString-cpu-arguments-constant": 245000,
"equalsByteString-cpu-arguments-intercept": 216773,
"equalsByteString-cpu-arguments-slope": 62,
"equalsByteString-cpu-arguments-model-arguments-intercept": 150000,
"equalsByteString-cpu-arguments-model-arguments-slope": 247,
"equalsByteString-memory-arguments": 1,
"equalsData-cpu-arguments-intercept": 1060367,
"equalsData-cpu-arguments-slope": 12586,
Expand All @@ -464,6 +466,8 @@
"equalsString-cpu-arguments-constant": 187000,
"equalsString-cpu-arguments-intercept": 1000,
"equalsString-cpu-arguments-slope": 52998,
"equalsString-cpu-arguments-model-arguments-intercept": 150000,
"equalsString-cpu-arguments-model-arguments-slope": 1000,
"equalsString-memory-arguments": 1,
"fstPair-cpu-arguments": 80436,
"fstPair-memory-arguments": 32,
Expand Down
1 change: 1 addition & 0 deletions cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"constitution": {
"anchor": {
"url": "",
Expand Down
4 changes: 4 additions & 0 deletions cardano_node_tests/cluster_scripts/conway_fast/genesis.alonzo.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,8 @@
"equalsByteString-cpu-arguments-constant": 245000,
"equalsByteString-cpu-arguments-intercept": 216773,
"equalsByteString-cpu-arguments-slope": 62,
"equalsByteString-cpu-arguments-model-arguments-intercept": 150000,
"equalsByteString-cpu-arguments-model-arguments-slope": 247,
"equalsByteString-memory-arguments": 1,
"equalsData-cpu-arguments-intercept": 1060367,
"equalsData-cpu-arguments-slope": 12586,
Expand All @@ -464,6 +466,8 @@
"equalsString-cpu-arguments-constant": 187000,
"equalsString-cpu-arguments-intercept": 1000,
"equalsString-cpu-arguments-slope": 52998,
"equalsString-cpu-arguments-model-arguments-intercept": 150000,
"equalsString-cpu-arguments-model-arguments-slope": 1000,
"equalsString-memory-arguments": 1,
"fstPair-cpu-arguments": 80436,
"fstPair-memory-arguments": 32,
Expand Down
1 change: 1 addition & 0 deletions cardano_node_tests/cluster_scripts/conway_fast/genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"constitution": {
"anchor": {
"url": "",
Expand Down
2 changes: 1 addition & 1 deletion cardano_node_tests/cluster_scripts/mainnet_fast/genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"constitution": {
"anchor": {
"url": "",
Expand All @@ -34,7 +35,6 @@
"committee": {
"members": {
},
"quorum": 0.0,
"threshold": 0.0
}
}
40 changes: 40 additions & 0 deletions cardano_node_tests/cluster_scripts/mainnet_fast/release_8_9-genesis.conway.spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"poolVotingThresholds": {
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"hardForkInitiation": 0.51,
"ppSecurityGroup": 0.51
},
"dRepVotingThresholds": {
"motionNoConfidence": 0.51,
"committeeNormal": 0.51,
"committeeNoConfidence": 0.51,
"updateToConstitution": 0.51,
"hardForkInitiation": 0.0,
"ppNetworkGroup": 0.51,
"ppEconomicGroup": 0.51,
"ppTechnicalGroup": 0.51,
"ppGovGroup": 0.51,
"treasuryWithdrawal": 0.51
},
"committeeMinSize": 0,
"committeeMaxTermLength": 11000,
"govActionLifetime": 2,
"govActionDeposit": 100000000,
"dRepDeposit": 2000000,
"dRepActivity": 100,
"minFeeRefScriptCostPerByte": 0,
"plutusV3CostModel": [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"constitution": {
"anchor": {
"url": "",
"dataHash": "0000000000000000000000000000000000000000000000000000000000000000"
}
},
"committee": {
"members": {
},
"threshold": 0.0
}
}
9 changes: 9 additions & 0 deletions cardano_node_tests/cluster_scripts/mainnet_fast/start-cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,15 @@ if [ "$genesis_created" -eq 0 ] ; then
echo "Failed to generate genesis files, retrying with a different genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/master-genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/release_8_9-genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/genesis.conway.spec.json"
gen_genesis && genesis_created=1 || genesis_created=0
fi

if [ "$genesis_created" -eq 0 ] ; then
echo "Failed to generate genesis files, retrying with a different genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/release_8_9-genesis.conway.spec.json"
mv "$STATE_CLUSTER/create_staked/release-genesis.conway.spec.json" \
"$STATE_CLUSTER/create_staked/genesis.conway.spec.json"
gen_genesis && genesis_created=1 || genesis_created=0
Expand Down
7 changes: 5 additions & 2 deletions cardano_node_tests/tests/tests_conway/test_hardfork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ class TestHardfork:

@pytest.fixture(scope="class")
def skip_hf_command(self):
if not clusterlib_utils.cli_has("action create-hardfork"):
pytest.skip("The `cardano-cli action create-hardfork` command is not available.")
if not clusterlib_utils.cli_has("conway governance action create-hardfork"):
pytest.skip(
"The `cardano-cli conway governance action create-hardfork` command "
"is not available."
)

@pytest.fixture
def skip_hf_version(
Expand Down
3 changes: 3 additions & 0 deletions cardano_node_tests/utils/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ def _check_cardano_node_socket_path() -> None:
# used also in startup scripts as `if [ -n "$VAR" ]...`
HAS_CC = (os.environ.get("NO_CC") or "") == ""

# used also in startup scripts as `if [ -n "$VAR" ]...`
PV10 = (os.environ.get("PV10") or "") == ""

# used also in startup scripts
DB_BACKEND = os.environ.get("DB_BACKEND") or ""
if DB_BACKEND not in ("", "mem", "lmdb"):
Expand Down
Loading