V12.3.1

.gitignore

@@ -35,8 +35,8 @@ config.log
 config.status
 configure
 libtool
-src/config/dash-config.h
-src/config/dash-config.h.in
+src/config/absolute-config.h
+src/config/absolute-config.h.in
 src/config/stamp-h1
 share/setup.nsi
 share/qt/Info.plist
@@ -82,6 +82,7 @@ libconftest.dylib*
 Makefile
 absolute-qt
 Absolute-Qt.app
+!/depends/Makefile
 
 # Unit-tests
 Makefile.test
@@ -108,7 +109,7 @@ linux-coverage-build
 linux-build
 win32-build
 qa/pull-tester/tests_config.py
-
+qa/pull-tester/tests_config.ini
 qa/cache/*
 
 

.travis.yml

@@ -1,101 +1,122 @@
 # errata:
-# - A travis bug causes caches to trample eachother when using the same
-#   compiler key (which we don't use anyway). This is worked around for now by
-#   replacing the "compilers" with a build name prefixed by the no-op ":"
-#   command. See: https://github.com/travis-ci/travis-ci/issues/4393
 # - sudo/dist/group are set so as to get Blue Box VMs, necessary for [loopback]
 #   IPv6 support
 
 sudo: required
-dist: trusty
-group: deprecated-2017Q3
+dist: bionic
 
 os: linux
 language: generic
 
+services:
+  - docker
+
 cache:
-  apt: true
   ccache: true
   directories:
-    - depends/built
-    - depends/sdk-sources
-    - $HOME/.ccache
+    - $HOME/cache
 
 env:
   global:
-    - MAKEJOBS=-j5
-    - RUN_TESTS=false
-    - CHECK_DOC=0
-    - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
-    - CCACHE_SIZE=400M
-    - CCACHE_TEMPDIR=/tmp/.ccache-temp
-    - CCACHE_COMPRESS=1
-    - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
-    - SDK_URL=https://bitcoincore.org/depends-sources/sdks
-    - PYTHON_DEBUG=1
-    - WINEDEBUG=fixme-all
+    # DOCKER_HUB_USER
+    - secure: "absolutetestuser"
+    # DOCKER_HUB_PASSWORD
+    - secure: "absolutetestuser"
+    - DOCKER_BUILD=false
+
+stages:
+  - build depends
+  - build src
+  - run tests
+  - build docker
+
+builddepends: &builddepends
+  stage: build depends
+  script:
+    - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
+
+buildsrc: &buildsrc
+  stage: build src
+  script:
+    - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
+
+runtests: &runtests
+  stage: run tests
+  script:
+    - $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh
+    - $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh --jobs=3
 
-  matrix:
-# ARM
-    - HOST=arm-linux-gnueabihf PPA="ppa:bitcoin/bitcoin" PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-# Win32
-    - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PPA="ppa:bitcoin/bitcoin" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.7 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j4"
-# 32-bit + absolute
-    - HOST=i686-pc-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="g++-multilib bc python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/absolute" PYZMQ=true
-# Win64
-    - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PPA="ppa:bitcoin/bitcoin" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.7 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j4"
-# absoluted
-    - HOST=x86_64-unknown-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="bc python3-zmq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports" CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_ABSOLUTE_DEBUG" PYZMQ=true
-# No wallet
-    - HOST=x86_64-unknown-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-# Cross-Mac
-    - HOST=x86_64-apple-darwin11 PPA="ppa:bitcoin/bitcoin" PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
+builddocker: &builddocker
+  stage: build docker
+  script:
+    # no need to run tests again here
+    - if [ "$DOCKER_BUILD" = "true" ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh && $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && BUILD_DIR=build-ci/absolutecore-$BUILD_TARGET ./docker/build-docker.sh; fi
+
+jobs:
+  include:
+    # build depends
+    - <<: *builddepends
+      env: BUILD_TARGET=arm-linux
+    - <<: *builddepends
+      env: BUILD_TARGET=win64
+    - <<: *builddepends
+      env: BUILD_TARGET=linux64
+    - <<: *builddepends
+      env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
+    - <<: *builddepends
+      env: BUILD_TARGET=mac
+    # build source
+    - <<: *buildsrc
+      env: BUILD_TARGET=arm-linux
+    - <<: *buildsrc
+      env: BUILD_TARGET=win64
+    - <<: *buildsrc
+      env: BUILD_TARGET=linux64
+    - <<: *buildsrc
+      env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
+    - <<: *buildsrc
+      env: BUILD_TARGET=mac
+    # run tests (no tests for arm-linux and mac)
+    - <<: *runtests
+      env: BUILD_TARGET=win64
+    - <<: *runtests
+      env: BUILD_TARGET=linux64
+    - <<: *runtests
+      env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
+    # build docker
+    - <<: *builddocker
+      env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
+
+before_cache:
+  # Save builder image
+  - docker save absolute-builder-$BUILD_TARGET-$TRAVIS_JOB_NUMBER $(docker history -q absolute-builder-$BUILD_TARGET-$TRAVIS_JOB_NUMBER | grep -v \<missing\>) | gzip -2 > $HOME/cache/docker/absolute-builder-$BUILD_TARGET.tar.gz
 
 before_install:
+  - travis_retry travis_apt_get_update
+  - travis_retry sudo apt-get -yq --no-install-suggests --no-install-recommends install docker-ce
 
-    - git clone https://github.com/absolute-community/absolute_hash
-    - travis_retry sudo apt-get install python3-pip python3-dev
-    - travis_retry sudo add-apt-repository ppa:ubuntu-wine/ppa -y
-    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
-    - chmod +rwx -R depends/
-    - chmod +rwx -R qa/
-    - chmod +rwx -R src/
-    - chmod +rwx -R share/
-    - chmod +rwx -R contrib/
-    - chmod +rwx autogen.sh
 install:
-    - if [ "$PYZMQ" = "true" ]; then pip3 install pyzmq --user ; fi
-    - if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi
-    - if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
-    - cd absolute_hash && python3 setup.py install --user && cd ..
-before_script:
-    - unset CC; unset CXX
-    - unset DISPLAY
-    #- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi TODO reenable after all Bitcoin PRs have been merged and docs fully fixed
-    - mkdir -p depends/SDKs depends/sdk-sources
-    - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
-script:
+    # Our scripts try to be Travis agnostic
+    - export PULL_REQUEST="$TRAVIS_PULL_REQUEST"
+    - export JOB_NUMBER="$TRAVIS_JOB_NUMBER"
+    - export HOST_SRC_DIR=$TRAVIS_BUILD_DIR
+    - export HOST_CACHE_DIR=$HOME/cache
     - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
-    - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
-    - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
-    - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
-    - depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
-    - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
-    - mkdir build && cd build
-    - ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
-    - make distdir VERSION=$HOST
-    - cd absolutecore-$HOST
-    - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
-    - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
-    - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
-    - if [ "$RUN_TESTS" = "true" ]; then travis_wait 30 make $MAKEJOBS check VERBOSE=1; fi
-    - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
-    - cd ../..
-    - if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build/absolutecore-$HOST ./docker/build-docker.sh; fi
+    - source ./ci/matrix.sh
+    - mkdir -p $HOST_CACHE_DIR/docker && mkdir -p $HOST_CACHE_DIR/ccache && mkdir -p $HOST_CACHE_DIR/depends && mkdir -p $HOST_CACHE_DIR/sdk-sources
+    # Keep this as it makes caching related debugging easier
+    - ls -lah $HOST_CACHE_DIR && ls -lah $HOST_CACHE_DIR/depends && ls -lah $HOST_CACHE_DIR/ccache && ls -lah $HOST_CACHE_DIR/docker
+    # Load cached builder image
+    - if [ -f $HOST_CACHE_DIR/docker/absolute-builder-$BUILD_TARGET.tar.gz ]; then zcat $HOST_CACHE_DIR/docker/absolute-builder-$BUILD_TARGET.tar.gz | docker load || true; fi
+    - travis_retry docker pull ubuntu:bionic
+    - travis_retry docker build -t $BUILDER_IMAGE_NAME --build-arg=USER_ID=$UID --build-arg=GROUP_ID=$UID --build-arg=BUILD_TARGET=$BUILD_TARGET -f ci/Dockerfile.builder ci
+before_script:
+    # Make sure stdout is in blocking mode. Otherwise builds will fail due to large writes to stdout
+    # See https://github.com/travis-ci/travis-ci/issues/4704. If this gets fixed, this line can also be removed.
+    - python3 -c 'import os,sys,fcntl; flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);'
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG

CONTRIBUTING.md

@@ -173,7 +173,7 @@ In general, all pull requests must:
     the project (for example refactoring for modularisation);
   - be well peer reviewed;
   - have unit tests and functional tests where appropriate;
-  - follow code style guidelines;
+  - follow [code style guidelines](/doc/developer-notes.md);
   - not break the existing test suite;
   - where bugs are fixed, where possible, there should be unit tests
     demonstrating the bug and also proving the fix. This helps prevent regression.

COPYING

@@ -1,7 +1,7 @@
 The MIT License (MIT)
-Copyright (c) 2009-2019 The Bitcoin Core developers
-Copyright (c) 2014-2019 The Dash Core developers
-Copyright (c) 2019 The Absolute Core developers
+Copyright (c) 2009-2020 The Bitcoin Core developers
+Copyright (c) 2014-2020 The Dash Core developers
+Copyright (c) 2020 The Absolute Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Jenkinsfile

@@ -0,0 +1,92 @@
+// This Jenkinsfile will build a builder image and then run the actual build and tests inside this image
+// It's very important to not execute any scripts outside of the builder container, as it's our protection against
+// external developers bringing in harmful code into Jenkins.
+// Jenkins will only run the build if this Jenkinsfile was not modified in an external pull request. Only branches
+// which are part of the Absolute repo will allow modification to the Jenkinsfile.
+
+def targets = [
+  'win32',
+  'win64',
+  'linux32',
+  'linux64',
+  'linux64_nowallet',
+  'linux64_release',
+  'mac',
+]
+
+def tasks = [:]
+for(int i = 0; i < targets.size(); i++) {
+  def target = targets[i]
+
+  tasks["${target}"] = {
+    node {
+      def BUILD_NUMBER = sh(returnStdout: true, script: 'echo $BUILD_NUMBER').trim()
+      def BRANCH_NAME = sh(returnStdout: true, script: 'echo $BRANCH_NAME').trim()
+      def UID = sh(returnStdout: true, script: 'id -u').trim()
+      def HOME = sh(returnStdout: true, script: 'echo $HOME').trim()
+      def pwd = sh(returnStdout: true, script: 'pwd').trim()
+
+      checkout scm
+
+      // restore cache
+      try {
+        copyArtifacts(projectName: "absolute-community-absolute/${BRANCH_NAME}", optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz")
+      } catch (Exception e) {
+      }
+      if (fileExists("ci-cache-${target}.tar.gz")) {
+        hasCache = true
+        echo "Using cache from absolute-community-absolute/${BRANCH_NAME}"
+      } else {
+        try {
+          copyArtifacts(projectName: 'absolute-community-absolute/develop', optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz");
+        } catch (Exception e) {
+        }
+        if (fileExists("ci-cache-${target}.tar.gz")) {
+          hasCache = true
+          echo "Using cache from absolute-community-absolute/develop"
+        }
+      }
+
+      def env = [
+        "BUILD_TARGET=${target}",
+        "PULL_REQUEST=false",
+        "JOB_NUMBER=${BUILD_NUMBER}",
+      ]
+      withEnv(env) {
+        def builderImageName="absolute-builder-${target}"
+
+        def builderImage
+        stage("${target}/builder-image") {
+          builderImage = docker.build("${builderImageName}", "--build-arg BUILD_TARGET=${target} ci -f ci/Dockerfile.builder")
+        }
+
+        if (hasCache) {
+          sh "cd ${pwd} && tar xzfv ci-cache-${target}.tar.gz"
+        } else {
+          sh "mkdir -p ${pwd}/ci-cache-${target}"
+        }
+
+        builderImage.inside("-t") {
+          stage("${target}/depends") {
+            sh './ci/build_depends.sh'
+          }
+          stage("${target}/build") {
+            sh './ci/build_src.sh'
+          }
+          stage("${target}/test") {
+            sh './ci/test_unittests.sh'
+          }
+          stage("${target}/test") {
+            sh './ci/test_integrationtests.sh'
+          }
+        }
+
+        // archive cache
+        sh "tar czfv ci-cache-${target}.tar.gz ci-cache-${target}"
+        archiveArtifacts artifacts: "ci-cache-${target}.tar.gz", fingerprint: true
+      }
+    }
+  }
+}
+
+parallel tasks