Update v1.1.0.0

exiliumcore · May 13, 2018 · 4bd6102 · 4bd6102
1 parent f9b5153
commit 4bd6102
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Exilium Core integration/staging tree 1.0.0.1
+Exilium Core integration/staging tree 1.1.0.0
 =====================================
 [![Build Status](https://travis-ci.org/exilium/exilium.svg?branch=master)](https://travis-ci.org/exilium/exilium)
 

diff --git a/configure.ac b/configure.ac
@@ -2,12 +2,12 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
-define(_CLIENT_VERSION_MINOR, 0)
+define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
-AC_INIT([Exilium Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/exilium/exilium/issues],[Exiliumcore])
+AC_INIT([Exilium Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/exiliumcore/exilium/issues],[Exiliumcore])
 AC_CONFIG_SRCDIR([src/validation.cpp])
 AC_CONFIG_HEADERS([src/config/exilium-config.h])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -118,9 +118,9 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThreshold = 3226; // 80% of 4032
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000001f150458eac07ac5"); // 782700
+        consensus.nMinimumChainWork = uint256S("0x"); // 782700
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x000000000000f4cead6c2ec1c1607f4cf89ee45fada3f0307b83b5e571831327"); // 782700
+        consensus.defaultAssumeValid = uint256S("0x"); // 782700
         /**
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -172,12 +172,11 @@ class CMainParams : public CChainParams {
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
-            ( 0, uint256S("0x00000254161b06b5477d23be9c9098a3938682e1526032ff70a3ee112312ebfc"))
-            ( 10300, uint256S("0x000000000000083ea8c7ebce3df51880bc4de5fa0ff6dcd12e831e46f2908b31")),
-            1526077223, // * UNIX timestamp of last checkpoint block
-            10823,    // * total number of transactions between genesis and last checkpoint
+            ( 0, uint256S("0x00000254161b06b5477d23be9c9098a3938682e1526032ff70a3ee112312ebfc")),
+            1524862600, // * UNIX timestamp of last checkpoint block
+            0,    // * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
-            20000        // * estimated number of transactions per day after checkpoint
+            3000        // * estimated number of transactions per day after checkpoint
         };
     }
 };

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -15,9 +15,9 @@
 
 //! These need to be macros, as clientversion.cpp's and exilium*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
-#define CLIENT_VERSION_MINOR 0
+#define CLIENT_VERSION_MINOR 1
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 1
+#define CLIENT_VERSION_BUILD 0
 
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/spork.h b/src/spork.h
@@ -33,7 +33,7 @@ static const int SPORK_14_REQUIRE_SENTINEL_FLAG                         = 10013;
 static const int64_t SPORK_2_INSTANTSEND_ENABLED_DEFAULT                = 0;            // ON
 static const int64_t SPORK_3_INSTANTSEND_BLOCK_FILTERING_DEFAULT        = 0;            // ON
 static const int64_t SPORK_5_INSTANTSEND_MAX_VALUE_DEFAULT              = 1000;         // 1000 exilium
-static const int64_t SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT     = 0;            // ON
+static const int64_t SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT     = 1526169540;   // ON
 static const int64_t SPORK_9_SUPERBLOCKS_ENABLED_DEFAULT                = 4070908800ULL;// OFF
 static const int64_t SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT      = 4070908800ULL;// OFF
 static const int64_t SPORK_12_RECONSIDER_BLOCKS_DEFAULT                 = 0;            // 0 BLOCKS

diff --git a/src/version.h b/src/version.h
@@ -11,7 +11,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70208;
+static const int PROTOCOL_VERSION = 70209;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;