Merge branch 'main' into farmer_solver_networking

Author: almogdepaz

.github/workflows/test.yml

@@ -40,8 +40,13 @@ 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
@@ -151,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
@@ -192,7 +213,8 @@ jobs:
       - configure
       - macos-intel
       - macos-arm
-      - ubuntu
+      - ubuntu-intel
+      - ubuntu-arm
       - windows
     strategy:
       fail-fast: false

build_scripts/build_linux_deb-2-installer.sh

@@ -86,12 +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
-  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/core/server/test_rate_limits.py

@@ -42,6 +42,7 @@ def advance(self, duration: float) -> None:
 @pytest.mark.anyio
 async def test_get_rate_limits_to_use() -> None:
     assert get_rate_limits_to_use(rl_v2, rl_v2) != get_rate_limits_to_use(rl_v2, rl_v1)
+    assert get_rate_limits_to_use(rl_v2, rl_v2) != get_rate_limits_to_use(rl_v1, rl_v2)
     assert get_rate_limits_to_use(rl_v1, rl_v1) == get_rate_limits_to_use(rl_v2, rl_v1)
     assert get_rate_limits_to_use(rl_v1, rl_v1) == get_rate_limits_to_use(rl_v1, rl_v2)
 

chia/plotting/check_plots.py

@@ -3,16 +3,20 @@
 import concurrent.futures
 import logging
 from collections import Counter
+from collections.abc import Sequence
 from pathlib import Path
 from threading import Lock
 from time import monotonic, sleep
-from typing import Optional
+from typing import Optional, Union
 
 from chia_rs import G1Element
+from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint8, uint32
 from chiapos import Verifier
 
+from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.plotting.manager import PlotManager
+from chia.plotting.prover import PlotVersion
 from chia.plotting.util import (
     PlotInfo,
     PlotRefreshEvents,
@@ -22,6 +26,10 @@
     get_plot_filenames,
     parse_plot_info,
 )
+from chia.types.blockchain_format.proof_of_space import (
+    quality_for_partial_proof,
+    solve_proof,
+)
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import load_config
 from chia.util.cpu import available_logical_cores
@@ -168,12 +176,18 @@ def process_plot(plot_path: Path, plot_info: PlotInfo, num_start: int, num_end:
 
             total_proofs = 0
             caught_exception: bool = False
+            version = pr.get_version()
             for i in range(num_start, num_end):
                 challenge = std_hash(i.to_bytes(32, "big"))
+                # these are either qualities (v1) or partial proofs (v2)
+                proofs: Sequence[Union[bytes32, bytes]]
                 # Some plot errors cause get_qualities_for_challenge to throw a RuntimeError
                 try:
                     quality_start_time = round(monotonic() * 1000)
-                    qualities = pr.get_qualities_for_challenge(challenge)
+                    if version == PlotVersion.V1:
+                        proofs = pr.get_qualities_for_challenge(challenge)
+                    else:
+                        proofs = pr.get_partial_proofs_for_challenge(challenge, DEFAULT_CONSTANTS.PLOT_STRENGTH_INITIAL)
                     quality_spent_time = round(monotonic() * 1000) - quality_start_time
                     if quality_spent_time > 8000:
                         log.warning(
@@ -201,13 +215,19 @@ def process_plot(plot_path: Path, plot_info: PlotInfo, num_start: int, num_end:
                     caught_exception = True
                     break
 
-                for index, quality_str in enumerate(qualities):
+                for index, proof in enumerate(proofs):
                     # Other plot errors cause get_full_proof or validate_proof to throw an AssertionError
                     try:
                         proof_start_time = round(monotonic() * 1000)
-                        # TODO : todo_v2_plots handle v2 plots
-                        proof = pr.get_full_proof(challenge, index, parallel_read)
-                        proof_spent_time = round(monotonic() * 1000) - proof_start_time
+                        if version == PlotVersion.V1:
+                            quality_str = bytes32(proof)
+                            full_proof = pr.get_full_proof(challenge, index, parallel_read)
+                            proof_spent_time = round(monotonic() * 1000) - proof_start_time
+                        else:
+                            quality_str = quality_for_partial_proof(proof, challenge)
+                            proof_spent_time = round(monotonic() * 1000) - proof_start_time
+                            full_proof = solve_proof(proof)
+
                         if proof_spent_time > 15000:
                             log.warning(
                                 f"\tFinding proof took: {proof_spent_time} ms. This should be below 15 seconds "
@@ -216,7 +236,7 @@ def process_plot(plot_path: Path, plot_info: PlotInfo, num_start: int, num_end:
                         else:
                             log.info(f"\tFinding proof took: {proof_spent_time} ms. Filepath: {plot_path}")
 
-                        ver_quality_str = v.validate_proof(pr.get_id(), pr.get_size().size_v1, challenge, proof)
+                        ver_quality_str = v.validate_proof(pr.get_id(), pr.get_size().size_v1, challenge, full_proof)
                         if quality_str == ver_quality_str:
                             total_proofs += 1
                         else: