Merge pull request #2417 from IntersectMBO/node_8_11_0_testing

Changes needed for testing node 8.11.0
IntersectMBO · May 16, 2024 · ed67b33 · ed67b33
2 parents bcbe195 + b9354fd
commit ed67b33
Show file tree

Hide file tree

Showing 17 changed files with 184 additions and 11 deletions.
diff --git a/.github/regression.sh b/.github/regression.sh
@@ -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
@@ -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

diff --git a/.github/workflows/regression.yaml b/.github/workflows/regression.yaml
@@ -11,7 +11,8 @@ on:
         description: "Cluster era"
         options:
         - babbage
-        - conway
+        - conway 9
+        - conway 10
         default: babbage
       tx_era:
         type: choice

diff --git a/cardano_node_tests/cluster_scripts/babbage/genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/babbage/genesis.conway.spec.json
@@ -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": "",
@@ -34,7 +35,6 @@
   "committee": {
     "members": {
     },
-    "quorum": 0.0,
     "threshold": 0.0
   }
 }
diff --git a/cardano_node_tests/cluster_scripts/babbage/release_8_9-genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/babbage/release_8_9-genesis.conway.spec.json
@@ -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
+  }
+}
diff --git a/cardano_node_tests/cluster_scripts/babbage/start-cluster b/cardano_node_tests/cluster_scripts/babbage/start-cluster
@@ -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

diff --git a/cardano_node_tests/cluster_scripts/babbage_fast/genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/babbage_fast/genesis.conway.spec.json
@@ -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": "",
@@ -34,7 +35,6 @@
   "committee": {
     "members": {
     },
-    "quorum": 0.0,
     "threshold": 0.0
   }
 }
diff --git a/cardano_node_tests/cluster_scripts/babbage_fast/release_8_9-genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/babbage_fast/release_8_9-genesis.conway.spec.json
@@ -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
+  }
+}
diff --git a/cardano_node_tests/cluster_scripts/babbage_fast/start-cluster b/cardano_node_tests/cluster_scripts/babbage_fast/start-cluster
@@ -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

diff --git a/cardano_node_tests/cluster_scripts/conway/genesis.alonzo.spec.json b/cardano_node_tests/cluster_scripts/conway/genesis.alonzo.spec.json
@@ -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,
@@ -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,

diff --git a/cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/conway/genesis.conway.spec.json
@@ -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": "",

diff --git a/cardano_node_tests/cluster_scripts/conway_fast/genesis.alonzo.spec.json b/cardano_node_tests/cluster_scripts/conway_fast/genesis.alonzo.spec.json
@@ -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,
@@ -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,

diff --git a/cardano_node_tests/cluster_scripts/conway_fast/genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/conway_fast/genesis.conway.spec.json
@@ -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": "",

diff --git a/cardano_node_tests/cluster_scripts/mainnet_fast/genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/mainnet_fast/genesis.conway.spec.json
@@ -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": "",
@@ -34,7 +35,6 @@
   "committee": {
     "members": {
     },
-    "quorum": 0.0,
     "threshold": 0.0
   }
 }
diff --git a/cardano_node_tests/cluster_scripts/mainnet_fast/release_8_9-genesis.conway.spec.json b/cardano_node_tests/cluster_scripts/mainnet_fast/release_8_9-genesis.conway.spec.json
@@ -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
+  }
+}
diff --git a/cardano_node_tests/cluster_scripts/mainnet_fast/start-cluster b/cardano_node_tests/cluster_scripts/mainnet_fast/start-cluster
@@ -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

diff --git a/cardano_node_tests/tests/tests_conway/test_hardfork.py b/cardano_node_tests/tests/tests_conway/test_hardfork.py
@@ -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(

diff --git a/cardano_node_tests/utils/configuration.py b/cardano_node_tests/utils/configuration.py
@@ -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"):