diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 98fcd0e41..f54d59f92 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -251,7 +251,6 @@ static const CRPCCommand vRPCCommands[] = { "settxfee", &settxfee, false, false, true }, { "getblocktemplate", &getblocktemplate, true, false, false }, { "submitblock", &submitblock, false, false, false }, - { "setmininput", &setmininput, false, false, false }, { "listsinceblock", &listsinceblock, false, false, true }, { "dumpprivkey", &dumpprivkey, true, false, true }, { "importprivkey", &importprivkey, false, false, true }, @@ -1173,7 +1172,6 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector 1) ConvertTo(params[1]); if (strMethod == "sendtoaddress" && n > 1) ConvertTo(params[1]); if (strMethod == "settxfee" && n > 0) ConvertTo(params[0]); - if (strMethod == "setmininput" && n > 0) ConvertTo(params[0]); if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo(params[1]); if (strMethod == "getreceivedbyaccount" && n > 1) ConvertTo(params[1]); if (strMethod == "listreceivedbyaddress" && n > 0) ConvertTo(params[0]); diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h index 441262d09..4c416e18f 100644 --- a/src/bitcoinrpc.h +++ b/src/bitcoinrpc.h @@ -199,7 +199,6 @@ extern json_spirit::Value getblockcount(const json_spirit::Array& params, bool f extern json_spirit::Value getbestblockhash(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getdifficulty(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value settxfee(const json_spirit::Array& params, bool fHelp); -extern json_spirit::Value setmininput(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getrawmempool(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getblockhash(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getblock(const json_spirit::Array& params, bool fHelp); diff --git a/src/init.cpp b/src/init.cpp index d647aa19d..a9e8eddaa 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -635,12 +635,6 @@ bool AppInit2(boost::thread_group& threadGroup) InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.")); } - if (mapArgs.count("-mininput")) - { - if (!ParseMoney(mapArgs["-mininput"], nMinimumInputValue)) - return InitError(strprintf(_("Invalid amount for -mininput=: '%s'"), mapArgs["-mininput"].c_str())); - } - strWalletFile = GetArg("-wallet", "wallet.dat"); // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log diff --git a/src/main.cpp b/src/main.cpp index 07748c014..87a5e3135 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -74,7 +74,6 @@ int64 nHPSTimerStart = 0; // Settings int64 nTransactionFee = 0; -int64 nMinimumInputValue = DUST_HARD_LIMIT; ////////////////////////////////////////////////////////////////////////////// diff --git a/src/main.h b/src/main.h index 25ca5e2e8..1050fd2b5 100644 --- a/src/main.h +++ b/src/main.h @@ -106,7 +106,6 @@ extern unsigned int nCoinCacheSize; // Settings extern int64 nTransactionFee; -extern int64 nMinimumInputValue; // Minimum disk space required - used in CheckDiskSpace() static const uint64 nMinDiskSpace = 52428800; diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index ec83914dc..d43f7af3b 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -88,7 +88,6 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); } obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); - obj.push_back(Pair("mininput", ValueFromAmount(nMinimumInputValue))); if (pwalletMain && pwalletMain->IsCrypted()) obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); obj.push_back(Pair("errors", GetWarnings("statusbar"))); @@ -254,23 +253,6 @@ Value getaddressesbyaccount(const Array& params, bool fHelp) } -Value setmininput(const Array& params, bool fHelp) -{ - if (fHelp || params.size() < 1 || params.size() > 1) - throw runtime_error( - "setmininput \n" - " is a real and is rounded to the nearest 0.00000001"); - - // Amount - int64 nAmount = 0; - if (params[0].get_real() != 0.0) - nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts - - nMinimumInputValue = nAmount; - return true; -} - - Value sendtoaddress(const Array& params, bool fHelp) { if (fHelp || params.size() < 2 || params.size() > 4) diff --git a/src/wallet.cpp b/src/wallet.cpp index d30e6e720..3e9da77e8 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1014,8 +1014,7 @@ void CWallet::AvailableCoins(vector& vCoins, bool fOnlyConfirmed, const continue; for (unsigned int i = 0; i < pcoin->vout.size(); i++) { - if (!(pcoin->IsSpent(i)) && IsMine(pcoin->vout[i]) && - !IsLockedCoin((*it).first, i) && pcoin->vout[i].nValue >= nMinimumInputValue && + if (!(pcoin->IsSpent(i)) && IsMine(pcoin->vout[i]) && !IsLockedCoin((*it).first, i) && (!coinControl || !coinControl->HasSelected() || coinControl->IsSelected((*it).first, i))) vCoins.push_back(COutput(pcoin, i, pcoin->GetDepthInMainChain())); } diff --git a/src/wallet.h b/src/wallet.h index 6fdbdf82f..bcce10c96 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -224,7 +224,7 @@ public: bool IsMine(const CTransaction& tx) const { BOOST_FOREACH(const CTxOut& txout, tx.vout) - if (IsMine(txout) && txout.nValue >= nMinimumInputValue) + if (IsMine(txout)) return true; return false; }