use gcc 8

.gitlab-ci.yml

@@ -6,7 +6,7 @@ stages:
 ####START####                                     PROJECT LEVEL VARIABLES                                  ####START####
 ########################################################################################################################
 variables:
-  VERSION: 0.6.5-dev-12
+  VERSION: 0.6.5-dev-13
   VERUS_CLI_ARM64_LINUX: Verus-CLI-Linux-v${VERSION}-arm64.tar.gz
   VERUS_CLI_LINUX_AMD64: Verus-CLI-Linux-v${VERSION}-amd64.tar.gz
   VERUS_CLI_WINDOWS: Verus-CLI-Windows-v${VERSION}.zip
@@ -38,8 +38,8 @@ build:linux:
     paths:
       - depends
   script:
-    - scl enable devtoolset-7 sh
-    - source /opt/rh/devtoolset-7/enable
+    - scl enable devtoolset-8 sh
+    - source /opt/rh/devtoolset-8/enable
     - zcutil/build.sh -j$(nproc)
     - if [ "${STRIP_BINARIES}" = "true" ]; then strip --strip-unneeded  src/verus && strip --strip-unneeded  src/verusd; fi
     - mkdir verus-cli
@@ -157,7 +157,16 @@ build:mac:
       - depends
   script:
     - zcutil/build-mac.sh -j$(sysctl -n hw.physicalcpu)
-    - ./makeReleaseMac.sh
+    - mkdir verus-cli
+    - cp src/verus \
+        src/verusd \
+        doc/man/verus-cli/mac/README.txt \
+        zcutil/fetch-params.sh \
+        verus-cli
+    - mv verus-cli/fetch-params.sh verus-cli/fetch-params
+    - chmod +x verus-cli/fetch-params
+    - chmod +x verus-cli/verus
+    - chmod +x verus-cli/verusd
     - tar -czvf ${VERUS_CLI_MACOS} verus-cli
     - shasum -a 256 ${VERUS_CLI_MACOS} > ${VERUS_CLI_MACOS}.sha256
     - curl -F file=@"${VERUS_CLI_MACOS}"

README.md

@@ -1,4 +1,4 @@
-## VerusCoin version 0.6.5-dev-12
+## VerusCoin version 0.6.5-dev-13
 
 Arguably the world's most advanced technology, zero knowledge privacy-centric blockchain, Verus Coin brings Sapling performance and zero knowledge features to an intelligent system with interchain smart contracts and a completely original, combined proof of stake/proof of work consensus algorithm that solves the nothing at stake problem. With this and its approach towards CPU mining and ASICs, Verus Coin strives to be one of the most naturally decentralizing and attack resistant blockchains in existence.
 

depends/builders/darwin.mk

@@ -1,5 +1,5 @@
-build_darwin_CC = gcc-6
-build_darwin_CXX = g++-6
+build_darwin_CC = gcc-8
+build_darwin_CXX = g++-8
 build_darwin_AR: = $(shell xcrun -f ar)
 build_darwin_RANLIB: = $(shell xcrun -f ranlib)
 build_darwin_STRIP: = $(shell xcrun -f strip)
@@ -10,8 +10,8 @@ build_darwin_SHA256SUM = shasum -a 256
 build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -f -o
 
 #darwin host on darwin builder. overrides darwin host preferences.
-darwin_CC= gcc-6
-darwin_CXX= g++-6
+darwin_CC= gcc-8
+darwin_CXX= g++-8
 darwin_AR:=$(shell xcrun -f ar)
 darwin_RANLIB:=$(shell xcrun -f ranlib)
 darwin_STRIP:=$(shell xcrun -f strip)

depends/hosts/darwin.mk

@@ -1,7 +1,7 @@
 OSX_MIN_VERSION=10.8
 LD64_VERSION=274.2
 darwin_CC=gcc-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(shell xcrun --show-sdk-path) -mlinker-version=$(LD64_VERSION)
-darwin_CXX=g++-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(shell xcrun --show-sdk-path) -mlinker-version=$(LD64_VERSION)
+darwin_CXX=g++-8 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(shell xcrun --show-sdk-path) -mlinker-version=$(LD64_VERSION)
 
 darwin_CFLAGS=-pipe
 darwin_CXXFLAGS=$(darwin_CFLAGS)

doc/man/verus-cli/linux/README.txt

@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.6.5-dev-12
+VerusCoin Command Line Tools v0.6.5-dev-13
 
 Contents:
 verusd - VerusCoin daemon

doc/man/verus-cli/mac/README.txt

@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.6.5-dev-12
+VerusCoin Command Line Tools v0.6.5-dev-13
 Contents:
 verusd - VerusCoin daemon.
 verus - VerusCoin command line utility.

doc/man/verus-cli/windows/README.txt

@@ -1,4 +1,4 @@
-VerusCoin Command Line Tools v0.6.5-dev-12
+VerusCoin Command Line Tools v0.6.5-dev-13
 Contents:
 verusd.exe - VerusCoin daemon
 verus.exe - VerusCoin command line utility

src/Makefile.am

@@ -83,7 +83,7 @@ LIBBITCOIN_WALLET=libbitcoin_wallet.a
 endif
 
 $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O3 -march=$(PLATFORM_VARIANT) -g "
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O2 -march=$(PLATFORM_VARIANT) -g "
 
 LIBSNARK_CXXFLAGS = $(AM_CXXFLAGS) $(PIC_FLAGS) -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1 -fstack-protector-all
 LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1
@@ -101,10 +101,10 @@ libsnark-tests: $(wildcard snark/src/*)
 	$(AM_V_at) CC="$(CC)" CXX="$(CXX)" AR="$(AR)" CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ check DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="$(LIBSNARK_OPTFLAGS)"
 
 $(LIBUNIVALUE): $(wildcard univalue/lib/*)
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O3 -march=$(PLATFORM_VARIANT) -g "
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O2 -march=$(PLATFORM_VARIANT) -g "
 
 $(LIBCRYPTOCONDITIONS): $(wildcard cryptoconditions/src/*) $(wildcard cryptoconditions/include/*)
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O3 -march=$(PLATFORM_VARIANT) -g "
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) OPTFLAGS="-O2 -march=$(PLATFORM_VARIANT) -g "
 
 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
@@ -596,6 +596,10 @@ verusd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 verusd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 verusd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
+if TARGET_DARWIN
+verusd_LDFLAGS += -static-libgcc
+endif
+
 if TARGET_WINDOWS
 verusd_SOURCES += bitcoind-res.rc
 endif

src/version.h

@@ -35,6 +35,6 @@ static const int MEMPOOL_GD_VERSION = 60002;
 static const int NO_BLOOM_VERSION = 170004;
 
 #define KOMODO_VERSION "0.2.1"
-#define VERUS_VERSION "0.6.5-dev-12"
+#define VERUS_VERSION "0.6.5-dev-13"
 
 #endif // BITCOIN_VERSION_H

toolchain-info.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-tools=("gcc-6" "g++-6" "otool" "nm")
+tools=("gcc-8" "g++-8" "otool" "nm")
 
 echo "Platform: `uname -a`"
 echo "-------------------------------------"

zcutil/build-mac.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-export CC=gcc-6
-export CXX=g++-6
+export CC=gcc-8
+export CXX=g++-8
 export LIBTOOL=libtool
 export AR=ar
 export RANLIB=ranlib
@@ -44,7 +44,7 @@ make "$@" -C ./depends/ V=1 NO_QT=1 NO_PROTON=1
 
 ./autogen.sh
 CPPFLAGS="-I$PREFIX/include -arch x86_64" LDFLAGS="-L$PREFIX/lib -arch x86_64 -Wl,-no_pie -g" \
-CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@6/6.5.0_2/include/c++/6.5.0_2/ -I$PREFIX/include -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup -g' \
+CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@8/8.3.0_1/include/c++/8.3.0_1/  -I$PREFIX/include -fwrapv -fno-strict-aliasing -Werror -g -Wl,-undefined -Wl,dynamic_lookup -g' \
 ./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG"
 
 make "$@" V=1 NO_GTEST=1 STATIC=1