neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #380 from UdjinM6/v0.12.0.x_typo_etc

Browse Source 
V0.12.0.x fixing all kind of typos etc
This commit is contained in:
UdjinM6 2015-06-23 23:46:53 +03:00
commit 9e36c40433
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/darksend.cpp
View File

@ -607,7 +607,7 @@ void CDarksendPool::CheckFinalTransaction()
if(fDebug) LogPrintf("Transaction 2: %s\n", txNew.ToString().c_str()); if(fDebug) LogPrintf("Transaction 2: %s\n", txNew.ToString().c_str());
// See if the transaction is valid // See if the transaction is valid
if (!txNew.AcceptToMemoryPool(false, true, true)); if (!txNew.AcceptToMemoryPool(false, true, true))
{ {
LogPrintf("CDarksendPool::Check() - CommitTransaction : Error: Transaction not valid\n"); LogPrintf("CDarksendPool::Check() - CommitTransaction : Error: Transaction not valid\n");
SetNull(); SetNull();
@ -1758,8 +1758,10 @@ bool CDarksendPool::MakeCollateralAmounts()
// use the same cachedLastSuccess as for DS mixinx to prevent race // use the same cachedLastSuccess as for DS mixinx to prevent race
if(pwalletMain->CommitTransaction(wtx, reservekeyChange)) if(pwalletMain->CommitTransaction(wtx, reservekeyChange))
cachedLastSuccess = chainActive.Tip()->nHeight; cachedLastSuccess = chainActive.Tip()->nHeight;
else
LogPrintf("MakeCollateralAmounts: CommitTransaction failed!\n");
LogPrintf("MakeCollateralAmounts Success: tx %s\n", wtx.GetHash().GetHex().c_str()); LogPrintf("MakeCollateralAmounts: tx %s\n", wtx.GetHash().GetHex());
return true; return true;
} }

2
src/init.cpp
View File

@ -791,7 +791,7 @@ bool AppInit2(boost::thread_group& threadGroup)
{ {
CAmount nMaxFee = 0; CAmount nMaxFee = 0;
if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee)) if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s'"), mapArgs["-maptxfee"])); return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s'"), mapArgs["-maxtxfee"]));
if (nMaxFee > nHighTransactionMaxFeeWarning) if (nMaxFee > nHighTransactionMaxFeeWarning)
InitWarning(_("Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.")); InitWarning(_("Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction."));
maxTxFee = nMaxFee; maxTxFee = nMaxFee;

4
src/masternode-payments.cpp
View File

@ -54,7 +54,7 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int64_t nBlockHeight)
if(IsSporkActive(SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT)){ if(IsSporkActive(SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT)){
return false; return false;
} else { } else {
LogPrintf("Budget enforcement is disabled, accepting block"); LogPrintf("Budget enforcement is disabled, accepting block\n");
return true; return true;
} }
} }
@ -69,7 +69,7 @@ bool IsBlockPayeeValid(const CTransaction& txNew, int64_t nBlockHeight)
if(IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)){ if(IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)){
return false; return false;
} else { } else {
LogPrintf("Masternode payment enforcement is disabled, accepting block"); LogPrintf("Masternode payment enforcement is disabled, accepting block\n");
return true; return true;
} }
} }

2
src/rpcmasternode.cpp
View File

@ -477,7 +477,7 @@ Value masternodelist(const Array& params, bool fHelp)
" additional matches in some modes are also available\n" " additional matches in some modes are also available\n"
"\nAvailable modes:\n" "\nAvailable modes:\n"
" activeseconds - Print number of seconds masternode recognized by the network as enabled\n" " activeseconds - Print number of seconds masternode recognized by the network as enabled\n"
" full - Print info in format 'status protocol pubkey vin lastseen activeseconds'\n" " full - Print info in format 'status protocol pubkey IP lastseen activeseconds lastpaid'\n"
" (can be additionally filtered, partial match)\n" " (can be additionally filtered, partial match)\n"
" lastseen - Print timestamp of when a masternode was last seen on the network\n" " lastseen - Print timestamp of when a masternode was last seen on the network\n"
" pose - Print Proof-of-Service score\n" " pose - Print Proof-of-Service score\n"

2
src/wallet.cpp
View File

@ -1648,7 +1648,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
{ {
setCoinsRet.insert(vValue[i].second); setCoinsRet.insert(vValue[i].second);
nValueRet += vValue[i].first; nValueRet += vValue[i].first;
s += FormatMoney(vValue[i].first); s += FormatMoney(vValue[i].first) + " ";
} }
} }
LogPrintf("%s - total %s\n", s, FormatMoney(nBest)); LogPrintf("%s - total %s\n", s, FormatMoney(nBest));