Skip to content

Commit

Permalink
Merge pull request #1002 from guydavis/integration
Browse files Browse the repository at this point in the history
Chia @v2.4.4
  • Loading branch information
guydavis authored Oct 18, 2024
2 parents 5b285eb + d5e15dd commit ee0204e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

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

## [2.4.4] - 2024-10-17
### Added
### Changed
### Updated
- [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.4.4) to v2.4.4 - misc improvements, see their release notes.

## [2.4.3] - 2024-08-27
### Added
### Changed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.3
2.4.4
4 changes: 2 additions & 2 deletions scripts/forks/chia_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.3/chia-blockchain-cli_2.4.3-1_amd64.deb
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.4/chia-blockchain-cli_2.4.4-1_amd64.deb
apt-get install ./chia-blockchain-cli*.deb
else
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.3/chia-blockchain-cli_2.4.3-1_arm64.deb
curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.4.4/chia-blockchain-cli_2.4.4-1_arm64.deb
apt-get install ./chia-blockchain-cli*.deb
fi

Expand Down
6 changes: 3 additions & 3 deletions scripts/pull_3rd_party_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ LEAFLET_VERSION=1.9.4

# List of other css/js links
LIST="
https://cdn.datatables.net/2.1.4/css/dataTables.bootstrap5.css
https://cdn.datatables.net/2.1.4/js/dataTables.bootstrap5.js
https://cdn.datatables.net/2.1.4/js/dataTables.min.js
https://cdn.datatables.net/2.1.8/css/dataTables.bootstrap5.css
https://cdn.datatables.net/2.1.8/js/dataTables.bootstrap5.js
https://cdn.datatables.net/2.1.8/js/dataTables.min.js
https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.js.map
https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js
https://cdn.jsdelivr.net/npm/[email protected]/dist/chartjs-adapter-luxon.umd.min.js
Expand Down
2 changes: 1 addition & 1 deletion web/models/chia.py
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ def parse_chia(self, connection, blockchain, geoip_cache, lang):
'mib_up': float(vals[7].split('|')[0]),
'mib_down': float(vals[7].split('|')[1])
}
if len(vals) > 9: # HDDCoin keeps SBHeight and Hash on same line
if len(vals) > 9 and vals[8] != '-Trusted:': # HDDCoin keeps SBHeight and Hash on same line
connection['height'] = vals[8]
connection['hash'] = vals[9]
try:
Expand Down

0 comments on commit ee0204e

Please sign in to comment.