diff --git a/.github/workflows/develop-achi.yaml b/.github/workflows/develop-achi.yaml
new file mode 100644
index 00000000..68e33cec
--- /dev/null
+++ b/.github/workflows/develop-achi.yaml
@@ -0,0 +1,51 @@
+name: develop-achi
+
+on:
+ push:
+ branches:
+ - 'develop'
+
+jobs:
+ docker:
+ runs-on: ubuntu-20.04
+ steps:
+ -
+ name: Checkout
+ uses: actions/checkout@v3
+ -
+ name: Set up QEMU
+ uses: docker/setup-qemu-action@v2
+ -
+ name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v2
+ -
+ name: Login to DockerHub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ -
+ name: Login to GitHub Container Registry
+ uses: docker/login-action@v2
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ -
+ name: Build and push
+ uses: docker/build-push-action@v4
+ with:
+ file: docker/dockerfile
+ context: .
+ platforms: linux/amd64
+ provenance: false
+ push: true
+ build-args: |
+ "UBUNTU_VER=focal"
+ "MACHINARIS_STREAM=develop"
+ "CHIADOG_BRANCH=dev"
+ "FDCLI_BRANCH=dev"
+ "ACHI_BRANCH=master"
+ tags: |
+ ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:develop
+ ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:develop
diff --git a/.github/workflows/main-achi.yaml b/.github/workflows/main-achi.yaml
new file mode 100644
index 00000000..dde8f1af
--- /dev/null
+++ b/.github/workflows/main-achi.yaml
@@ -0,0 +1,52 @@
+name: release-achi
+
+on:
+ workflow_dispatch:
+ inputs:
+ version:
+ description: 'Release Version'
+
+jobs:
+ docker:
+ runs-on: ubuntu-20.04
+ steps:
+ -
+ name: Checkout
+ uses: actions/checkout@v3
+ -
+ name: Set up QEMU
+ uses: docker/setup-qemu-action@v2
+ -
+ name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v2
+ -
+ name: Login to DockerHub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ -
+ name: Login to GitHub Container Registry
+ uses: docker/login-action@v2
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ -
+ name: Build and push
+ uses: docker/build-push-action@v4
+ with:
+ file: docker/dockerfile
+ context: .
+ platforms: linux/amd64,linux/arm64
+ provenance: false
+ push: true
+ build-args: |
+ "UBUNTU_VER=focal"
+ "MACHINARIS_STREAM=latest"
+ "ACHI_BRANCH=master"
+ tags: |
+ ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:latest
+ ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:v${{ github.event.inputs.version }}
+ ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:latest
+ ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-achi.yaml b/.github/workflows/test-achi.yaml
new file mode 100644
index 00000000..df34bee8
--- /dev/null
+++ b/.github/workflows/test-achi.yaml
@@ -0,0 +1,50 @@
+name: test-achi
+
+on:
+ push:
+ branches:
+ - 'integration'
+
+jobs:
+ docker:
+ runs-on: ubuntu-20.04
+ steps:
+ -
+ name: Checkout
+ uses: actions/checkout@v3
+ -
+ name: Set up QEMU
+ uses: docker/setup-qemu-action@v2
+ -
+ name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v2
+ -
+ name: Login to DockerHub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ -
+ name: Login to GitHub Container Registry
+ uses: docker/login-action@v2
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ -
+ name: Build and push
+ uses: docker/build-push-action@v4
+ with:
+ file: docker/dockerfile
+ context: .
+ platforms: linux/amd64,linux/arm64
+ provenance: false
+ push: true
+ build-args: |
+ "UBUNTU_VER=focal"
+ "MACHINARIS_STREAM=test"
+ "CHIADOG_BRANCH=dev"
+ "ACHI_BRANCH=master"
+ tags: |
+ ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:test
+ ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-achi:test
diff --git a/api/commands/rpc.py b/api/commands/rpc.py
index 2c301c57..6865cd57 100644
--- a/api/commands/rpc.py
+++ b/api/commands/rpc.py
@@ -15,7 +15,14 @@
blockchain = globals.enabled_blockchains()[0]
-if blockchain == "apple":
+if blockchain == "achi":
+ from achi.rpc.full_node_rpc_client import FullNodeRpcClient
+ from achi.rpc.farmer_rpc_client import FarmerRpcClient
+ from achi.rpc.wallet_rpc_client import WalletRpcClient
+ from achi.util.default_root import DEFAULT_ROOT_PATH
+ from achi.util.ints import uint16
+ from achi.util.config import load_config as load_fork_config
+elif blockchain == "apple":
from apple.rpc.full_node_rpc_client import FullNodeRpcClient
from apple.rpc.farmer_rpc_client import FarmerRpcClient
from apple.rpc.wallet_rpc_client import WalletRpcClient
diff --git a/common/config/blockchains.json b/common/config/blockchains.json
index 7bca352f..ad05d2e5 100644
--- a/common/config/blockchains.json
+++ b/common/config/blockchains.json
@@ -1,4 +1,21 @@
{
+ "achi": {
+ "name": "Achi",
+ "symbol": "ACH" ,
+ "binary": "/achi-blockchain/venv/bin/achi",
+ "network_path": "/root/.achi/mainnet",
+ "network_name": "mainnet",
+ "network_port": 9975,
+ "farmer_port": 9977,
+ "fullnode_rpc_port": 9965,
+ "worker_port": 8960,
+ "reward": 495,
+ "mojos_per_coin": 1000000000,
+ "blocks_per_day": 4608,
+ "git_url": "https://github.com/Achi-Coin/achi-blockchain/",
+ "discord_url": "https://discord.gg/ZTtQ9922zp",
+ "website_url": "https://achicoin.org/"
+ },
"apple": {
"name": "Apple",
"symbol": "APPLE",
diff --git a/docker/dockerfile b/docker/dockerfile
index ea5ba410..962e823a 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -10,6 +10,7 @@ ARG FDCLI_BRANCH=master
ARG FORKTOOLS_BRANCH=main
ARG BLADEBIT_BRANCH=master
+ARG ACHI_BRANCH
ARG APPLE_BRANCH
ARG BALLCOIN_BRANCH
ARG BPX_BRANCH
@@ -53,7 +54,8 @@ WORKDIR /chia-blockchain
# Install specific blockchain fork (based on branch enabled) + tools that depend on the fork
RUN \
- /usr/bin/bash /machinaris/scripts/forks/apple_install.sh ${APPLE_BRANCH} \
+ /usr/bin/bash /machinaris/scripts/forks/achi_install.sh ${ACHI_BRANCH} \
+ && /usr/bin/bash /machinaris/scripts/forks/apple_install.sh ${APPLE_BRANCH} \
&& /usr/bin/bash /machinaris/scripts/forks/ballcoin_install.sh ${BALLCOIN_BRANCH} \
&& /usr/bin/bash /machinaris/scripts/forks/bpx_install.sh ${BPX_BRANCH} \
&& /usr/bin/bash /machinaris/scripts/forks/btcgreen_install.sh ${BTCGREEN_BRANCH} \
diff --git a/scripts/forks/achi_install.sh b/scripts/forks/achi_install.sh
new file mode 100644
index 00000000..fae8b3e9
--- /dev/null
+++ b/scripts/forks/achi_install.sh
@@ -0,0 +1,26 @@
+#!/bin/env bash
+#
+# Installs Achi as per https://github.com/Achi-Coin/achi-blockchain
+#
+
+ACHI_BRANCH=$1
+# On 2024-02-08
+HASH=e3ca475efb3d7267d3a2eedef8b4897d129aeb5d
+
+if [ -z ${ACHI_BRANCH} ]; then
+ echo 'Skipping Achi install as not requested.'
+else
+ git clone --branch ${ACHI_BRANCH} --recurse-submodules https://github.com/Achi-Coin/achi-blockchain.git /achi-blockchain
+ cd /achi-blockchain
+ git submodule update --init mozilla-ca
+ git checkout $HASH
+ chmod +x install.sh
+ /usr/bin/sh ./install.sh
+
+ if [ ! -d /chia-blockchain/venv ]; then
+ cd /
+ rmdir /chia-blockchain
+ ln -s /achi-blockchain /chia-blockchain
+ ln -s /achi-blockchain/venv/bin/achi /chia-blockchain/venv/bin/chia
+ fi
+fi
\ No newline at end of file
diff --git a/scripts/forks/achi_launch.sh b/scripts/forks/achi_launch.sh
new file mode 100644
index 00000000..32bcdb14
--- /dev/null
+++ b/scripts/forks/achi_launch.sh
@@ -0,0 +1,116 @@
+#!/bin/env bash
+#
+# Initialize Achi service, depending on mode of system requested
+#
+
+cd /achi-blockchain
+
+. ./activate
+
+# Only the /root/.chia folder is volume-mounted so store achi within
+mkdir -p /root/.chia/achi
+rm -f /root/.achi
+ln -s /root/.chia/achi /root/.achi
+
+if [[ "${blockchain_db_download}" == 'true' ]] \
+ && [[ "${mode}" == 'fullnode' ]] \
+ && [[ ! -f /root/.achi/mainnet/db/blockchain_v1_mainnet.sqlite ]] \
+ && [[ ! -f /root/.achi/mainnet/db/blockchain_v2_mainnet.sqlite ]]; then
+ echo "Sorry, achi does not offer a recent blockchain DB for download. Standard sync will happen over a few days."
+ echo "It is recommended to add some peer node connections on the Connections page of Machinaris."
+fi
+
+mkdir -p /root/.achi/mainnet/log
+achi init >> /root/.achi/mainnet/log/init.log 2>&1
+
+echo 'Configuring achi...'
+if [ -f /root/.achi/mainnet/config/config.yaml ]; then
+ sed -i 's/log_stdout: true/log_stdout: false/g' /root/.achi/mainnet/config/config.yaml
+ sed -i 's/log_level: WARNING/log_level: INFO/g' /root/.achi/mainnet/config/config.yaml
+ sed -i 's/localhost/127.0.0.1/g' /root/.achi/mainnet/config/config.yaml
+fi
+
+# Loop over provided list of key paths
+for k in ${keys//:/ }; do
+ if [[ "${k}" == "persistent" ]]; then
+ echo "Not touching key directories."
+ elif [ -s ${k} ]; then
+ echo "Adding key at path: ${k}"
+ achi keys add -f ${k} > /dev/null
+ fi
+done
+
+# Loop over provided list of completed plot directories
+IFS=':' read -r -a array <<< "$plots_dir"
+joined=$(printf ", %s" "${array[@]}")
+echo "Adding plot directories at: ${joined:1}"
+for p in ${plots_dir//:/ }; do
+ achi plots add -d ${p}
+done
+
+chmod 755 -R /root/.achi/mainnet/config/ssl/ &> /dev/null
+achi init --fix-ssl-permissions >/dev/null 2>&1
+
+# Start services based on mode selected. Default is 'fullnode'
+if [[ ${mode} =~ ^fullnode.* ]]; then
+ for k in ${keys//:/ }; do
+ while [[ "${k}" != "persistent" ]] && [[ ! -s ${k} ]]; do
+ echo 'Waiting for key to be created/imported into mnemonic.txt. See: http://localhost:8926'
+ sleep 10 # Wait 10 seconds before checking for mnemonic.txt presence
+ if [ -s ${k} ]; then
+ achi keys add -f ${k}
+ sleep 10
+ fi
+ done
+ done
+ if [ -f /root/.chia/machinaris/config/wallet_settings.json ]; then
+ achi start farmer-no-wallet
+ else
+ achi start farmer
+ fi
+ if [[ ${mode} =~ .*timelord$ ]]; then
+ if [ ! -f vdf_bench ]; then
+ echo "Building timelord binaries..."
+ apt-get update > /tmp/timelord_build.sh 2>&1
+ apt-get install -y libgmp-dev libboost-python-dev libboost-system-dev >> /tmp/timelord_build.sh 2>&1
+ BUILD_VDF_CLIENT=Y BUILD_VDF_BENCH=Y /usr/bin/sh ./install-timelord.sh >> /tmp/timelord_build.sh 2>&1
+ fi
+ achi start timelord-only
+ fi
+elif [[ ${mode} =~ ^farmer.* ]]; then
+ if [ ! -f ~/.achi/mainnet/config/ssl/wallet/public_wallet.key ]; then
+ echo "No wallet key found, so not starting farming services. Please add your Chia mnemonic.txt to the ~/.machinaris/ folder and restart."
+ else
+ achi start farmer-only
+ fi
+elif [[ ${mode} =~ ^harvester.* ]]; then
+ if [[ -z ${farmer_address} || -z ${farmer_port} ]]; then
+ echo "A farmer peer address and port are required."
+ exit
+ else
+ if [ ! -f /root/.achi/farmer_ca/private_ca.crt ]; then
+ mkdir -p /root/.achi/farmer_ca
+ response=$(curl --write-out '%{http_code}' --silent http://${farmer_address}:8960/certificates/?type=achi --output /tmp/certs.zip)
+ if [ $response == '200' ]; then
+ unzip /tmp/certs.zip -d /root/.achi/farmer_ca
+ else
+ echo "Certificates response of ${response} from http://${farmer_address}:8960/certificates/?type=achi. Is the fork's fullnode container running?"
+ fi
+ rm -f /tmp/certs.zip
+ fi
+ if [[ -f /root/.achi/farmer_ca/private_ca.crt ]] && [[ ! ${keys} == "persistent" ]]; then
+ achi init -c /root/.achi/farmer_ca 2>&1 > /root/.achi/mainnet/log/init.log
+ chmod 755 -R /root/.achi/mainnet/config/ssl/ &> /dev/null
+ achi init --fix-ssl-permissions >/dev/null 2>&1
+ else
+ echo "Did not find your farmer's certificates within /root/.achi/farmer_ca."
+ echo "See: https://github.com/guydavis/machinaris/wiki/Workers#harvester"
+ fi
+ echo "Configuring farmer peer at ${farmer_address}:${farmer_port}"
+ achi configure --set-farmer-peer ${farmer_address}:${farmer_port} 2>&1 >> /root/.achi/mainnet/log/init.log
+ achi configure --enable-upnp false 2>&1 >> /root/.achi/mainnet/log/init.log
+ achi start harvester -r
+ fi
+elif [[ ${mode} == 'plotter' ]]; then
+ echo "Starting in Plotter-only mode. Run Plotman from either CLI or WebUI."
+fi
diff --git a/scripts/worker_port_warning.sh b/scripts/worker_port_warning.sh
index 964f45f0..6ae02e2b 100644
--- a/scripts/worker_port_warning.sh
+++ b/scripts/worker_port_warning.sh
@@ -1,4 +1,7 @@
# Warn if non-standard worker_api_port is being used, likely default value they did not override properly
+if [[ "${blockchains}" == "achi" && "${worker_api_port}" != '8960' ]]; then
+ echo "Achi worker with non-standard worker_api_port of ${worker_api_port} found. Did you mean to use 8960?"
+fi
if [[ "${blockchains}" == "apple" && "${worker_api_port}" != '8947' ]]; then
echo "Apple worker with non-standard worker_api_port of ${worker_api_port} found. Did you mean to use 8947?"
fi
diff --git a/web/templates/worker_launch.html b/web/templates/worker_launch.html
index 1340a839..fecb62e8 100644
--- a/web/templates/worker_launch.html
+++ b/web/templates/worker_launch.html
@@ -155,6 +155,9 @@
}
function lookup_worker_port(blockchain) {
+ if (blockchain == 'achi') {
+ return 8960;
+ }
if (blockchain == 'apple') {
return 8947;
}
@@ -258,6 +261,9 @@
}
function lookup_farmer_port(blockchain) {
+ if (blockchain == 'achi') {
+ return 9977;
+ }
if (blockchain == 'apple') {
return 26667;
}
@@ -671,6 +677,13 @@ {{_('Machinaris Worker - Launch Config')}}