Bump master branch from v3.0.0 to v4.0.0 and build consensus from master. (reverted from commit 3322fab)

Author: evoskuil

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 master
+call :init libbitcoin libbitcoin-consensus version2
 IF %ERRORLEVEL% NEQ 0 (
-  call :failure "Initializing repository libbitcoin libbitcoin-consensus master failed."
+  call :failure "Initializing repository libbitcoin libbitcoin-consensus version2 failed."
   exit /b 1
 )
 call :init libbitcoin libbitcoin-database master

configure.ac

@@ -13,7 +13,7 @@
 AC_PREREQ([2.65])
 
 # Process command-line arguments and perform initialization and verification.
-AC_INIT([libbitcoin-node], [4.0.0], [eric@voskuil.org])
+AC_INIT([libbitcoin-node], [3.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-blockchain of at least version 4.0.0 and output ${bitcoin_blockchain_CPPFLAGS/LIBS/PKG}.
+# Require bitcoin-blockchain of at least version 3.0.0 and output ${bitcoin_blockchain_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([bitcoin_blockchain], [libbitcoin-blockchain >= 4.0.0])
-AC_SUBST([bitcoin_blockchain_PKG], ['libbitcoin-blockchain >= 4.0.0'])
+PKG_CHECK_MODULES([bitcoin_blockchain], [libbitcoin-blockchain >= 3.0.0])
+AC_SUBST([bitcoin_blockchain_PKG], ['libbitcoin-blockchain >= 3.0.0'])
 AC_SUBST([bitcoin_blockchain_CPPFLAGS], [${bitcoin_blockchain_CFLAGS}])
 AC_MSG_NOTICE([bitcoin_blockchain_CPPFLAGS : ${bitcoin_blockchain_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_blockchain_LIBS : ${bitcoin_blockchain_LIBS}])
 
-# Require bitcoin-network of at least version 4.0.0 and output ${bitcoin_network_CPPFLAGS/LIBS/PKG}.
+# Require bitcoin-network of at least version 3.0.0 and output ${bitcoin_network_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 4.0.0])
-AC_SUBST([bitcoin_network_PKG], ['libbitcoin-network >= 4.0.0'])
+PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 3.0.0])
+AC_SUBST([bitcoin_network_PKG], ['libbitcoin-network >= 3.0.0'])
 AC_SUBST([bitcoin_network_CPPFLAGS], [${bitcoin_network_CFLAGS}])
 AC_MSG_NOTICE([bitcoin_network_CPPFLAGS : ${bitcoin_network_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_network_LIBS : ${bitcoin_network_LIBS}])

include/bitcoin/node/version.hpp

@@ -12,8 +12,8 @@
  * For interpretation of the versioning scheme see: http://semver.org
  */
 
-#define LIBBITCOIN_NODE_VERSION "4.0.0"
-#define LIBBITCOIN_NODE_MAJOR_VERSION 4
+#define LIBBITCOIN_NODE_VERSION "3.0.0"
+#define LIBBITCOIN_NODE_MAJOR_VERSION 3
 #define LIBBITCOIN_NODE_MINOR_VERSION 0
 #define LIBBITCOIN_NODE_PATCH_VERSION 0
 

install.sh

@@ -701,7 +701,7 @@ build_all()
     build_from_tarball_boost $BOOST_URL $BOOST_ARCHIVE bzip2 . $PARALLEL "$BUILD_BOOST" "${BOOST_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 master $PARALLEL ${BITCOIN_CONSENSUS_OPTIONS[@]} "$@"
+    build_from_github libbitcoin libbitcoin-consensus version2 $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[@]} "$@"

libbitcoin-node.pc.in

@@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@
 #==============================================================================
 # Dependencies that publish package configuration.
 #------------------------------------------------------------------------------
-Requires: libbitcoin-blockchain >= 4.0.0 libbitcoin-network >= 4.0.0
+Requires: libbitcoin-blockchain >= 3.0.0 libbitcoin-network >= 3.0.0
 
 # Include directory and any other required compiler flags.
 #------------------------------------------------------------------------------