Merge develop to beta - 5.0

.github/copilot-instructions.md

@@ -0,0 +1,20 @@
+- always keep the changes minimal and purposeful
+- focus on fixing the exact problem or implementing the exact feature
+- keep the code simple, do not write defensive code
+- do not describe your changes in details after you made changes, focus on writing code
+- do not generate any documentation, the code should be self-explanatory
+- do not generate any in-line comments
+- for the new files, always add a license header, same format as in the existing files
+- no commented out code
+- no console logs in production code
+- no unused imports
+- no redundant code - move repeated logic into helper functions
+- use type hints to specify the expected types of function arguments and return values
+
+- check `pyproject.toml` for formatting rules
+- always lint changes using `uv run ruff check`
+- tests should be placed in `tests/` directory, follow the existing structure and code style
+- always use `uv` to run all commands in the repo (e.g., `uv run ruff`, `uv run pytest`, etc.)
+- for running tests, export environment variables in the terminal before running the tests: `. ./scripts/export_env.sh`
+
+- additional external context is located in context directory

.github/workflows/publish.yml

@@ -1,180 +1,78 @@
 name: Build and publish
+
 on:
   pull_request:
     types: [closed]
     branches:
-      - master
       - develop
       - beta
       - stable
       - 'v*.*.*'
 
 jobs:
-  create_release:
+  build_and_release:
     if: github.event.pull_request.merged
-    name: Create release
+    name: Build and create release
     runs-on: ubuntu-22.04
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-      version: ${{ steps.export_outputs.outputs.version }}
-      branch: ${{ steps.export_outputs.outputs.branch }}
+    permissions:
+      contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: Checkout submodules
-        run: git submodule update --init
-
-      - name: Install ubuntu dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install python-setuptools
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.13
 
-      - name: Set Versions
+      - name: Calculate version
+        id: versioning
         run: |
           bash ./scripts/set_versions_ga.sh
-
-      - name: Set release
+
+      - name: Determine prerelease status
+        id: release_info
         run: |
-          if [[ "$BRANCH" == "stable" ]]; then
-            export PRERELEASE=false
+          if [[ "${{ env.BRANCH }}" == "stable" ]]; then
+            echo "prerelease=false" >> $GITHUB_OUTPUT
           else
-            export PRERELEASE=true
+            echo "prerelease=true" >> $GITHUB_OUTPUT
           fi
-          echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
 
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build binaries
+        id: build
+        run: |
+          mkdir -p ${{ github.workspace }}/dist
+          docker build . -t node-cli-builder
+
+          docker run --rm -v ${{ github.workspace }}/dist:/app/dist node-cli-builder \
+            bash scripts/build.sh ${{ env.VERSION }} ${{ env.BRANCH }} skale
+
+          docker run --rm -v ${{ github.workspace }}/dist:/app/dist node-cli-builder \
+            bash scripts/build.sh ${{ env.VERSION }} ${{ env.BRANCH }} fair
+
+          echo "dist_path=${{ github.workspace }}/dist" >> $GITHUB_OUTPUT
+
+      - name: Generate checksums
+        run: |
+          cd ${{ steps.build.outputs.dist_path }}
+          for file in skale-*; do
+            sha512sum "$file" > "$file.sha512"
+          done
+          echo "Checksums generated:"
+          ls -l *.sha512
+
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.VERSION }}
-          release_name: ${{ env.VERSION }}
+          name: Release ${{ env.VERSION }}
           draft: false
-          prerelease: ${{ env.PRERELEASE }}
-      - name: Export outputs
-        id: export_outputs
-        run: |
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=branch::$BRANCH"
-
-  build_and_publish_normal:
-    if: github.event.pull_request.merged
-    needs: create_release
-    name: Build and publish for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-22.04
-            asset_name: skale-${{ needs.create_release.outputs.version }}-Linux-x86_64
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.11
-
-    - name: Install ubuntu dependencies
-      if: matrix.os == 'ubuntu-22.04'
-      run: |
-        sudo apt-get update
-
-    - name: Checkout submodules
-      run: git submodule update --init
-
-    - name: Build normal binary
-      run: |
-        mkdir -p ./dist
-        docker build . -t node-cli-builder
-        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh ${{ needs.create_release.outputs.version }} ${{ needs.create_release.outputs.branch }} normal
-        ls -altr /home/ubuntu/dist/
-        docker rm -f $(docker ps -aq)
-
-    - name: Save sha512sum
-      run: |
-        sudo sha512sum /home/ubuntu/dist/${{ matrix.asset_name }} | sudo tee > /dev/null /home/ubuntu/dist/sha512sum
-
-    - name: Upload release binary
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/${{ matrix.asset_name }}
-        asset_name: ${{ matrix.asset_name }}
-        asset_content_type: application/octet-stream
-
-    - name: Upload release checksum
-      id: upload-release-checksum
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/sha512sum
-        asset_name: ${{ matrix.asset_name }}.sha512
-        asset_content_type: text/plain
-
-  build_and_publish_sync:
-    if: github.event.pull_request.merged
-    needs: create_release
-    name: Build and publish for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-22.04
-            asset_name: skale-${{ needs.create_release.outputs.version }}-Linux-x86_64-sync
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.11
-
-    - name: Install ubuntu dependencies
-      if: matrix.os == 'ubuntu-22.04'
-      run: |
-        sudo apt-get update
-
-    - name: Checkout submodules
-      run: git submodule update --init
-
-    - name: Build sync release binary
-      run: |
-        mkdir -p ./dist
-        docker build . -t node-cli-builder
-        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh ${{ needs.create_release.outputs.version }} ${{ needs.create_release.outputs.branch }} sync
-        ls -altr /home/ubuntu/dist/
-        docker rm -f $(docker ps -aq)
-
-    - name: Save sha512sum
-      run: |
-        sudo sha512sum /home/ubuntu/dist/${{ matrix.asset_name }} | sudo tee > /dev/null /home/ubuntu/dist/sha512sum
-
-    - name: Upload release sync CLI
-      id: upload-sync-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/${{ matrix.asset_name }}
-        asset_name: ${{ matrix.asset_name }}
-        asset_content_type: application/octet-stream
-
-    - name: Upload release sync CLI checksum
-      id: upload-sync-release-checksum
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ needs.create_release.outputs.upload_url }}
-        asset_path: /home/ubuntu/dist/sha512sum
-        asset_name: ${{ matrix.asset_name }}.sha512
-        asset_content_type: text/plain
+          prerelease: ${{ steps.release_info.outputs.prerelease }}
+          generate_release_notes: true
+          files: |
+            ${{ steps.build.outputs.dist_path }}/skale-*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -1,68 +1,85 @@
 name: Test
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.11]
+        python-version: ['3.13']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Checkout submodules
       run: git submodule update --init
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
+
+    - name: Cache uv
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/uv
+        key: ${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
+
     - name: Install ubuntu dependencies
       run: |
         sudo apt-get update
         sudo apt-get install iptables nftables python3-nftables
 
     - name: Install python dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -e .[dev]
+        uv venv
+        uv pip install -e ".[dev]"
+
+    - name: Generate info
+      run: bash ./scripts/generate_info.sh 1.0.0 my-branch skale
 
-    - name: Lint with flake8
+    - name: Check with ruff
       run: |
-        flake8 .
+        uv run ruff check
 
-    - name: Build binary - normal
+    - name: Build docker image
+      run: docker build . -t node-cli-builder
+
+    - name: Build binary - skale
       run: |
         mkdir -p ./dist
-        docker build . -t node-cli-builder
-        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh test test normal
+        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder bash scripts/build.sh test test skale
         docker rm -f $(docker ps -aq)
 
-    - name: Check build - normal
+    - name: Check build - skale
       run: sudo /home/ubuntu/dist/skale-test-Linux-x86_64
 
-    - name: Build binary - sync
+    - name: Build binary - fair
       run: |
         mkdir -p ./dist
-        docker build . -t node-cli-builder
-        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder scripts/build.sh test test sync
+        docker run  -v /home/ubuntu/dist:/app/dist node-cli-builder bash scripts/build.sh test test fair
         docker rm -f $(docker ps -aq)
 
-    - name: Check build - sync
-      run: sudo /home/ubuntu/dist/skale-test-Linux-x86_64-sync
+    - name: Check build - fair
+      run: sudo /home/ubuntu/dist/skale-test-Linux-x86_64-fair
 
     - name: Run prepare test build
       run: |
-        scripts/build.sh test test normal
+        uv run bash scripts/build.sh test test skale
+
+    - name: Run redis
+      run: |
+        bash ./helper-scripts/redis/run.sh
 
     - name: Run tests
       run: |
         export PYTHONPATH=${PYTHONPATH}:/usr/lib/python3/dist-packages/
-        bash ./scripts/run_tests.sh
+        uv run bash ./scripts/run_tests.sh
 
     - name: Run nftables tests
       run: |
-        scripts/run_nftables_test.sh
+        uv run scripts/run_nftables_test.sh

.gitignore

@@ -113,10 +113,16 @@ node_cli/cli/info.py
 
 meta.json
 
-disk_mountpoint.txt
+block_device.txt
 sgx_server_url.txt
 resource_allocation.json
 conf.json
 test-env
 
-nginx.conf
+nginx.conf
+tests/.skale/node_data/docker.json
+tests/.skale/node_data/node_options.json
+tests/.skale/config/nginx.conf.j2
+
+.zed
+uv.lock