Merge remote-tracking branch 'origin/13.2' into add-jenkins

CHANGELOG.md

@@ -1,4 +1,14 @@
 # Changelog
+
+## v13.2.2 (2024-01-24)
+- Set mainnet hard fork date to April 24, 2024
+- Adjusted minimum fee calculations
+
+## v13.2.1 (2023-07-04)
+- Reduced the minimum fee after a fork
+- Fixed a bug in the derivation of TxTime that could potentially lead to unplanned hard forks
+- Fixed a segfault issue occurring during the initial sync
+
 ## v13.2.0 (2022-11-24)
 - Changed versioning (backport of Core's PR20223)
 - Testnet hard fork: Removed transaction timestamp

COPYING

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2022 The Blackcoin More developers
+Copyright (c) 2018-2024 The Blackcoin More developers
 Copyright (c) 2014-2018 The BlackCoin Developers
 Copyright (c) 2013-2014 The NovaCoin Developers
 Copyright (c) 2011-2013 The PPCoin Developers

README.md

@@ -63,3 +63,24 @@ Changes should be tested by somebody other than the developer who wrote the
 code. This is especially important for large or high-risk changes. It is useful
 to add a test plan to the pull request description if testing the changes is
 not straightforward.
+
+Branches
+-------
+
+### develop
+The develop branch is typically used by developers as the main branch for integrating new features and changes into the codebase.
+Pull requests should always be made to this branch (except for critical fixes), and might possibly break the code.
+The develop branch is considered an unstable branch, as it is constantly updated with new code, and it may contain bugs or unfinished features. It is not guaranteed to work properly on any system.
+
+### master
+The master branch gets latest updates from the stable branch.
+However, it may contain experimental features and should be used with caution.
+
+### 13.2
+The release branch for Blackcoin More 13.2.x. It is intended to contain stable and functional code that has been thoroughly tested and reviewed.
+
+### 25.x
+The release branch for Blackcoin More 25.x. Contains functional but experimental code.
+
+### 26.x
+The release branch for Blackcoin More 26.x. Contains functional but highly experimental code.

configure.ac

@@ -1,9 +1,9 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 13)
 define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2022)
+define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Blackcoin More]])
 AC_INIT([Blackcoin More],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_BUILD],[https://gitlab.com/blackcoin/blackcoin-more],[blackcoin-more])
@@ -140,7 +140,7 @@ AC_ARG_ENABLE([upnp-default],
 AC_ARG_ENABLE(tests,
     AS_HELP_STRING([--disable-tests],[do not compile tests (default is to compile)]),
     [use_tests=$enableval],
-    [use_tests=no])
+    [use_tests=yes])
 
 AC_ARG_ENABLE(gui-tests,
     AS_HELP_STRING([--disable-gui-tests],[do not compile GUI tests (default is to compile if GUI and tests enabled)]),
@@ -150,7 +150,7 @@ AC_ARG_ENABLE(gui-tests,
 AC_ARG_ENABLE(bench,
     AS_HELP_STRING([--disable-bench],[do not compile benchmarks (default is to compile)]),
     [use_bench=$enableval],
-    [use_bench=no])
+    [use_bench=yes])
 
 AC_ARG_WITH([comparison-tool],
     AS_HELP_STRING([--with-comparison-tool],[path to java comparison tool (requires --enable-tests)]),

contrib/builder-keys/keys.txt

@@ -1,5 +1,4 @@
-959E1836C72EE404A161DC61A8D82124A918C480 Michel van Kessel (michelvankessel)
-871433A5552622837BFC82606FA92FFD56BA38AD Michel van Kessel (nedcloud-blackchain)
+7F9EFB458122B8A39C46947DA87935AB61FABA71 BlackcoinDev (blackcoindev)
 BE93C86529A158782F194649E5ED33AFDE82B5E7 Crypto Wiz (cryptotafkar)
 7F8CCB3546FBEA90F530583C8AF220AA13AE7865 Daniel Clough (danielclough)
-DECCB2A72944D41E3F6DCE8D37B2C626F568C466 Lateminer (lateminer)
+DECCB2A72944D41E3F6DCE8D37B2C626F568C466 lateminer (lateminer)