sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-30 22:35:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/evan82/darkcoin

Browse Source
This commit is contained in:
Evan 2014-02-23 10:30:50 -07:00
commit 8f302ddd65
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin-qt.pro
View File

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
TARGET = darkcoin-qt TARGET = darkcoin-qt
macx:TARGET = "DarkCoin-Qt" macx:TARGET = "DarkCoin-Qt"
VERSION = 0.8.8.0 VERSION = 0.8.9.0
INCLUDEPATH += src src/json src/qt INCLUDEPATH += src src/json src/qt
QT += core gui network QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

6
share/setup.nsi
View File

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

2
src/clientversion.h
View File

@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it // 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_MAJOR 0
#define CLIENT_VERSION_MINOR 8 #define CLIENT_VERSION_MINOR 8
#define CLIENT_VERSION_REVISION 8 #define CLIENT_VERSION_REVISION 9
#define CLIENT_VERSION_BUILD 0 #define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build // Set to true for release, false for prerelease or test build

17
src/main.cpp
View File

@ -1085,9 +1085,16 @@ int64 static GetBlockValue(int nBits, int nHeight, int64 nFees)
int64 nSubsidy = 0; int64 nSubsidy = 0;
if(nHeight >= 5465) { if(nHeight >= 5465) {
nSubsidy = (11111.0 / (pow((dDiff+51.0)/6.0,2.0))); if(nHeight >= 17000 && dDiff > 75) { // GPU/ASIC difficulty calc
if (nSubsidy > 500) nSubsidy = 500; // 2222222/(((x+2600)/9)^2)
if (nSubsidy < 25) nSubsidy = 25; 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 { } else {
nSubsidy = (1111.0 / (pow((dDiff+1.0),2.0))); nSubsidy = (1111.0 / (pow((dDiff+1.0),2.0)));
if (nSubsidy > 500) nSubsidy = 500; if (nSubsidy > 500) nSubsidy = 500;
@ -1097,8 +1104,8 @@ int64 static GetBlockValue(int nBits, int nHeight, int64 nFees)
//printf("height %u diff %4.2f reward %i \n", nHeight, dDiff, nSubsidy); //printf("height %u diff %4.2f reward %i \n", nHeight, dDiff, nSubsidy);
nSubsidy *= COIN; nSubsidy *= COIN;
// Subsidy is cut in half every 840000 blocks, which will occur approximately every 2 years // Subsidy is cut in half every 210240 blocks, which will occur approximately every year
nSubsidy >>= (nHeight / 840000); // DarkCoin: 840k blocks in ~2 years nSubsidy >>= (nHeight / 210240); // DarkCoin: 210k blocks in 1 year
return nSubsidy + nFees; return nSubsidy + nFees;
} }