Merge branch 'dev' into duke

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 \
+      build-essential pkg-config libc6-dev m4 g++-multilib libdb++-dev \
-      autoconf libtool ncurses-dev unzip git python \
+      autoconf libtool ncurses-dev unzip git zip \
       zlib1g-dev wget bsdmainutils automake mingw-w64 cmake libsodium-dev
 ```
 
@@ -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
 ```

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

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
+details on installing dependencies. If you are using a recent-ish Ubuntu or Debian Linux
-is probably what you need:
+distro, this is probably what you need:
 
 ```
 # install build dependencies

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

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

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

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

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

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

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

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

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

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"))                
+        (1690000,     uint256S("0x00000002dbbef67d168a562e36ba850e15acfad1172d1134df4f1f4288c9d865"))
-	,(int64_t)  1709123120, // time of last checkpointed block
+        (1691000,     uint256S("0x000000048ad7645fb07ec103dadabfb66c2b544c69bd920692a834a8844be93d"))
-	(int64_t) 2533194,      // total txs
+        (1692000,     uint256S("0x000000010ddd71bc79e292a7c6e3c70565ba211f918eb1751e905301acbcd517"))
-	(double)  1555        // txs in the last day before block 1690236
+        (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
+                    (1132000,     uint256S("0x00008bd55bfae2a954b70b04f570e03b9148d639358a697b5d2e948fc6345918"))
-	  	    (int64_t) 1158597,      // total txs
+                    (1133000,     uint256S("0x00003a59655529f46df2b436019db7b1d7b9757f4416699ab5d895cd68f9be64"))
-	            (double)  2480          // txs in the last day before block 1131156
+                    (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

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