Update toolchains, deps and further cleanup

.dockerignore

@@ -54,7 +54,6 @@ src/config/defi-config.h
 src/config/defi-config.h.in
 src/config/stamp-h1
 src/obj
-share/setup.nsi
 
 .deps
 .dirstamp

.github/workflows/build-dev.yaml

@@ -12,7 +12,6 @@ on:
       - master
 
 env:
-  MAKE_CONF_ARGS: --disable-bench
   BUILD_VERSION: latest # Computed
 
 jobs:
@@ -22,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v3
@@ -64,7 +63,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Build and package
-      run: DOCKERFILE="arm-linux-gnueabihf" TARGET="arm-linux-gnueabihf" ./make.sh docker-release-git
+      run: TARGET="arm-linux-gnueabihf" ./make.sh docker-release-git
 
     - name: Publish artifact - arm-linux-gnueabihf
       uses: actions/upload-artifact@v3

.github/workflows/build-release.yaml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:

.github/workflows/lint.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
     env:
       BUILD_VERSION: latest # Computed
       GITHUB_PULL_REQUEST: ${{ github.event.number }}

.github/workflows/tests-e2e.yaml

@@ -19,9 +19,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
     env:
-      BUILD_VERSION: latest # Computed
       GITHUB_PULL_REQUEST: ${{ github.event.number }}
       PYTHON: 3.6
       TRAVIS_BUILD_DIR: ${{ github.workspace }}

.github/workflows/tests-jellyfish.yml

@@ -5,7 +5,9 @@ on:
   pull_request:
     branches:
       - master
-
+env:
+  BUILD_VERSION: latest # Computed
+
 jobs:
   test:
     name: Test
@@ -27,7 +29,7 @@ jobs:
       - name: Set build version
         run: |
           cd defichain
-          DOCKERFILE="x86_64-pc-linux-gnu-clang" TARGET="x86_64-pc-linux-gnu" ./make.sh git_version
+          ./make.sh git_version
 
       - name: Build and package
         run: |

.github/workflows/tests-sync.yml

@@ -25,7 +25,7 @@ jobs:
         fetch-depth: 0
 
     - name: Build Node
-      run: MAKE_CONF_ARGS="--disable-bench --disable-tests" ./make.sh build
+      run: TARGET="x86_64-pc-linux-gnu" ./make.sh build
 
     - name: Upload Binaries
       uses: actions/upload-artifact@v3

.gitignore

@@ -48,8 +48,6 @@ src/config/defi-config.h
 src/config/defi-config.h.in
 src/config/stamp-h1
 src/obj
-share/setup.nsi
-share/qt/Info.plist
 
 src/univalue/gen
 

Makefile.am

@@ -13,13 +13,13 @@ DEFID_BIN=$(top_builddir)/src/$(DEFI_DAEMON_NAME)$(EXEEXT)
 DEFI_CLI_BIN=$(top_builddir)/src/$(DEFI_CLI_NAME)$(EXEEXT)
 DEFI_TX_BIN=$(top_builddir)/src/$(DEFI_TX_NAME)$(EXEEXT)
 
-support_examples_dir = $(pkgdatadir)/examples
-support_examples__DATA = $(top_srcdir)/share/examples/default.conf \
-		$(top_srcdir)/share/examples/pruned.conf
+support_examples_dir = $(pkgdatadir)/conf-examples
+support_examples__DATA = $(top_srcdir)/contrib/conf-examples/default.conf \
+		$(top_srcdir)/contrib/conf-examples/pruned.conf
 
 support_rpcauth_dir = $(pkgdatadir)/rpcauth
-support_rpcauth__DATA = $(top_srcdir)/share/rpcauth/rpcauth.py \
-		$(top_srcdir)/share/rpcauth/README.md
+support_rpcauth__DATA = $(top_srcdir)/contrib/rpcauth/rpcauth.py \
+		$(top_srcdir)/contrib/rpcauth/README.md
 
 support_service_dir = $(pkgdatadir)/service
 support_service__DATA = \
@@ -29,22 +29,22 @@ support_service__DATA = \
 		$(top_srcdir)/contrib/init/defid.service
 
 support_bash_dir = $(datadir)/bash-completion/completions
-support_bash__DATA = $(top_srcdir)/contrib/defi-cli.bash-completion \
-		$(top_srcdir)/contrib/defi-tx.bash-completion \
-		$(top_srcdir)/contrib/defid.bash-completion
+support_bash__DATA = $(top_srcdir)/contrib/bash-completion/defi-cli.bash-completion \
+		$(top_srcdir)/contrib/bash-completion/defi-tx.bash-completion \
+		$(top_srcdir)/contrib/bash-completion/defid.bash-completion
 
 empty :=
 space := $(empty) $(empty)
 
 DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
-DIST_CONTRIB = $(top_srcdir)/contrib/defi-cli.bash-completion \
-	       $(top_srcdir)/contrib/defi-tx.bash-completion \
-	       $(top_srcdir)/contrib/defid.bash-completion \
+DIST_CONTRIB = $(top_srcdir)/contrib/bash-completion/defi-cli.bash-completion \
+	       $(top_srcdir)/contrib/bash-completion/defi-tx.bash-completion \
+	       $(top_srcdir)/contrib/bash-completion/defid.bash-completion \
 	       $(top_srcdir)/contrib/init \
 	       $(top_srcdir)/contrib/install_db4.sh
 DIST_SHARE = \
-  $(top_srcdir)/share/genbuild.sh \
-  $(top_srcdir)/share/rpcauth
+  $(top_srcdir)/contrib/genbuild.sh \
+  $(top_srcdir)/contrib/rpcauth
 
 BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
@@ -197,6 +197,6 @@ clean-docs:
 
 clean-local: clean-docs
 	rm -rf coverage_percent.txt test_defi.coverage/ total.coverage/ test/tmp/ cache/
-	rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__
+	rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache contrib/rpcauth/__pycache__
 	rm -rf osx_volname dist/ dpi36.background.tiff dpi72.background.tiff
 

ci/extended_lint/04_install.sh

@@ -6,7 +6,7 @@
 
 export LC_ALL=C
 
-CPPCHECK_VERSION=1.86
+CPPCHECK_VERSION=2.10
 curl -s https://codeload.github.com/danmar/cppcheck/tar.gz/${CPPCHECK_VERSION} | tar -zxf - --directory /tmp/
 (cd /tmp/cppcheck-${CPPCHECK_VERSION}/ && make CFGDIR=/tmp/cppcheck-${CPPCHECK_VERSION}/cfg/ > /dev/null)
 export PATH="$PATH:/tmp/cppcheck-${CPPCHECK_VERSION}/"

ci/test/06_script_a.sh

@@ -28,7 +28,6 @@ END_FOLD
 
 BEGIN_FOLD distdir
 DOCKER_EXEC make distdir VERSION=$HOST
-DOCKER_EXEC cp -r ../share  "defi-$HOST/"
 DOCKER_EXEC cp -r ../contrib  "defi-$HOST/"
 END_FOLD
 

share/examples/default.conf → contrib/conf-examples/default.conf

@@ -81,9 +81,9 @@
 # If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API.
 #
 # The config option `rpcauth` can be added to server startup argument. It is set at initialization time
-# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
+# using the output from the script in contrib/rpcauth/rpcauth.py after providing a username:
 #
-# ./share/rpcauth/rpcauth.py alice
+# ./contrib/rpcauth/rpcauth.py alice
 # String to be appended to defi.conf:
 # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
 # Your password:

share/examples/pruned.conf → contrib/conf-examples/pruned.conf

@@ -81,9 +81,9 @@
 # If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API.
 #
 # The config option `rpcauth` can be added to server startup argument. It is set at initialization time
-# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
+# using the output from the script in contrib/rpcauth/rpcauth.py after providing a username:
 #
-# ./share/rpcauth/rpcauth.py alice
+# ./contrib/rpcauth/rpcauth.py alice
 # String to be appended to defi.conf:
 # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
 # Your password:

contrib/devtools/optimize-pngs.py

@@ -26,7 +26,7 @@ def content_hash(filename):
 
 pngcrush = 'pngcrush'
 git = 'git'
-folders = ["share/pixmaps"]
+folders = ["contrib/pixmaps"]
 basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel'], universal_newlines=True, encoding='utf8').rstrip('\n')
 totalSaveBytes = 0
 noHashChange = True

contrib/dockerfiles/aarch64-linux-gnu.dockerfile

@@ -1,7 +1,7 @@
 ARG TARGET=aarch64-linux-gnu
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -27,7 +27,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -44,7 +43,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM arm64v8/ubuntu:20.04
+FROM --platform=linux/arm64 ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}

contrib/dockerfiles/arm-linux-gnueabihf.dockerfile

@@ -1,7 +1,7 @@
 ARG TARGET=arm-linux-gnueabihf
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -27,7 +27,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -44,7 +43,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM arm32v7/ubuntu:20.04
+FROM --platform=linux/arm/v7 ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}

contrib/dockerfiles/x86_64-apple-darwin18.dockerfile

@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-apple-darwin18
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -28,7 +28,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -45,7 +44,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}

contrib/dockerfiles/x86_64-pc-linux-gnu-clang.dockerfile

@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-pc-linux-gnu
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM debian:10 as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -22,12 +22,13 @@ LABEL org.defichain.arch=${TARGET}
 WORKDIR /work
 COPY ./depends ./depends
 
-RUN ./make.sh clean-depends && ./make.sh build-deps
+RUN ./make.sh clean-depends && \
+    export MAKE_DEPS_ARGS="x86_64_linux_CC=clang-16 x86_64_linux_CXX=clang++-16" && \
+    ./make.sh build-deps
 
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -45,7 +46,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}

contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile

@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-pc-linux-gnu
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -26,7 +26,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -44,7 +43,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}

contrib/dockerfiles/x86_64-w64-mingw32.dockerfile

@@ -1,7 +1,7 @@
 ARG TARGET=x86_64-w64-mingw32
 
 # -----------
-FROM ubuntu:20.04 as builder-base
+FROM ubuntu:latest as builder-base
 ARG TARGET
 LABEL org.defichain.name="defichain-builder-base"
 LABEL org.defichain.arch=${TARGET}
@@ -30,7 +30,6 @@ RUN ./make.sh clean-depends && ./make.sh build-deps
 # -----------
 FROM builder-base as builder
 ARG TARGET
-ARG BUILD_VERSION=
 
 LABEL org.defichain.name="defichain-builder"
 LABEL org.defichain.arch=${TARGET}
@@ -47,7 +46,7 @@ RUN mkdir /app && make prefix=/ DESTDIR=/app install && cp /work/README.md /app/
 
 # -----------
 ### Actual image that contains defi binaries
-FROM ubuntu:20.04
+FROM ubuntu:latest
 ARG TARGET
 LABEL org.defichain.name="defichain"
 LABEL org.defichain.arch=${TARGET}

share/genbuild.sh → contrib/genbuild.sh

@@ -25,7 +25,7 @@ git_check_in_repo() {
 DESC=""
 SUFFIX=""
 CURRENT_BRANCH=""
-if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then
+if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo contrib/genbuild.sh; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null