diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 18) -define(_CLIENT_VERSION_REVISION, 5) +define(_CLIENT_VERSION_REVISION, 6) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) diff --git a/doc/Doxyfile b/doc/Doxyfile --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.18.5 +PROJECT_NUMBER = 0.18.6 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,9 +1,5 @@ -Bitcoin ABC version 0.18.5 is now available from: +Bitcoin ABC version 0.18.6 is now available from: - + This release includes the following features and fixes: - - Add the finalized block concept. Finalized blocks cannot be reorged, which protects the network against deep reorgs. - - Add the `-maxreorgdepth` configuration to configure at what depth block are considered final. Default is 10. Use -1 to disable. - - Introduce `finalizeblock` RPC to finalize a block at the will of the node operator. - - Introduce a penalty to alternative chains based on the depth of the fork. This makes it harder for an attacker to do mid size reorg. diff --git a/doc/release-notes.md b/doc/release-notes/release-notes-0.18.5.md copy from doc/release-notes.md copy to doc/release-notes/release-notes-0.18.5.md diff --git a/src/clientversion.h b/src/clientversion.h --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ //! requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 18 -#define CLIENT_VERSION_REVISION 5 +#define CLIENT_VERSION_REVISION 6 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -13,7 +13,7 @@ # Version set(CLIENT_VERSION_MAJOR 0) set(CLIENT_VERSION_MINOR 18) -set(CLIENT_VERSION_REVISION 5) +set(CLIENT_VERSION_REVISION 6) set(CLIENT_VERSION_BUILD 0) option(CLIENT_VERSION_IS_RELEASE "Build a release version" OFF) diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -198,7 +198,7 @@ BOOST_CHECK_EQUAL(userAgent(config).size(), MAX_SUBVERSION_LENGTH); BOOST_CHECK_EQUAL(userAgent(config), - "/Bitcoin ABC:0.18.5(EB8.0; very very very very very " + "/Bitcoin ABC:0.18.6(EB8.0; very very very very very " "very very very very very very very very very very very " "very very very very very very very very very very very " "very very very very very very very very very very very "