From 5ed2a6a9ba790e4dc489b6edd688b244387e6bc5 Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 13 Feb 2014 06:57:12 -0700 Subject: [PATCH 1/4] changed halving to every year or 210k blocks --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 80080af653..90d4b55541 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1097,8 +1097,8 @@ int64 static GetBlockValue(int nBits, int nHeight, int64 nFees) //printf("height %u diff %4.2f reward %i \n", nHeight, dDiff, nSubsidy); nSubsidy *= COIN; - // Subsidy is cut in half every 840000 blocks, which will occur approximately every 2 years - nSubsidy >>= (nHeight / 840000); // DarkCoin: 840k blocks in ~2 years + // Subsidy is cut in half every 210240 blocks, which will occur approximately every year + nSubsidy >>= (nHeight / 210240); // DarkCoin: 210k blocks in 1 year return nSubsidy + nFees; } From a5b819423a0fad66e1cf9ac759ea3835e8e895f2 Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 13 Feb 2014 12:19:24 -0700 Subject: [PATCH 2/4] updated for gpu fork --- src/main.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 90d4b55541..2c031a2bfa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1085,9 +1085,16 @@ int64 static GetBlockValue(int nBits, int nHeight, int64 nFees) int64 nSubsidy = 0; if(nHeight >= 5465) { - nSubsidy = (11111.0 / (pow((dDiff+51.0)/6.0,2.0))); - if (nSubsidy > 500) nSubsidy = 500; - if (nSubsidy < 25) nSubsidy = 25; + if(dDiff > 75) { // GPU/ASIC difficulty calc + // 2222222/(((x+2600)/9)^2) + nSubsidy = (2222222.0 / (pow((dDiff+2600.0)/9.0,2.0))); + if (nSubsidy > 25) nSubsidy = 25; + if (nSubsidy < 5) nSubsidy = 5; + } else { // CPU mining calc + nSubsidy = (11111.0 / (pow((dDiff+51.0)/6.0,2.0))); + if (nSubsidy > 500) nSubsidy = 500; + if (nSubsidy < 25) nSubsidy = 25; + } } else { nSubsidy = (1111.0 / (pow((dDiff+1.0),2.0))); if (nSubsidy > 500) nSubsidy = 500; From f12c67fa8ed70df1d26255b04d22dbf2c0e347d0 Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 13 Feb 2014 12:23:21 -0700 Subject: [PATCH 3/4] 0.8.9.0 --- bitcoin-qt.pro | 2 +- share/setup.nsi | 6 +++--- src/clientversion.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 832ce8bf17..4424b83cea 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = darkcoin-qt macx:TARGET = "DarkCoin-Qt" -VERSION = 0.8.8.0 +VERSION = 0.8.9.0 INCLUDEPATH += src src/json src/qt QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/share/setup.nsi b/share/setup.nsi index 77ea439191..479f2dc3c2 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -5,7 +5,7 @@ SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 0.8.8.0 +!define VERSION 0.8.9.0 !define COMPANY "DarkCoin project" !define URL http://www.darkcoin.io/ @@ -45,13 +45,13 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile darkcoin-0.8.6.2-win32-setup.exe +OutFile darkcoin-0.8.0.0-win32-setup.exe InstallDir $PROGRAMFILES\DarkCoin CRCCheck on XPStyle on BrandingText " " ShowInstDetails show -VIProductVersion 0.8.8.0 +VIProductVersion 0.8.9.0 VIAddVersionKey ProductName DarkCoin VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" diff --git a/src/clientversion.h b/src/clientversion.h index 8531fa39e8..7321636c08 100644 --- 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 0 #define CLIENT_VERSION_MINOR 8 -#define CLIENT_VERSION_REVISION 8 +#define CLIENT_VERSION_REVISION 9 #define CLIENT_VERSION_BUILD 0 // Set to true for release, false for prerelease or test build From 415f7a28d4da02a89b8fe76eb2d43ac82f8ba4fe Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 13 Feb 2014 12:44:11 -0700 Subject: [PATCH 4/4] fixed --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 2c031a2bfa..e39fd1bad5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1085,7 +1085,7 @@ int64 static GetBlockValue(int nBits, int nHeight, int64 nFees) int64 nSubsidy = 0; if(nHeight >= 5465) { - if(dDiff > 75) { // GPU/ASIC difficulty calc + if(nHeight >= 17000 && dDiff > 75) { // GPU/ASIC difficulty calc // 2222222/(((x+2600)/9)^2) nSubsidy = (2222222.0 / (pow((dDiff+2600.0)/9.0,2.0))); if (nSubsidy > 25) nSubsidy = 25;