Merge branch 'dev' into bzedge

Cargo.toml

@@ -33,10 +33,18 @@ tracing = "0.1"
 tracing-core = "0.1"
 tracing-appender = "0.1"
 zcash_history = "0.2"
-zcash_primitives = "0.4"
-zcash_proofs = "0.4"
+zcash_primitives = "0.5"
+zcash_proofs = "0.5"
 ed25519-zebra = "2.0.0"
 
+# Metrics
+hyper = { version = "=0.14.2", default-features = false, features = ["server", "tcp", "http1"] }
+ipnet = "2"
+metrics = "0.14.2"
+metrics-exporter-prometheus = "0.3"
+thiserror = "1"
+tokio = { version = "1.0", features = ["rt", "net", "time", "macros"] }
+
 # Temporary workaround for https://github.com/myrrlyn/funty/issues/3
 funty = "=1.1.0"
 

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
-define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_MINOR, 4)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 50)
 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)))
@@ -370,32 +370,29 @@ use_pkgconfig=yes
 case $host in
   *mingw*)
 
-     #pkgconfig does more harm than good with MinGW
+     dnl pkgconfig does more harm than good with MinGW
      use_pkgconfig=no
 
      TARGET_OS=windows
-     AC_CHECK_LIB([mingwthrd],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([kernel32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([user32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([gdi32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([comdlg32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([winspool],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([winmm],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([shell32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([comctl32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([ole32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([oleaut32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([uuid],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([rpcrt4],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([advapi32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([ws2_32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([mswsock],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([shlwapi],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([iphlpapi],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([crypt32],      [main],, AC_MSG_ERROR(lib missing))
-
-     # -static is interpreted by libtool, where it has a different meaning.
-     # In libtool-speak, it's -all-static.
+     AC_CHECK_LIB([kernel32],   [GetModuleFileNameA],,      AC_MSG_ERROR(libkernel32 missing))
+     AC_CHECK_LIB([user32],     [main],,                    AC_MSG_ERROR(libuser32 missing))
+     AC_CHECK_LIB([gdi32],      [main],,                    AC_MSG_ERROR(libgdi32 missing))
+     AC_CHECK_LIB([comdlg32],   [main],,                    AC_MSG_ERROR(libcomdlg32 missing))
+     AC_CHECK_LIB([winmm],      [main],,                    AC_MSG_ERROR(libwinmm missing))
+     AC_CHECK_LIB([shell32],    [SHGetSpecialFolderPathW],, AC_MSG_ERROR(libshell32 missing))
+     AC_CHECK_LIB([comctl32],   [main],,                    AC_MSG_ERROR(libcomctl32 missing))
+     AC_CHECK_LIB([ole32],      [CoCreateInstance],,        AC_MSG_ERROR(libole32 missing))
+     AC_CHECK_LIB([oleaut32],   [main],,                    AC_MSG_ERROR(liboleaut32 missing))
+     AC_CHECK_LIB([uuid],       [main],,                    AC_MSG_ERROR(libuuid missing))
+     AC_CHECK_LIB([advapi32],   [CryptAcquireContextW],,    AC_MSG_ERROR(libadvapi32 missing))
+     AC_CHECK_LIB([ws2_32],     [WSAStartup],,              AC_MSG_ERROR(libws2_32 missing))
+     AC_CHECK_LIB([shlwapi],    [PathRemoveFileSpecW],,     AC_MSG_ERROR(libshlwapi missing))
+     AC_CHECK_LIB([iphlpapi],   [GetAdaptersAddresses],,    AC_MSG_ERROR(libiphlpapi missing))
+     AC_CHECK_LIB([ntdll],      [main],,                    AC_MSG_ERROR(libntdll missing))
+     AC_CHECK_LIB([bcrypt],     [main],,                    AC_MSG_ERROR(libbcrypt missing))
+
+     dnl -static is interpreted by libtool, where it has a different meaning.
+     dnl In libtool-speak, it's -all-static.
      AX_CHECK_LINK_FLAG([[-static]],[LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"])
 
      AC_PATH_PROG([MAKENSIS], [makensis], none)
@@ -405,17 +402,8 @@ case $host in
 
      ZC_REQUIRE_TOOL(WINDRES, windres)
 
-     CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB"
+     CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
      LEVELDB_TARGET_FLAGS="-DOS_WINDOWS"
-     if test "x$CXXFLAGS_overridden" = "xno"; then
-       CXXFLAGS="$CXXFLAGS -w"
-     fi
-     case $host in
-       i?86-*) WINDOWS_BITS=32 ;;
-       x86_64-*) WINDOWS_BITS=64 ;;
-       *) AC_MSG_ERROR("Could not determine win32/win64 for installer") ;;
-     esac
-     AC_SUBST(WINDOWS_BITS)
 
      dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
      dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
@@ -425,6 +413,8 @@ case $host in
      archive_cmds_CXX="\$CC -shared \$libobjs \$deplibs \$compiler_flags -static -o \$output_objdir/\$soname \${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker \$lib"
      postdeps_CXX=
 
+     dnl We require Windows 7 (NT 6.1) or later
+     AX_CHECK_LINK_FLAG([[-Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1]],[LDFLAGS="$LDFLAGS -Wl,--major-subsystem-version -Wl,6 -Wl,--minor-subsystem-version -Wl,1"],,[[$LDFLAG_WERROR]])
      ;;
   *darwin*)
      TARGET_OS=darwin
@@ -560,8 +550,6 @@ if test x$ac_cv_sys_large_files != x &&
   CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
 fi
 
-AX_CHECK_LINK_FLAG([[-Wl,--large-address-aware]], [LDFLAGS="$LDFLAGS -Wl,--large-address-aware"])
-
 AX_GCC_FUNC_ATTRIBUTE([visibility])
 AX_GCC_FUNC_ATTRIBUTE([dllexport])
 AX_GCC_FUNC_ATTRIBUTE([dllimport])

contrib/ci-builders/docker-build.sh → contrib/ci-builders/buildbot/docker-build.sh

@@ -17,6 +17,14 @@ docker push electriccoinco/zcashd-gitian-debian10
 docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-bbworker-debian10
 docker push electriccoinco/zcashd-bbworker-debian10
 
+# Debian 11
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=bullseye -t electriccoinco/zcashd-build-debian11
+docker push electriccoinco/zcashd-build-debian11
+docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=bullseye -t electriccoinco/zcashd-gitian-debian11
+docker push electriccoinco/zcashd-gitian-debian11
+docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=bullseye -t electriccoinco/zcashd-bbworker-debian11
+docker push electriccoinco/zcashd-bbworker-debian11
+
 # Ubuntu 16.04
 docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=16.04 -t electriccoinco/zcashd-build-ubuntu1604
 docker push electriccoinco/zcashd-build-ubuntu1604
@@ -25,18 +33,20 @@ docker push electriccoinco/zcashd-gitian-ubuntu1604
 docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1604 -t electriccoinco/zcashd-bbworker-ubuntu1604
 docker push electriccoinco/zcashd-bbworker-ubuntu1604
 
-# Ubuntu 18.04, 20.04
+# Ubuntu 18.04
 docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-build-ubuntu1804
-docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-build-ubuntu2004
 docker push electriccoinco/zcashd-build-ubuntu1804
-docker push electriccoinco/zcashd-build-ubuntu2004
 docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1804 -t electriccoinco/zcashd-gitian-ubuntu1804
-docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-gitian-ubuntu2004
 docker push electriccoinco/zcashd-gitian-ubuntu1804
-docker push electriccoinco/zcashd-gitian-ubuntu2004
 docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1804 -t electriccoinco/zcashd-bbworker-ubuntu1804
-docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-bbworker-ubuntu2004
 docker push electriccoinco/zcashd-bbworker-ubuntu1804
+
+# Ubuntu 20.04
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-build-ubuntu2004
+docker push electriccoinco/zcashd-build-ubuntu2004
+docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-gitian-ubuntu2004
+docker push electriccoinco/zcashd-gitian-ubuntu2004
+docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-bbworker-ubuntu2004
 docker push electriccoinco/zcashd-bbworker-ubuntu2004
 
 # Centos8

contrib/ci-builders/tekton/Dockerfile-build.apt

@@ -0,0 +1,9 @@
+ARG FROMBASEOS
+ARG FROMBASEOS_BUILD_TAG
+FROM $FROMBASEOS:$FROMBASEOS_BUILD_TAG
+ARG DEBIAN_FRONTEND=noninteractive
+
+ADD apt-package-list.txt /tmp/apt-package-list.txt
+RUN apt-get update \
+    && apt-get install -y $(tr "\n" " " < /tmp/apt-package-list.txt) \
+    && update-alternatives --install /usr/bin/python python /usr/bin/python3 1

contrib/ci-builders/tekton/Dockerfile-build.arch

@@ -0,0 +1,14 @@
+ARG FROMBASEOS
+ARG FROMBASEOS_BUILD_TAG
+FROM $FROMBASEOS:$FROMBASEOS_BUILD_TAG
+
+RUN pacman -Syyu --noconfirm \
+    && pacman -S --noconfirm \
+      base-devel \
+      git \
+      python3 \
+      python-pip \
+      ncurses \
+      wget
+
+RUN sudo link /lib/libtinfo.so.6 /lib/libtinfo.so.5

contrib/ci-builders/tekton/Dockerfile-build.centos8

@@ -0,0 +1,14 @@
+FROM centos:8
+
+RUN yum update -y \
+    && dnf group install -y "Development Tools" \
+    && yum install -y \
+      ncurses-compat-libs \
+      python3 \
+      python3-devel \
+      wget
+
+RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
+RUN chmod +x /usr/bin/dumb-init
+RUN alternatives --set  python /usr/bin/python3 \
+    && python3 -m pip install virtualenv

contrib/ci-builders/tekton/Dockerfile-tekton-worker

@@ -0,0 +1,11 @@
+ARG FROMBASEOS
+ARG FROMBASEOS_BUILD_TAG
+FROM electriccoinco/zcashd-build-$FROMBASEOS$FROMBASEOS_BUILD_TAG
+
+ADD requirements.txt requirements.txt
+RUN python -m venv venv \
+    && . venv/bin/activate \
+    && pip install --upgrade pip \
+    && python -m pip install -r requirements.txt
+
+ADD ./zcash-params /home/.zcash-params

contrib/ci-builders/tekton/README.md

@@ -0,0 +1,35 @@
+# zcashd ci Docker images
+
+These Dockerfiles can be used to build zcashd.
+
+The current objective is to build a base image for each distribution that includes the system packages to build zcashd. From `build` images, more targeted images are created.
+
+The process is meant to be automated, but an example `docker-build.sh` script is included.
+
+
+## build images
+`apt-package-tekton-list.txt` contains the required packages for debian based systems.
+
+`Dockerfile-build.apt` uses that file, and some build time arguments, to build apt based build images.
+
+Currently available images are hosted at
+https://hub.docker.com/r/electriccoinco/zcashd-build/tags
+
+
+
+## Tekton worker images
+
+`Dockerfile-tekton-worker` uses the above build images as a base and layers on toolchains needed for testing
+
+- requirements.txt is the python package requirements for the tekton worker
+
+Currently available images are hosted at https://hub.docker.com/r/electriccoinco
+
+
+### Stand alone, best effort images
+
+Additional Tekton base builders for Centos8 and Arch. Can be used with `Dockerfile-tekton-worker` to create Tekton workers.
+
+- Dockerfile-build.arch
+- Dockerfile-build.centos8
+

contrib/ci-builders/tekton/apt-package-tekton-list.txt

@@ -0,0 +1,24 @@
+autoconf
+bsdmainutils
+build-essential
+cmake
+curl
+g++-aarch64-linux-gnu
+git
+lcov
+libcap-dev
+libffi-dev
+libtinfo5
+libtool
+libssl-dev
+libz-dev
+libbz2-dev
+mingw-w64
+pkg-config
+python3
+python3-pip
+python3-dev
+python3-venv
+valgrind
+wget
+zstd

contrib/ci-builders/tekton/docker-build.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C
+set -exo pipefail
+
+# Debian 9
+docker build . -f Dockerfile-build-python.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-build-debian9
+docker push electriccoinco/zcashd-build-debian9
+
+docker build . -f Dockerfile-tekton-worker --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-worker-debian9
+docker push electriccoinco/zcashd-worker-debian9
+
+# Debian 10
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-build-debian10
+docker push electriccoinco/zcashd-build-debian10
+
+docker build . -f Dockerfile-tekton-worker --build-arg BASEOS=debian --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-worker-debian10
+docker push electriccoinco/zcashd-worker-debian10
+
+# Debian 11
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=bullseye -t electriccoinco/zcashd-build-debian11
+docker push electriccoinco/zcashd-build-debian11
+
+docker build . -f Dockerfile-tekton-worker --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=11 -t electriccoinco/zcashd-worker-debian11
+docker push electriccoinco/zcashd-worker-debian11
+
+# Ubuntu 16.04
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=16.04 -t electriccoinco/zcashd-build-ubuntu1604
+docker push electriccoinco/zcashd-build-ubuntu1604
+
+docker build . -f Dockerfile-tekton-worker --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1604 -t electriccoinco/zcashd-worker-ubuntu1604
+docker push electriccoinco/zcashd-worker-ubuntu1604
+
+# Ubuntu 18.04
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-build-ubuntu1804
+docker push electriccoinco/zcashd-build-ubuntu1804
+
+docker build . -f Dockerfile-tekton-worker --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1804 -t electriccoinco/zcashd-worker-ubuntu1804
+docker push electriccoinco/zcashd-worker-ubuntu1804
+
+# Ubuntu 20.04
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-build-ubuntu2004
+docker push electriccoinco/zcashd-build-ubuntu2004
+
+docker build . -f Dockerfile-tekton-worker --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-worker-ubuntu2004
+docker push electriccoinco/zcashd-worker-ubuntu2004
+
+# Centos8
+docker build . -f Dockerfile-build.centos8 -t electriccoinco/zcashd-build-centos8
+docker push electriccoinco/zcashd-build-centos8
+
+docker build . -f Dockerfile-tekton-worker --build-arg FROMBASEOS=centos --build-arg FROMBASEOS_BUILD_TAG=8  -t electriccoinco/zcashd-worker-centos8
+docker push electriccoinco/zcashd-worker-centos8
+
+# Arch 20210418.0.20194
+docker build . -f Dockerfile-build.arch --build-arg FROMBASEOS=archlinux --build-arg FROMBASEOS_BUILD_TAG=base-20210418.0.20194 -t electriccoinco/zcashd-build-archlinux
+docker push electriccoinco/zcashd-build-archlinux
+
+docker build . -f Dockerfile-tekton-worker --build-arg FROMBASEOS=archlinux -t electriccoinco/zcashd-worker-archlinux
+docker push electriccoinco/zcashd-worker-archlinux

contrib/ci-builders/tekton/requirements.txt

@@ -0,0 +1,8 @@
+wheel
+pyblake2
+pyflakes
+pyutil
+pyzmq
+requests
+simplejson
+twisted[tls]

contrib/debian/changelog

@@ -1,3 +1,27 @@
+zcash (4.4.1) stable; urgency=medium
+
+  * 4.4.1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Wed, 09 Jun 2021 23:19:49 +0100
+
+zcash (4.4.1~rc1) stable; urgency=medium
+
+  * 4.4.1-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Tue, 08 Jun 2021 22:45:20 +0100
+
+zcash (4.4.0) stable; urgency=medium
+
+  * 4.4.0 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Thu, 15 Apr 2021 16:55:39 +1200
+
+zcash (4.4.0~rc1) stable; urgency=medium
+
+  * 4.4.0-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Fri, 09 Apr 2021 17:40:36 +1200
+
 zcash (4.3.0) stable; urgency=medium
 
   * 4.3.0 release.