Merge pull request #384 from leofidus/1.7-fee

warning and documentation changes to match dogecoin fees
This commit is contained in:
langerhans 2014-03-29 22:18:56 +01:00
commit 25a4d58b20
2 changed files with 3 additions and 3 deletions

View file

@ -555,7 +555,7 @@ bool AppInit2(boost::thread_group& threadGroup)
{
if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))
return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"]));
if (nTransactionFee > 0.25 * COIN)
if (nTransactionFee > 25 * COIN)
InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
}
bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);

View file

@ -1875,8 +1875,8 @@ Value settxfee(const Array& params, bool fHelp)
"\nResult\n"
"true|false (boolean) Returns true if successful\n"
"\nExamples:\n"
+ HelpExampleCli("settxfee", "0.00001")
+ HelpExampleRpc("settxfee", "0.00001")
+ HelpExampleCli("settxfee", "5")
+ HelpExampleRpc("settxfee", "5")
);
// Amount