From beee6c1698460e1a9001d072af6ca831780b3753 Mon Sep 17 00:00:00 2001 From: onryo Date: Mon, 4 Mar 2024 10:32:51 +0100 Subject: [PATCH 1/4] Update HUSH/DRGX checkpoints --- src/chainparams.cpp | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 3242316ef..180c7fc5d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1921,7 +1921,7 @@ void *chainparams_commandline() { (1620000, uint256S("0x000000048c6667a8724512cbd999bc491ec8522b1f3817001c7ba485dec46d10")) (1621000, uint256S("0x00000005d981cd3473f8815d18965c0e0035993117390e9659fe8d3b9562c8dc")) (1622000, uint256S("0x0000000371a1663973c7b19a0b4dd8673f1ddb14a0438c89de3908712437f688")) - // Generated at 1709141140 via hush3 util/checkpoints.pl by onryo + // Generated at 1709544651 via hush3 util/checkpoints.pl by onryo (1623000, uint256S("0x000000038ed359f4cdcfb54a0ba36a8ac89e4f697836920c28dd038d643064d1")) (1624000, uint256S("0x00000000ca915eb30164ac2aad328ae5d9d4531bf8ef30c7bdf3c18c0abcdae4")) (1625000, uint256S("0x0000000303957deb36dc6a3b6597984ca9585172a198342eb102a9d3b9455596")) @@ -1989,10 +1989,15 @@ void *chainparams_commandline() { (1687000, uint256S("0x00000003eda47c88b7d313cc525f0511934dacc364d045057eefc2148934cfbb")) (1688000, uint256S("0x000000040d7bda41689357c29aedb77b016f3cd2ce2bc3ba04c4bdd95d455286")) (1689000, uint256S("0x0000000128027ca8f7b2dccb44d26946b9df6533f05e63da9d475867c4b251fa")) - (1690000, uint256S("0x00000002dbbef67d168a562e36ba850e15acfad1172d1134df4f1f4288c9d865")) - ,(int64_t) 1709123120, // time of last checkpointed block - (int64_t) 2533194, // total txs - (double) 1555 // txs in the last day before block 1690236 + (1690000, uint256S("0x00000002dbbef67d168a562e36ba850e15acfad1172d1134df4f1f4288c9d865")) + (1691000, uint256S("0x000000048ad7645fb07ec103dadabfb66c2b544c69bd920692a834a8844be93d")) + (1692000, uint256S("0x000000010ddd71bc79e292a7c6e3c70565ba211f918eb1751e905301acbcd517")) + (1693000, uint256S("0x000000010dc70ae11c82e34000cd7d1a344bbf9fcf6344b3ac04f3173d1703d0")) + (1694000, uint256S("0x000000027e5cb8c5bfd613100811708f7d180b994650d3ca6900a81683d50fa0")) + (1695000, uint256S("0x000000014325867b388dc34843b695536eb9185c6782707f1c86edf0b5b89e9d")) + ,(int64_t) 1709499985, // time of last checkpointed block + (int64_t) 2539894, // total txs + (double) 1801 // txs in the last day before block 1695599 }; // END HUSH mainnet checkpoint data } else if (strcmp(SMART_CHAIN_SYMBOL,"DRAGONX") == 0) { @@ -2989,7 +2994,7 @@ void *chainparams_commandline() { (987000, uint256S("0x00002723abb80e9ece84055c113e0caa507177ddc88cb6b8011ecba39b490dd8")) (988000, uint256S("0x00001938e724c8033d1f60ddd27512f6f358847e96c63def28e85bd40616117c")) (989000, uint256S("0x00003071ff9188d27f744395aefb1d406cccc15f61b7f79bba0ea9d100475a63")) - // Generated at 1709141373 via hush3 util/checkpoints.pl by onryo + // Generated at 1709542425 via hush3 util/checkpoints.pl by onryo (990000, uint256S("0x00005340e6855081dd3fade7baa8db18b660ffd272373e67c812c5cf69006300")) (991000, uint256S("0x000027d07656cbdbd3746495e091388f35c9e2a11a2389174490a9433a9e0da4")) (992000, uint256S("0x00001413d8eb317a69e45bf44aba0af79c724b45272043307480213bd4e7d653")) @@ -3132,9 +3137,20 @@ void *chainparams_commandline() { (1129000, uint256S("0x00004691aec7b3d82d064a112e4a480e48ec3d7fa678862df12ae146265f5482")) (1130000, uint256S("0x000082de552f3b0dbd1a805e08db29f9f60fe020ee88944b0266e55cda2f7e78")) (1131000, uint256S("0x0000061cc63ed366899e9d4d7c748ac75ae3ef9a32ef60e92cf7c0c306ee9711")) - ,(int64_t) 1709135822, // time of last checkpointed block - (int64_t) 1158597, // total txs - (double) 2480 // txs in the last day before block 1131156 + (1132000, uint256S("0x00008bd55bfae2a954b70b04f570e03b9148d639358a697b5d2e948fc6345918")) + (1133000, uint256S("0x00003a59655529f46df2b436019db7b1d7b9757f4416699ab5d895cd68f9be64")) + (1134000, uint256S("0x00004f6097651296f52e7d69a51e7b82ce12599109c5abc201d77cf9af9d6e88")) + (1135000, uint256S("0x000049450fcc6b737c938099e17bc0c54cd18b385112cd7689477a9cc8a27e99")) + (1136000, uint256S("0x00005ea94a0ee3a23b8224a87dd107e13ea0e86a59c3d2de4fb9fd3a94c0fe27")) + (1137000, uint256S("0x0000270eb8f01ef39a7a1cbc8a3d0d2ceefc65f5842ac3001b4a5247e8c2e525")) + (1138000, uint256S("0x0000339b020870d50d1496802dcf21142c95971f1781000c202d1e8a52bf12ca")) + (1139000, uint256S("0x0000716e4b703564bd4b4bfa84fd6b317aefcea3d13e6eead901de144a703005")) + (1140000, uint256S("0x0000012c87cc87745fe70667c7a2eca8b03dac27a8424b0830c06a18fdf9fc77")) + (1141000, uint256S("0x00006bf655db63cb0e89eb631a25d198d80d593cd4d35c8c9de2b62003a8f4f2")) + (1142000, uint256S("0x00000949c0348276363e0aabc6895b7a5298ba2ba1f003c2a4a23be5c6d843a7")) + ,(int64_t) 1709532066, // time of last checkpointed block + (int64_t) 1170154, // total txs + (double) 2511 // txs in the last day before block 1142288 }; } else { // all other HSC's with no checkpoints From 4a3c335050957ddf5740c54e10420b4b4a128ce4 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Mon, 4 Mar 2024 08:57:14 -0500 Subject: [PATCH 2/4] minor QA changes --- contrib/dragonx_scanner | 2 +- doc/developer-notes.md | 4 ++-- qa/hush/create_benchmark_archive.py | 1 + qa/rpc-tests/test_framework/authproxy.py | 1 + qa/rpc-tests/test_framework/bignum.py | 1 + qa/rpc-tests/test_framework/blockstore.py | 1 + qa/rpc-tests/test_framework/blocktools.py | 1 + qa/rpc-tests/test_framework/equihash.py | 1 + qa/rpc-tests/test_framework/mininode.py | 1 + qa/rpc-tests/test_framework/script.py | 1 + qa/rpc-tests/test_framework/socks5.py | 1 + src/chainparams.cpp | 2 +- src/crypto/common.h | 1 - 13 files changed, 13 insertions(+), 5 deletions(-) diff --git a/contrib/dragonx_scanner b/contrib/dragonx_scanner index 4f97d8da4..8e11610ae 100755 --- a/contrib/dragonx_scanner +++ b/contrib/dragonx_scanner @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/doc/developer-notes.md b/doc/developer-notes.md index df090cd05..e83a92145 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -18,8 +18,8 @@ git checkout dev Then install needed dependencies. This is different on each OS as well as older or newer systems. See https://git.hush.is/hush/hush3/src/branch/dev/INSTALL.md for -details on installing dependencies. If you are using a recent-ish Linux distro, this -is probably what you need: +details on installing dependencies. If you are using a recent-ish Ubuntu or Debian Linux +distro, this is probably what you need: ``` # install build dependencies diff --git a/qa/hush/create_benchmark_archive.py b/qa/hush/create_benchmark_archive.py index 612d5bcad..15994b1a6 100644 --- a/qa/hush/create_benchmark_archive.py +++ b/qa/hush/create_benchmark_archive.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/authproxy.py b/qa/rpc-tests/test_framework/authproxy.py index 158fc04e9..366140aab 100644 --- a/qa/rpc-tests/test_framework/authproxy.py +++ b/qa/rpc-tests/test_framework/authproxy.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/bignum.py b/qa/rpc-tests/test_framework/bignum.py index f77bc2226..de5bf3f0e 100644 --- a/qa/rpc-tests/test_framework/bignum.py +++ b/qa/rpc-tests/test_framework/bignum.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/blockstore.py b/qa/rpc-tests/test_framework/blockstore.py index e1ecf7648..5a3e911e2 100644 --- a/qa/rpc-tests/test_framework/blockstore.py +++ b/qa/rpc-tests/test_framework/blockstore.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/blocktools.py b/qa/rpc-tests/test_framework/blocktools.py index 5e87321ec..6f111f3bf 100644 --- a/qa/rpc-tests/test_framework/blocktools.py +++ b/qa/rpc-tests/test_framework/blocktools.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/equihash.py b/qa/rpc-tests/test_framework/equihash.py index c19b24217..7a182274d 100755 --- a/qa/rpc-tests/test_framework/equihash.py +++ b/qa/rpc-tests/test_framework/equihash.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index 4a7624cc8..69120e5b8 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/script.py b/qa/rpc-tests/test_framework/script.py index 67a868cf6..29ac60ab7 100644 --- a/qa/rpc-tests/test_framework/script.py +++ b/qa/rpc-tests/test_framework/script.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html diff --git a/qa/rpc-tests/test_framework/socks5.py b/qa/rpc-tests/test_framework/socks5.py index 36e2d66b3..16a2d4cbe 100644 --- a/qa/rpc-tests/test_framework/socks5.py +++ b/qa/rpc-tests/test_framework/socks5.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # Copyright (c) 2016-2024 The Hush developers # Copyright (c) 2015 The Bitcoin Core developers # Distributed under the GPLv3 software license, see the accompanying diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 180c7fc5d..e2603e14c 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -3138,7 +3138,7 @@ void *chainparams_commandline() { (1130000, uint256S("0x000082de552f3b0dbd1a805e08db29f9f60fe020ee88944b0266e55cda2f7e78")) (1131000, uint256S("0x0000061cc63ed366899e9d4d7c748ac75ae3ef9a32ef60e92cf7c0c306ee9711")) (1132000, uint256S("0x00008bd55bfae2a954b70b04f570e03b9148d639358a697b5d2e948fc6345918")) - (1133000, uint256S("0x00003a59655529f46df2b436019db7b1d7b9757f4416699ab5d895cd68f9be64")) + (1133000, uint256S("0x00003a59655529f46df2b436019db7b1d7b9757f4416699ab5d895cd68f9be64")) (1134000, uint256S("0x00004f6097651296f52e7d69a51e7b82ce12599109c5abc201d77cf9af9d6e88")) (1135000, uint256S("0x000049450fcc6b737c938099e17bc0c54cd18b385112cd7689477a9cc8a27e99")) (1136000, uint256S("0x00005ea94a0ee3a23b8224a87dd107e13ea0e86a59c3d2de4fb9fd3a94c0fe27")) diff --git a/src/crypto/common.h b/src/crypto/common.h index bfc43d8bc..64c144848 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -1,4 +1,3 @@ -// Copyright (c) 2016-2024 The Hush developers // Copyright (c) 2014 The Bitcoin Core developers // Copyright (c) 2016-2024 The Hush developers // Released under the GPLv3 From 63fc690ca35655b0e7c267417021ea828a43142d Mon Sep 17 00:00:00 2001 From: onryo Date: Tue, 5 Mar 2024 17:51:45 +0000 Subject: [PATCH 3/4] Update cross-compile on Linux INSTALL.md for Windows --- INSTALL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 51edd9fdb..76b8f2730 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -105,9 +105,9 @@ Downloading Git source repo, building and running Hush: ```sh # pull git clone https://git.hush.is/hush/hush3 -cd hush +cd hush3 # Build -./build-win.sh -j$(nproc) +./util/build-win.sh -j$(nproc) # Run a HUSH node ./src/hushd ``` From fc95d692e2063ea543d6eb012ebabbb048145e86 Mon Sep 17 00:00:00 2001 From: onryo Date: Wed, 6 Mar 2024 09:09:00 +0000 Subject: [PATCH 4/4] Update cross-compile on Linux INSTALL.md for Windows --- INSTALL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 76b8f2730..1557ed4e4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -95,8 +95,8 @@ After you have compiled Hush, then you can run it with the following command: Get dependencies: ```ssh sudo apt-get install \ - build-essential pkg-config libc6-dev m4 g++-multilib \ - autoconf libtool ncurses-dev unzip git python \ + build-essential pkg-config libc6-dev m4 g++-multilib libdb++-dev \ + autoconf libtool ncurses-dev unzip git zip \ zlib1g-dev wget bsdmainutils automake mingw-w64 cmake libsodium-dev ```