diff --git a/src/amount.cpp b/src/amount.cpp index 91ab8c1f4..ea2d3fa45 100644 --- a/src/amount.cpp +++ b/src/amount.cpp @@ -1,39 +1,38 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Copyright (c) 2017-2019 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include -#include #include #include #include static const Currency BCHA{COIN, SATOSHI, 8, "BCHA"}; static const Currency XEC{100 * SATOSHI, SATOSHI, 2, "XEC"}; const Currency &Currency::get() { return gArgs.GetBoolArg("-ecash", DEFAULT_ECASH) ? XEC : BCHA; } std::string Amount::ToString() const { const auto currency = Currency::get(); return strprintf("%d.%0*d %s", *this / currency.baseunit, currency.decimals, (*this % currency.baseunit) / currency.subunit, currency.ticker); } Amount::operator UniValue() const { bool sign = *this < Amount::zero(); Amount n_abs(sign ? -amount : amount); const auto currency = Currency::get(); int64_t quotient = n_abs / currency.baseunit; int64_t remainder = (n_abs % currency.baseunit) / currency.subunit; return UniValue(UniValue::VNUM, strprintf("%s%d.%0*d", sign ? "-" : "", quotient, currency.decimals, remainder)); } diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 1f5158bfc..a46b6d1e5 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -1,210 +1,209 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) #include #endif #include #include #include #include #include #include #include -#include #include #include #include #include #include #include #include #include #include #include #include const std::function G_TRANSLATION_FUN = nullptr; static void WaitForShutdown(NodeContext &node) { while (!ShutdownRequested()) { UninterruptibleSleep(std::chrono::milliseconds{200}); } Interrupt(node); } ////////////////////////////////////////////////////////////////////////////// // // Start // static bool AppInit(int argc, char *argv[]) { // FIXME: Ideally, we'd like to build the config here, but that's currently // not possible as the whole application has too many global state. However, // this is a first step. auto &config = const_cast(GetConfig()); RPCServer rpcServer; NodeContext node; std::any context{&node}; HTTPRPCRequestProcessor httpRPCRequestProcessor(config, rpcServer, context); bool fRet = false; util::ThreadSetInternalName("init"); // If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's // main() SetupServerArgs(node); ArgsManager &args = *Assert(node.args); std::string error; if (!args.ParseParameters(argc, argv, error)) { return InitError(Untranslated( strprintf("Error parsing command line arguments: %s\n", error))); } // Process help and version before taking care about datadir if (HelpRequested(args) || args.IsArgSet("-version")) { std::string strUsage = PACKAGE_NAME " version " + FormatFullVersion() + "\n"; if (args.IsArgSet("-version")) { strUsage += FormatParagraph(LicenseInfo()) + "\n"; } else { strUsage += "\nUsage: bitcoind [options] " "Start " PACKAGE_NAME "\n"; strUsage += "\n" + args.GetHelpMessage(); } tfm::format(std::cout, "%s", strUsage); return true; } try { if (!CheckDataDirOption()) { return InitError(Untranslated( strprintf("Specified data directory \"%s\" does not exist.\n", args.GetArg("-datadir", "")))); } if (!args.ReadConfigFiles(error, true)) { return InitError(Untranslated( strprintf("Error reading configuration file: %s\n", error))); } // Check for -chain, -testnet or -regtest parameter (Params() calls are // only valid after this clause) try { SelectParams(args.GetChainName()); } catch (const std::exception &e) { return InitError(Untranslated(strprintf("%s\n", e.what()))); } // Make sure we create the net-specific data directory early on: if it // is new, this has a side effect of also creating // //wallets/. // // TODO: this should be removed once GetDataDir() no longer creates the // wallets/ subdirectory. // See more info at: // https://reviews.bitcoinabc.org/D3312 GetDataDir(true); // Error out when loose non-argument tokens are encountered on command // line for (int i = 1; i < argc; i++) { if (!IsSwitchChar(argv[i][0])) { return InitError(Untranslated( strprintf("Command line contains unexpected token '%s', " "see bitcoind -h for a list of options.\n", argv[i]))); } } if (!args.InitSettings(error)) { InitError(Untranslated(error)); return false; } // -server defaults to true for bitcoind but not for the GUI so do this // here args.SoftSetBoolArg("-server", true); // Set this early so that parameter interactions go to console InitLogging(args); InitParameterInteraction(args); if (!AppInitBasicSetup(args)) { // InitError will have been called with detailed error, which ends // up on console return false; } if (!AppInitParameterInteraction(config, args)) { // InitError will have been called with detailed error, which ends // up on console return false; } if (!AppInitSanityChecks()) { // InitError will have been called with detailed error, which ends // up on console return false; } if (args.GetBoolArg("-daemon", false)) { #if HAVE_DECL_DAEMON #if defined(MAC_OSX) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif tfm::format(std::cout, PACKAGE_NAME " starting\n"); // Daemonize if (daemon(1, 0)) { // don't chdir (1), do close FDs (0) return InitError(Untranslated( strprintf("daemon() failed: %s\n", strerror(errno)))); } #if defined(MAC_OSX) #pragma GCC diagnostic pop #endif #else return InitError(Untranslated( "-daemon is not supported on this operating system\n")); #endif // HAVE_DECL_DAEMON } // Lock data directory after daemonization if (!AppInitLockDataDirectory()) { // If locking the data directory failed, exit immediately return false; } fRet = AppInitInterfaces(node) && AppInitMain(config, rpcServer, httpRPCRequestProcessor, node); } catch (const std::exception &e) { PrintExceptionContinue(&e, "AppInit()"); } catch (...) { PrintExceptionContinue(nullptr, "AppInit()"); } if (!fRet) { Interrupt(node); } else { WaitForShutdown(node); } Shutdown(node); return fRet; } int main(int argc, char *argv[]) { #ifdef WIN32 util::WinCmdLineArgs winArgs; std::tie(argc, argv) = winArgs.get(); #endif SetupEnvironment(); // Connect bitcoind signal handlers noui_connect(); return (AppInit(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE); } diff --git a/src/feerate.cpp b/src/feerate.cpp index 78a8b609e..45bce5c74 100644 --- a/src/feerate.cpp +++ b/src/feerate.cpp @@ -1,65 +1,63 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Copyright (c) 2017-2019 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include - #include CFeeRate::CFeeRate(const Amount nFeePaid, size_t nBytes_) { assert(nBytes_ <= uint64_t(std::numeric_limits::max())); int64_t nSize = int64_t(nBytes_); if (nSize > 0) { nSatoshisPerK = 1000 * nFeePaid / nSize; } else { nSatoshisPerK = Amount::zero(); } } template static Amount GetFee(size_t nBytes_, Amount nSatoshisPerK) { assert(nBytes_ <= uint64_t(std::numeric_limits::max())); int64_t nSize = int64_t(nBytes_); // Ensure fee is rounded up when truncated if ceil is true. Amount nFee = Amount::zero(); if (ceil) { nFee = Amount(nSize * nSatoshisPerK % 1000 > Amount::zero() ? nSize * nSatoshisPerK / 1000 + SATOSHI : nSize * nSatoshisPerK / 1000); } else { nFee = nSize * nSatoshisPerK / 1000; } if (nFee == Amount::zero() && nSize != 0) { if (nSatoshisPerK > Amount::zero()) { nFee = SATOSHI; } if (nSatoshisPerK < Amount::zero()) { nFee = -SATOSHI; } } return nFee; } Amount CFeeRate::GetFee(size_t nBytes) const { return ::GetFee(nBytes, nSatoshisPerK); } Amount CFeeRate::GetFeeCeiling(size_t nBytes) const { return ::GetFee(nBytes, nSatoshisPerK); } std::string CFeeRate::ToString() const { const auto currency = Currency::get(); return strprintf("%d.%0*d %s/kB", nSatoshisPerK / currency.baseunit, currency.decimals, (nSatoshisPerK % currency.baseunit) / currency.subunit, currency.ticker); } diff --git a/src/init.cpp b/src/init.cpp index 2b6d18e6e..95274a4cd 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,3124 +1,3123 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #if defined(HAVE_CONFIG_H) #include #endif #include #include #include #include #include #include // For AVALANCHE_LEGACY_PROOF_DEFAULT #include #include // For AVALANCHE_VOTE_STALE_* #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include -#include #include #include #include #include #include #include #include #include #include #include #include #include