Merge pull request #586 from KomodoPlatform/dev

[release] v0.8.0

.github/workflows/komodo_mac_ci.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install deps (macOS)
         run: |
           brew update
-          brew upgrade
+          brew upgrade || true
           brew tap discoteq/discoteq; brew install flock
           brew install autoconf autogen automake
           brew install gcc@8

.github/workflows/komodo_win_ci.yml

@@ -32,7 +32,7 @@ jobs:
                              libncurses-dev \
                              unzip  \
                              git \
-                             python \
+                             python3 \
                              zlib1g-dev \
                              wget \
                              bsdmainutils \

.github/workflows/komodod_cd.yml

@@ -16,7 +16,7 @@ jobs:
   linux-build:
     name: Linux Build
     # using there as old release as possible with GHA worker to provide better compatibility
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
 
       - name: Extract branch name
@@ -79,7 +79,7 @@ jobs:
       - name: Install deps (macOS)
         run: |
           brew update
-          brew upgrade
+          brew upgrade || true
           brew tap discoteq/discoteq; brew install flock
           brew install autoconf autogen automake
           brew install gcc@8

.gitignore

@@ -161,5 +161,5 @@ Makefile.in
 configure
 doc/man/Makefile.in
 src/Makefile.in
-src/cc/customcc.so
+src/cc/libcc.so
 src/libcc.so

Dockerfile.release

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 RUN \ 
     apt-get update &&\
     apt-get install -y libgomp1

Makefile.am

@@ -344,3 +344,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-man
 
 clean-local:
 	rm -rf test_bitcoin.coverage/ zcash-gtest.coverage/ total.coverage/
+
+clean-all: clean-local
+	$(MAKE) -C src clean-all

README.md

@@ -58,11 +58,11 @@ Komodo is based on Zcash and has been extended by our innovative consensus algor
 
 ## Getting started
 
-### Dependencies
+### Dependencies (Ubuntu 20.04)
 
 ```shell
 #The following packages are needed:
-sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl4-gnutls-dev bsdmainutils automake curl libsodium-dev
+sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python3 python3-zmq zlib1g-dev wget libcurl4-gnutls-dev bsdmainutils automake curl libsodium-dev
 ```
 
 ### Build Komodo

SECURITY.md

@@ -9,22 +9,19 @@ Hash: SHA256
 Contact: [email protected]
 Contact: [email protected]
 Contact: [email protected]
-Encryption: http://pgp.key-server.io:11371/0x379287998EE6CF47
------BEGIN PGP SIGNATURE-----
+Encryption: https://keys.openpgp.org/vks/v1/by-fingerprint/7D49C41069D4A78FFAC2B7232D420826CF311F19
+-----BEGIN PGP PUBLIC KEY BLOCK-----
 
-iQJNBAEBCAA3FiEEVez5U2AlPa805zvqN5KHmY7mz0cFAlz6EuMZHGNhMzMzQGtv
-bW9kb3BsYXRmb3JtLmNvbQAKCRA3koeZjubPR8cIEACP+JjyXDIzjgIewMMi/02b
-tsYswPyQ+9bAoEJnis3r94d1FP1rqXmt4oNz6VwFTqQLEa5opW+gvvaxBTFJSPb0
-UzbS+1PjfAOox5cnT3Dnv9kcy4ECslnW/G+mH+85BUgz1HuqYc8A3kNQJL7KqLoi
-YeD0Hd09KtlG+B4PWdnqLw/uvfbavSKdMn6WSIU6adNZWX0ewSubWPXvrWea5cI2
-yKDdMcDqB8Sc9J4JR2L9zW8NqPQuaxfLQbkCt2tg9QjlClrAqQgb8OZQJgY9f1T/
-kBlVXoA4ZUZeifvjSKxQ/3TdRFP+jbV9xsb6sr14zTx+Wcoqtgsh3l9F4+T3V2m8
-/c/iS4mFlK31pJtwYyrJAq9hpggqymdCVi0Pa3yLZsEj3orBPaPWbmq2v7xeF3J8
-y8vqAkt3M3T6251aZAKEcaN5RXYJW70CTseadwp0tmrAL2nIVmziNCMOF+Bufyxi
-HddkasTcNX8VYfPCLWqBwrocx8d3n3E7dBGeS2x2iwuRVQ85pH5d+imxaMftcbqm
-YrNuiqcI/0XDGk9pS6f1gpu5Eh5Q2QXGmOoRlfosfkAEfgFxfaMvmcu5Ay1s0gSR
-MsTn0PrQyMYC3t3KpyP47C8ui9x7FtJFltR/QT4yzBF1QyDmINnK86ldQqSui402
-2+gQFt7YFvLIBUiy1fh1Jw==
-=UITq
------END PGP SIGNATURE-----
+mDMEY+62mRYJKwYBBAHaRw8BAQdAqK7CMI2SFtioUIFLSbpUq6QSmnWueIBTKJpB
+Ar15JBS0LUtvbW9kbyBTZWN1cml0eSA8c2VjdXJpdHlAa29tb2RvcGxhdGZvcm0u
+Y29tPoiZBBMWCgBBFiEEfUnEEGnUp4/6wrcjLUIIJs8xHxkFAmPutpkCGwMFCQPC
+ZwAFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQLUIIJs8xHxlU6AD/e/Z8
+T6w7AdNM6fXU/UXoyLU09BL+GBt/GU6RHXx1L9gBALyQFiyeFCEt4pbqkAYfp6l3
+GQ8W9r5x1V480mYPCesPuDgEY+62mRIKKwYBBAGXVQEFAQEHQNxl9WfOg69rsUPo
+gu03kiyEyXY1bctRmiRsYhJ5NKRcAwEIB4h+BBgWCgAmFiEEfUnEEGnUp4/6wrcj
+LUIIJs8xHxkFAmPutpkCGwwFCQPCZwAACgkQLUIIJs8xHxmRIQEA1Yy+bAqf7ZMJ
+mDfSs67TPShM7/N7DpEDxvMcnFENyJIBALq2kCSyBYBUuPYbPUunMq3LwkNS/GUz
+oH/1cpSRTLUF
+=hTp/
+-----END PGP PUBLIC KEY BLOCK-----
 ```

configure.ac

@@ -1,13 +1,13 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 7)
-define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_MINOR, 8)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2022)
+define(_COPYRIGHT_YEAR, 2023)
 AC_INIT([Komodo],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/KomodoPlatform/komodo/issues],[komodo])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
@@ -199,7 +199,7 @@ AC_LANG_PUSH([C++])
 AX_CHECK_COMPILE_FLAG([-Werror],[CXXFLAG_WERROR="-Werror"],[CXXFLAG_WERROR=""])
 
 if test "x$enable_debug" = xyes; then
-    CPPFLAGS="$CPPFLAGS -DDEBUG -DDEBUG_LOCKORDER"
+    CPPFLAGS="$CPPFLAGS -DDEBUG"
     if test "x$GCC" = xyes; then
         CFLAGS="$CFLAGS -g3 -O0"
     fi

depends/hosts/darwin.mk

@@ -8,10 +8,10 @@ darwin_CXX=g++-8 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysro
 darwin_CFLAGS=-pipe
 darwin_CXXFLAGS=$(darwin_CFLAGS)
 
-darwin_release_CFLAGS=-O1
+darwin_release_CFLAGS=-g -O2
 darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
 
-darwin_debug_CFLAGS=-O1
+darwin_debug_CFLAGS=-g -O0
 darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS)
 
 darwin_native_toolchain=native_cctools

depends/hosts/linux.mk

@@ -1,12 +1,11 @@
 linux_CFLAGS=-pipe
 linux_CXXFLAGS=$(linux_CFLAGS)
 
-linux_release_CFLAGS=-O1
+linux_release_CFLAGS=-g -O2
 linux_release_CXXFLAGS=$(linux_release_CFLAGS)
 
-linux_debug_CFLAGS=-O1
+linux_debug_CFLAGS=-g -O0
 linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
-
 linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
 
 ifeq (86,$(findstring 86,$(build_arch)))

depends/hosts/mingw32.mk

@@ -1,12 +1,11 @@
 mingw32_CC=x86_64-w64-mingw32-gcc-posix
 mingw32_CXX=x86_64-w64-mingw32-g++-posix
 mingw32_CFLAGS=-pipe -std=c11
-mingw32_CXXFLAGS=$(mingw32_CFLAGS) -std=c++11
+mingw32_CXXFLAGS=-pipe -std=c++11
 
-mingw32_release_CFLAGS=-O1
-mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)
-
-mingw32_debug_CFLAGS=-O1
-mingw32_debug_CXXFLAGS=$(mingw32_debug_CFLAGS)
+mingw32_release_CFLAGS=-g -O2
+mingw32_release_CXXFLAGS=$(mingw32_CXXFLAGS) $(mingw32_release_CFLAGS)
 
+mingw32_debug_CFLAGS=-g -O0
 mingw32_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
+mingw32_debug_CXXFLAGS=$(mingw32_CXXFLAGS) $(mingw32_debug_CFLAGS)

depends/packages/libevent.mk

@@ -1,18 +1,18 @@
 package=libevent
-$(package)_version=2.1.8
-$(package)_download_path=https://github.com/libevent/libevent/archive
+$(package)_version=2.1.12-stable
+$(package)_download_path=https://github.com/libevent/libevent/releases/download/release-$($(package)_version)/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_download_file=release-$($(package)_version)-stable.tar.gz
-$(package)_sha256_hash=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d
-
-define $(package)_preprocess_cmds
-  ./autogen.sh
-endef
+$(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 
+# When building for Windows, we set _WIN32_WINNT to target the same Windows
+# version as we do in configure. Due to quirks in libevents build system, this
+# is also required to enable support for ipv6. See #19375.
 define $(package)_set_vars
-  $(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress
+  $(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress --disable-samples
+  $(package)_config_opts += --disable-dependency-tracking --enable-option-checking
   $(package)_config_opts_release=--disable-debug-mode
   $(package)_config_opts_linux=--with-pic
+  $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0601
 endef
 
 define $(package)_config_cmds
@@ -28,4 +28,7 @@ define $(package)_stage_cmds
 endef
 
 define $(package)_postprocess_cmds
+  rm lib/*.la && \
+  rm include/ev*.h && \
+  rm include/event2/*_compat.h
 endef

depends/packages/libgmp.mk

@@ -22,7 +22,7 @@ $(package)_download_path=https://github.com/KomodoPlatform/libgmp/releases/downl
 $(package)_file_name=gmp-$($(package)_version).tar.bz2
 $(package)_sha256_hash=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
 $(package)_dependencies=
-$(package)_config_opts=--enable-cxx --disable-shared
+$(package)_config_opts=--enable-cxx --disable-shared --with-pic
 endif
 
 define $(package)_config_cmds

depends/packages/rust.mk

@@ -41,12 +41,12 @@ define $(package)_extract_cmds
 endef
 
 define $(package)_stage_cmds
-  ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig && \
+  ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig --without=rust-docs && \
   cp -r ../mingw32/rust-std-x86_64-pc-windows-gnu/lib/rustlib/x86_64-pc-windows-gnu $($(package)_staging_dir)$(host_prefix)/native/lib/rustlib
 endef
 else
 
 define $(package)_stage_cmds
-  ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig
+  ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(host_prefix)/native --disable-ldconfig --without=rust-docs
 endef
 endif