Merge branch 'dev' into duke

build.sh

@@ -9,13 +9,11 @@ set -eu -o pipefail
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     ./util/build.sh --disable-tests $@
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-    # code from ./util/build.sh needs to be ported to support --disable-tests
-    #./util/build-mac.sh --disable-tests $@
-    ./util/build-mac.sh $@
+    ./util/build-mac.sh --disable-tests $@
 elif [[ "$OSTYPE" == "msys"* ]]; then
     ./util/build-win.sh --disable-tests $@
-elif [[ "$OSTYPE" == "freebsd"* ]]; then
-    ./util/build.sh --disable-tests $@
+#elif [[ "$OSTYPE" == "freebsd"* ]]; then
+    # placeholder
 else
     echo "Unable to detect your OS. What are you using?"
 fi

src/hush_bitcoind.h

@@ -24,6 +24,9 @@
 #include "cc/CCinclude.h"
 #include "sietch.h"
 
+// this is the address for pubkey = 0x000000000000000000000000000000000 (33 bytes)
+#define BURN_ADDRESS "RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY"
+
 int32_t hush_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp);
 int32_t hush_findnotary(int32_t *numnotariesp,uint8_t *pubkey33,int32_t height,uint32_t timestamp);
 int32_t hush_voutupdate(bool fJustCheck,int32_t *isratificationp,int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen,int32_t height,uint256 txhash,int32_t i,int32_t j,uint64_t *voutmaskp,int32_t *specialtxp,int32_t *notarizedheightp,uint64_t value,int32_t notarized,uint64_t signedmask,uint32_t timestamp);
@@ -1798,15 +1801,15 @@ int64_t hush_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
         {
             for (j=0; j<m-1; j++)
             {
-                // This is an example address used in docs
-                if ( ExtractDestination(tx.vout[j].scriptPubKey,address) != 0 && strcmp("RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY",CBitcoinAddress(address).ToString().c_str()) != 0 )
+                // This address is a burn address which is used in some RPC documentation
+                if ( ExtractDestination(tx.vout[j].scriptPubKey,address) != 0 && strcmp(BURN_ADDRESS,CBitcoinAddress(address).ToString().c_str()) != 0 )
                     voutsum += tx.vout[j].nValue;
                 else printf("skip %.8f -> %s\n",dstr(tx.vout[j].nValue),CBitcoinAddress(address).ToString().c_str());
             }
             script = (uint8_t *)&tx.vout[j].scriptPubKey[0];
             if ( script == 0 || script[0] != 0x6a )
             {
-                if ( ExtractDestination(tx.vout[j].scriptPubKey,address) != 0 && strcmp("RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY",CBitcoinAddress(address).ToString().c_str()) != 0 )
+                if ( ExtractDestination(tx.vout[j].scriptPubKey,address) != 0 && strcmp(BURN_ADDRESS,CBitcoinAddress(address).ToString().c_str()) != 0 )
                     voutsum += tx.vout[j].nValue;
             }
         }

util/build-mac.sh

@@ -46,6 +46,13 @@ PREFIX="$(pwd)/depends/$TRIPLET"
 
 make "$@" -C ./depends/ V=1 NO_QT=1
 
+#BUILD CCLIB
+WD=$PWD
+cd src/cc
+echo $PWD
+./makecustom
+cd $WD
+
 # Build RandomX
 cd src/RandomX
 if [ -d "build" ]

util/build-win.sh

@@ -18,6 +18,13 @@ cd ..
 
 CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
 
+# Build CryptoConditions stuff
+WD=$PWD
+cd src/cc
+echo $PWD
+./makecustom
+cd $WD
+
 # Build RandomX
 cd src/RandomX
 if [ -d "build" ]