cryptogera/dogecoin
1
0
Fork 0
mirror of https://github.com/dogecoin/dogecoin.git synced 2026-03-02 00:56:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #347 from dogecoin/master-1.6

Browse Source 
Why aren't we pulling into develop?
This commit is contained in:
voidref 2014-03-19 01:18:27 -07:00
commit 68464d699b
5 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -27,7 +27,7 @@ Scrypt Proof of Work
1 Minute Block Targets, 4 Hour Diff Readjustments
Special reward system: Random block rewards
Special reward system: Random block rewards before block 145,000. Static block reward of 250,00 afterwards.
1-100,000: 0-1,000,000 Dogecoin Reward

2
src/init.cpp
View File

@ -303,7 +303,7 @@ std::string HelpMessage()
" -pid=<file> " + _("Specify pid file (default: dogecoind.pid)") + "\n" +
" -gen " + _("Generate coins (default: 0)") + "\n" +
" -datadir=<dir> " + _("Specify data directory") + "\n" +
" -wallet=<file> " + _("Specify wallet file (within data directory)") + "\n";
" -wallet=<file> " + _("Specify wallet file (within data directory)") + "\n" +
" -dbcache=<n> " + _("Set database cache size in megabytes (default: 100)") + "\n" +
" -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" +
" -proxy=<ip:port> " + _("Connect through socks proxy") + "\n" +

4
src/mac/Info.plist
View File

@ -14,9 +14,9 @@
</dict>
</array>
<key>CFBundleShortVersionString</key>
<string>1.5.2</string>
<string>1.6.0</string>
<key>CFBundleVersion</key>
<string>1.5.2</string>
<string>1.6.0</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>CFBundleIconFile</key>

18
src/wallet.cpp
View File

@ -664,27 +664,13 @@ void CWalletTx::GetAmounts(list<pair<CTxDestination, int64> >& listReceived,
nFee = nDebit - nValueOut;
}
if (!fMineCached)
vfMine.resize(vout.size());
// Sent/received.
for (unsigned int i = 0; i < vout.size(); i++) {
const CTxOut &txout = vout[i];
bool isMine = false;
bool warnUnkownTX = false;
if (!fMineCached) {
address = CNoDestination();
warnUnkownTX = !ExtractDestinationAndMine(*pwallet, txout.scriptPubKey, address, &isMine);
vfMine[i] = isMine;
}
else {
if (vfMine[i]) {
isMine = true; // already know this is ours, just fetch address
address = CNoDestination();
warnUnkownTX = !ExtractDestination(txout.scriptPubKey, address);
}
}
warnUnkownTX = !ExtractDestinationAndMine(*pwallet, txout.scriptPubKey, address, &isMine);
if (warnUnkownTX) {
printf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n", this->GetHash().ToString().c_str());
}
@ -699,8 +685,6 @@ void CWalletTx::GetAmounts(list<pair<CTxDestination, int64> >& listReceived,
if (isMine)
listReceived.push_back(make_pair(address, txout.nValue));
}
fMineCached = true;
}
void CWalletTx::GetAccountAmounts(const string& strAccount, int64& nReceived,

6
src/wallet.h
View File

@ -384,8 +384,6 @@ public:
int64 nOrderPos; // position in ordered transaction list
// memory only
mutable std::vector<char> vfMine; // which outputs are mine
mutable bool fMineCached;
mutable bool fDebitCached;
mutable bool fCreditCached;
mutable bool fImmatureCreditCached;
@ -429,8 +427,6 @@ public:
fFromMe = false;
strFromAccount.clear();
vfSpent.clear();
vfMine.clear();
fMineCached = false;
fDebitCached = false;
fCreditCached = false;
fImmatureCreditCached = false;
@ -524,8 +520,6 @@ public:
// make sure balances are recalculated
void MarkDirty()
{
vfMine.clear();
fMineCached = false;
fCreditCached = false;
fAvailableCreditCached = false;
fDebitCached = false;