Merge pull request #113 from dustinengle/master

v2.0.0.0

.gitignore

@@ -1,2 +1,47 @@
-
 \.DS_Store
+
+.vscode/
+autom4te.cache/
+build-aux/
+contrib/devtools/split-debug.sh
+qa/pull-tester/run-bitcoind-for-test.sh
+qa/pull-tester/tests-config.sh
+share/qt/Info.plist
+share/setup.nsi
+
+**/.deps/
+**/.dirstamp
+
+src/**/*.o
+src/**/*.a
+src/**/*.pb.cc
+src/**/*.pb.h
+
+src/config/
+src/leveldb/build_config.mk
+
+src/qt/forms/*.h
+src/qt/locale/*.qm
+
+src/qt/**/moc_*.cpp
+src/qt/**/*.moc
+src/qt/**/qrc_*.cpp
+
+src/test/data/*.h
+src/test/buildenv.py
+
+aclocal.m4
+config.log
+config.status
+configure
+libtool
+Makefile
+Makefile.in
+
+# Output binaries
+src/bulwarkd
+src/bulwark-cli
+src/bulwark-tx
+src/qt/bulwark-qt
+src/qt/test/test_bulwark-qt
+src/test/test_bulwark

.travis.yml

@@ -1,88 +1,152 @@
-sudo: required
+language: cpp
 dist: trusty
-group: deprecated-2017Q3
-os:
-- linux
-language: generic
+sudo: false
+branches:
+  only:
+  - master
 cache:
-  apt: true
   ccache: true
   directories:
   - depends/built
   - depends/sdk-sources
   - "$HOME/.ccache"
+addons:
+  apt:
+    sources:
+    - ppa:bitcoin/bitcoin
+    packages:
+    - autoconf
+    - autotools-dev
+    - binutils
+    - bsdmainutils
+    - build-essential
+    - cmake
+    - curl
+    - libboost-all-dev
+    - libbz2-dev
+    - libcap-dev
+    - libdb4.8-dev
+    - libdb4.8++-dev
+    - libevent-dev
+    - libssl-dev
+    - libtool
+    - linux-libc-dev
+    - miniupnpc
+    - pkg-config
+    - python-dev
+    - python-setuptools
+    - python3
+    - python3-zmq
+    - zlib1g-dev
 env:
   global:
-  - MAKEJOBS=-j5
-  - RUN_TESTS=false
-  - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
-  - CCACHE_SIZE=400M
-  - CCACHE_TEMPDIR=/tmp/.ccache-temp
+  - BULWARK_VERSION=2.0.0.0
   - CCACHE_COMPRESS=1
-  - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
-  - SDK_URL=https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/
-  - PYTHON_DEBUG=1
-  - WINEDEBUG=fixme-all
-  matrix:
-  - HOST=arm-linux-gnueabihf PPA="ppa:bitcoin/bitcoin" PACKAGES="g++-arm-linux-gnueabihf"
-    CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-  - HOST=i686-pc-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="g++-multilib bc python3-zmq"
-    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat
-    --enable-reduce-exports LDFLAGS=-static-libstdc++" PYZMQ=true
-  - HOST=x86_64-unknown-linux-gnu PPA="ppa:bitcoin/bitcoin" PACKAGES="bc python3-zmq"
-    RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat
-    --enable-reduce-exports" CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG" PYZMQ=true
-  - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" PPA="ppa:bitcoin/bitcoin" PACKAGES="python3
-    nsis g++-mingw-w64-i686 wine1.7 bc" RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--enable-gui
-    --enable-reduce-exports" MAKEJOBS="-j4" WINE=true
-  - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" PPA="ppa:bitcoin/bitcoin" PACKAGES="python3
-    nsis g++-mingw-w64-x86-64 wine1.7 bc" RUN_TESTS=false GOAL="install" BITCOIN_CONFIG="--enable-gui
-    --enable-reduce-exports" MAKEJOBS="-j4" WINE=true
+  - CCACHE_SIZE=500M
+  - CCACHE_TEMPDIR=/tmp/.ccache-temp
+  - MAKEJOBS="-s -j 2"
+matrix:
+  include:
+  - name: Linux ARM 32 Bit
+    addons:
+      apt:
+        packages:
+        - g++-arm-linux-gnueabihf
+        - binutils-arm-linux-gnueabihf
+    env:
+    - BULWARK_CONFIG="--enable-glibc-back-compat --with-gui=no"
+    - HOST=arm-linux-gnueabihf
+    - LABEL=ARM
+    os: linux
+  - name: Linux i686 32 Bit
+    addons:
+      apt:
+        packages:
+        - bc
+        - g++-multilib
+        - libprotobuf-dev
+        - libqrencode-dev
+        - python3-zmq
+        - qtdeclarative5-dev
+    env:
+    - BULWARK_CONFIG="--enable-zmq --enable-glibc-back-compat LDFLAGS=-static-libstdc++
+      --with-gui=qt5"
+    - HOST=i686-pc-linux-gnu
+    - LABEL=linux32
+    - PYZMQ=true
+    os: linux
+  - name: Linux x86 64 Bit
+    addons:
+      apt:
+        packages:
+        - bc
+        - libprotobuf-dev
+        - libqrencode-dev
+        - python3-zmq
+        - qtdeclarative5-dev
+    env:
+    - BULWARK_CONFIG="--enable-zmq --enable-glibc-back-compat LDFLAGS=-static-libstdc++
+      --with-gui=qt5"
+    - CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG"
+    - HOST=x86_64-pc-linux-gnu
+    - LABEL=linux64
+    - PYZMQ=true
+    os: linux
+  - name: Windows i686 32 Bit
+    addons:
+      apt:
+        packages:
+        - g++-mingw-w64-i686 bc
+        - libprotobuf-dev
+        - libqrencode-dev
+        - linux-libc-dev:i386
+        - nsis
+        - python3
+        - qtdeclarative5-dev
+    env:
+    - BULWARK_CONFIG="--with-gui=qt5"
+    - HOST=i686-w64-mingw32
+    - LABEL=win32
+    os: linux
+  - name: Windows x86 64 Bit
+    addons:
+      apt:
+        packages:
+        - bc
+        - g++-mingw-w64-x86-64
+        - libprotobuf-dev
+        - libqrencode-dev
+        - linux-libc-dev:i386
+        - nsis
+        - python3
+        - qtdeclarative5-dev
+    env:
+    - BULWARK_CONFIG="--with-gui=qt5"
+    - HOST=x86_64-w64-mingw32
+    - LABEL=win64
+    os: linux
+  - name: macOS x86 64 Bit
+    env:
+    - HOST=x86_64-apple-darwin
+    - LABEL=macOS
+    os: osx
+    osx_image: xcode9.2
 before_install:
-- travis_retry sudo apt-get install python-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")
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 install:
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew uninstall mercurial python; brew
+  bundle; brew link --overwrite --force boost@1.57; fi
 - if [ "$PYZMQ" = "true" ]; then pip 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
 before_script:
-- unset CC; unset CXX
-- unset DISPLAY
-- mkdir -p depends/SDKs depends/sdk-sources
-- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz ]; then
-  curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.xz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz;
-  fi
-- if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz ]; then
-  tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.xz; fi
-- make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unset CC CXX DISPLAY; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LDFLAGS=-L/usr/local/opt/openssl/lib;
+  export CPPFLAGS=-I/usr/local/opt/openssl/include; fi
+- GLOBAL_CONFIG="--enable-reduce-exports --enable-tests --prefix=$TRAVIS_BUILD_DIR/depends/$HOST"
 script:
-- 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
-- "./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || (
-  cat config.log && false)"
-- make distdir PACKAGE=bulwark VERSION=$HOST
-- cd bulwark-$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" -a "$WINE" != "true" ]; then make $MAKEJOBS check VERBOSE=1;
-  fi
-- if [ "$RUN_TESTS" = "true" -a "$WINE" = "true" ]; then wine  src/test/test_bulwark.exe;
-  fi
-- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
-after_script:
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi
-    - echo $TRAVIS_COMMIT_RANGE
-    - echo $TRAVIS_COMMIT_LOG
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make $MAKEJOBS -C depends HOST="$HOST";
+  depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE; sh ./autogen.sh; ./configure
+  --cache-file=config.cache $GLOBAL_CONFIG $BULWARK_CONFIG; make; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh ./autogen.sh; ./configure --enable-reduce-exports;
+  make deploy; fi
+before_deploy:
+- true

Brewfile

@@ -0,0 +1,14 @@
+brew "autoconf"
+brew "automake"
+brew "berkeley-db@4"
+brew "boost@1.57"
+brew "git"
+brew "libevent"
+brew "libtool"
+brew "miniupnpc"
+brew "openssl"
+brew "pkg-config"
+brew "protobuf"
+brew "qt"
+brew "zeromq"
+brew "librsvg"

README.md

@@ -25,7 +25,7 @@ Bulwark offers both SwiftTX and Obfuscation to enable speedy transactions with a
 | Circulation (5 Years) | 27,668,220 BWK                          |
 | PoW Period            | nHeight ≤ 182,700                       |
 | PoS Period            | nHeight ≥ 182,701                       |
-| Protocol Support      | IPV4, IPV6, TOR                         |
+| Protocol Support      | IPV4, IPV6, TOR, I2P                    |
 | PoS                   | SeeSaw & Split Rewards                  |
 
 ## PoW Block Reward