Merge pull request #3 from crypto-node/master

update
BareCrypto · Aug 4, 2019 · f160ac4 · f160ac4
2 parents ed2e616 + 550b459
commit f160ac4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 2)
+define(_CLIENT_VERSION_BUILD, 3)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 AC_INIT([Bare Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[http://bit.bares],[bare])

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -159,7 +159,7 @@ class CMainParams : public CChainParams
         fHeadersFirstSyncingActive = false;
 
         nPoolMaxTransactions = 3;
-        strSporkKey = "043d984e3599782daa3065b9ddc5911f9059951e6e7578d704de0343fd259859042e0dad158e013c3cbbf13211d91838ff3ae3c3e37f930a95be149e51206d36fc";
+        strSporkKey = "04a8e3030242c007ca14373355bb62733aa635d3cda8225817750b1deee91751222870c860ba3bca6cb9583806f36617f0d248e01673a0f4ffea0722cb82a584a0";
         strDarksendPoolDummyAddress = "QZcAHb6H4TZkD9s4XqXzATwtTxcJgGx4jK";
         nStartMasternodePayments = 1559634300;
     }

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 1
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 2
+#define CLIENT_VERSION_BUILD 3
 //bitcoingui.cpp L116
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git a/src/spork.h b/src/spork.h
@@ -47,8 +47,8 @@ using namespace boost;
 #define SPORK_3_INSTANTX_BLOCK_FILTERING_DEFAULT 1424217600       // 2015-2-18
 #define SPORK_5_MAX_VALUE_DEFAULT 1000                            // 1000 bare
 #define SPORK_7_MASTERNODE_SCANNING_DEFAULT 978307200             // 2001-1-1
-#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT 4070908800 // February 20, 2018 00:00:00 UTC
-#define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT 4070908800  // February 20, 2018 00:00:00 UTC
+#define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT 1565179140 // Wednesday, August 7, 11:59:00 AM GMT
+#define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT 1565189940  // Wednesday, August 7, 02:59:00 PM GMT
 #define SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT 4070908800  // OFF
 #define SPORK_11_RESET_BUDGET_DEFAULT 0
 #define SPORK_12_RECONSIDER_BLOCKS_DEFAULT 0

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