Resolve merge conflict and apply PR review suggestions

.github/env_nightly

@@ -1,2 +1,4 @@
 CLUSTER_ERA=babbage
-TX_ERA=babbage
+MIXED_P2P=true
+NUM_POOLS=4
+CI_BYRON_CLUSTER=true

.github/env_nightly_conway_bootstrap

@@ -0,0 +1,3 @@
+CLUSTER_ERA=conway
+COMMAND_ERA=conway
+ENABLE_P2P=true

.github/env_nightly_conway_cc

@@ -1,3 +1,4 @@
 CLUSTER_ERA=conway
 COMMAND_ERA=conway
+PV10=true
 ENABLE_P2P=true

.github/env_nightly_conway_nocc

@@ -1,4 +1,5 @@
 CLUSTER_ERA=conway
 COMMAND_ERA=conway
 NO_CC=true
+PV10=true
 ENABLE_P2P=true

.github/env_nightly_dbsync

@@ -2,6 +2,6 @@ CLUSTER_ERA=babbage
 TX_ERA=babbage
 MARKEXPR=dbsync
 CLUSTERS_COUNT=5
-DBSYNC_REV=sancho-4-2-1
+DBSYNC_REV=sancho-5.0.0
 DBSYNC_SKIP_INDEXES=true
 CI_BYRON_CLUSTER=true

.github/env_nightly_p2p

@@ -1,4 +1,3 @@
 CLUSTER_ERA=babbage
 TX_ERA=babbage
 ENABLE_P2P=true
-CI_BYRON_CLUSTER=true

.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

.github/workflows/nightly_alonzo_tx.yaml → .github/workflows/nightly_conway_bootstrap.yaml

@@ -1,4 +1,4 @@
-name: Nightly tests Alonzo Tx
+name: Nightly tests Conway Bootstrap
 
 on:
   schedule:
@@ -11,7 +11,7 @@ jobs:
     # reusable workflow from local repo and same branch as this config
     uses: ./.github/workflows/regression_reusable.yaml
     with:
-      env-path: .github/env_nightly_alonzo_tx
+      env-path: .github/env_nightly_conway_bootstrap
     secrets:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       CI_FAIL_MAILS: ${{ secrets.NIGHTLY_FAIL_MAILS }}

.github/workflows/nightly_conway_nocc.yaml

@@ -2,7 +2,7 @@ name: Nightly tests Conway no CC
 
 on:
   schedule:
-    - cron: '15 07 * * *'
+    - cron: '15 04 * * *'
   workflow_dispatch:
 
 jobs:

.github/workflows/nightly_upgrade.yaml

@@ -2,7 +2,7 @@ name: Nightly tests upgrade
 
 on:
   schedule:
-    - cron: '15 06 * * *'
+    - cron: '15 05 * * *'
   workflow_dispatch:
 
 jobs:

.github/workflows/nix_smoke.yaml

@@ -17,7 +17,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v26
+        uses: cachix/install-nix-action@V27
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

.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

.github/workflows/regression_reusable.yaml

@@ -71,7 +71,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v26
+        uses: cachix/install-nix-action@V27
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GH_TOKEN }}

.github/workflows/upgrade_reusable.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v26
+        uses: cachix/install-nix-action@V27
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GH_TOKEN }}

.gitignore

@@ -5,6 +5,7 @@
 
 # Workdir for running tests
 run_workdir/
+dev_workdir/
 
 # Status files of cluster instances
 /state-cluster*/

README.md

@@ -164,7 +164,7 @@ When running tests, the testing framework starts and stops cluster instances as
 1. cd back to 'cardano-node-tests' repo
 
     ```sh
-    cd ../cardano-node-test
+    cd ../cardano-node-tests
     ```
 
 1. activate virtual env
@@ -179,22 +179,24 @@ When running tests, the testing framework starts and stops cluster instances as
     export PYTHONPATH="$(echo $VIRTUAL_ENV/lib/python3*/site-packages)":$PYTHONPATH
     ```
 
-1. prepare cluster scripts for starting local cluster directly in Babbage era
+1. set env variables
 
     ```sh
-    prepare-cluster-scripts -d <destination dir>/babbage_fast -s cardano_node_tests/cluster_scripts/babbage_fast/
+    export CARDANO_NODE_SOCKET_PATH="$PWD/dev_workdir/state-cluster0/bft1.socket" DEV_CLUSTER_RUNNING=1
+    mkdir -p "${CARDANO_NODE_SOCKET_PATH%/*}"
     ```
 
-1. set env variables
+1. prepare cluster scripts for starting local cluster directly in Babbage era
 
     ```sh
-    export CARDANO_NODE_SOCKET_PATH=<your path to cardano-node repo>/state-cluster0/bft1.socket DEV_CLUSTER_RUNNING=1
+    mkdir -p dev_workdir
+    prepare-cluster-scripts -c -d dev_workdir/babbage_fast -s cardano_node_tests/cluster_scripts/babbage_fast/
     ```
 
 1. start the cluster instance in development mode
 
     ```sh
-    <destination dir>/babbage_fast/start-cluster
+    ./dev_workdir/babbage_fast/start-cluster
     ```
 
 After the cluster starts, keys and configuration files are available in the `<your path to cardano-node repo>/state-cluster0` directory. The pool-related files and keys are located in the `nodes` subdirectory, genesis keys in the `shelley` and `byron` subdirectories, and payment address with initial funds and related keys in the `byron` subdirectory. The local faucet address and related key files are stored in the `addrs_data` subdirectory.

cardano_node_tests/chang_us_coverage.py

@@ -36,11 +36,11 @@ def get_args() -> argparse.Namespace:
 
 
 def _get_color(status: str) -> str:
-    if status == requirements.Statuses.SUCCESS:
+    if status == requirements.Statuses.success.name:
         return "green"
-    if status == requirements.Statuses.FAILURE:
+    if status == requirements.Statuses.failure.name:
         return "red"
-    if status == requirements.Statuses.PARTIAL_SUCCESS:
+    if status == requirements.Statuses.partial_success.name:
         return "yellow"
     return "grey"
 
@@ -62,7 +62,7 @@ def main() -> None:
 
     for req_id, req_data in chang_group.items():
         # Partial or uncovered requirements should be ignored
-        if req_id.startswith("int") or req_data["status"] == requirements.Statuses.UNCOVERED:
+        if req_id.startswith("int") or req_data["status"] == requirements.Statuses.uncovered.name:
             continue
 
         color = _get_color(req_data["status"])

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
   }
 }

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
+  }
+}

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

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
   }
 }

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
+  }
+}

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