Skip to content
Permalink
Browse files
Merge branch 'dev' into release
  • Loading branch information
gandrewstone committed Oct 10, 2019
2 parents 5a37149 + 729d1f4 commit e455c779eda9e5a9b8ff40a60a4fc7c0baca593a
Showing 267 changed files with 18,311 additions and 4,526 deletions.
@@ -126,3 +126,7 @@ libbitcoinconsensus.pc
# IDE files
*.sublime-project
*.sublime-workspace

# Visual Studio 2015/2017/2019 cache/options directory
.vs/
src/.vs/
@@ -27,6 +27,7 @@ env:
- PYTHON_DEBUG=1
- WINEDEBUG=fixme-all
- DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache python3"
- DOCKER_PACKAGES_RPM="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"
- DIST=DEB
- CACHE_ERR_MSG="Error! Initial build successful, but not enough time remains to run later build stages and tests. Please manually re-run this job by using the travis restart button or asking a bitcoin maintainer to restart. The next run should not time out because the build cache has been saved."

@@ -78,7 +79,7 @@ matrix:
- DPKG_ADD_ARCH="i386"
- DEP_OPTS="NO_QT=1"
- PACKAGES="python3 nsis g++-mingw-w64-i686 wine32 wine-binfmt"
- RUN_TESTS=true GOAL="install"
- RUN_TESTS=false GOAL="install"
- BITCOIN_CONFIG="--enable-reduce-exports"
#Win64
- compiler: gcc
@@ -87,7 +88,7 @@ matrix:
- HOST=x86_64-w64-mingw32
- DEP_OPTS="NO_QT=1"
- PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine64 wine-binfmt"
- RUN_TESTS=false GOAL="install"
- RUN_TESTS=true GOAL="install"
- BITCOIN_CONFIG="--enable-reduce-exports"
#Linux32-bit + dash
- compiler: gcc
@@ -98,13 +99,13 @@ matrix:
- 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/dash"
#x86_64 Linux, No wallet (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout)
#x86_64 Linux + deps as via system lib
- compiler: gcc
env:
- CXX=g++ CC=gcc
- HOST=x86_64-unknown-linux-gnu
- PACKAGES="python3 qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev libdb5.3++-dev"
- DEP_OPTS="NO_WALLET=1 NO_QT=1 ALLOW_HOST_PACKAGES=1"
- PACKAGES="python3-zmq libzmq3-dev qttools5-dev-tools qttools5-dev libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev"
- NODEPENDS=true
- RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-debug --with-incompatible-bdb --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports"
#Cross-Mac
- compiler: gcc
@@ -118,10 +119,10 @@ matrix:
env:
- CXX=g++ CC=gcc
- HOST=x86_64-unknown-linux-gnu
- DOCKER_NAME_TAG=centos:latest
- DOCKER_NAME_TAG=centos:7.6.1810
- DIST=RPM
- DEP_OPTS="ALLOW_HOST_PACKAGES=1"
- PACKAGES="libtool libevent-devel autoconf automake openssl-devel python36u libdb4-devel libdb4-cxx-devel devtoolset-6-gcc* miniupnpc-devel zeromq-devel"
- PACKAGES="libtool libevent-devel autoconf automake openssl-devel python36u libdb4-devel libdb4-cxx-devel devtoolset-7-gcc* miniupnpc-devel zeromq-devel"
- RUN_TESTS=false GOAL="install"
- BITCOIN_CONFIG="--enable-zmq --with-gui=no --disable-bench"
- NODEPENDS=true
@@ -136,7 +137,7 @@ script:
- export CONTINUE=1
- if [ $SECONDS -gt 1980 ]; then export CONTINUE=0; fi # Likely the depends build took very long
- if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
- if [ $SECONDS -gt 1980 ]; then export CONTINUE=0; fi # Likely the build took very long
- if [ $SECONDS -gt 2300 -a "$RUN_TESTS"="true" ]; then export CONTINUE=0; echo "$SECONDS"; fi # Likely the build took very long
- if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi

after_script:
@@ -33,9 +33,9 @@ if [ $DIST = "RPM" ]; then
travis_retry DOCKER_EXEC yum install -y boost166-devel
# this is temporary until the default compiler on centos/rhel supports c++14
travis_retry DOCKER_EXEC yum install -y centos-release-scl
travis_retry DOCKER_EXEC yum install -y $PACKAGES $DOCKER_PACKAGES
travis_retry DOCKER_EXEC yum install -y $PACKAGES $DOCKER_PACKAGES_RPM
# this is temporary until the default compiler on centos/rhel supports c++14
travis_retry DOCKER_EXEC scl enable devtoolset-6 bash
travis_retry DOCKER_EXEC scl enable devtoolset-7 bash
fi
if [ $RUN_FORMATTING_CHECK = "true" ]; then
curl --location $LINTER_DEB_URL/libllvm3.8_3.8.1-27ubuntu1_amd64.deb -o llvm-3.8.deb;
@@ -11,7 +11,7 @@ fi

if [ $DIST = "RPM" ]; then
# this is temporary until the default compiler on centos/rhel supports c++14
DOCKER_EXEC ln -fs /opt/rh/devtoolset-6/root/bin/g++ /usr/bin/g++
DOCKER_EXEC ln -fs /opt/rh/devtoolset-7/root/bin/g++ /usr/bin/g++
DOCKER_EXEC ln -fs /usr/bin/python3.6 /usr/bin/python3
DOCKER_EXEC ln -fs /usr/bin/python3 /usr/bin/python
fi
@@ -11,9 +11,11 @@ fi

cd "build" || (echo "could not enter distdir build"; exit 1)

if [ "$RUN_TESTS" = "true" ] && ! { [ "$HOST" = "i686-w64-mingw32" ] || [ "$HOST" = "x86_64-w64-mingw32" ]; }; then
if [ "$RUN_TESTS" = "true" ]; then
BEGIN_FOLD unit-tests
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1;
if [ $HOST != "x86_64-w64-mingw32" ]; then
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1;
fi
END_FOLD
fi

@@ -1,11 +1,11 @@
[Website](https://www.bitcoinunlimited.info) | [Download](https://www.bitcoinunlimited.info/download) | [Setup](README.md) | [Xthin](doc/bu-xthin.md) | [Xpedited](doc/bu-xpedited-forwarding.md) | [Miner](doc/miner.md)
[Website](https://www.bitcoinunlimited.info) | [Download](https://www.bitcoinunlimited.info/download) | [Setup](README.md) | [Miner](doc/miner.md) | [ElectronCash](doc/bu-electrum-integration.md) | [UnconfirmedChains](doc/unconfirmedTxChainLimits.md)

[![Build Status](https://travis-ci.org/BitcoinUnlimited/BitcoinUnlimited.svg?branch=dev)](https://travis-ci.org/BitcoinUnlimited/BitcoinUnlimited)

# What is Bitcoin?
# What is Bitcoin Cash?

Bitcoin is an experimental new digital currency that enables instant payments to
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
Bitcoin Cash is an experimental new digital currency that enables instant payments to
anyone, anywhere in the world. Bitcoin Cash uses peer-to-peer technology to operate
with no central authority: managing transactions and issuing money are carried
out collectively by the network. Bitcoin Unlimited is the name of open source
software which enables the use of this currency.
@@ -45,6 +45,8 @@ They are not complete guides, but include notes on the necessary libraries, comp

# Running / setup

- [Running large unconfirmed transaction chain limits](doc/unconfirmedTxChainLimits.md)
- [Running an electron cash protocol server](doc/bu-electrum-integration.md)
- [Getting the most out of Xtreme thinblocks](bu-xthin.md)
- [Setting up an Xpedited Relay Network](bu-xpedited-forwarding.md)
- [Tor Support](doc/tor.md)
@@ -3,37 +3,10 @@
; MODIFY AT OWN RISK - EXERCISE EXTREME CARE
; Line format:
; chainname,bit,name,starttime,timeout,windowsize,threshold,minlockedblocks,minlockedtime,gbtforce
; main network, 95% @ 2016 blocks:
; start sep 1, 2018, end sep 1, 2019, 90 day window, 75% threshold, 0, 90 day locked time
main,1,block_max_size_128mb,1535760000,1567296000, 12960, 9720, 0, 7776000, true
main,2,opcodes_mul_shift_invert,1535760000,1567296000, 12960, 9720, 0, 7776000, true
main,3,unrestricted_script_instructions,1535760000,1567296000, 12960, 9720, 0, 7776000, true
main,4,op_checkdatasig,1535760000,1567296000, 12960, 9720, 0, 7776000, true
main,5,tx_min_size_100,1535760000,1567296000, 12960, 9720, 0, 7776000, true
main,6,enforce_CTOR,1535760000,1567296000, 12960, 9720, 0, 7776000, true
main,7,enforce_scriptsig_push_only,1535760000,1567296000, 12960, 9720, 0, 7776000, true
;
; test network (testnet), 75% @ 2016 blocks:
;
; start sep 1, 2018, end sep 1, 2019, 14 day window, 75% threshold, 0, 7 day locked time
test,1,block_max_size_128mb,1535760000,1567296000, 2016, 1512, 0, 604800, true
test,2,opcodes_mul_shift_invert,1535760000,1567296000, 2016, 1512, 0, 604800, true
test,3,unrestricted_script_instructions,1535760000,1567296000, 2016, 1512, 0, 604800, true
test,4,op_checkdatasig,1535760000,1567296000, 2016, 1512, 0, 604800, true
test,5,tx_min_size_100,1535760000,1567296000, 2016, 1512, 0, 604800, true
test,6,enforce_CTOR,1535760000,1567296000, 2016, 1512, 0, 604800, true
test,7,enforce_scriptsig_push_only,1535760000,1567296000, 2016, 1512, 0, 604800, true
;
test,28,testdummy,1199145601,1230767999,2016,1512,2016,0,true
; regtest chain 75% @ 144 blocks:
;
; start Aug 29, 2018, end sep 1, 2019, 100 block window, 75% threshold, 0, 60 second
regtest,1,block_max_size_128mb,1535566484,1567296000, 100, 75, 0, 60, true
regtest,2,opcodes_mul_shift_invert,1535566484,1567296000, 100, 75, 0, 60, true
regtest,3,unrestricted_script_instructions,1535566484,1567296000, 100, 75, 0, 60, true
regtest,4,op_checkdatasig,1535566484,1567296000, 100, 75, 0, 60, true
regtest,5,tx_min_size_100,1535566484,1567296000, 100, 75, 0, 60, true
regtest,6,enforce_CTOR,1535566484,1567296000, 100, 75, 0, 60, true
regtest,7,enforce_scriptsig_push_only,1535566484,1567296000, 100, 75, 0, 60, true
;
regtest,28,testdummy,0,999999999999,144,108,108,0,true
@@ -10,9 +10,9 @@ esac
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 6)
define(_CLIENT_VERSION_MINOR, 7)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 1) # version 99 here indicates an unreleased version
define(_CLIENT_VERSION_BUILD, 0) # version 99 here indicates an unreleased version
define(_CLIENT_VERSION_RC, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2019)