diff --git a/src/core.h b/src/core.h index 0d80f82f..6cd3f7ea 100644 --- a/src/core.h +++ b/src/core.h @@ -178,17 +178,12 @@ public: class CTransaction { public: - static int64 nMinTxFee; - static int64 nMinRelayTxFee; static const int CURRENT_VERSION=1; int nVersion; CScript message; CScript userName; CScript userID; CScript pubKey; - //std::vector vin; - //std::vector vout; - //unsigned int nLockTime; CTransaction() { diff --git a/src/init.cpp b/src/init.cpp index f6b2c91b..a81f4df2 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -462,37 +462,6 @@ bool AppInit2(boost::thread_group& threadGroup) const char* pszP2SH = "/P2SH/"; COINBASE_FLAGS << std::vector(pszP2SH, pszP2SH+strlen(pszP2SH)); - // Fee-per-kilobyte amount considered the same as "free" - // If you are mining, be careful setting this: - // if you set it to zero then - // a transaction spammer can cheaply fill blocks using - // 1-satoshi-fee transactions. It should be set above the real - // cost to you of processing a transaction. - if (mapArgs.count("-mintxfee")) - { - int64 n = 0; - if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0) - CTransaction::nMinTxFee = n; - else - return InitError(strprintf(_("Invalid amount for -mintxfee=: '%s'"), mapArgs["-mintxfee"].c_str())); - } - if (mapArgs.count("-minrelaytxfee")) - { - int64 n = 0; - if (ParseMoney(mapArgs["-minrelaytxfee"], n) && n > 0) - CTransaction::nMinRelayTxFee = n; - else - return InitError(strprintf(_("Invalid amount for -minrelaytxfee=: '%s'"), mapArgs["-minrelaytxfee"].c_str())); - } - - if (mapArgs.count("-paytxfee")) - { - if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee)) - return InitError(strprintf(_("Invalid amount for -paytxfee=: '%s'"), mapArgs["-paytxfee"].c_str())); - if (nTransactionFee > 0.25 * COIN) - InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.")); - } - // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log std::string strDataDir = GetDataDir().string(); diff --git a/src/main.cpp b/src/main.cpp index f7b93f1c..e9c565e4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -49,12 +49,6 @@ bool fTxIndex = false; unsigned int nCoinCacheSize = 5000; bool fHaveGUI = false; -/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */ -int64 CTransaction::nMinTxFee = 10000; // Override with -mintxfee -/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */ -int64 CTransaction::nMinRelayTxFee = 10000; - - CMedianFilter cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have map mapOrphanBlocks;