diff --git a/.github/workflows/marmara_linux_ci.yml b/.github/workflows/marmara_linux_ci.yml index 5df0747894d..66d60aae393 100644 --- a/.github/workflows/marmara_linux_ci.yml +++ b/.github/workflows/marmara_linux_ci.yml @@ -3,8 +3,6 @@ name: Marmara Linux CI on: pull_request: types: [opened, synchronize, reopened] - schedule: - - cron: '0 0 * * 1' jobs: diff --git a/.github/workflows/marmara_mac_ci.yml b/.github/workflows/marmara_mac_ci.yml index d32e13facaa..02e82dff3c7 100644 --- a/.github/workflows/marmara_mac_ci.yml +++ b/.github/workflows/marmara_mac_ci.yml @@ -3,14 +3,12 @@ name: Marmara MacOS CI on: pull_request: types: [opened, synchronize, reopened] - schedule: - - cron: '0 0 * * 1' jobs: macos-build: name: MacOS Build - runs-on: macos-latest + runs-on: macos-latest-large steps: - uses: actions/checkout@v4 @@ -31,47 +29,49 @@ jobs: - name: Install deps (macOS) run: | brew update - brew upgrade || true brew tap discoteq/discoteq; brew install flock brew install autoconf autogen automake - brew install gcc@8 brew install binutils brew install protobuf brew install coreutils brew install wget brew install python3 - brew install gmp - + + # https://www.jessesquires.com/blog/2020/01/06/selecting-an-xcode-version-on-github-ci/ + # https://github.com/actions/runner-images/issues/2619 (bsdtar issues) + # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!! - name: Build (macOS) run: | - # flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!! - export CPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ ./zcutil/build-mac-dtest.sh -j4 - tar -czvf marmara-macos.tar.gz src/marmarad src/marmara-cli - + gtar -czvf marmara-macos.tar.gz src/marmarad src/marmara-cli src/wallet-utility src/komodo-tx + # env: + # DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer + - name: Upload marmara-macos.tar.gz as artifact uses: actions/upload-artifact@v4 with: name: marmara-macos - path: ./marmara-macos.tar.gz + path: | + ./marmara-macos.tar.gz - # macos-test-dice-token-reards-faucet-cc: + # macos-test-dice-token-rewards-faucet-cc: + # if: ${{ false }} # name: Test (MacOS/Dice, Token, Faucet, Rewards) # runs-on: macos-latest # needs: macos-build # steps: - # - uses: actions/checkout@v2 + # - uses: actions/checkout@v4 # - name: Install deps (Dice, Token, Faucet, Rewards CC) # run: | - # brew install curl + # brew install python3 curl # python3 -m pip install setuptools wheel # python3 -m pip install slick-bitcoinrpc pytest wget jsonschema # - name: Download komodo-macos.tar.gz - # uses: actions/download-artifact@v1 + # uses: actions/download-artifact@v4 # with: # name: komodo-macos @@ -150,11 +150,11 @@ jobs: # needs: macos-build # steps: - # - uses: actions/checkout@v2 + # - uses: actions/checkout@v4 # - name: Install deps (ChannelsCC) # run: | - # brew install curl + # brew install python3 curl # python3 -m pip install setuptools wheel # python3 -m pip install slick-bitcoinrpc pytest wget jsonschema # - name: Download komodo-macos.tar.gz @@ -183,11 +183,11 @@ jobs: # - name: Install deps (HeirCC) # run: | - # brew install curl + # brew install python3 curl # python3 -m pip install setuptools wheel # python3 -m pip install slick-bitcoinrpc pytest wget jsonschema # - name: Download komodo-macos.tar.gz - # uses: actions/download-artifact@v1 + # uses: actions/download-artifact@v4 # with: # name: komodo-macos diff --git a/.github/workflows/marmara_win_ci.yml b/.github/workflows/marmara_win_ci.yml index 7d657b8de8b..182cd514703 100644 --- a/.github/workflows/marmara_win_ci.yml +++ b/.github/workflows/marmara_win_ci.yml @@ -3,8 +3,6 @@ name: Marmara Win CI on: pull_request: types: [opened, synchronize, reopened] - schedule: - - cron: '0 0 * * 1' jobs: diff --git a/README.md b/README.md index fc47a06196d..5466deb5a3c 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ brew update brew upgrade brew tap discoteq/discoteq; brew install flock brew install autoconf autogen automake -brew update && brew install gcc@8 +brew update brew install binutils brew install protobuf brew install coreutils diff --git a/darwin.host.mk.patch b/darwin.host.mk.patch deleted file mode 100644 index deeb7a81045..00000000000 --- a/darwin.host.mk.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** depends/hosts/darwin.mk 2017-01-03 10:53:52.440371182 +0000 ---- ../../komodo-jl777/depends/hosts/darwin.mk 2017-01-03 09:48:21.650035146 +0000 -*************** -*** 2,9 **** - OSX_SDK_VERSION=10.9 - OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk - LD64_VERSION=241.9 -! darwin_CC=gcc-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -! darwin_CXX=g++-6 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) - - darwin_CFLAGS=-pipe - darwin_CXXFLAGS=$(darwin_CFLAGS) ---- 2,9 ---- - OSX_SDK_VERSION=10.9 - OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk - LD64_VERSION=241.9 -! darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -! darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) - - darwin_CFLAGS=-pipe - darwin_CXXFLAGS=$(darwin_CFLAGS) diff --git a/darwin.mk.patch b/darwin.mk.patch deleted file mode 100644 index fdfd7bc3899..00000000000 --- a/darwin.mk.patch +++ /dev/null @@ -1,40 +0,0 @@ -*** depends/builders/darwin.mk 2017-01-03 10:53:52.440371182 +0000 ---- ../../komodo-jl777/depends/builders/darwin.mk 2017-01-03 09:48:21.646034937 +0000 -*************** -*** 1,5 **** -! build_darwin_CC = gcc-6 -! build_darwin_CXX = g++-6 - build_darwin_AR: = $(shell xcrun -f ar) - build_darwin_RANLIB: = $(shell xcrun -f ranlib) - build_darwin_STRIP: = $(shell xcrun -f strip) ---- 1,5 ---- -! build_darwin_CC: = $(shell xcrun -f clang) -! build_darwin_CXX: = $(shell xcrun -f clang++) - build_darwin_AR: = $(shell xcrun -f ar) - build_darwin_RANLIB: = $(shell xcrun -f ranlib) - build_darwin_STRIP: = $(shell xcrun -f strip) -*************** -*** 7,17 **** - build_darwin_NM: = $(shell xcrun -f nm) - build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) - build_darwin_SHA256SUM = shasum -a 256 -! build_darwin_DOWNLOAD = wget --timeout=$(DOWNLOAD_CONNECT_TIMEOUT) --tries=$(DOWNLOAD_RETRIES) -nv -O - - #darwin host on darwin builder. overrides darwin host preferences. -! darwin_CC= gcc-6 -! darwin_CXX= g++-6 - darwin_AR:=$(shell xcrun -f ar) - darwin_RANLIB:=$(shell xcrun -f ranlib) - darwin_STRIP:=$(shell xcrun -f strip) ---- 7,17 ---- - build_darwin_NM: = $(shell xcrun -f nm) - build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) - build_darwin_SHA256SUM = shasum -a 256 -! build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o - - #darwin host on darwin builder. overrides darwin host preferences. -! darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) -! darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) - darwin_AR:=$(shell xcrun -f ar) - darwin_RANLIB:=$(shell xcrun -f ranlib) - darwin_STRIP:=$(shell xcrun -f strip) diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk index cbbc5a667ab..6b877101327 100644 --- a/depends/builders/darwin.mk +++ b/depends/builders/darwin.mk @@ -1,5 +1,5 @@ -build_darwin_CC = gcc-8 -build_darwin_CXX = g++-8 +build_darwin_CC:=$(shell xcrun -f clang) --sysroot $(shell xcrun --show-sdk-path) +build_darwin_CXX:=$(shell xcrun -f clang++) --sysroot $(shell xcrun --show-sdk-path) build_darwin_AR: = $(shell xcrun -f ar) build_darwin_RANLIB: = $(shell xcrun -f ranlib) build_darwin_STRIP: = $(shell xcrun -f strip) @@ -7,11 +7,11 @@ build_darwin_OTOOL: = $(shell xcrun -f otool) build_darwin_NM: = $(shell xcrun -f nm) build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) build_darwin_SHA256SUM = shasum -a 256 -build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -f -o +build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o #darwin host on darwin builder. overrides darwin host preferences. -darwin_CC= gcc-8 -darwin_CXX= g++-8 +darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) -fvisibility=hidden -fvisibility-inlines-hidden --sysroot $(shell xcrun --show-sdk-path) +darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -fvisibility=hidden -fvisibility-inlines-hidden -stdlib=libc++ --sysroot $(shell xcrun --show-sdk-path) darwin_AR:=$(shell xcrun -f ar) darwin_RANLIB:=$(shell xcrun -f ranlib) darwin_STRIP:=$(shell xcrun -f strip) @@ -19,4 +19,5 @@ darwin_LIBTOOL:=$(shell xcrun -f libtool) darwin_OTOOL:=$(shell xcrun -f otool) darwin_NM:=$(shell xcrun -f nm) darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) +darwin_native_binutils= darwin_native_toolchain= diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index 7be744aebc0..2fafa535668 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -1,17 +1,50 @@ -OSX_MIN_VERSION=10.12 -OSX_SDK_VERSION=10.12 -OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk -LD64_VERSION=253.9 -darwin_CC=gcc-8 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -darwin_CXX=g++-8 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) +OSX_MIN_VERSION=10.15 +OSX_SDK_VERSION=10.15.6 +XCODE_VERSION=12.1 +XCODE_BUILD_ID=12A7403 +LD64_VERSION=609 + +OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers + +# Flag explanations: +# +# -mlinker-version +# +# Ensures that modern linker features are enabled. See here for more +# details: https://github.com/bitcoin/bitcoin/pull/19407. +# +# -B$(build_prefix)/bin +# +# Explicitly point to our binaries (e.g. cctools) so that they are +# ensured to be found and preferred over other possibilities. +# +# -nostdinc++ -isystem $(OSX_SDK)/usr/include/c++/v1 +# +# Forces clang to use the libc++ headers from our SDK and completely +# forget about the libc++ headers from the standard directories +# +# TODO: Once we start requiring a clang version that has the +# -stdlib++-isystem flag first introduced here: +# https://reviews.llvm.org/D64089, we should use that instead. Read the +# differential summary there for more details. +# +darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -B$(build_prefix)/bin +darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++ -mlinker-version=$(LD64_VERSION) -B$(build_prefix)/bin -nostdinc++ -isystem $(OSX_SDK)/usr/include/c++/v1 darwin_CFLAGS=-pipe darwin_CXXFLAGS=$(darwin_CFLAGS) -darwin_release_CFLAGS=-O1 +darwin_release_CFLAGS=-O2 darwin_release_CXXFLAGS=$(darwin_release_CFLAGS) -darwin_debug_CFLAGS=-O1 +darwin_debug_CFLAGS=-g -O0 darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS) +darwin_native_binutils=native_cctools +ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) darwin_native_toolchain=native_cctools +else +darwin_native_toolchain= +endif + +darwin_cmake_system=Darwin \ No newline at end of file diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk index 404d94c5180..385e646b916 100644 --- a/depends/packages/bdb.mk +++ b/depends/packages/bdb.mk @@ -9,7 +9,7 @@ define $(package)_set_vars $(package)_config_opts=--disable-shared --enable-cxx --disable-replication $(package)_config_opts_mingw32=--enable-mingw $(package)_config_opts_linux=--with-pic -$(package)_cxxflags=-std=c++11 +$(package)_cxxflags+=-std=c++11 endef define $(package)_preprocess_cmds @@ -25,7 +25,9 @@ endef ifeq ($(build_os),darwin) define $(package)_preprocess_cmds - sed -i -e "s/WinIoCtl.h/winioctl.h/g" src/dbinc/win_db.h + sed -i -e "s/WinIoCtl.h/winioctl.h/g" src/dbinc/win_db.h && \ + sed -i.old 's/__atomic_compare_exchange\\(/__atomic_compare_exchange_db(/' src/dbinc/atomic.h && \ + sed -i.old 's/atomic_init/atomic_init_db/' src/dbinc/atomic.h src/mp/mp_region.c src/mp/mp_mvcc.c src/mp/mp_fget.c src/mutex/mut_method.c src/mutex/mut_tas.c endef else ifeq ($(host_os),mingw32) define $(package)_preprocess_cmds @@ -39,4 +41,4 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install_lib install_include -endef +endef \ No newline at end of file diff --git a/depends/packages/libcurl.mk b/depends/packages/libcurl.mk index d25f43e1705..1996ad3502f 100644 --- a/depends/packages/libcurl.mk +++ b/depends/packages/libcurl.mk @@ -7,6 +7,7 @@ $(package)_sha256_hash=816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f $(package)_config_opts=--with-openssl --disable-shared --enable-static --prefix=$(host_prefix) $(package)_config_opts_linux=--host=x86_64-unknown-linux-gnu $(package)_config_opts_mingw32=--enable-mingw --host=x86_64-w64-mingw32 +$(package)_config_opts_darwin=--without-libidn2 --without-zstd --without-nghttp2 --without-librtmp --without-brotli $(package)_cflags_darwin=-mmacosx-version-min=$(OSX_MIN_VERSION) $(package)_conf_tool=./configure diff --git a/depends/packages/libsodium.mk b/depends/packages/libsodium.mk index 4974edc70d1..fe8b0a4e915 100644 --- a/depends/packages/libsodium.mk +++ b/depends/packages/libsodium.mk @@ -9,7 +9,7 @@ $(package)_config_opts= define $(package)_set_vars $(package)_build_env=DO_NOT_UPDATE_CONFIG_SCRIPTS=1 ifeq ($(build_os),darwin) - $(package)_build_env+=MACOSX_DEPLOYMENT_TARGET="10.11" + $(package)_build_env+=MACOSX_DEPLOYMENT_TARGET="$(OSX_MIN_VERSION)" $(package)_cc=clang $(package)_cxx=clang++ endif diff --git a/doc/man/verus-cli/linux/README.txt b/doc/man/verus-cli/linux/README.txt deleted file mode 100644 index cb2c10f0fbb..00000000000 --- a/doc/man/verus-cli/linux/README.txt +++ /dev/null @@ -1,13 +0,0 @@ -VerusCoin Command Line Tools v0.4.0c - -Contents: -komodod - VerusCoin's enhanced Komodo daemon -komodo-cli - VerusCoin's Komodo command line utility -verus - wrapper for komodo-cli that applies the command to the VRSC coin -verusd - wrapper for komodod that sets the VerusCoin parameters to defaults properly - -The first time on a new system you will need to run ./fetch-params before using komodod or verusd. - -Run ./verusd to launch komodod, and use verus to run commands such as: -./verus stop -Which signals komodod (if it is running) to stop running. diff --git a/doc/man/verus-cli/mac/README.txt b/doc/man/verus-cli/mac/README.txt deleted file mode 100644 index 367e52fce00..00000000000 --- a/doc/man/verus-cli/mac/README.txt +++ /dev/null @@ -1,17 +0,0 @@ -VerusCoin Command Line Tools v0.4.0c -Contents: -komodod - VerusCoin's enhanced Komodo daemon. -komodo-cli - VerusCoin's enhanced Komodo command line utility. -verus - wrapper for komodo-cli that applies the command to the VRSC coin -verusd - wrapper for komodod that sets the VerusCoin parameters to defaults properly -fetch_params.sh - utility to download the zcash parameters needed to start the VerusCoin command line tools and scripts -lib*.dylib - assorted dynamic libraries, dependencies needed by fetch-params.sh, komodod and/or komodo-cli - -Command line tools are run from the terminal. You can launch the terminal on a Mac by using the Finder, selecting Applications and from that select Utilities, finally selecting Terminal from the Utilities folder. -You will need to switch to the directory you extracted the verus-cl into. If you extracted it in the Download folder then the change directory command is -cd ~/Downloads/verus-cli -The first time on a new system you will need to run ./fetch-params before using komodod or verusd. - -Run ./verusd to launch komodod, and use verus to run commands such as: -./verus stop -Which signals komodod (if it is running) to stop running. diff --git a/doc/man/verus-cli/windows/README.txt b/doc/man/verus-cli/windows/README.txt deleted file mode 100644 index aa71d8c3f05..00000000000 --- a/doc/man/verus-cli/windows/README.txt +++ /dev/null @@ -1,21 +0,0 @@ -VerusCoin Command Line Tools v0.4.0c -Contents: -komodod.exe - VerusCoin's enhanced Komodo daemon -komodo-cli.exe - VerusCoin's Komodo command line utility -verus.bat - wrapper for komodo-cli that applies the command to the VRSC coin -verusd.bat - wrapper for komodod that sets the VerusCoin parameters to defaults properly - -You need to run a command prompt, for example hit and type cmd -From the command prompt change to the directory where you installed verus-cli. If you downloaded the file to your Downloads directory and extracted it there then the change directory command is -cd \Users\MyName\Downloads\verus-cli -From this directory you can run the Verus command line utilities. -The first time on a new system you will need to run fetch-params before using komodod.exe or verusd. -Many anti-virus products interfere with the VerusCoin tool's ability to open ports and will need to be configured to allow what the scanner says is unsafe behavior. -Extreme cases can result in the virus scanner deleting Agama.exe or moving it to "protect" the system. You will to add the executables to a whitelist and re-extract the verus-cli-windows.zip file if that happens. -Run verusd.bat to launch komodod, and use verus.bat to run commands such as: -verus.bat stop -Which signals komodod.exe (if it is running) to stop running. - -Note that if you pass in command line options to verus.bat or verusd.bat that include an = like -ac_veruspos=50 you must surround it with double quotes like this: -verusd.bat "-ac_veruspos=50" -Otherwise Windows will drop the = and pass the two values in as separate command line options. diff --git a/qa/verus-cli-tests/verus-cli-tester.py b/qa/verus-cli-tests/verus-cli-tester.py deleted file mode 100644 index 1476861101b..00000000000 --- a/qa/verus-cli-tests/verus-cli-tester.py +++ /dev/null @@ -1,39 +0,0 @@ -from subprocess import Popen, check_output, call -from time import sleep -from os import environ, path - -daemon_wrapper = "verusd" -cli_wrapper = "verus" -daemon_runtime_seconds = 600 -cli_commands = ["getblockchaininfo", "getmininginfo", "getwalletinfo", "stop"] - - -def start_daemon(daemon_wrapper): - try: - Popen(daemon_wrapper, shell=True, close_fds=True) - except: - exit(1) - - -def fetch_zcash_params(): - try: - call("fetch-params", shell=True) - except: - exit(1) - - -def run_cli_commands(cli_wrapper, commands): - for command in commands: - command = "%(cli_wrapper)s %(command)s" % locals() - try: - with open(path.join(environ["CI_PROJECT_DIR"], "log.txt"), "a") as log: - command_output = check_output(command, shell=True) - log.write("%(command_output)s\n" % locals()) - except: - exit(1) - - -fetch_zcash_params() -start_daemon(daemon_wrapper) -sleep(daemon_runtime_seconds) -run_cli_commands(cli_wrapper, cli_commands) diff --git a/src/Makefile.am b/src/Makefile.am index cdb88f73f27..0c488fb004f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,8 +46,6 @@ LIBBITCOIN_COMMON=libbitcoin_common.a LIBBITCOIN_CLI=libbitcoin_cli.a LIBBITCOIN_UTIL=libbitcoin_util.a LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a -LIBVERUS_CRYPTO=crypto/libverus_crypto.a -LIBVERUS_PORTABLE_CRYPTO=crypto/libverus_portable_crypto.a LIBSECP256K1=secp256k1/libsecp256k1.la LIBCRYPTOCONDITIONS=cryptoconditions/libcryptoconditions_core.la LIBSNARK=snark/libsnark.a @@ -95,8 +93,6 @@ $(LIBCRYPTOCONDITIONS): $(wildcard cryptoconditions/src/*) $(wildcard cryptocond # But to build the less dependent modules first, we manually select their order here: EXTRA_LIBRARIES += \ $(LIBBITCOIN_CRYPTO) \ - $(LIBVERUS_CRYPTO) \ - $(LIBVERUS_PORTABLE_CRYPTO) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_SERVER) \ @@ -183,9 +179,6 @@ BITCOIN_CORE_H = \ consensus/validation.h \ core_io.h \ core_memusage.h \ - crypto/haraka.h \ - crypto/haraka_portable.h \ - crypto/verus_hash.h \ deprecation.h \ hash.h \ httprpc.h \ @@ -324,10 +317,6 @@ libbitcoin_server_a_SOURCES = \ checkpoints.cpp \ crosschain.cpp \ crosschain_authority.cpp \ - crypto/haraka.h \ - crypto/haraka_portable.h \ - crypto/verus_hash.h \ - crypto/verus_hash.cpp \ deprecation.cpp \ httprpc.cpp \ httpserver.cpp \ @@ -430,11 +419,7 @@ crypto_libbitcoin_crypto_a_SOURCES = \ crypto/sha256.cpp \ crypto/sha256.h \ crypto/sha512.cpp \ - crypto/sha512.h \ - crypto/haraka.h \ - crypto/haraka_portable.h \ - crypto/verus_hash.h \ - crypto/verus_hash.cpp + crypto/sha512.h if EXPERIMENTAL_ASM crypto_libbitcoin_crypto_a_SOURCES += crypto/sha256_sse4.cpp @@ -452,20 +437,6 @@ crypto_libbitcoin_crypto_a_SOURCES += \ ${EQUIHASH_TROMP_SOURCES} endif -# Verus hash specific library - optimized -crypto_libverus_crypto_a_CPPFLAGS = -O3 -Wint-conversion -march=x86-64 -msse4 -msse4.1 -msse4.2 -mssse3 -mavx -maes -g -funroll-loops -fomit-frame-pointer -fPIC $(AM_CPPFLAGS) -crypto_libverus_crypto_a_CXXFLAGS = -O3 -Wint-conversion -march=x86-64 -msse4 -msse4.1 -msse4.2 -mssse3 -mavx -maes -g -funroll-loops -fomit-frame-pointer -fPIC $(AM_CXXFLAGS) -crypto_libverus_crypto_a_SOURCES = \ - crypto/haraka.h \ - crypto/haraka.c - -# Verus hash specific library - portable -crypto_libverus_portable_crypto_a_CPPFLAGS = -O3 -Wint-conversion -march=x86-64 -g -funroll-loops -fomit-frame-pointer -fPIC $(AM_CPPFLAGS) -crypto_libverus_portable_crypto_a_CXXFLAGS = -O3 -Wint-conversion -march=x86-64 -g -funroll-loops -fomit-frame-pointer -fPIC $(AM_CXXFLAGS) -crypto_libverus_portable_crypto_a_SOURCES = \ - crypto/haraka_portable.h \ - crypto/haraka_portable.c - # common: shared between zcashd and non-server tools libbitcoin_common_a_CPPFLAGS = -fPIC $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_common_a_CXXFLAGS = -fPIC $(AM_CXXFLAGS) $(PIE_FLAGS) @@ -480,10 +451,6 @@ libbitcoin_common_a_SOURCES = \ consensus/upgrades.cpp \ core_read.cpp \ core_write.cpp \ - crypto/haraka.h \ - crypto/haraka_portable.h \ - crypto/verus_hash.h \ - crypto/verus_hash.cpp \ hash.cpp \ importcoin.cpp \ key.cpp \ @@ -570,8 +537,6 @@ marmarad_LDADD = \ $(LIBBITCOIN_ZMQ) \ $(LIBBITCOIN_PROTON) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBVERUS_CRYPTO) \ - $(LIBVERUS_PORTABLE_CRYPTO) \ $(LIBZCASH) \ $(LIBSNARK) \ $(LIBLEVELDB) \ @@ -593,8 +558,6 @@ marmarad_LDADD += \ $(ZMQ_LIBS) \ $(PROTON_LIBS) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBVERUS_CRYPTO) \ - $(LIBVERUS_PORTABLE_CRYPTO) \ $(LIBZCASH_LIBS) if TARGET_DARWIN @@ -612,18 +575,13 @@ marmarad_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS) endif # [+] Decker: use static linking for libstdc++.6.dylib, libgomp.1.dylib, libgcc_s.1.dylib -if TARGET_DARWIN -marmarad_LDFLAGS += -static-libgcc -endif # bitcoin-cli binary # marmara_cli_SOURCES = bitcoin-cli.cpp marmara_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) marmara_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) marmara_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -if TARGET_DARWIN -marmara_cli_LDFLAGS += -static-libgcc -endif + # wallet-utility binary # if ENABLE_WALLET @@ -647,8 +605,6 @@ marmara_cli_LDADD = \ $(EVENT_LIBS) \ $(LIBZCASH) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBVERUS_CRYPTO) \ - $(LIBVERUS_PORTABLE_CRYPTO) \ $(LIBZCASH_LIBS) if ENABLE_WALLET @@ -656,8 +612,6 @@ wallet_utility_LDADD = \ libbitcoin_wallet.a \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBVERUS_CRYPTO) \ - $(LIBVERUS_PORTABLE_CRYPTO) \ $(LIBSECP256K1) \ $(LIBBITCOIN_UTIL) \ $(BOOST_LIBS) \ @@ -666,7 +620,7 @@ wallet_utility_LDADD = \ $(LIBZCASH) \ $(LIBSNARK) \ $(LIBZCASH_LIBS)\ - $(LIBCRYPTOCONDITIONS) + $(LIBCRYPTOCONDITIONS) endif # zcash-tx binary # @@ -688,8 +642,6 @@ komodo_tx_LDADD = \ $(LIBZCASH) \ $(LIBSNARK) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBVERUS_CRYPTO) \ - $(LIBVERUS_PORTABLE_CRYPTO) \ $(LIBZCASH_LIBS) \ $(LIBCRYPTOCONDITIONS) @@ -706,7 +658,7 @@ libzcash_a_SOURCES = \ zcash/Note.cpp \ zcash/prf.cpp \ zcash/util.cpp \ - zcash/zip32.cpp \ + zcash/zip32.cpp \ zcash/circuit/commitment.tcc \ zcash/circuit/gadget.tcc \ zcash/circuit/merkle.tcc \ @@ -799,4 +751,4 @@ if ENABLE_TESTS include Makefile.ktest.include #include Makefile.test.include #include Makefile.gtest.include -endif +endif \ No newline at end of file diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include index ec3a4a12e29..cb9aa844a04 100644 --- a/src/Makefile.gtest.include +++ b/src/Makefile.gtest.include @@ -54,7 +54,7 @@ endif komodo_gtest_CPPFLAGS = $(AM_CPPFLAGS) -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES) komodo_gtest_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -komodo_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBVERUS_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +komodo_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) if ENABLE_ZMQ zcash_gtest_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 6afc3a7075a..c2101673749 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -361,7 +361,7 @@ qt_komodo_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET qt_komodo_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_komodo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBVERUS_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +qt_komodo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZCASH_LIBS) qt_komodo_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) qt_komodo_qt_LIBTOOLFLAGS = --tag CXX diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 2d56d07e381..3e57a89266a 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -30,7 +30,7 @@ qt_test_test_komodo_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) if ENABLE_WALLET qt_test_test_komodo_qt_LDADD += $(LIBBITCOIN_WALLET) endif -qt_test_test_komodo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBVERUS_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ +qt_test_test_komodo_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZCASH_LIBS) qt_test_test_komodo_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 1f9f9ac1e7f..59c66ad43f2 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -113,7 +113,7 @@ endif test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) -fopenmp $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS) -test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBVERUS_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) if ENABLE_WALLET diff --git a/src/Makefile.zcash.include b/src/Makefile.zcash.include index 4302b2e0da5..da5b4344da7 100644 --- a/src/Makefile.zcash.include +++ b/src/Makefile.zcash.include @@ -24,7 +24,6 @@ zcash_CreateJoinSplit_LDADD = \ $(LIBSNARK) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBVERUS_CRYPTO) \ $(BOOST_LIBS) \ $(LIBZCASH_LIBS) \ $(LIBCRYPTOCONDITIONS) \ diff --git a/src/fiat/verus.bat b/src/fiat/verus.bat deleted file mode 100644 index 0bf87d33bed..00000000000 --- a/src/fiat/verus.bat +++ /dev/null @@ -1,14 +0,0 @@ -@call :GET_CURRENT_DIR -@cd %THIS_DIR% -komodo-cli.exe -ac_name=VRSC %1 %2 %3 %4 %5 %6 %7 %8 %9 -@goto :EOF - -:GET_CURRENT_DIR -@pushd %~dp0 -@set THIS_DIR=%CD% -@popd -@goto :EOF - - - - diff --git a/src/hush-cli b/src/hush-cli deleted file mode 100755 index efa1840a6fc..00000000000 --- a/src/hush-cli +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Copyright (c) 2019 Hush developers - -# set working directory to the location of this script -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $DIR - -NAME=HUSH3 - -CLI=${KOMODOCLI:-./komodo-cli} -$CLI -ac_name=$NAME "$@" diff --git a/src/hushd b/src/hushd deleted file mode 100755 index 949779a90c1..00000000000 --- a/src/hushd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -# Copyright (c) 2019 Hush developers - -# set working directory to the location of this script -DIR="$( cd "$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" )" && pwd )" -cd $DIR - -NAME=HUSH3 -# this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn -SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac - -# Chain parameters -ERAS=3 -BLOCKTIME=150 -# 6250000 - (sprout pool at block 500,000) -SUPPLY=6178674 -FOUNDERS=1 -REWARD=0,1125000000,562500000 -PERC=11111111 -HALVING=129,340000,840000 -# NOTE: keep in sync with komodo_bitcoind.h -END=128,340000,5422111 -CLIENTNAME=GoldenSandtrout -SEEDNODE1=188.165.212.101 -SEEDNODE2=136.243.227.142 -SEEDNODE3=5.9.224.250 -CCLIB=hush3 - -# CryptoConditions/Custom Consensus params -FAUCET=228 -HEIR=234 -CHANNEL=235 -ORACLE=236 -GATEWAY=241 -CCENABLE=$FAUCET,$HEIR,$CHANNEL,$ORACLE,$GATEWAY - -KMD=${KOMODOD:-./komodod} -$KMD -ac_name=$NAME -ac_sapling=1 \ - -ac_reward=$REWARD \ - -ac_halving=$HALVING \ - -ac_end=$END \ - -ac_eras=$ERAS \ - -ac_blocktime=$BLOCKTIME \ - -ac_cc=2 -ac_ccenable=$CCENABLE \ - -ac_founders=$FOUNDERS -ac_supply=$SUPPLY \ - -ac_perc=$PERC \ - -clientname=$CLIENTNAME \ - -addnode=$SEEDNODE1 \ - -addnode=$SEEDNODE2 \ - -addnode=$SEEDNODE3 \ - -ac_cclib=$CCLIB \ - -ac_script=$SCRIPT "$@" diff --git a/src/verusd b/src/verusd deleted file mode 100755 index 17958551933..00000000000 --- a/src/verusd +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -#set working directory to the location of this script -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $DIR -./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 "$@" diff --git a/src/verusd.bat b/src/verusd.bat deleted file mode 100644 index b921ed4527c..00000000000 --- a/src/verusd.bat +++ /dev/null @@ -1,10 +0,0 @@ -@call :GET_CURRENT_DIR -@cd %THIS_DIR% -komodod.exe -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -ac_veruspos=50 %1 %2 %3 %4 %5 %6 %7 %8 %9 -@goto :EOF - -:GET_CURRENT_DIR -@pushd %~dp0 -@set THIS_DIR=%CD% -@popd -@goto :EOF diff --git a/zcutil/VerusCoin.xml b/zcutil/VerusCoin.xml deleted file mode 100644 index 914e2f14b2d..00000000000 --- a/zcutil/VerusCoin.xml +++ /dev/null @@ -1,432 +0,0 @@ - - VerusCoin - VerusCoin - 0.3.12 - ${product_shortname}-v${product_version}-${platform_name}-installer.${platform_exec_suffix} - ../COPYING - ../assets/imgs/VRSC_256x256.png - ../assets/imgs/VRSC_256x256.png - ../assets/imgs/VRSC_256x256.png - 1 - - - VerusCoin - VerusCoin CLI - 1 - 1 - 1 - 1 - - - Agama - Verus-Enhanced Agama Wallet - 1 - 1 - 1 - 1 - - - Start Agama App - - ../assets/icons/agama_icons/256x256.png - Agama App - - all - 0 - 0 - ${installdir}/Agama/Agama-win32-x64/Agama.exe - - - ${windows_folder_common_programs}/ - - - - - Verus-Enhanced Agama Wallet - ${installdir}/Agama - Agama - all - - - ../Agama-win32-x64 - - - - - - - - - Program Files - ${installdir} - programfiles - all - - - Uninstall - ${installdir}/${uninstallerName} - - Uninstall ${product_fullname} - ${installdir} - all - 0 - 0 - ${installdir}/${uninstallerName}.exe - - - ${installdir} - - - - - VerusCoin - ${installdir}/ - VerusCoin - all - - - ../verus-cli - - - - - - - - - HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} - uninstaller_path - uninstaller_path - - - previous_installation_exists - 1 - - - - - - - - ${uninstaller_path} - - - - equals - ${previous_installation_exists} - 1 - - - - - Deleting user data - ${windows_folder_appdata}/Agama - Deleting user data - - - equals - ${previous_installation_exists} - 1 - - - equals - ${installation_type} - uninstall - - - equals - ${delete_user_data} - 1 - - - - - Deleting iguana config json - ${windows_folder_appdata}/Iguana/config.json - Deleting iguana config - - - equals - ${previous_installation_exists} - 1 - - - equals - ${installation_type} - uninstall - - - equals - ${delete_config_data} - 1 - - - - - Uninstalled - Uninstalled - - - equals - ${previous_installation_exists} - 1 - - - equals - ${installation_type} - uninstall - - - - - Downloading files - - - 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon - ${system_temp_directory}/vc_redist.x64.exe - Downloading Visual C++ Redistributable for Visual Studio 2015 - 0 - https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe - - - - - 1 - ${system_temp_directory}/vc_redist.x64.exe - - - - - 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon - ${system_temp_directory}/vc_redist.x64.exe - /install /passive - Downloading Visual C++ Redistributable for Visual Studio 2015 - 0 - - - Downloading files - - - 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon - ${system_temp_directory}/vc_redist.x86.exe - Downloading Visual C++ Redistributable for Visual Studio 2015 - 0 - https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe - - - - - 1 - ${system_temp_directory}/vc_redist.x86.exe - - - - - 0 - Visual C++ Redistributable for Visual Studio 2015 library files are needed for Agama daemon - ${system_temp_directory}/vc_redist.x86.exe - /install /passive - Downloading Visual C++ Redistributable for Visual Studio 2015 - 0 - - - 0 - Creating ZcashParam directory - ${windows_folder_appdata}/ZcashParams/ - Creating ZcashParam directory - 0 - - - 0 - Zcash Params file: sprout-proving.key - Zcash Params file: sprout-proving.key - 0 - Downloading Zcash Params file - - - 0 - Zcash Params file: sprout-proving.key - ${windows_folder_appdata}/ZcashParams/sprout-proving.key - Zcash Params file: sprout-proving.key - 0 - https://z.cash/downloads/sprout-proving.key - - - - - 1 - ${windows_folder_appdata}/ZcashParams/sprout-proving.key - - - - - 0 - Zcash Params file: sprout-verifying.key - Zcash Params file: sprout-verifying.key - Downloading Zcash Params files - - - 0 - Zcash Params file: sprout-verifying.key - ${windows_folder_appdata}/ZcashParams/sprout-verifying.key - Zcash Params file: sprout-verifying.key - 0 - https://z.cash/downloads/sprout-verifying.key - - - - - 1 - ${windows_folder_appdata}/ZcashParams/sprout-verifying.key - - - - - - - VERUS_HOME - system - ${installdir}/verus-cli/ - - - HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} - uninstaller_path - REG_SZ - ${installdir}/${uninstallerName}.exe - - - - - C:\Windows\System32\ - Copying ReqCopying Required DLL filesuired DLL files - ${installdir}/resources/app/windeps/x86/vcruntime140d.dll - Copying ReqCopying Required DLL filesuired DLL files - - - - - - - - - - C:\Windows\System32\ - Copying ReqCopying Required DLL filesuired DLL files - ${installdir}/resources/app/windeps/x64/ucrtbased.dll - Copying ReqCopying Required DLL filesuired DLL files - - - C:\Windows\System32\ - Copying ReqCopying Required DLL filesuired DLL files - ${installdir}/resources/app/windeps/x64/vcruntime140d.dll - Copying ReqCopying Required DLL filesuired DLL files - - - C:\Windows\SysWOW64\ - Copying ReqCopying Required DLL filesuired DLL files - ${installdir}/resources/app/windeps/x86/ucrtbased.dll - Copying ReqCopying Required DLL filesuired DLL files - - - C:\Windows\SysWOW64\ - Copying ReqCopying Required DLL filesuired DLL files - ${installdir}/resources/app/windeps/x86/vcruntime140d.dll - Copying ReqCopying Required DLL filesuired DLL files - - - - - - - - - - HKEY_LOCAL_MACHINE\SOFTWARE\${project.shortname} - uninstaller_path - - - 1 - 1 - 1 - 1 - 1 - ../builds - 1 - ${windows_folder_appdata} - 1 - 1 - VerusCoin - 1 - - - installdir - Installer.Parameter.installdir.description - Installer.Parameter.installdir.explanation - - ${platform_install_prefix}/${product_shortname} - 0 - prefix - 1 - 0 - 30 - - - You don't have enough disk space to install the application, - please select another installation directory - - - less - ${installdir} - ${required_diskspace} - - - - - - - installation_type - Instalation type - Existing instalation is detected - Existing instalation is detected - uninstall - uninstall - - - uninstall - Uninstall - Uninstall - - - - - - 0 - 0 - - - - 0 - 0 - - - - - Upgrade - - - - - - - equals - ${previous_installation_exists} - 1 - - - - - - diff --git a/zcutil/build-mac-dtest.sh b/zcutil/build-mac-dtest.sh index b3cba3b8670..866c51f0702 100755 --- a/zcutil/build-mac-dtest.sh +++ b/zcutil/build-mac-dtest.sh @@ -1,13 +1,4 @@ #!/bin/bash -export CC=gcc-8 -export CXX=g++-8 -export LIBTOOL=libtool -export AR=ar -export RANLIB=ranlib -export STRIP=strip -export OTOOL=otool -export NM=nm - set -eu -o pipefail if [ "x$*" = 'x--help' ] @@ -18,11 +9,13 @@ Usage: $0 --help Show this help message and exit. -$0 [ --enable-lcov ] [ MAKEARGS... ] - Build Zcash and most of its transitive dependencies from - source. MAKEARGS are applied to both dependencies and Zcash itself. If - --enable-lcov is passed, Zcash is configured to add coverage +$0 [ --enable-lcov ] [ --enable-debug ] [ MAKEARGS... ] + Build Komodo and most of its transitive dependencies from + source. MAKEARGS are applied to both dependencies and Komodo itself. + If --enable-lcov is passed, Komodo is configured to add coverage instrumentation, thus enabling "make cov" to work. + If --enable-debug is passed, Komodo is built with debugging information. It + must be passed after the previous arguments, if present. EOF exit 0 fi @@ -37,6 +30,16 @@ then shift fi +# If --enable-debug is the next argument, enable debugging +DEBUGGING_ARG='' +if [ "x${1:-}" = 'x--enable-debug' ] +then + DEBUG=1 + export DEBUG + DEBUGGING_ARG='--enable-debug' + shift +fi + TRIPLET=`./depends/config.guess` PREFIX="$(pwd)/depends/$TRIPLET" @@ -51,8 +54,11 @@ echo $PWD cd $WD ./autogen.sh + CPPFLAGS="-I$PREFIX/include -arch x86_64 -DTESTMODE" LDFLAGS="-L$PREFIX/lib -arch x86_64 -Wl,-no_pie" \ -CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@8/8.4.0_2/include/c++/8.4.0_2/ -I$PREFIX/include -fwrapv -fno-strict-aliasing -Wno-builtin-declaration-mismatch -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \ -./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" +CXXFLAGS="-arch x86_64 -I$PREFIX/include -fwrapv -fno-strict-aliasing \ +-Wno-deprecated-declarations -Wno-deprecated-builtins -Wno-enum-constexpr-conversion \ +-Wno-unknown-warning-option -Werror -Wno-error=attributes -g" \ +./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$DEBUGGING_ARG" -make "$@" V=1 NO_GTEST=1 STATIC=1 +make "$@" NO_GTEST=1 STATIC=1 \ No newline at end of file diff --git a/zcutil/build-mac.sh b/zcutil/build-mac.sh index 4e51e63306a..0954d060b0e 100755 --- a/zcutil/build-mac.sh +++ b/zcutil/build-mac.sh @@ -1,13 +1,4 @@ #!/bin/bash -export CC=gcc-8 -export CXX=g++-8 -export LIBTOOL=libtool -export AR=ar -export RANLIB=ranlib -export STRIP=strip -export OTOOL=otool -export NM=nm - set -eu -o pipefail if [ "x$*" = 'x--help' ] @@ -18,11 +9,13 @@ Usage: $0 --help Show this help message and exit. -$0 [ --enable-lcov ] [ MAKEARGS... ] - Build Zcash and most of its transitive dependencies from - source. MAKEARGS are applied to both dependencies and Zcash itself. If - --enable-lcov is passed, Zcash is configured to add coverage +$0 [ --enable-lcov ] [ --enable-debug ] [ MAKEARGS... ] + Build Komodo and most of its transitive dependencies from + source. MAKEARGS are applied to both dependencies and Komodo itself. + If --enable-lcov is passed, Komodo is configured to add coverage instrumentation, thus enabling "make cov" to work. + If --enable-debug is passed, Komodo is built with debugging information. It + must be passed after the previous arguments, if present. EOF exit 0 fi @@ -37,6 +30,16 @@ then shift fi +# If --enable-debug is the next argument, enable debugging +DEBUGGING_ARG='' +if [ "x${1:-}" = 'x--enable-debug' ] +then + DEBUG=1 + export DEBUG + DEBUGGING_ARG='--enable-debug' + shift +fi + TRIPLET=`./depends/config.guess` PREFIX="$(pwd)/depends/$TRIPLET" @@ -58,8 +61,11 @@ make all cd $WD ./autogen.sh + CPPFLAGS="-I$PREFIX/include -arch x86_64" LDFLAGS="-L$PREFIX/lib -arch x86_64 -Wl,-no_pie" \ -CXXFLAGS='-arch x86_64 -I/usr/local/Cellar/gcc\@8/8.3.0/include/c++/8.3.0/ -I$PREFIX/include -fwrapv -fno-strict-aliasing -Wno-builtin-declaration-mismatch -Werror -g -Wl,-undefined -Wl,dynamic_lookup' \ -./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" +CXXFLAGS="-arch x86_64 -I$PREFIX/include -fwrapv -fno-strict-aliasing \ +-Wno-deprecated-declarations -Wno-deprecated-builtins -Wno-enum-constexpr-conversion \ +-Wno-unknown-warning-option -Werror -Wno-error=attributes -g" \ +./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" "$DEBUGGING_ARG" -make "$@" V=1 NO_GTEST=1 STATIC=1 +make "$@" NO_GTEST=1 STATIC=1 \ No newline at end of file