Skip to content

Commit

Permalink
Merge pull request #902 from guydavis/integration
Browse files Browse the repository at this point in the history
Version 1.8.0
  • Loading branch information
guydavis authored May 4, 2023
2 parents 4674569 + b4a2e4e commit 18e3b57
Show file tree
Hide file tree
Showing 54 changed files with 466 additions and 367 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/develop-chia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=develop"
"CHIADOG_BRANCH=dev"
"CHIA_BRANCH=release/1.7.1"
"CHIA_BRANCH=release/1.8.0"
"BLADEBIT_BRANCH=cuda-compression"
"MADMAX_BRANCH=master"
"PLOTMAN_BRANCH=compress"
Expand Down Expand Up @@ -90,8 +90,9 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=develop"
"CHIADOG_BRANCH=dev"
"GIGAHORSE_BRANCH=v1.6.2.giga7"
"CHIA_BRANCH=release/1.6.2"
"GIGAHORSE_BRANCH=v1.8.0.giga10"
"CHIA_BRANCH=release/1.8.0"
"MADMAX_BRANCH=v1.8.0.giga10"
"PLOTMAN_BRANCH=compress"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:develop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/develop-hddcoin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
"MACHINARIS_STREAM=develop"
"CHIADOG_BRANCH=dev"
"FDCLI_BRANCH=dev"
"HDDCOIN_BRANCH=main"
"HDDCOIN_BRANCH=beta"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:develop
10 changes: 5 additions & 5 deletions .github/workflows/main-chia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
build-args: |
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=latest"
"CHIA_BRANCH=release/1.7.1"
"MADMAX_BRANCH=v1.6.2-1"
"CHIA_BRANCH=release/1.8.0"
"MADMAX_BRANCH=v1.8.0.giga10"
"BLADEBIT_BRANCH=cuda-compression"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
Expand Down Expand Up @@ -90,9 +90,9 @@ jobs:
build-args: |
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=latest"
"GIGAHORSE_BRANCH=v1.6.2.giga7"
"CHIA_BRANCH=release/1.6.2"
"MADMAX_BRANCH=v1.6.2-1"
"GIGAHORSE_BRANCH=v1.8.0.giga10"
"CHIA_BRANCH=release/1.8.0"
"MADMAX_BRANCH=v1.8.0.giga10"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:v${{ github.event.inputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-chives.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
"MACHINARIS_STREAM=latest"
"CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
"CHIVES_BRANCH=1.5.4"
"MADMAX_BRANCH=v1.6.2-1"
"MADMAX_BRANCH=v1.8.0.giga10"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-hddcoin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
build-args: |
"UBUNTU_VER=focal"
"MACHINARIS_STREAM=latest"
"HDDCOIN_BRANCH=main"
"HDDCOIN_BRANCH=beta"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:latest
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:v${{ github.event.inputs.version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main-mmx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=latest"
"CHIA_BRANCH=latest"
"MMX_BRANCH=v0.9.14"
"MADMAX_BRANCH=v1.6.2-1"
"MMX_BRANCH=v0.10.2"
"MADMAX_BRANCH=v1.8.0.giga10"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-chia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=test"
"CHIADOG_BRANCH=dev"
"CHIA_BRANCH=release/1.7.1"
"CHIA_BRANCH=release/1.8.0"
"PLOTMAN_BRANCH=development"
"BLADEBIT_BRANCH=cuda-compression"
"MADMAX_BRANCH=v1.6.2-1"
"MADMAX_BRANCH=v1.8.0.giga10"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
Expand Down Expand Up @@ -90,8 +90,8 @@ jobs:
"UBUNTU_VER=jammy"
"MACHINARIS_STREAM=test"
"CHIADOG_BRANCH=dev"
"GIGAHORSE_BRANCH=v1.6.2.giga7"
"CHIA_BRANCH=release/1.6.2"
"GIGAHORSE_BRANCH=v1.8.0.giga10"
"CHIA_BRANCH=release/1.8.0"
"PLOTMAN_BRANCH=development"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-chives.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
"CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
"CHIVES_BRANCH=main"
"PLOTMAN_BRANCH=development"
"MADMAX_BRANCH=v1.6.2-1"
"MADMAX_BRANCH=v1.8.0.giga10"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
2 changes: 1 addition & 1 deletion .github/workflows/test-hddcoin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
"UBUNTU_VER=focal"
"MACHINARIS_STREAM=test"
"CHIADOG_BRANCH=dev"
"HDDCOIN_BRANCH=main"
"HDDCOIN_BRANCH=beta"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:test
ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-hddcoin:test
4 changes: 2 additions & 2 deletions .github/workflows/test-mmx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
"MACHINARIS_STREAM=test"
"CHIA_BRANCH=latest"
"PLOTMAN_BRANCH=development"
"MMX_BRANCH=v0.9.14"
"MADMAX_BRANCH=v1.6.2-1"
"MMX_BRANCH=v0.10.2"
"MADMAX_BRANCH=v1.8.0.giga10"
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

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).

## [1.8.0] - 2023-05-04
### Added
- Concurrent plot transfers to both remote and local archive paths. Previously was one plot transferred at a time.
- Checking for adequate free space on both tmp and dst paths before starting another plotting job.
- Replotting selection (Farming page settings) can now target uncompressed plots for deletion.
## Changed
- Fix for Download button on Settings pages that were providing the wrong config file. Thanks @TuftyBruno.
- Updated German and Portugese translations. Thanks to @slowfinger and @antcasq. All contributions are appreciated.
- Follow Chia version numbers (like 1.8.0) from now on, as Machinaris is on their release cadence.
## Updated
- [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/1.7.1) to v1.7.1
- [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/1.8.0) to v1.8.0
- [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.7.1.giga10) to v1.7.1.giga10.
- [HDDCoin](https://github.com/HDDcoin-Network/hddcoin-blockchain/releases/tag/3.0.0-beta.1) to 3.0.0-beta1 based on Chia 1.7.0.
- [MMX](https://github.com/madMAx43v3r/mmx-node/releases/tag/v0.10.2) to (v0.10.2) on `testnet10`.

## [0.8.8] - 2023-03-23
### Added
- Support for running a blockchain timelord with environment variable `mode` set to `fullnode,timelord`.
Expand Down
1 change: 1 addition & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ A big thanks to all that contributed with dev and test including:
* Joe Zotac Experience
* @qoole
* @miguell
* @slowfinger

## 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.*
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.8
1.8.0
2 changes: 1 addition & 1 deletion api/commands/chia_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
WALLET_SETTINGS_FILE = '/root/.chia/machinaris/config/wallet_settings.json'

# Blockchains which dropped compatibility with `show -c` commands around v1.6
BLOCKCHAINS_USING_PEER_CMD = ['btcgreen', 'cactus', 'chia', 'chinilla', 'flax', 'gigahorse', 'littlelambocoin', 'maize', 'one', 'pipscoin', 'shibgreen', 'tad']
BLOCKCHAINS_USING_PEER_CMD = ['btcgreen', 'cactus', 'chia', 'chinilla', 'flax', 'gigahorse', 'hddcoin', 'littlelambocoin', 'maize', 'one', 'pipscoin', 'shibgreen', 'tad']

def load_farm_summary(blockchain):
chia_binary = globals.get_blockchain_binary(blockchain)
Expand Down
2 changes: 1 addition & 1 deletion api/commands/plotman_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def find_plotting_job_log(plot_id):
return None

def analyze(plot_file):
groups = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot_file)
groups = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d+)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot_file)
if not groups:
return "Invalid plot file name provided: {0}".format(plot_file)
plot_log_file = find_plotting_job_log(groups[7])
Expand Down
2 changes: 1 addition & 1 deletion api/models/plotman.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def parse_transfer_log(self, log_file, running_transfers):
elif line.startswith("Completed"):
self.end_date = line[line.index(' at ')+4:].strip()
elif line.startswith("+ rsync"):
m = re.search("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", line)
m = re.search("plot(?:-mmx)?-k(\d+)(?:-c\d+)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", line)
if m:
self.plot_id = m.group(7)[:16].strip()
self.k = int(m.group(1).strip())
Expand Down
19 changes: 14 additions & 5 deletions api/schedules/plots_replot.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@
import traceback

from flask import g
from sqlalchemy import or_
from sqlalchemy import and_, or_

from common.models import plots as p, plottings as pl
from common.models import workers as w
from common.config import globals
from api import app, utils

REPLOTTING_CONFIG = '/root/.chia/machinaris/config/replotting.json'
GIGAHORSE_COMPRESSION_LEVELS = range(1, 10) # Compression levels are 1 thru 9 for Gigahorse (see https://xch.farm/compressed-plots/)
BLADEBIT_COMPRESSION_LEVELS = range(1, 12) # Compression levels are 01 thru 11 for Bladebit (see https://xch.farm/compressed-plots/)

def load_replotting_settings():
settings = {}
Expand All @@ -46,6 +48,11 @@ def gather_oldest_solo_plots(db, harvester):
return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
p.Plot.type == 'solo').order_by(p.Plot.created_at.asc()).limit(20).all()

def gather_uncompressed_plots(db, harvester):
return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
and_(*[p.Plot.file.notlike("%-c{0}-%".format(level)) for level in GIGAHORSE_COMPRESSION_LEVELS]),
and_(*[p.Plot.file.notlike("%-c0{0}-%".format(level)) for level in BLADEBIT_COMPRESSION_LEVELS])).order_by(p.Plot.created_at.asc()).limit(20).all()

def gather_plots_before(db, harvester, delete_before_date):
return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
p.Plot.created_at < "{0} 00:00".format(delete_before_date)).order_by(p.Plot.created_at.asc()).limit(20).all()
Expand All @@ -59,7 +66,7 @@ def gather_plots_by_ksize(db, harvester, delete_by_ksizes):
app.logger.error("Invalid target ksize for deletion provided: {0}".format(ksize))
return []
return db.session.query(p.Plot).filter(p.Plot.blockchain == harvester.blockchain, p.Plot.hostname == harvester.hostname,
or_(*[p.Plot.file.like("-k{0}-".format(ksize)) for ksize in delete_by_ksizes])).order_by(p.Plot.created_at.asc()).limit(20).all()
or_(*[p.Plot.file.like("%-k{0}-%".format(ksize)) for ksize in delete_by_ksizes])).order_by(p.Plot.created_at.asc()).limit(20).all()

def limit_deletes_to_accomodate_ksize(db, candidate_plots, free_ksize):
size_bytes_to_delete = 0
Expand Down Expand Up @@ -99,11 +106,13 @@ def execute():
for harvester in gather_harvesters(db, blockchain):
app.logger.debug("Checking {0} harvester {1} for candidate plot deletions. ({2})".format(blockchain, harvester.displayname, harvester.hostname))
candidate_plots = []
if settings['delete_solo']:
if 'delete_solo' in settings and settings['delete_solo']:
candidate_plots.extend(gather_oldest_solo_plots(db, harvester))
if settings['delete_before']:
if 'delete_uncompressed' in settings and settings['delete_uncompressed']:
candidate_plots.extend(gather_uncompressed_plots(db, harvester))
if 'delete_before' in settings and settings['delete_before']:
candidate_plots.extend(gather_plots_before(db, harvester, settings['delete_before_date']))
if settings['delete_by_ksize']:
if 'delete_by_ksize' in settings and settings['delete_by_ksize']:
candidate_plots.extend(gather_plots_by_ksize(db, harvester, settings['delete_by_ksizes']))
if len(candidate_plots) > 0:
candidate_plots = limit_deletes_to_accomodate_ksize(db, candidate_plots, settings['free_ksize'])
Expand Down
2 changes: 1 addition & 1 deletion api/schedules/stats_effort.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def get_oldest_plot_file_time():
for plot_dir in globals.get_disks("plots"):
plots = [f for f in os.listdir(plot_dir) if os.path.isfile(os.path.join(plot_dir,f))]
for plot in plots:
match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot)
match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d+)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", plot)
if match:
created_at_str = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
created_at_secs = time.mktime(datetime.datetime.strptime(created_at_str, "%Y-%m-%d %H:%M").timetuple())
Expand Down
2 changes: 1 addition & 1 deletion api/schedules/status_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

def get_plot_attrs(plot_id, filename):
dir,file = os.path.split(filename)
match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
match = re.match("plot(?:-mmx)?-k(\d+)(?:-c\d+)?-(\d+)-(\d+)-(\d+)-(\d+)-(\d+)-(\w+).plot", file)
if match:
short_plot_id = match.group(7)[:16]
created_at = "{0}-{1}-{2} {3}:{4}".format( match.group(2),match.group(3),match.group(4),match.group(5),match.group(6))
Expand Down
2 changes: 1 addition & 1 deletion api/translations/de_DE/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Machinaris VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
"/issuesCreation-Date: 2022-02-16 15:00-0700\n"
"POT-Creation-Date: 2023-03-21 10:35-0600\n"
"POT-Creation-Date: 2023-04-23 17:03-0600\n"
"PO-Revision-Date: 2022-02-15 14:29-0700\n"
"Last-Translator: ApfelBirneKreis\n"
"Language: de\n"
Expand Down
2 changes: 1 addition & 1 deletion api/translations/fr_FR/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Machinaris VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
"/issuesCreation-Date: 2022-02-16 15:00-0700\n"
"POT-Creation-Date: 2023-03-21 10:35-0600\n"
"POT-Creation-Date: 2023-04-23 17:03-0600\n"
"PO-Revision-Date: 2022-02-15 14:29-0700\n"
"Last-Translator: Guy Davis\n"
"Language: fr\n"
Expand Down
2 changes: 1 addition & 1 deletion api/translations/it_IT/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Machinaris VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
"/issuesCreation-Date: 2022-02-16 15:00-0700\n"
"POT-Creation-Date: 2023-03-21 10:35-0600\n"
"POT-Creation-Date: 2023-04-23 17:03-0600\n"
"PO-Revision-Date: 2022-02-15 14:29-0700\n"
"Last-Translator: Fabrizio Cacicia\n"
"Language: it\n"
Expand Down
2 changes: 1 addition & 1 deletion api/translations/nl_NL/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Machinaris VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris/issuesPOT-"
"Creation-Date: 2022-03-13 10:30-0600\n"
"POT-Creation-Date: 2023-03-21 10:35-0600\n"
"POT-Creation-Date: 2023-04-23 17:03-0600\n"
"PO-Revision-Date: 2022-03-13 10:29-0600\n"
"Last-Translator: Bernie Deprez\n"
"Language: nl_NL\n"
Expand Down
2 changes: 1 addition & 1 deletion api/translations/pt_PT/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Machinaris VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
"/issuesCreation-Date: 2022-02-16 15:00-0700\n"
"POT-Creation-Date: 2023-03-21 10:35-0600\n"
"POT-Creation-Date: 2023-04-23 17:03-0600\n"
"PO-Revision-Date: 2022-02-13 13:45-0700\n"
"Last-Translator: Antonio Casqueiro\n"
"Language: pt\n"
Expand Down
2 changes: 1 addition & 1 deletion api/translations/zh/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Machinaris VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/guydavis/machinaris"
"/issuesCreation-Date: 2022-02-16 15:00-0700\n"
"POT-Creation-Date: 2023-03-21 10:35-0600\n"
"POT-Creation-Date: 2023-04-23 17:03-0600\n"
"PO-Revision-Date: 2022-02-15 14:29-0700\n"
"Last-Translator: Guy Davis\n"
"Language: zh\n"
Expand Down
6 changes: 3 additions & 3 deletions common/config/blockchains.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"farmer_port": 27914,
"fullnode_rpc_port": 27925,
"worker_port": 8945,
"reward": 200.0,
"reward": 20.0,
"mojos_per_coin": 1000000000000,
"blocks_per_day": 4608,
"git_url": "https://github.com/bpx-network/bpx-blockchain",
Expand Down Expand Up @@ -343,8 +343,8 @@
"name": "MMX",
"symbol": "MMX" ,
"binary": "/mmx-node/bin/mmx",
"network_path": "/root/.mmx/testnet9",
"network_name": "testnet9",
"network_path": "/root/.mmx/testnet10",
"network_name": "testnet10",
"network_port": 12339,
"farmer_port": 11330,
"worker_port": 8940,
Expand Down
1 change: 1 addition & 0 deletions docker/dockerfile-focal.base
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN apt-get update \
openssl \
p7zip-full \
p7zip-rar \
psmisc \
python3 \
python3.9-distutils \
python3.9-venv \
Expand Down
1 change: 1 addition & 0 deletions docker/dockerfile-jammy.base
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN apt-get update \
openssl \
p7zip-full \
p7zip-rar \
psmisc \
python3 \
python3.10-distutils \
python3.10-venv \
Expand Down
7 changes: 3 additions & 4 deletions scripts/forks/cactus_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#

CACTUS_BRANCH=$1
# On 2023-01-24
HASH=96dcdf36a214fea2236e88bd5fb251c81da46897
# On 2023-03-26
HASH=31d37fea4e000152962d1a13d75ee156e7779837

if [ -z ${CACTUS_BRANCH} ]; then
echo 'Skipping Cactus install as not requested.'
Expand All @@ -15,10 +15,9 @@ else
git submodule update --init mozilla-ca
git checkout $HASH
chmod +x install.sh
# 2022-07-20: Python needs 'packaging==21.3'
sed -i 's/packaging==21.0/packaging==21.3/g' setup.py
# Log "Added Coins" at info, not debug level. See: https://github.com/Chia-Network/chia-blockchain/issues/11955
sed -e 's/^ self.log.debug($/ self.log.info(/g' cactus/wallet/wallet_state_manager.py

/usr/bin/sh ./install.sh

if [ ! -d /chia-blockchain/venv ]; then
Expand Down
Loading

0 comments on commit 18e3b57

Please sign in to comment.