much change

This commit is contained in:
root 2013-12-06 15:38:08 -05:00
parent 8b09dc5d71
commit 25d26b4848
18 changed files with 39 additions and 75 deletions

View file

@ -8,4 +8,14 @@ P2P 22556
1 Minute Block Targets, 4 Hour Diff Readjustments
Total of 500,000,000 coins. Special reward system.
Total of 100,000,000,000 coins.
Special reward system: Random block rewards
1-100,000: 0-1,000,000 DogeCoin Reward
100,001 — 200,000: 0-500,000 DogeCoin Reward
200,001 — 300,000: 0-250,000 DogeCoin Reward
300,001 — 400,000: 0-125,000 DogeCoin Reward
400,001 — 500,000: 0-62,500 DogeCoin Reward
500,001 - 600,000: 0-31,250 DogeCoin Reward
600,000+ — 10,000 Reward (flat)

View file

@ -278,8 +278,8 @@ class CBitcoinAddress : public CBase58Data
public:
enum
{
PUBKEY_ADDRESS = 12, // DogeCoin addresses start with D
SCRIPT_ADDRESS = 30,
PUBKEY_ADDRESS = 30, // DogeCoin addresses start with D
SCRIPT_ADDRESS = 22,
PUBKEY_ADDRESS_TEST = 113,
SCRIPT_ADDRESS_TEST = 196,
};

Binary file not shown.

View file

@ -846,103 +846,57 @@ int64 static GetBlockValue(int nHeight, int64 nFees, uint256 prevHash)
std::string cseed_str = prevHash.ToString().substr(7,7);
const char* cseed = cseed_str.c_str();
long seed = hex2long(cseed);
int rand = generateMTRandom(seed, 800000);
int rand = generateMTRandom(seed, 999999);
int rand1 = 0;
int rand2 = 0;
int rand3 = 0;
int rand4 = 0;
int rand5 = 0;
int rand6 = 0;
int rand7 = 0;
if(nHeight < 80000)
if(nHeight < 100000)
{
nSubsidy = rand * COIN;
nSubsidy = (1 + rand) * COIN;
}
else if(nHeight < 160000)
else if(nHeight < 200000)
{
cseed_str = prevHash.ToString().substr(7,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand1 = generateMTRandom(seed, 400000);
if(rand1 < 1000)
nSubsidy = rand1 + 1000 * COIN;
else if(rand1 > 1000)
nSubsidy = rand1 * COIN;
rand1 = generateMTRandom(seed, 499999);
nSubsidy = (1 + rand1) * COIN;
}
else if(nHeight < 240000)
else if(nHeight < 300000)
{
cseed_str = prevHash.ToString().substr(6,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand2 = generateMTRandom(seed, 300000);
if(rand2 < 2000)
nSubsidy = rand2 + 2000 * COIN;
else if(rand2 > 2000)
nSubsidy = rand2 * COIN;
}
else if(nHeight < 320000)
{
cseed_str = prevHash.ToString().substr(7,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand3 = generateMTRandom(seed, 200000);
if(rand3 < 3000)
nSubsidy = rand3 + 3000 * COIN;
else if(rand3 > 3000)
nSubsidy = rand3 * COIN;
rand2 = generateMTRandom(seed, 249999);
nSubsidy = (1 + rand2) * COIN;
}
else if(nHeight < 400000)
{
cseed_str = prevHash.ToString().substr(7,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand4 = generateMTRandom(seed, 100000);
if(rand4 < 4000)
nSubsidy = rand4 + 4000 * COIN;
else if(rand4 > 4000)
nSubsidy = rand4 * COIN;
rand3 = generateMTRandom(seed, 124999);
nSubsidy = (1 + rand3) * COIN;
}
else if(nHeight < 480000)
else if(nHeight < 500000)
{
cseed_str = prevHash.ToString().substr(7,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand4 = generateMTRandom(seed, 62499);
nSubsidy = (1 + rand4) * COIN;
}
else if(nHeight < 600000)
{
cseed_str = prevHash.ToString().substr(6,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand5 = generateMTRandom(seed, 50000);
if(rand5 < 5000)
nSubsidy = rand5 + 5000 * COIN;
else if(rand5 > 5000)
nSubsidy = rand5 * COIN;
rand5 = generateMTRandom(seed, 31249);
nSubsidy = (1 + rand5) * COIN;
}
else if(nHeight < 560000)
{
cseed_str = prevHash.ToString().substr(7,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand6 = generateMTRandom(seed, 25000);
if(rand6 < 6000)
nSubsidy = rand6 + 6000 * COIN;
else if(rand6 > 6000)
nSubsidy = rand6 * COIN;
}
else if(nHeight < 600000)
{
cseed_str = prevHash.ToString().substr(7,7);
cseed = cseed_str.c_str();
seed = hex2long(cseed);
rand1 = generateMTRandom(seed, 14000);
if(rand7 < 1000)
nSubsidy = rand7 + 7000 * COIN;
else if(rand7 > 7000)
nSubsidy = rand7 * COIN;
}
nSubsidy >>= (nHeight / 1000000);
return nSubsidy + nFees;
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -288,7 +288,7 @@ void BitcoinGUI::createActions()
optionsAction->setMenuRole(QAction::PreferencesRole);
toggleHideAction = new QAction(QIcon(":/icons/bitcoin"), tr("Show/Hide &DogeCoin"), this);
toggleHideAction->setToolTip(tr("Show or hide the DogeCoin window"));
exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this);
exportAction = new QAction(QIcon(":/icons/export"), tr("&So Export..."), this);
exportAction->setToolTip(tr("Export the data in the current tab to a file"));
encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);
encryptWalletAction->setToolTip(tr("Encrypt or decrypt wallet"));
@ -566,7 +566,7 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
tooltip = tr("Downloaded %1 blocks of transaction history.").arg(count);
}
tooltip = tr("Current difficulty is %1.").arg(clientModel->GetDifficulty()) + QString("<br>") + tooltip;
tooltip = tr("Such difficult %1.").arg(clientModel->GetDifficulty()) + QString("<br>") + tooltip;
QDateTime now = QDateTime::currentDateTime();
QDateTime lastBlockDate = clientModel->getLastBlockDate();
@ -631,12 +631,12 @@ void BitcoinGUI::setMining(bool mining, int hashrate)
if (mining)
{
labelMiningIcon->setPixmap(QIcon(":/icons/mining_active").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelMiningIcon->setToolTip(tr("Mining DogeCoins at %1 hashes per second").arg(hashrate));
labelMiningIcon->setToolTip(tr("Dig DogeCoins at %1 hashes per second").arg(hashrate));
}
else
{
labelMiningIcon->setPixmap(QIcon(":/icons/mining_inactive").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelMiningIcon->setToolTip(tr("Not mining DogeCoins"));
labelMiningIcon->setToolTip(tr("Not dig DogeCoins"));
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB