Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Machinaris v2.2.0 #973

Merged
merged 37 commits into from
Feb 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c960812
Gigahorse version bump to 2.1.4.giga26
guydavis Jan 12, 2024
0799fa4
Optionally start chia exporter in harvester mode as well.
guydavis Jan 12, 2024
badc2c9
Update status_plotnfts.py
chris-merritt Jan 15, 2024
4cd6f65
Merge pull request #963 from chris-merritt/integration
guydavis Jan 15, 2024
3f6976f
Merge pull request #964 from guydavis/develop
guydavis Jan 15, 2024
6a63957
Cactus to v2.1.4
guydavis Jan 24, 2024
a786159
Cactus @ v2.1.4
guydavis Jan 24, 2024
3cc7c8f
Chia 2.2.0rc1
guydavis Feb 1, 2024
0ac7b6e
Optionally start chia data layer services.
guydavis Feb 3, 2024
fc35031
Merge pull request #965 from guydavis/develop
guydavis Feb 5, 2024
d1a50e5
Merge pull request #6 from guydavis/develop
priyankub Feb 7, 2024
2b40032
Bump up GreenBTC to latest hash
priyankub Feb 8, 2024
6885ae2
Update chia_cli.py for greenbtc
priyankub Feb 8, 2024
25352ac
1. Achi check in - Develop branch
priyankub Feb 8, 2024
2c0ad12
1. Correct Achi links, and minor case corrections in comments
priyankub Feb 8, 2024
ca8e364
Merge branch 'guydavis:integration' into integration
priyankub Feb 8, 2024
0630f1d
Merge pull request #8 from priyankub/integration
priyankub Feb 8, 2024
9f9ad60
Merge pull request #7 from priyankub/develop
priyankub Feb 8, 2024
0a3213a
1. Update legacy chains - remove greenbtc, add achi
priyankub Feb 8, 2024
5ca5e93
Chia 2.2.0rc2
guydavis Feb 8, 2024
e3e56af
Chia 2.2.0rc3
guydavis Feb 16, 2024
af57d15
Merge pull request #966 from priyankub/integration
guydavis Feb 16, 2024
cee3d7d
Cleanups after merge.
guydavis Feb 16, 2024
bff7737
Formatting fix for Achi.
guydavis Feb 18, 2024
b7866fe
Wheat @ 2.1.5
guydavis Feb 19, 2024
59546f7
Latest JS libs.
guydavis Feb 20, 2024
e85d87e
Wheat @ 2.1.6
guydavis Feb 21, 2024
42e806f
Chia 2.2.0rc4
guydavis Feb 21, 2024
d7c163a
Merge pull request #968 from guydavis/develop
guydavis Feb 22, 2024
1d2696e
Fixing for Datatables.js v2.0 import issue.
guydavis Feb 22, 2024
f65f728
Merge pull request #969 from guydavis/develop
guydavis Feb 22, 2024
2735379
Fix for Chia's changes to bladebit packaging.
guydavis Feb 26, 2024
37bdebe
Merge pull request #970 from guydavis/develop
guydavis Feb 26, 2024
bf7b8d3
Chia 2.2.0
guydavis Feb 28, 2024
b8f1d8f
Merge pull request #971 from guydavis/develop
guydavis Feb 28, 2024
3be12ce
Account for another year of Chia blockchain DB bloat.
guydavis Feb 29, 2024
76b1699
Merge pull request #972 from guydavis/develop
guydavis Feb 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1. Correct Achi links, and minor case corrections in comments
priyankub committed Feb 8, 2024
commit 2c0ad124f2fc4275f74d8fc5299194cc3dd507b5
6 changes: 3 additions & 3 deletions common/config/blockchains.json
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@
"farmer_port": 9977,
"fullnode_rpc_port": 9965,
"worker_port": 8960,
"reward": 495,
"reward": 512.0,
"mojos_per_coin": 1000000000,
"blocks_per_day": 4608,
"git_url": "https://github.com/Achi-Coin/achi-blockchain/",
"discord_url": "https://discord.gg/ZTtQ9922zp",
"git_url": "https://github.com/Achi-Coin/achi-blockchain",
"discord_url": "https://discord.gg/cnS7fUfwTq",
"website_url": "https://achicoin.org/"
},
"apple": {
2 changes: 1 addition & 1 deletion scripts/forks/achi_install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/env bash
#
# Installs Achi as per https://github.com/Achi-Coin/achi-blockchain
# Installs Achi as per https://achicoin.org/achipedia/post-1/
#

ACHI_BRANCH=$1
4 changes: 2 additions & 2 deletions scripts/forks/achi_launch.sh
Original file line number Diff line number Diff line change
@@ -16,14 +16,14 @@ 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 "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...'
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