Merge branch 'main' into fine_william___fine

Author: altendky

.github/workflows/build-macos-installers.yml

@@ -53,7 +53,7 @@ jobs:
       matrix:
         python-version: ["3.10"]
         os:
-          - runs-on: macos-13
+          - runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
             name: intel
             bladebit-suffix: macos-x86-64.tar.gz
             arch-artifact-name: intel
@@ -296,7 +296,7 @@ jobs:
           - name: 13
             matrix: 13
             runs-on:
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
           - name: 14
             matrix: 14
             runs-on:

.github/workflows/check_wheel_availability.yaml

@@ -32,7 +32,7 @@ jobs:
           - name: macOS
             matrix: macos
             runs-on:
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
               arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
           - name: Windows
             matrix: windows

.github/workflows/pre-commit.yml

@@ -29,7 +29,7 @@ jobs:
           - name: macOS
             matrix: macos
             runs-on:
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
               arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
           - name: Windows
             matrix: windows
@@ -51,6 +51,11 @@ jobs:
               matrix: windows
             arch:
               matrix: arm
+          # Back to self hosted mac intel runners, which we have very few of
+          - os:
+              matrix: macos
+            arch:
+              matrix: intel
 
     steps:
       - name: Clean workspace

.github/workflows/test-install-scripts.yml

@@ -40,7 +40,7 @@ jobs:
             emoji: 🍎
             runs-on:
               arm: macos-15
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
             matrix: macos
           - name: Windows
             emoji: 🪟

.github/workflows/test.yml

@@ -40,14 +40,19 @@ on:
         default: 1
         required: false
         type: number
-      run-linux:
-        description: "run Linux tests"
+      run-linux-intel:
+        description: "run Linux-intel tests"
+        default: true
+        required: false
+        type: boolean
+      run-linux-arm:
+        description: "run Linux-arm tests"
         default: true
         required: false
         type: boolean
       run-macos-intel:
         description: "run macOS-intel tests"
-        default: true
+        default: false
         required: false
         type: boolean
       run-macos-arm:
@@ -104,12 +109,24 @@ jobs:
             || 'main'
           }} >> "$GITHUB_OUTPUT"
 
+      - name: Generate mac intel configuration
+        id: macintel
+        run: |
+          echo mac_intel=${{
+            ( github.event_name == 'schedule' || inputs.run-macos-intel )
+            || ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.ref, 'refs/heads/release/') )
+            || ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.base_ref, 'release/') )
+            && 'true'
+            || 'false'
+          }} >> "$GITHUB_OUTPUT"
+
     outputs:
       configuration: ${{ steps.configure.outputs.configuration }}
       matrix_mode: ${{ steps.configure.outputs.matrix_mode }}
+      mac_intel: ${{ steps.macintel.outputs.mac_intel }}
 
   macos-intel:
-    if: github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
+    if: needs.configure.outputs.mac_intel == 'true'
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
@@ -120,7 +137,7 @@ jobs:
       concurrency-name: macos-intel
       configuration: ${{ needs.configure.outputs.configuration }}
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
-      runs-on: macos-13
+      runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
       arch: intel
       arch-emoji: 🌀
   macos-arm:
@@ -139,22 +156,38 @@ jobs:
       arch: arm
       arch-emoji: 💪
       collect-junit: false
-  ubuntu:
-    if: github.event_name != 'workflow_dispatch' || inputs.run-linux
+  ubuntu-intel:
+    if: github.event_name != 'workflow_dispatch' || inputs.run-linux-intel
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
       os-emoji: 🐧
       matrix: ubuntu
       name: Ubuntu
-      file_name: ubuntu
-      concurrency-name: ubuntu
+      file_name: ubuntu-intel
+      concurrency-name: ubuntu-intel
       configuration: ${{ needs.configure.outputs.configuration }}
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
       runs-on: ubuntu-latest
       arch: intel
       arch-emoji: 🌀
       collect-junit: false
+  ubuntu-arm:
+    if: github.event_name != 'workflow_dispatch' || inputs.run-linux-arm
+    uses: ./.github/workflows/test-single.yml
+    needs: configure
+    with:
+      os-emoji: 🐧
+      matrix: ubuntu
+      name: Ubuntu
+      file_name: ubuntu-arm
+      concurrency-name: ubuntu-arm
+      configuration: ${{ needs.configure.outputs.configuration }}
+      matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
+      runs-on: ubuntu-24.04-arm
+      arch: arm
+      arch-emoji: 💪
+      collect-junit: false
   windows:
     if: github.event_name != 'workflow_dispatch' || inputs.run-windows
     uses: ./.github/workflows/test-single.yml
@@ -173,13 +206,15 @@ jobs:
       collect-junit: false
 
   coverage:
-    if: github.repository_owner == 'Chia-Network'
+    if: always() && github.repository_owner == 'Chia-Network'
     name: ${{ matrix.os.emoji }} Coverage - ${{ matrix.python.name }}
     runs-on: ${{ matrix.os.runs-on }}
     needs:
+      - configure
       - macos-intel
       - macos-arm
-      - ubuntu
+      - ubuntu-intel
+      - ubuntu-arm
       - windows
     strategy:
       fail-fast: false
@@ -197,6 +232,12 @@ jobs:
             matrix: "3.10"
 
     steps:
+      - uses: re-actors/alls-green@release/v1.2
+        id: alls-green
+        with:
+          allowed-skips: ${{ needs.configure.outputs.mac_intel != 'true' && 'macos-intel' || '' }}
+          jobs: ${{ toJSON(needs) }}
+
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
@@ -253,13 +294,13 @@ jobs:
       - uses: chia-network/actions/activate-venv@main
 
       - name: Add time out assert results to workflow summary
-        if: always() && false
+        if: always() && steps.alls-green.outputs.success == 'true' && false
         run: |
           python -m chia._tests.process_junit --limit 50 --type time_out_assert --xml junit-results/junit.xml --markdown --link-prefix ${{ github.event.repository.html_url }}/blob/${{ github.sha }}/ --link-line-separator \#L >> "$GITHUB_STEP_SUMMARY"
           python -m chia._tests.process_junit            --type time_out_assert --xml junit-results/junit.xml --markdown --link-prefix ${{ github.event.repository.html_url }}/blob/${{ github.sha }}/ --link-line-separator \#L >> junit-results/time_out_assert.md
 
       - name: Publish JUnit results
-        if: always() && false
+        if: always() && steps.alls-green.outputs.success == 'true' && false
         uses: actions/upload-artifact@v4
         with:
           name: junit-results
@@ -273,18 +314,18 @@ jobs:
           coverage html --rcfile=.coveragerc --data-file=coverage-reports/.coverage --directory coverage-reports/html/
 
       - uses: coverallsapp/github-action@v2
-        if: always()
+        if: always() && steps.alls-green.outputs.success == 'true'
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
       - name: Coverage report (chia/)
-        if: always()
+        if: always() && steps.alls-green.outputs.success == 'true'
         run: |
           set -o pipefail
           coverage report --rcfile=.coveragerc --data-file=coverage-reports/.coverage --include='chia/**/*' --omit='chia/_tests/**/*' --show-missing | tee coverage-reports/coverage-chia-stdout
 
       - name: Coverage report (chia/_tests/)
-        if: always()
+        if: always() && steps.alls-green.outputs.success == 'true'
         run: |
           set -o pipefail
           coverage report --rcfile=.coveragerc --data-file=coverage-reports/.coverage --include='chia/_tests/**/*' --show-missing | tee coverage-reports/coverage-tests-stdout
@@ -295,7 +336,7 @@ jobs:
           echo "hash=$(git rev-parse HEAD~1)" >> "$GITHUB_OUTPUT"
 
       - name: Coverage report (diff)
-        if: (github.base_ref != '' || github.event.before != '') && always()
+        if: (github.base_ref != '' || github.event.before != '') && always() && steps.alls-green.outputs.success == 'true'
         env:
           compare-branch: ${{ github.base_ref == '' && steps.parent-commit.outputs.hash || format('origin/{0}', github.base_ref) }}
         run: |
@@ -308,7 +349,7 @@ jobs:
           fi
 
       - name: Remove previous coverage report comment and label from PR
-        if: github.base_ref != '' && always()
+        if: github.base_ref != '' && always() && steps.alls-green.outputs.success == 'true'
         shell: bash
         env:
           COV_STATUS: ${{ env.COV_STATUS }}
@@ -329,7 +370,7 @@ jobs:
           fi
 
       - name: Add diff coverage report comment to PR
-        if: github.base_ref != '' && always()
+        if: github.base_ref != '' && always() && steps.alls-green.outputs.success == 'true'
         env:
           BRANCH_NAME: ${{ github.sha }}
           COV_STATUS: ${{ env.COV_STATUS }}
@@ -379,12 +420,12 @@ jobs:
           fi
 
       - name: Add diff coverage report to workflow summary
-        if: (github.base_ref != '' || github.event.before != '') && always()
+        if: (github.base_ref != '' || github.event.before != '') && always() && steps.alls-green.outputs.success == 'true'
         run: |
           cat coverage-reports/diff-cover.md >> "$GITHUB_STEP_SUMMARY"
 
       - name: Publish coverage reports
-        if: always()
+        if: always() && steps.alls-green.outputs.success == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: coverage-reports

.github/workflows/upload-pypi-source.yml

@@ -44,7 +44,7 @@ jobs:
             matrix: macos
             emoji: 🍎
             runs-on:
-              intel: macos-13
+              intel: macos-13-intel
               arm: macos-13-arm64
           - name: Windows
             matrix: windows
@@ -75,6 +75,11 @@ jobs:
               matrix: windows
             arch:
               matrix: arm
+          # Back to self hosted mac intel runners, which we have very few of
+          - os:
+              matrix: macos
+            arch:
+              matrix: intel
 
     steps:
       - uses: chia-network/actions/clean-workspace@main

build_scripts/build_linux_deb-2-installer.sh

@@ -86,17 +86,9 @@ jq --arg VER "$CHIA_INSTALLER_VERSION" '.version=$VER' package.json >temp.json &
 echo "Building Linux(deb) Electron app"
 PRODUCT_NAME="chia"
 if [ "$PLATFORM" = "arm64" ]; then
-  # electron-builder does not work for arm64 as of Aug 16, 2022.
-  # This is a temporary fix.
   # https://github.com/jordansissel/fpm/issues/1801#issuecomment-919877499
-  # @TODO Consolidates the process to amd64 if the issue of electron-builder is resolved
-  sudo apt-get -y install ruby ruby-dev
-  # ERROR:  Error installing fpm:
-  #     The last version of dotenv (>= 0) to support your Ruby & RubyGems was 2.8.1. Try installing it with `gem install dotenv -v 2.8.1` and then running the current command again
-  #     dotenv requires Ruby version >= 3.0. The current ruby version is 2.7.0.0.
-  # @TODO Once ruby 3.0 can be installed on `apt install ruby`, installing dotenv below should be removed.
-  sudo gem install dotenv -v 2.8.1
-  sudo gem install fpm
+  # workaround for above now implemented in the image build at
+  # https://github.com/Chia-Network/build-images/blob/7c74d2f20739543c486c2522032cf09d96396d24/ubuntu-22.04/Dockerfile#L48-L61
   echo USE_SYSTEM_FPM=true "${NPM_PATH}/electron-builder" build --linux deb --arm64 \
     --config.extraMetadata.name=chia-blockchain \
     --config.productName="$PRODUCT_NAME" --config.linux.desktop.Name="Chia Blockchain" \

chia/_tests/blockchain/blockchain_test_utils.py

@@ -76,7 +76,7 @@ async def _validate_and_add_block(
             conds = None
         else:
             # fake the signature validation. Just say True here.
-            conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0)
+            conds = SpendBundleConditions([], 0, 0, 0, None, None, [], 0, 0, 0, True, 0, 0, 0, 0, 0)
         results = PreValidationResult(None, uint64(1), conds, uint32(0))
     else:
         future = await pre_validate_block(

chia/_tests/blockchain/test_blockchain.py

@@ -4352,6 +4352,9 @@ async def test_include_spends_same_as_parent(
         True,
         0,
         0,
+        0,
+        0,
+        0,
     )
     # Now let's run the test
     test_setup.fork_info.include_spends(conds, test_setup.test_block, test_setup.test_block.header_hash)

chia/_tests/core/custom_types/test_proof_of_space.py

@@ -12,8 +12,8 @@
 from chia._tests.util.misc import Marks, datacases
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.types.blockchain_format.proof_of_space import (
-    calculate_plot_difficulty,
     calculate_prefix_bits,
+    calculate_required_plot_strength,
     check_plot_size,
     make_pos,
     passes_plot_filter,
@@ -201,26 +201,26 @@ def test_verify_and_get_quality_string_v2(caplog: pytest.LogCaptureFixture, case
 
 
 @pytest.mark.parametrize(
-    "height, difficulty",
+    "height, strength",
     [
         (0, 2),
         (DEFAULT_CONSTANTS.HARD_FORK_HEIGHT, 2),
         (DEFAULT_CONSTANTS.HARD_FORK2_HEIGHT, 2),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_4_HEIGHT - 1, 2),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_4_HEIGHT, 4),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_5_HEIGHT - 1, 4),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_5_HEIGHT, 5),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_6_HEIGHT - 1, 5),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_6_HEIGHT, 6),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_7_HEIGHT - 1, 6),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_7_HEIGHT, 7),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT - 1, 7),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT, 8),
-        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT + 1000000, 8),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_4_HEIGHT - 1, 2),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_4_HEIGHT, 4),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_5_HEIGHT - 1, 4),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_5_HEIGHT, 5),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_6_HEIGHT - 1, 5),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_6_HEIGHT, 6),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_7_HEIGHT - 1, 6),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_7_HEIGHT, 7),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_8_HEIGHT - 1, 7),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_8_HEIGHT, 8),
+        (DEFAULT_CONSTANTS.PLOT_STRENGTH_8_HEIGHT + 1000000, 8),
     ],
 )
-def test_calculate_plot_difficulty(height: uint32, difficulty: uint8) -> None:
-    assert calculate_plot_difficulty(DEFAULT_CONSTANTS, height) == difficulty
+def test_calculate_plot_strength(height: uint32, strength: uint8) -> None:
+    assert calculate_required_plot_strength(DEFAULT_CONSTANTS, height) == strength
 
 
 @pytest.mark.parametrize(