Version 2.2.0 - block halving restored at block height 385000

avgttt · Aug 17, 2023 · 40c7caf · 40c7caf
1 parent 78e4464
commit 40c7caf
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -60,5 +60,5 @@
 </tbody>
 </table>
 
-HARD FORK on 18th August 2023 to version 2.1.0.0 Protocol version 70300
+HARD FORK on 18th August 2023 to version 2.2.0.1 Protocol version 70301
 
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
-define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
@@ -35,7 +35,7 @@
 import dash_hash
 
 BIP0031_VERSION = 60000
-MY_VERSION = 70300  # current MIN_PEER_PROTO_VERSION
+MY_VERSION = 70301  # current MIN_PEER_PROTO_VERSION
 MY_SUBVERSION = b"/python-mininode-tester:0.0.2/"
 
 MAX_INV_SZ = 50000

diff --git a/share/genbuild.sh b/share/genbuild.sh
@@ -34,6 +34,7 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/
     LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
 fi
 
+SUFFIX="-release"
 if [ -n "$DESC" ]; then
     NEWINFO="#define BUILD_DESC \"$DESC\""
 elif [ -n "$SUFFIX" ]; then

diff --git a/src/governance-object.h b/src/governance-object.h
@@ -24,8 +24,8 @@ class CGovernanceObject;
 class CGovernanceVote;
 
 static const int MAX_GOVERNANCE_OBJECT_DATA_SIZE = 16 * 1024;
-static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70300;
-static const int GOVERNANCE_FILTER_PROTO_VERSION = 70300;
+static const int MIN_GOVERNANCE_PEER_PROTO_VERSION = 70301;
+static const int GOVERNANCE_FILTER_PROTO_VERSION = 70301;
 
 static const double GOVERNANCE_FILTER_FP_RATE = 0.001;
 

diff --git a/src/instantx.h b/src/instantx.h
@@ -28,7 +28,7 @@ extern CInstantSend instantsend;
 static const int INSTANTSEND_CONFIRMATIONS_REQUIRED = 6;
 static const int DEFAULT_INSTANTSEND_DEPTH          = 5;
 
-static const int MIN_INSTANTSEND_PROTO_VERSION      = 70300;
+static const int MIN_INSTANTSEND_PROTO_VERSION      = 70301;
 
 // For how long we are going to accept votes/locks
 // after we saw the first one for a specific transaction

diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -30,8 +30,8 @@ static const int64_t FOUNDATION = 1000 * COIN; // 1% to Foundation
 //  vote for masternode and be elected as a payment winner
 // V1 - Last protocol version before update
 // V2 - Newest protocol version
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70300;
-static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70300;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70301;
+static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70301;
 
 extern CCriticalSection cs_vecPayees;
 extern CCriticalSection cs_mapMasternodeBlocks;

diff --git a/src/privatesend.h b/src/privatesend.h
@@ -23,7 +23,7 @@ static const int PRIVATESEND_QUEUE_TIMEOUT          = 30;
 static const int PRIVATESEND_SIGNING_TIMEOUT        = 15;
 
 //! minimum peer version accepted by mixing pool
-static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70300;
+static const int MIN_PRIVATESEND_PEER_PROTO_VERSION = 70301;
 
 static const CAmount PRIVATESEND_ENTRY_MAX_SIZE     = 9;
 

diff --git a/src/version.h b/src/version.h
@@ -10,7 +10,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70300;
+static const int PROTOCOL_VERSION = 70301;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -19,7 +19,7 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70300;
+static const int MIN_PEER_PROTO_VERSION = 70301;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this