Merge pull request #10 from x-slacks/master

Updated checkpoints and version bump to fix forking event @block 15809

Author: dobbscoin

bitcoin-qt.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = dobbscoin-qt
 macx:TARGET = "Dobbscoin-Qt"
-VERSION = 0.8.6.1
+VERSION = 0.8.6.2
 INCLUDEPATH += src src/json src/qt
 QT += network
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE

doc/README.md

@@ -1,4 +1,4 @@
-Dobbscoin 0.8.6.1 BETA
+Dobbscoin 0.8.6.2 BETA
 ====================
 
 Copyright (c) 2009-2013 Bitcoin Developers

doc/release-process.md

@@ -17,7 +17,7 @@ Release Process
 
 ###tag version in git
 
-	git tag -a v0.8.6.1
+	git tag -a v0.8.6.2
 
 ###write release notes. git shortlog helps a lot, for example:
 
@@ -30,7 +30,7 @@ Release Process
  From a directory containing the dobbscoin source, gitian-builder and gitian.sigs
 
 	export SIGNER=(your gitian key, ie bluematt, sipa, etc)
-	export VERSION=0.8.6.1
+	export VERSION=0.8.6.2
 	pushd ./gitian-builder
 
  Fetch and build inputs: (first time, or when dependency versions change)

share/setup.nsi

@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.8.6.1
+!define VERSION 0.8.6.2
 !define COMPANY "Dobbscoin project"
 !define URL http://www.dobbscoin.info/
 
@@ -45,13 +45,13 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile dobbscoin-0.8.6.1-win32-setup.exe
+OutFile dobbscoin-0.8.6.2-win32-setup.exe
 InstallDir $PROGRAMFILES\Dobbscoin
 CRCCheck on
 XPStyle on
 BrandingText " "
 ShowInstDetails show
-VIProductVersion 0.8.6.1
+VIProductVersion 0.8.6.2
 VIAddVersionKey ProductName Dobbscoin
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"

src/checkpoints.cpp

@@ -43,11 +43,12 @@ namespace Checkpoints
         ( 13422, uint256("0xc70a40fe1c53e5525636644e625d4c38c8493b180a0ca81c9d7c9801748e6b52"))
         ( 14496, uint256("0xd50a2656a6ac593ebb034c1d5ca5eac93220455727f677e7506629f61d566239"))
         ( 15809, uint256("0x31cdc96eb5510e69bf2635b76b0266c0065839685bb30d9b94224d9a5c972b78"))
+        ( 15882, uint256("0xbfbbf161974b59797b5698b086fd8a5efab4786a3cee389d130da20e03d65eaf"))
         ;
     static const CCheckpointData data = {
         &mapCheckpoints,
-        1399736336, // * UNIX timestamp of last checkpoint block
-        18226,   // * total number of transactions between genesis and last checkpoint
+        1399777091, // * UNIX timestamp of last checkpoint block
+        18340,   // * total number of transactions between genesis and last checkpoint
                     //   (the tx=... number in the SetBestChain debug.log lines)
         600.0     // * estimated number of transactions per day after checkpoint
     };

src/clientversion.h

@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       8
 #define CLIENT_VERSION_REVISION    6
-#define CLIENT_VERSION_BUILD       1
+#define CLIENT_VERSION_BUILD       2
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true