Added Checkpoint & Fixed Keys

metaspartan · Jul 5, 2017 · 050dcd5 · 050dcd5
1 parent b3cd0cf
commit 050dcd5
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 38 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: Denarius
-# Generated by qmake (2.01a) (Qt 4.8.6) on: Sun Jun 18 15:56:43 2017
+# Generated by qmake (2.01a) (Qt 4.8.6) on: Wed Jul 5 12:12:36 2017
 # Project: denarius-qt.pro
 # Template: app
 # Command: c:\Qt\4.8.6\bin\qmake.exe USE_QRCODE=1 USE_UPNP=- -o Makefile denarius-qt.pro
@@ -133,16 +133,16 @@ make_default: release-make_default debug-make_default FORCE
 make_first: release-make_first debug-make_first FORCE
 all: release-all debug-all FORCE
 clean: release-clean debug-clean FORCE
- -$(DEL_FILE) C:/Users/Carsen/Desktop/Denarius/src/leveldb/libleveldb.a;
+ -$(DEL_FILE) C:/Users/Carsen/Desktop/denariusdev/src/leveldb/libleveldb.a;
  -$(DEL_FILE) cd
- -$(DEL_FILE) C:/Users/Carsen/Desktop/Denarius/src/leveldb
+ -$(DEL_FILE) C:/Users/Carsen/Desktop/denariusdev/src/leveldb
  -$(DEL_FILE) ;
  -$(DEL_FILE) $(MAKE)
  -$(DEL_FILE) clean
 distclean: release-distclean debug-distclean FORCE
  -$(DEL_FILE) Makefile
 
-C:/Users/Carsen/Desktop/Denarius/src/leveldb/libleveldb.a: FORCE
+C:/Users/Carsen/Desktop/denariusdev/src/leveldb/libleveldb.a: FORCE
 
 check: first
 

diff --git a/Makefile.Debug b/Makefile.Debug
diff --git a/Makefile.Release b/Makefile.Release
diff --git a/denarius-qt.pro b/denarius-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = Denarius
-VERSION = 1.0.0
+VERSION = 1.0.1
 INCLUDEPATH += src src/json src/qt src/tor src/qt/plugins/mrichtexteditor
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd

diff --git a/src/alert.cpp b/src/alert.cpp
@@ -19,10 +19,10 @@ using namespace std;
 map<uint256, CAlert> mapAlerts;
 CCriticalSection cs_mapAlerts;
 
-static const char* pszMainKey = "031d5def92b2d59943e57aaa8b1adbb110ff215fc4ebdc6fb5c9a797e2b1dea527";
+static const char* pszMainKey = "0417d4b095e451d08bd83111d9ddc7f648af93d8f72e4391940bfa97bde644c0504e1f04a9e7e89be7e1c54c8995f8905be76f50d43fb4a31a7abba5e5291fbc63";
 
 // TestNet alerts pubKey
-static const char* pszTestKey = "0373d8dce43eb98374bcfff2352cd559e6774fd6a87eef73b2fbdb39b2b0bc0082";
+static const char* pszTestKey = "047805b1a52dd1d474ddc6cdbdcfa95021e82e688c2f3ad6cfeb4f094172931fa801419d52c294b2412e904775d6f6ab9421ff746ed0a8a86c1fbc2033621cbcd9";
 
 
 void CUnsignedAlert::SetNull()

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -32,6 +32,7 @@ namespace Checkpoints
  ( 5000, uint256("0x000000000324161ad72079927d9b5a317a93f63bd0c4f28ad89046dd25373fad") )
  ( 10000, uint256("0x00000000058989f94843c6047bdf72b3f37f62055354c5ff859e28bb0b5282b9") )
  ( 20000, uint256("0x00000000000420ca6af3e3e90066c806ac033ed963247adf566b7397122e2c8a") )
+ ( 30000, uint256("0x000000000282bafc3e63bb0f86134329de9ff387d04764ad6a4ca700c47fbf7e") )
  ;
 
  // TestNet has no checkpoints

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 1
 #define CLIENT_VERSION_BUILD 0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -15,6 +15,11 @@ typedef std::map<int, unsigned int> MapModifierCheckpoints;
 static std::map<int, unsigned int> mapStakeModifierCheckpoints =
  boost::assign::map_list_of
  ( 0, 0xe00670b )
+ ( 2000, 0x1e8ae45e )
+ ( 5000, 0x34377c3a )
+ ( 10000, 0x11c06314 )
+ ( 20000, 0x41c4dd9b )
+ ( 30000, 0xada5100d )
  ;
 
 // Hard checkpoints of stake modifiers to ensure they are deterministic (testNet)

diff --git a/src/version.h b/src/version.h
@@ -30,7 +30,7 @@ static const int DATABASE_VERSION = 21212;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 21212;
+static const int PROTOCOL_VERSION = 21213; //Old Version 21212
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 21212;