Merge pull request #87 from guydavis/integration

v0.3.2 - update to include Chia v1.1.7

Author: guydavis

.github/workflows/develop.yaml

@@ -39,7 +39,7 @@ jobs:
           platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6
           push: true
           build-args: |
-            "CHIA_BRANCH=1.1.6"
+            "CHIA_BRANCH=1.1.7"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

.github/workflows/main.yaml

@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.1.6"
+            "CHIA_BRANCH=1.1.7"
             "PATCH_CHIAPOS=true"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest

.github/workflows/test.yaml

@@ -40,7 +40,7 @@ jobs:
           platforms: linux/amd64
           push: true
           build-args: |
-            "CHIA_BRANCH=1.1.6"
+            "CHIA_BRANCH=1.1.7"
             "PATCH_CHIAPOS=true"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.2] - 2021-06-06
+
+- Include the just released Chia 1.1.7. For details, see their [changelog](https://github.com/Chia-Network/chia-blockchain/blob/1.1.7/CHANGELOG.md#117-chia-blockchain-2021-06-05).
+
 ## [0.3.1] - 2021-06-04
 
 - After testing showed between 15% to 30% speedup on plotting, adopting [Chiapos multithreaded library](https://github.com/guydavis/machinaris/wiki/Releases#chiapos).

app/commands/global_config.py

@@ -20,7 +20,7 @@
 from app.commands import global_config
 
 # Hard-coded verson numbers for now
-MACHINARIS_VERSION = "0.3.1"
+MACHINARIS_VERSION = "0.3.2"
 
 CHIA_BINARY = '/chia-blockchain/venv/bin/chia'
 PLOTMAN_SCRIPT = '/chia-blockchain/venv/bin/plotman'
@@ -118,10 +118,13 @@ def load_chia_version():
     last_chia_version = outs.decode('utf-8').strip()
     # Chia version with .dev is actually one # to high
     # See: https://github.com/Chia-Network/chia-blockchain/issues/5655
-    if '.dev' in last_chia_version:
+    if last_chia_version.endswith('dev0'):
         sem_ver = last_chia_version.split('.')
         last_chia_version = sem_ver[0] + '.' + \
             sem_ver[1] + '.' + str(int(sem_ver[2])-1)
+    elif '.dev' in last_chia_version:
+        sem_ver = last_chia_version.split('.')
+        last_chia_version = sem_ver[0] + '.' + sem_ver[1] + '.' + sem_ver[2]
     last_chia_version_load_time = datetime.datetime.now()
     return last_chia_version
 

dockerfile

@@ -97,7 +97,7 @@ ENV farmer_pk="null"
 ENV pool_pk="null"
 # If mode=harvester, required for host and port the harvester will your farmer
 ENV farmer_address="null"
-ENV farmer_port="null"
+ENV farmer_port="8447"
 # Only set true if using Chia's old test for testing only, default uses mainnet
 ENV testnet="false"