Merge branch 'master' into clean-up-build-cmd

Author: OlufemiAdeOlusile

.github/workflows/db_sync_docker_sync_test.yaml

@@ -117,7 +117,7 @@ jobs:
 
 
       - name: Upload Logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.env }}-db-sync-logs
           path: |

.github/workflows/node_sync_test.yaml

@@ -94,7 +94,7 @@ jobs:
           echo "current branch3: $(git branch --show-current)"
           python sync_tests/node_write_sync_values_to_db.py -e ${{ matrix.env }}
       - name: generate artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: always()
         with:
           name: node_logs_${{ matrix.env }}_${{ matrix.os }}

.github/workflows/regression_reusable.yaml

@@ -126,27 +126,27 @@ jobs:
             curl -s -X PUT --fail-with-body -u ${{ secrets.TCACHE_BASIC_AUTH }} "${{ secrets.TCACHE_URL }}/${testrun_name_strip}/${{ github.run_number }}/import" -F "junitxml=@testrun-report.xml"
           fi
       - name: ↟ Upload testing artifacts on failure
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: testing-artifacts
           path: testing_artifacts.tar.xz
       - name: ↟ Upload Allure results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         # When using `always()`, you lose ability to manually cancel the workflow.
         # Use `success() || failure()` instead.
         if: success() || failure()
         with:
           name: allure-results
           path: allure-results.tar.xz
       - name: ↟ Upload HTML report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: testrun-report
           path: testrun-report.html
       - name: ↟ Upload testrun files
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: testrun-files
@@ -157,7 +157,7 @@ jobs:
             deselected_tests.txt
             requirements_coverage.json
       - name: ↟ Upload CLI coverage
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: cli-coverage

.github/workflows/smash_tests.yaml

@@ -120,15 +120,15 @@ jobs:
 
 
       - name: Publish cardano-db-sync and SMASH logs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: always()
         with:
           name: db_sync_and smash_logs_${{ env.ENVM }}
           path: ${{ github.workspace }}/cardano-db-sync/logs/*
 
 
       - name: Publish test reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: always()
         with:
           name: pytest_results_${{ env.ENVM }}

.github/workflows/upgrade_reusable.yaml

@@ -51,33 +51,33 @@ jobs:
           ./.github/node_upgrade.sh
           echo "::endgroup::"
       - name: ↟ Upload testing artifacts on failure
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: testing-artifacts
           path: testing_artifacts.tar.xz
       - name: ↟ Upload Allure results for step1
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         # When using `always()`, you lose ability to manually cancel the workflow.
         # Use `success() || failure()` instead.
         if: success() || failure()
         with:
           name: allure-results-step1
           path: allure-results-step1.tar.xz
       - name: ↟ Upload Allure results for step2
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: allure-results-step2
           path: allure-results-step2.tar.xz
       - name: ↟ Upload Allure results for step3
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: allure-results-step3
           path: allure-results-step3.tar.xz
       - name: ↟ Upload HTML reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: testrun-reports
@@ -86,15 +86,15 @@ jobs:
             testrun-report-step2.html
             testrun-report-step3.html
       - name: ↟ Upload testrun files
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: testrun-files
           path: |
             scheduling.log.xz
             errors_all.log
       - name: ↟ Upload CLI coverage
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
           name: cli-coverage

.gitignore

@@ -26,6 +26,7 @@ __pycache__/
 
 # Env variables
 /.source*
+!/.source.dev
 
 # Distribution / packaging
 .Python

.source.dev

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# An environment setup script for cardano-node-tests local development.
+#
+# Create a `.source` script in the root of the repository.
+# Source this file from the .source script. You can also include additional environment
+# variables such as DBSYNC_SCHEMA_DIR and GITHUB_TOKEN in that file, or change INSTANCE_NUM.
+#
+# export DBSYNC_SCHEMA_DIR="$HOME/Source/repos/cardano-db-sync/schema"
+# export GITHUB_TOKEN=ghp_....
+INSTANCE_NUM="${INSTANCE_NUM:-0}"
+
+# Ensure we are in the correct directory
+if [[ "${PWD##*/}" != "cardano-node-tests"* ]]; then
+  echo "Must be in cardano-node-tests* directory" >&2
+  return 1
+fi
+
+# Activate poetry virtual environment
+if [ -z "${VIRTUAL_ENV:-}" ]; then
+  # shellcheck disable=SC2091
+  $(poetry env activate)
+  # Override PYTHONPATH to prefer virtual environment packages over nix packages
+  PYTHONPATH="$(echo "$VIRTUAL_ENV"/lib/python3*/site-packages):$PYTHONPATH"
+  export PYTHONPATH
+fi
+
+# Set Cardano Node socket path and other environment variables
+export CARDANO_NODE_SOCKET_PATH="/var/tmp/cardonnay/state-cluster${INSTANCE_NUM}/bft1.socket"
+export DEV_CLUSTER_RUNNING=1 CLUSTERS_COUNT=1 FORBID_RESTART=1 NO_ARTIFACTS=1
+unset BOOTSTRAP_DIR
+
+mkdir -p "${CARDANO_NODE_SOCKET_PATH%/*}"
+
+# Set temporary directory for this instance
+TMPDIR="$PWD/tmp"
+if [ "$INSTANCE_NUM" != 0 ]; then
+  TMPDIR="$PWD/tmp${INSTANCE_NUM}"
+fi
+mkdir -p "$TMPDIR"
+export TMPDIR
+
+# Remove ghcup from PATH to avoid conflicts with nix environment
+PATH="$(echo "$PATH" | tr ":" "\n" | grep -v "ghcup" | tr "\n" ":")"
+export PATH
+
+# Prepend instance-specific .bin directory to PATH if it exists
+if [ -e "$PWD/.bin${INSTANCE_NUM}" ]; then
+  export PATH="$PWD/.bin${INSTANCE_NUM}:$PATH"
+fi
+
+# Prepend default .bin directory to PATH for instance 0 if it exists
+if [ "$INSTANCE_NUM" = 0 ] && [ -e "$PWD/.bin" ]; then
+  export PATH="$PWD/.bin:$PATH"
+fi
+
+# Set database connection environment variables for db-sync
+export PGHOST=localhost PGUSER=postgres
+
+# Enable SMASH server if available
+if [ -n "${DBSYNC_SCHEMA_DIR:-}" ] && command -v cardano-smash-server >/dev/null 2>&1; then
+  export SMASH=true
+fi
+
+# Enable cardano-cli bash completion
+if ! command -v _cardano-cli >/dev/null 2>&1 && command -v cardano-cli >/dev/null 2>&1; then
+  # shellcheck disable=SC1090
+  . <(cardano-cli --bash-completion-script cardano-cli)
+fi
+
+unset INSTANCE_NUM

Makefile

@@ -35,6 +35,17 @@ build_doc:
 doc:
 	./scripts/deploy_doc.sh
 
+
+# reinstall cardano-clusterlib-py in editable mode from a given git repository
+.PHONY: reinstall-editable
+reinstall-editable:
+	@if [ -z "$(repo)" ]; then \
+		echo "Usage: make reinstall-editable repo=/path/to/cardano-clusterlib-py" >&2; \
+		exit 1; \
+	fi
+	@./scripts/clusterlib_reinstall_editable.sh "$(repo)"
+
+
 # run tests
 
 TESTS_DIR ?= cardano_node_tests/

README.md

@@ -174,18 +174,20 @@ NODE_REV=10.5.1 BOOTSTRAP_DIR=~/tmp/preview_config/ ./.github/regression.sh
 make install
 ```
 
-### 🧱 Start Development Cluster
+### 🔧 Activate Dev Environment
 
 ```sh
 cd ../cardano-node
 git checkout <tag>
 nix develop .#devops
 /bin/bash --login  # fresh shell needed
 cd ../cardano-node-tests
-source "$(poetry env info --path)"/bin/activate
-export PYTHONPATH="$(echo $VIRTUAL_ENV/lib/python3*/site-packages):$PYTHONPATH"
-export CARDANO_NODE_SOCKET_PATH="$PWD/dev_workdir/state-cluster0/bft1.socket" DEV_CLUSTER_RUNNING=1
-mkdir -p "${CARDANO_NODE_SOCKET_PATH%/*}"
+source .source.dev
+```
+
+### 🧱 Start Development Cluster
+
+```sh
 prepare-cluster-scripts -c -d dev_workdir/conway_fast -t conway_fast
 ./dev_workdir/conway_fast/start-cluster
 ```
@@ -198,6 +200,12 @@ prepare-cluster-scripts -c -d dev_workdir/conway_fast -t conway_fast
 make check_dev_env
 ```
 
+### 🧰 Reinstall `cardano-clusterlib` in Editable Mode
+
+```sh
+make reinstall-editable repo=../cardano-clusterlib-py
+```
+
 ### 🧪 Run Individual Tests
 
 ```sh
@@ -212,18 +220,6 @@ source "$(poetry env info --path)"/bin/activate
 make lint
 ```
 
-### 🧰 Use `cardano-clusterlib` in Dev Mode
-
-```sh
-source "$(poetry env info --path)"/bin/activate
-make install
-pip uninstall cardano-clusterlib
-cd ../cardano-clusterlib-py
-pip install -e . --config-settings editable_mode=compat
-cd -
-python -c 'from cardano_clusterlib import clusterlib_klass; print(clusterlib_klass.__file__)'
-```
-
 > ⚠️ After each dependencies update, repeat the steps above to retain dev mode.
 
 ### 📦 Update Poetry Dependencies

cardano_node_tests/tests/issues.py

@@ -191,6 +191,12 @@
     fixed_in="10.1.3.0",  # Unknown yet, will be fixed/changed sometime in the future
     message="Delegation to DRep2 removed after retirement of DRep1.",
 )
+ledger_5365 = blockers.GH(
+    issue=5365,
+    repo="IntersectMBO/cardano-ledger",
+    fixed_in="10.6.0.0",
+    message="queryPoolState returns current pool params instead of the future ones.",
+)
 
 node_3788 = blockers.GH(
     issue=3788,