Chia @ v2.5.0-rc1

guydavis · Dec 6, 2024 · ef281e0 · ef281e0
1 parent 9faf8b5
commit ef281e0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,10 @@ All notable changes to this project will be documented in this file. The format
 
 ## [2.4.5] - Unreleased
 ### Added
+ - New check to restart a farmer if pooling and no partials have been observed in the last hour.  Thanks @aweigold!
 ### Changed
 ### Updated
- - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.5) to v2.4.5 - misc improvements, see their release notes.
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.0) to v2.5.0 - misc improvements, see their release notes.
  - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.4.4.giga36) to v2.4.4.giga36.
 
 ## [2.4.4] - 2024-10-17

diff --git a/CREDITS.md b/CREDITS.md
@@ -96,6 +96,7 @@ A big thanks to all that contributed with dev and test including:
 * @Finball
 * @chris-merritt
 * @priyankub
+* @aweigold
 
 ## Trademark Notice
 CHIA NETWORK INC, CHIA™, the CHIA BLOCKCHAIN™, the CHIA PROTOCOL™, CHIALISP™ and the “leaf Logo” (including the leaf logo alone when it refers to or indicates Chia), are trademarks or registered trademarks of Chia Network, Inc., a Delaware corporation.  *There is no affliation between this Machinaris project and the main Chia Network project.*
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4.5
+2.5.0
diff --git a/api/schedules/restart_stuck_farmer.py b/api/schedules/restart_stuck_farmer.py
@@ -20,6 +20,7 @@
 from common.config import globals
 from api.commands import chia_cli, plotman_cli
 from common.models import partials as pr
+from common.models import plotnfts as pn
 
 RESTART_IF_STUCK_MINUTES = 15
 RESTART_IF_STUCK_NO_PARTIALS_MINUTES = 60
@@ -99,7 +100,14 @@ def execute():
         # If no partial proofs for pools for a while, restart farmer
         try:
             if not globals.wallet_running():  # Only if wallet is not currently being synced
-                partials = db.session.query(pr.Partial).filter(pr.Partial.created_at >= (dt.datetime.now() - dt.timedelta(minutes=RESTART_IF_STUCK_NO_PARTIALS_MINUTES))).all()
+                plotnfts = db.session.query(pn.Plotnft).filter(pn.Plotnft.blockchain == blockchain).all()
+                is_pooling = False
+                for plotnft in plotnfts:
+                    if not "SELF_POOLING" in plotnft.details:
+                        is_pooling = True
+                if not is_pooling:
+                    return # No plotnft currently pooling (not self-pooling), so don't expect any partials
+                partials = db.session.query(pr.Partial).filter(pr.Partial.blockchain == blockchain, pr.Partial.created_at >= (dt.datetime.now() - dt.timedelta(minutes=RESTART_IF_STUCK_NO_PARTIALS_MINUTES))).all()
                 if len(partials) == 0:
                     app.logger.info("***************** RESTARTING FARMER DUE TO NO PARTIALS FOR {} MINUTES!!! ******************".format(RESTART_IF_STUCK_MINUTES))
                     chia_cli.restart_farmer(blockchain)

diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
@@ -27,10 +27,10 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" == "x86_64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.4/chia-blockchain-cli_2.4.4-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.0-rc1/chia-blockchain-cli_2.5.0-rc1-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.4/chia-blockchain-cli_2.4.4-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.0-rc1/chia-blockchain-cli_2.5.0-rc1-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     fi