From f3e0315174535d079a6bf4c8436b83b9c60d8726 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Thu, 9 Feb 2017 14:37:27 -0800
Subject: [PATCH] Bump master branch from v3.0.0 to v4.0.0 and build consensus
 from master.

---
 build.cmd                          |  4 ++--
 configure.ac                       | 14 +++++++-------
 include/bitcoin/server/version.hpp |  4 ++--
 install.sh                         |  2 +-
 libbitcoin-server.pc.in            |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.cmd b/build.cmd
index c60175d5..1f30949f 100644
--- a/build.cmd
+++ b/build.cmd
@@ -25,9 +25,9 @@ IF %ERRORLEVEL% NEQ 0 (
   call :failure "Initializing repository libbitcoin libbitcoin master failed."
   exit /b 1
 )
-call :init libbitcoin libbitcoin-consensus version2
+call :init libbitcoin libbitcoin-consensus master
 IF %ERRORLEVEL% NEQ 0 (
-  call :failure "Initializing repository libbitcoin libbitcoin-consensus version2 failed."
+  call :failure "Initializing repository libbitcoin libbitcoin-consensus master failed."
   exit /b 1
 )
 call :init libbitcoin libbitcoin-database master
diff --git a/configure.ac b/configure.ac
index f2914e9d..1384399c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 AC_PREREQ([2.65])
 
 # Process command-line arguments and perform initialization and verification.
-AC_INIT([libbitcoin-server], [3.0.0], [eric@voskuil.org])
+AC_INIT([libbitcoin-server], [4.0.0], [eric@voskuil.org])
 
 # Do compilation tests.
 AC_LANG(C++)
@@ -157,18 +157,18 @@ AS_CASE([${bash_completiondir}], [yes],
      AC_MSG_NOTICE([bash_completion_LIBS : ${bash_completion_LIBS}])],
     [AC_SUBST([bash_completion_PKG], [])])
 
-# Require bitcoin-node of at least version 3.0.0 and output ${bitcoin_node_CPPFLAGS/LIBS/PKG}.
+# Require bitcoin-node of at least version 4.0.0 and output ${bitcoin_node_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 3.0.0])
-AC_SUBST([bitcoin_node_PKG], ['libbitcoin-node >= 3.0.0'])
+PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 4.0.0])
+AC_SUBST([bitcoin_node_PKG], ['libbitcoin-node >= 4.0.0'])
 AC_SUBST([bitcoin_node_CPPFLAGS], [${bitcoin_node_CFLAGS}])
 AC_MSG_NOTICE([bitcoin_node_CPPFLAGS : ${bitcoin_node_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_node_LIBS : ${bitcoin_node_LIBS}])
 
-# Require bitcoin-protocol of at least version 3.0.0 and output ${bitcoin_protocol_CPPFLAGS/LIBS/PKG}.
+# Require bitcoin-protocol of at least version 4.0.0 and output ${bitcoin_protocol_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([bitcoin_protocol], [libbitcoin-protocol >= 3.0.0])
-AC_SUBST([bitcoin_protocol_PKG], ['libbitcoin-protocol >= 3.0.0'])
+PKG_CHECK_MODULES([bitcoin_protocol], [libbitcoin-protocol >= 4.0.0])
+AC_SUBST([bitcoin_protocol_PKG], ['libbitcoin-protocol >= 4.0.0'])
 AC_SUBST([bitcoin_protocol_CPPFLAGS], [${bitcoin_protocol_CFLAGS}])
 AC_MSG_NOTICE([bitcoin_protocol_CPPFLAGS : ${bitcoin_protocol_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_protocol_LIBS : ${bitcoin_protocol_LIBS}])
diff --git a/include/bitcoin/server/version.hpp b/include/bitcoin/server/version.hpp
index 33c4e654..fb23ba1e 100644
--- a/include/bitcoin/server/version.hpp
+++ b/include/bitcoin/server/version.hpp
@@ -12,8 +12,8 @@
  * For interpretation of the versioning scheme see: http://semver.org
  */
 
-#define LIBBITCOIN_SERVER_VERSION "3.0.0"
-#define LIBBITCOIN_SERVER_MAJOR_VERSION 3
+#define LIBBITCOIN_SERVER_VERSION "4.0.0"
+#define LIBBITCOIN_SERVER_MAJOR_VERSION 4
 #define LIBBITCOIN_SERVER_MINOR_VERSION 0
 #define LIBBITCOIN_SERVER_PATCH_VERSION 0
 
diff --git a/install.sh b/install.sh
index dc391fe1..eb0cce4c 100755
--- a/install.sh
+++ b/install.sh
@@ -718,7 +718,7 @@ build_all()
     build_from_github zeromq libzmq master $PARALLEL ${ZMQ_OPTIONS[@]} "$@"
     build_from_github libbitcoin secp256k1 version4 $PARALLEL ${SECP256K1_OPTIONS[@]} "$@"
     build_from_github libbitcoin libbitcoin master $PARALLEL ${BITCOIN_OPTIONS[@]} "$@"
-    build_from_github libbitcoin libbitcoin-consensus version2 $PARALLEL ${BITCOIN_CONSENSUS_OPTIONS[@]} "$@"
+    build_from_github libbitcoin libbitcoin-consensus master $PARALLEL ${BITCOIN_CONSENSUS_OPTIONS[@]} "$@"
     build_from_github libbitcoin libbitcoin-database master $PARALLEL ${BITCOIN_DATABASE_OPTIONS[@]} "$@"
     build_from_github libbitcoin libbitcoin-blockchain master $PARALLEL ${BITCOIN_BLOCKCHAIN_OPTIONS[@]} "$@"
     build_from_github libbitcoin libbitcoin-network master $PARALLEL ${BITCOIN_NETWORK_OPTIONS[@]} "$@"
diff --git a/libbitcoin-server.pc.in b/libbitcoin-server.pc.in
index 51385d9e..dfe7e06b 100644
--- a/libbitcoin-server.pc.in
+++ b/libbitcoin-server.pc.in
@@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@
 #==============================================================================
 # Dependencies that publish package configuration.
 #------------------------------------------------------------------------------
-Requires: libbitcoin-protocol >= 3.0.0 libbitcoin-node >= 3.0.0
+Requires: libbitcoin-protocol >= 4.0.0 libbitcoin-node >= 4.0.0
 
 # Include directory and any other required compiler flags.
 #------------------------------------------------------------------------------