From e059c57eb9239a59c888970247f26ce6ba1554ad Mon Sep 17 00:00:00 2001 From: barton26 Date: Thu, 24 Jun 2021 03:31:58 -0400 Subject: [PATCH 001/362] qt: Replace deprecated QSignalMapper by lambda expressions Ref: https://github.com/bitcoin/bitcoin/pull/16706 --- src/qt/rpcconsole.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index ce13896b98..988f9697b5 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -338,18 +338,10 @@ void RPCConsole::setClientModel(ClientModel *model) peersTableContextMenu->addAction(banAction7d); peersTableContextMenu->addAction(banAction365d); - // Add a signal mapping to allow dynamic context menu arguments. - // We need to use int (instead of int64_t), because signal mapper only supports - // int or objects, which is okay because max bantime (1 year) is < int_max. - QSignalMapper* signalMapper = new QSignalMapper(this); - signalMapper->setMapping(banAction1h, 60*60); - signalMapper->setMapping(banAction24h, 60*60*24); - signalMapper->setMapping(banAction7d, 60*60*24*7); - signalMapper->setMapping(banAction365d, 60*60*24*365); - connect(banAction1h, &QAction::triggered, signalMapper, static_cast(&QSignalMapper::map)); - connect(banAction24h, &QAction::triggered, signalMapper, static_cast(&QSignalMapper::map)); - connect(banAction7d, &QAction::triggered, signalMapper, static_cast(&QSignalMapper::map)); - connect(banAction365d, &QAction::triggered, signalMapper, static_cast(&QSignalMapper::map)); + connect(banAction1h, &QAction::triggered, [this] { banSelectedNode(60 * 60); }); + connect(banAction24h, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24); }); + connect(banAction7d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 7); }); + connect(banAction365d, &QAction::triggered, [this] { banSelectedNode(60 * 60 * 24 * 365); }); #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(signalMapper, static_cast(&QSignalMapper::mapped), this, &RPCConsole::banSelectedNode); From 316c5f24282d42b216cea1b95194b902a4e33cc2 Mon Sep 17 00:00:00 2001 From: barton26 Date: Sun, 11 Jul 2021 23:17:32 -0400 Subject: [PATCH 002/362] qt: Remove stray QT4 references We haven't supported QT4 for a while now --- doc/gridcoinresearch.1 | 2 +- src/qt/bitcoin.cpp | 20 ++------------------ src/qt/bitcoingui.cpp | 2 +- src/qt/test/test_main.cpp | 7 ------- src/qt/winshutdownmonitor.cpp | 2 +- src/qt/winshutdownmonitor.h | 2 -- 6 files changed, 5 insertions(+), 30 deletions(-) diff --git a/doc/gridcoinresearch.1 b/doc/gridcoinresearch.1 index c7c7790e5a..f73691075c 100644 --- a/doc/gridcoinresearch.1 +++ b/doc/gridcoinresearch.1 @@ -2,7 +2,7 @@ .\" Contact richard.leckinger@riseup.net to correct errors or typos. .TH man 1 "25 September 2016" "1.0" "gridcoinresearch man page" .SH NAME -gridcoinresearch \- graphical (qt4) gridcoin wallet +gridcoinresearch \- graphical (qt5) gridcoin wallet .SH SYNOPSIS gridcoinresearch .SH DESCRIPTION diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 5e5b54bdbe..0fe56ccf85 100755 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -220,16 +220,6 @@ static std::string Translate(const char* psz) } /* qDebug() message handler --> debug.log */ -#if QT_VERSION < 0x050000 -void DebugMessageHandler(QtMsgType type, const char *msg) -{ - if (type == QtDebugMsg) { - LogPrint(BCLog::LogFlags::QT, "GUI: %s\n", msg); - } else { - LogPrintf("GUI: %s\n", msg); - } -} -#else void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &msg) { Q_UNUSED(context); @@ -239,7 +229,6 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons LogPrintf("GUI: %s\n", msg.toStdString()); } } -#endif /* Handle runaway exceptions. Shows a message box with the problem and quits the program. */ @@ -339,7 +328,7 @@ int main(int argc, char *argv[]) // Install global event filter that suppresses help context question mark app.installEventFilter(new GUIUtil::WindowContextHelpButtonHintFilter(&app)); -#if defined(WIN32) && QT_VERSION >= 0x050000 +#if defined(WIN32) // Install global event filter for processing Windows session related Windows messages (WM_QUERYENDSESSION and WM_ENDSESSION) app.installNativeEventFilter(new WinShutdownMonitor()); #endif @@ -573,13 +562,8 @@ int StartGridcoinQt(int argc, char *argv[], QApplication& app, OptionsModel& opt std::shared_ptr threads = std::make_shared(); -#if QT_VERSION < 0x050000 - // Install qDebug() message handler to route to debug.log - qInstallMsgHandler(DebugMessageHandler); -#else // Install qDebug() message handler to route to debug.log qInstallMessageHandler(DebugMessageHandler); -#endif // Subscribe to global signals from core uiInterface.ThreadSafeMessageBox.connect(ThreadSafeMessageBox); @@ -669,7 +653,7 @@ int StartGridcoinQt(int argc, char *argv[], QApplication& app, OptionsModel& opt // Place this here as guiref has to be defined if we don't want to lose URIs ipcInit(argc, argv); -#if defined(WIN32) && defined(QT_GUI) && QT_VERSION >= 0x050000 +#if defined(WIN32) && defined(QT_GUI) WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely...").arg(QObject::tr(PACKAGE_NAME)), (HWND)window.winId()); #endif diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 1e1e0e884e..4d30788460 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1,5 +1,5 @@ /* - * Qt4 bitcoin GUI. + * Qt5 bitcoin GUI. * * W.J. van der Laan 2011-2012 * The Bitcoin Developers 2011-2012 diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 88627b4673..f600889b9f 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -5,12 +5,6 @@ #if defined(QT_STATICPLUGIN) #include -#if QT_VERSION < 0x050000 -Q_IMPORT_PLUGIN(qcncodecs) -Q_IMPORT_PLUGIN(qjpcodecs) -Q_IMPORT_PLUGIN(qtwcodecs) -Q_IMPORT_PLUGIN(qkrcodecs) -#else #if defined(QT_QPA_PLATFORM_MINIMAL) Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin); #endif @@ -22,7 +16,6 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin); Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin); #endif #endif -#endif // This is all you need to run all the tests diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp index aa8453208f..54e55462a7 100755 --- a/src/qt/winshutdownmonitor.cpp +++ b/src/qt/winshutdownmonitor.cpp @@ -4,7 +4,7 @@ #include -#if defined(WIN32) && QT_VERSION >= 0x050000 +#if defined(WIN32) #include #include diff --git a/src/qt/winshutdownmonitor.h b/src/qt/winshutdownmonitor.h index 0bed55a2c6..c8a523a538 100644 --- a/src/qt/winshutdownmonitor.h +++ b/src/qt/winshutdownmonitor.h @@ -9,7 +9,6 @@ #include #include -#if QT_VERSION >= 0x050000 #include // for HWND #include @@ -24,6 +23,5 @@ class WinShutdownMonitor : public QAbstractNativeEventFilter static void registerShutdownBlockReason(const QString& strReason, const HWND& mainWinId); }; #endif -#endif #endif // BITCOIN_QT_WINSHUTDOWNMONITOR_H From 7cb68d4a6679defd1fdcf8aad72d57eb2e5d3e33 Mon Sep 17 00:00:00 2001 From: barton26 Date: Mon, 12 Jul 2021 03:59:59 -0400 Subject: [PATCH 003/362] Typos and Grammar --- src/gridcoin/staking/kernel.cpp | 2 +- src/gridcoin/upgrade.h | 2 +- src/qt/forms/voting/pollwizardprojectpage.ui | 2 +- src/rpc/rawtransaction.cpp | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gridcoin/staking/kernel.cpp b/src/gridcoin/staking/kernel.cpp index 768d34d85b..9a0663f838 100644 --- a/src/gridcoin/staking/kernel.cpp +++ b/src/gridcoin/staking/kernel.cpp @@ -476,7 +476,7 @@ bool GRC::CalculateLegacyV3HashProof( // Note: Payment age and magnitude restrictions not included as they are not // important in my view and are too restrictive for honest users. // TODO: flags? -// Note: Transaction hash is used here even thou ppcoin devs advised against it, +// Note: Transaction hash is used here even though ppcoin devs advised against it, // Gridcoin already used txhash in previous kernel, trying to brute-force // good tx hash is not possible as it is not known what stake modifier will be // after the coins mature! diff --git a/src/gridcoin/upgrade.h b/src/gridcoin/upgrade.h index 8ccb9536a1..ae14a25e37 100644 --- a/src/gridcoin/upgrade.h +++ b/src/gridcoin/upgrade.h @@ -133,7 +133,7 @@ class Progress const char *Filler = "*"; /** Keep this even for simplicity **/ const int LengthBar = 50; - /** Keep spaced for cleaning look thou this may not be perfect when translated **/ + /** Keep spaced for cleaning look though this may not be perfect when translated **/ const std::string StartStrings[4] = { _("Stage (1/4): Downloading snapshot.zip: "), _("Stage (2/4): Verify SHA256SUM of snapshot.zip: "), _("Stage (3/4): Cleanup blockchain data: "), diff --git a/src/qt/forms/voting/pollwizardprojectpage.ui b/src/qt/forms/voting/pollwizardprojectpage.ui index 344cadc2e4..59ec12a347 100644 --- a/src/qt/forms/voting/pollwizardprojectpage.ui +++ b/src/qt/forms/voting/pollwizardprojectpage.ui @@ -94,7 +94,7 @@ - Proposals must follow community guidelines for validation. Please review the wiki and verify that the prequisites have been fulfilled: + Proposals must follow community guidelines for validation. Please review the wiki and verify that the prerequisites have been fulfilled: true diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 890930424f..cb7c18059d 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -818,7 +818,7 @@ UniValue consolidateunspent(const UniValue& params, bool fHelp) * * In order to do the best possible calculation and prediction of end result you need to understand transaction serialization. * It was brought to my attention that no one could understand where the numbers actually came from. With multisig transactions - * there is many simularities to standard transactions. Here i'll break down all aspects of a serialized hex transaction. + * there are many similarities to standard transactions. Here I'll break down all aspects of a serialized hex transaction. * I plan to break it down into sections for easier understanding since its quite detailed. Some details I'm unaware of though. * It is important to note that padding at new areas start with OP_0 aka 0x00 and padding at end of an area ends with OP_INVALIDOPCODE 0xff. * Last information to know is that I will use byte size in calculations but explain in hex sizes here. Byte size is typically Hex size / 2. @@ -829,7 +829,7 @@ UniValue consolidateunspent(const UniValue& params, bool fHelp) * 47 30 44 02 20 (..) 02 20 (..) 01 * * - * sl: Canonical signature data length (typically 71-73 bytes in length as the ECDSA is 32 bytes and in some cases it can be longer) + * sl: Canonical signature data length (typically 71-73 bytes in length as the ECDSA is 32 bytes and in some cases it can be longer). * ch: 0x30 hex signifies Canonical signature. * tl: Total length in hex of combined data padding, R & S data. * dp: Padding of 0x02 between data points. @@ -839,7 +839,7 @@ UniValue consolidateunspent(const UniValue& params, bool fHelp) * sd: S Data; Typically 32 bytes in length. * st: Signature type. * - * Note: I'm not going into excessive details of the canonical signatures as there are many references to explain more indepth then needed for this function. + * Note: I'm not going into excessive details of the canonical signatures as there are many references to explain more in depth then needed for this function. * We will say that the base size of a single signature is 1 + 73 * After the signatures are 2 OP codes (2 bytes) for a multisignature tx. * @@ -979,7 +979,7 @@ UniValue consolidatemsunspent(const UniValue& params, bool fHelp) // Check The OP codes to determine how many signatures are needed. // redeemScript is formatted as such 2121.......... - // We doing that here with this code since it's already in the wallet and verified. This saves cycles. + // We are doing that here with this code since it's already in the wallet and verified. This saves cycles. bool fOPCodeSuccess = false; CScript CSDestSubscript; @@ -1013,7 +1013,7 @@ UniValue consolidatemsunspent(const UniValue& params, bool fHelp) if (!CSDestSubscript.GetOp(script, Whatopcode, vValue)) break; - // We Just care about the OP Codes here for signatures required and total signatures for informational purposes + // We just care about the OP Codes here for signatures required and total signatures for informational purposes switch (Whatopcode) { case OP_1: @@ -1101,7 +1101,7 @@ UniValue consolidatemsunspent(const UniValue& params, bool fHelp) hash = block.vtx[i].GetHash(); - // In case a fail here we can just continue thou it shouldn't happen + // In case a fail here we can just continue though it shouldn't happen if (!ReadTxFromDisk(tx, txdb, COutPoint(hash, 0), txindex)) continue; @@ -1114,7 +1114,7 @@ UniValue consolidatemsunspent(const UniValue& params, bool fHelp) const CTxOut& txout = tx.vout[j]; CTxDestination txaddress; - // Pass failures here thou we shouldn't have any failures + // Pass failures here though we shouldn't have any failures if (!ExtractDestination(txout.scriptPubKey, txaddress)) continue; @@ -1296,7 +1296,7 @@ UniValue scanforunspent(const UniValue& params, bool fHelp) hash = block.vtx[i].GetHash(); - // In case a fail here we can just continue thou it shouldn't happen + // In case a fail here we can just continue though it shouldn't happen if (!ReadTxFromDisk(tx, txdb, COutPoint(hash, 0), txindex)) continue; @@ -1306,7 +1306,7 @@ UniValue scanforunspent(const UniValue& params, bool fHelp) const CTxOut& txout = tx.vout[j]; CTxDestination txaddress; - // Pass failures here thou we shouldn't have any failures + // Pass failures here though we shouldn't have any failures if (!ExtractDestination(txout.scriptPubKey, txaddress)) continue; From 89d2e7bf467cdd3bfcfea06e65c6cb879ae72a91 Mon Sep 17 00:00:00 2001 From: barton26 Date: Sun, 11 Jul 2021 22:46:33 -0400 Subject: [PATCH 004/362] [Trivial, RPC] Fix and cleanup listreceivedbyX documentation Ref: https://github.com/bitcoin/bitcoin/pull/7527 --- src/wallet/rpcwallet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index bcef94d089..f75251b936 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1342,7 +1342,7 @@ UniValue listreceivedbyaddress(const UniValue& params, bool fHelp) "\nList balances by receiving address.\n" "\nArguments:\n" "1. minconf (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n" - "2. includeempty (numeric, optional, default=false) Whether to include addresses that haven't received any payments.\n" + "2. includeempty (bool, optional, default=false) Whether to include addresses that haven't received any payments.\n" "3. includeWatchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n" "\nResult:\n" "[\n" @@ -1367,7 +1367,7 @@ UniValue listreceivedbyaccount(const UniValue& params, bool fHelp) "\nList balances by account.\n" "\nArguments:\n" "1. minconf (numeric, optional, default=1) The minimum number of confirmations before payments are included.\n" - "2. includeempty (boolean, optional, default=false) Whether to include accounts that haven't received any payments.\n" + "2. includeempty (bool, optional, default=false) Whether to include accounts that haven't received any payments.\n" "3. includeWatchonly (bool, optional, default=false) Whether to include watchonly addresses (see 'importaddress').\n" "\nResult:\n" "[\n" From 1e5c60e9c7c2ebf94e952fcc55729a7f65024a44 Mon Sep 17 00:00:00 2001 From: barton26 Date: Sun, 11 Jul 2021 22:46:33 -0400 Subject: [PATCH 005/362] [wallet] Close DB on error. Ref: https://github.com/bitcoin/bitcoin/pull/11017 I thought better and moved the trivial to another PR. This will be exclusively the DB change because it is a regression risk. --- src/wallet/db.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 860e75f40b..25e92b397e 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -101,8 +101,10 @@ bool CDBEnv::Open(fs::path pathEnv_) DB_RECOVER | nEnvFlags, S_IRUSR | S_IWUSR); - if (ret != 0) + if (ret != 0) { + dbenv.close(0); return error("CDB() : error %s (%d) opening database environment", DbEnv::strerror(ret), ret); + } fDbEnvInit = true; fMockDb = false; @@ -376,9 +378,9 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) DB_BTREE, // Database type DB_CREATE, // Flags 0); - if (ret > 0) - { + if (ret > 0) { LogPrintf("Cannot create database file %s", strFileRes); + pdbCopy->close(0); fSuccess = false; } @@ -415,14 +417,15 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) if (ret2 > 0) fSuccess = false; } - if (fSuccess) - { + if (fSuccess) { db.Close(); bitdb.CloseDb(strFile); if (pdbCopy->close(0)) fSuccess = false; - delete pdbCopy; + } else { + pdbCopy->close(0); } + delete pdbCopy; } if (fSuccess) { From 7a5b5d316833504a28f2011809ee740b24ad847e Mon Sep 17 00:00:00 2001 From: barton26 Date: Mon, 12 Jul 2021 14:56:59 -0400 Subject: [PATCH 006/362] build: Clean remnants of QTBUG-34748 fix Ref: https://github.com/bitcoin/bitcoin/pull/21382 --- depends/packages/libxcb.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/depends/packages/libxcb.mk b/depends/packages/libxcb.mk index 451237285d..888168a5ad 100644 --- a/depends/packages/libxcb.mk +++ b/depends/packages/libxcb.mk @@ -18,13 +18,8 @@ define $(package)_preprocess_cmds sed "s/pthread-stubs//" -i configure endef -# Don't install xcb headers to the default path in order to work around a qt -# build issue: https://bugreports.qt.io/browse/QTBUG-34748 -# When using qt's internal libxcb, it may end up finding the real headers in -# depends staging. Use a non-default path to avoid that. - define $(package)_config_cmds - $($(package)_autoconf) --includedir=$(host_prefix)/include/xcb-shared + $($(package)_autoconf) endef define $(package)_build_cmds @@ -36,5 +31,5 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm -rf share/man share/doc + rm -rf share lib/*.la endef From 43e7989b030641e32867828da5fc0728609a36da Mon Sep 17 00:00:00 2001 From: barton26 Date: Mon, 12 Jul 2021 15:29:29 -0400 Subject: [PATCH 007/362] build: use -isysroot over --sysroot on macOS Ref: https://github.com/bitcoin/bitcoin/pull/21793 --- contrib/macdeploy/README.md | 2 +- depends/builders/darwin.mk | 8 ++++---- depends/hosts/darwin.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 735659df9e..90f4362672 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -71,7 +71,7 @@ Working macOS DMGs are created in Linux by combining a recent `clang`, the Apple Apple uses `clang` extensively for development and has upstreamed the necessary functionality so that a vanilla clang can take advantage. It supports the use of `-F`, -`-target`, `-mmacosx-version-min`, and `--sysroot`, which are all necessary when +`-target`, `-mmacosx-version-min`, and `-isysroot`, which are all necessary when building for macOS. Apple's version of `binutils` (called `cctools`) contains lots of functionality missing in the diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk index 69c394ec1d..a6978a91d3 100644 --- a/depends/builders/darwin.mk +++ b/depends/builders/darwin.mk @@ -1,5 +1,5 @@ -build_darwin_CC:=$(shell xcrun -f clang) --sysroot $(shell xcrun --show-sdk-path) -build_darwin_CXX:=$(shell xcrun -f clang++) --sysroot $(shell xcrun --show-sdk-path) +build_darwin_CC:=$(shell xcrun -f clang) -isysroot$(shell xcrun --show-sdk-path) +build_darwin_CXX:=$(shell xcrun -f clang++) -isysroot$(shell xcrun --show-sdk-path) build_darwin_AR:=$(shell xcrun -f ar) build_darwin_RANLIB:=$(shell xcrun -f ranlib) build_darwin_STRIP:=$(shell xcrun -f strip) @@ -10,8 +10,8 @@ build_darwin_SHA256SUM=shasum -a 256 build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o #darwin host on darwin builder. overrides darwin host preferences. -darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(shell xcrun --show-sdk-path) -darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ --sysroot $(shell xcrun --show-sdk-path) +darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) -isysroot$(shell xcrun --show-sdk-path) +darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ -isysroot$(shell xcrun --show-sdk-path) darwin_AR:=$(shell xcrun -f ar) darwin_RANLIB:=$(shell xcrun -f ranlib) darwin_STRIP:=$(shell xcrun -f strip) diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index 58b060a811..9a7eeeb479 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -101,7 +101,7 @@ darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \ -u LIBRARY_PATH \ $(clang_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \ -B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \ - --sysroot=$(OSX_SDK) \ + -isysroot$(OSX_SDK) \ -Xclang -internal-externc-isystem$(clang_resource_dir)/include \ -Xclang -internal-externc-isystem$(OSX_SDK)/usr/include darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \ @@ -109,7 +109,7 @@ darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \ -u LIBRARY_PATH \ $(clangxx_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \ -B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \ - --sysroot=$(OSX_SDK) \ + -isysroot$(OSX_SDK) \ -stdlib=libc++ -nostdinc++ \ -Xclang -cxx-isystem$(OSX_SDK)/usr/include/c++/v1 \ -Xclang -internal-externc-isystem$(clang_resource_dir)/include \ From 6771e523c581cc10111200cc2f06ce35ce59b206 Mon Sep 17 00:00:00 2001 From: barton26 Date: Mon, 12 Jul 2021 15:45:35 -0400 Subject: [PATCH 008/362] build: libevent 2.1.12-stable Changelog: https://raw.githubusercontent.com/libevent/libevent/release-2.1.12-stable/ChangeLog Ref: https://github.com/bitcoin/bitcoin/pull/21991 --- depends/packages/libevent.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index 8879dd9467..24908810ab 100644 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -1,9 +1,9 @@ package=libevent GCCFLAGS?= -$(package)_version=2.1.11-stable -$(package)_download_path=https://github.com/libevent/libevent/archive/ -$(package)_file_name=release-$($(package)_version).tar.gz -$(package)_sha256_hash=229393ab2bf0dc94694f21836846b424f3532585bac3468738b7bf752c03901e +$(package)_version=2.1.12-stable +$(package)_download_path=https://github.com/libevent/libevent/releases/download/release-$($(package)_version)/ +$(package)_file_name=$(package)-$($(package)_version).tar.gz +$(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb define $(package)_preprocess_cmds ./autogen.sh From 81390dc608761e4b46108c54ca235ef29f4b9dec Mon Sep 17 00:00:00 2001 From: barton26 Date: Tue, 13 Jul 2021 00:55:51 -0400 Subject: [PATCH 009/362] Remove old boost workaround Minimum boost is 1.58 --- src/gridcoin/backup.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gridcoin/backup.cpp b/src/gridcoin/backup.cpp index b027b410fc..da7b81b0f9 100644 --- a/src/gridcoin/backup.cpp +++ b/src/gridcoin/backup.cpp @@ -123,10 +123,8 @@ bool GRC::BackupConfigFile(const std::string& strDest) { #if BOOST_VERSION >= 107400 fs::copy_file(ConfigSource, ConfigTarget, fs::copy_options::overwrite_existing); - #elif BOOST_VERSION >= 104000 - fs::copy_file(ConfigSource, ConfigTarget, fs::copy_option::overwrite_if_exists); #else - fs::copy_file(ConfigSource, ConfigTarget); + fs::copy_file(ConfigSource, ConfigTarget, fs::copy_option::overwrite_if_exists); #endif LogPrintf("BackupConfigFile: Copied gridcoinresearch.conf to %s", ConfigTarget.string()); return true; @@ -164,10 +162,8 @@ bool GRC::BackupWallet(const CWallet& wallet, const std::string& strDest) { #if BOOST_VERSION >= 107400 fs::copy_file(WalletSource, WalletTarget, fs::copy_options::overwrite_existing); -#elif BOOST_VERSION >= 104000 - fs::copy_file(WalletSource, WalletTarget, fs::copy_option::overwrite_if_exists); #else - fs::copy_file(WalletSource, WalletTarget); + fs::copy_file(WalletSource, WalletTarget, fs::copy_option::overwrite_if_exists); #endif LogPrintf("BackupWallet: Copied wallet.dat to %s", WalletTarget.string()); } From 03d6b5aca17910001bc5801dee70dafdbff3b7c0 Mon Sep 17 00:00:00 2001 From: barton26 Date: Tue, 13 Jul 2021 01:18:16 -0400 Subject: [PATCH 010/362] timed_wait is deprecated --- src/scheduler.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/scheduler.cpp b/src/scheduler.cpp index c252c0a32f..d92e4e67b7 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -54,13 +54,6 @@ void CScheduler::serviceQueue() // Wait until either there is a new task, or until // the time of the first item on the queue: -// wait_until needs boost 1.50 or later; older versions have timed_wait: -#if BOOST_VERSION < 105000 - while (!shouldStop() && !taskQueue.empty() && - newTaskScheduled.timed_wait(lock, toPosixTime(taskQueue.begin()->first))) { - // Keep waiting until timeout - } -#else // Some boost versions have a conflicting overload of wait_until that returns void. // Explicitly use a template here to avoid hitting that overload. while (!shouldStop() && !taskQueue.empty()) { @@ -80,7 +73,7 @@ void CScheduler::serviceQueue() throw; } } -#endif + // If there are multiple threads, the queue can empty while we're waiting (another // thread may service the task we were waiting on). if (shouldStop() || taskQueue.empty()) From 90a0f5386468d9860f4104cf7708238b92f70c0e Mon Sep 17 00:00:00 2001 From: barton26 Date: Tue, 13 Jul 2021 02:15:58 -0400 Subject: [PATCH 011/362] opensource.org is https --- Makefile.am | 2 +- autogen.sh | 2 +- build-aux/m4/bitcoin_find_bdb48.m4 | 2 +- build-aux/m4/bitcoin_qt.m4 | 2 +- build-aux/m4/bitcoin_subdir_to_include.m4 | 2 +- ci/lint/04_install.sh | 2 +- ci/lint/05_before_script.sh | 2 +- ci/lint/06_script.sh | 2 +- ci/test/00_setup_env.sh | 2 +- ci/test/00_setup_env_arm.sh | 2 +- ci/test/00_setup_env_linux_i386.sh | 2 +- ci/test/00_setup_env_mac.sh | 2 +- ci/test/00_setup_env_mac_host.sh | 2 +- ci/test/00_setup_env_native.sh | 2 +- ci/test/00_setup_env_native_old.sh | 2 +- ci/test/00_setup_env_win32.sh | 2 +- ci/test/00_setup_env_win64.sh | 2 +- ci/test/03_before_install.sh | 2 +- ci/test/04_install.sh | 2 +- ci/test/05_before_script.sh | 2 +- ci/test/06_script_a.sh | 2 +- ci/test/06_script_b.sh | 2 +- ci/test/wrap-qemu.sh | 2 +- ci/test/wrap-wine.sh | 2 +- ci/test_run_all.sh | 2 +- contrib/devtools/circular-dependencies.py | 2 +- contrib/devtools/copyright_header.py | 6 +++--- contrib/devtools/symbol-check.py | 2 +- contrib/devtools/test_deterministic_coverage.sh | 2 +- contrib/gitian-build.sh | 2 +- contrib/install_db4.sh | 2 +- contrib/macdeploy/background.svg | 2 +- contrib/macdeploy/detached-sig-apply.sh | 2 +- contrib/macdeploy/detached-sig-create.sh | 2 +- share/qt/extract_strings_qt.py | 2 +- src/Makefile.am | 2 +- src/Makefile.leveldb.include | 2 +- src/Makefile.qt.include | 2 +- src/Makefile.qttest.include | 2 +- src/Makefile.test.include | 2 +- src/addrdb.cpp | 2 +- src/addrdb.h | 2 +- src/addrman.cpp | 2 +- src/addrman.h | 2 +- src/alert.h | 2 +- src/amount.h | 2 +- src/arith_uint256.cpp | 2 +- src/arith_uint256.h | 2 +- src/attributes.h | 2 +- src/banman.cpp | 2 +- src/banman.h | 2 +- src/base58.h | 2 +- src/bignum.h | 2 +- src/chainparams.cpp | 2 +- src/chainparams.h | 2 +- src/chainparamsbase.cpp | 2 +- src/chainparamsbase.h | 2 +- src/checkpoints.cpp | 2 +- src/checkpoints.h | 2 +- src/compat.h | 2 +- src/compat/assumptions.h | 2 +- src/compat/byteswap.h | 2 +- src/compat/endian.h | 2 +- src/consensus/merkle.cpp | 2 +- src/consensus/merkle.h | 2 +- src/consensus/params.h | 2 +- src/consensus/tx_verify.cpp | 2 +- src/consensus/tx_verify.h | 2 +- src/crypter.cpp | 2 +- src/crypter.h | 2 +- src/crypto/aes.cpp | 2 +- src/crypto/aes.h | 2 +- src/crypto/chacha20.cpp | 2 +- src/crypto/chacha20.h | 2 +- src/crypto/common.h | 2 +- src/crypto/ctaes/ctaes.c | 2 +- src/crypto/ctaes/ctaes.h | 2 +- src/crypto/ctaes/test.c | 2 +- src/crypto/hmac_sha256.cpp | 2 +- src/crypto/hmac_sha256.h | 2 +- src/crypto/hmac_sha512.cpp | 2 +- src/crypto/hmac_sha512.h | 2 +- src/crypto/poly1305.cpp | 2 +- src/crypto/poly1305.h | 2 +- src/crypto/ripemd160.cpp | 2 +- src/crypto/ripemd160.h | 2 +- src/crypto/sha1.cpp | 2 +- src/crypto/sha1.h | 2 +- src/crypto/sha256.cpp | 2 +- src/crypto/sha256.h | 2 +- src/crypto/sha256_shani.cpp | 2 +- src/crypto/sha256_sse4.cpp | 2 +- src/crypto/sha512.cpp | 2 +- src/crypto/sha512.h | 2 +- src/crypto/siphash.cpp | 2 +- src/crypto/siphash.h | 2 +- src/fs.h | 2 +- src/gridcoin/account.h | 2 +- src/gridcoin/accrual/computer.h | 2 +- src/gridcoin/accrual/newbie.h | 2 +- src/gridcoin/accrual/null.h | 2 +- src/gridcoin/accrual/research_age.h | 2 +- src/gridcoin/accrual/snapshot.h | 2 +- src/gridcoin/appcache.cpp | 2 +- src/gridcoin/appcache.h | 2 +- src/gridcoin/backup.cpp | 2 +- src/gridcoin/backup.h | 2 +- src/gridcoin/beacon.cpp | 2 +- src/gridcoin/beacon.h | 2 +- src/gridcoin/block_index.h | 2 +- src/gridcoin/boinc.cpp | 2 +- src/gridcoin/boinc.h | 2 +- src/gridcoin/claim.cpp | 2 +- src/gridcoin/claim.h | 2 +- src/gridcoin/contract/contract.cpp | 2 +- src/gridcoin/contract/contract.h | 2 +- src/gridcoin/contract/handler.h | 2 +- src/gridcoin/contract/message.cpp | 2 +- src/gridcoin/contract/message.h | 2 +- src/gridcoin/contract/payload.h | 2 +- src/gridcoin/cpid.cpp | 2 +- src/gridcoin/cpid.h | 2 +- src/gridcoin/gridcoin.cpp | 2 +- src/gridcoin/gridcoin.h | 2 +- src/gridcoin/magnitude.h | 2 +- src/gridcoin/project.cpp | 2 +- src/gridcoin/project.h | 2 +- src/gridcoin/quorum.cpp | 2 +- src/gridcoin/quorum.h | 2 +- src/gridcoin/researcher.cpp | 2 +- src/gridcoin/researcher.h | 2 +- src/gridcoin/scraper/fwd.h | 2 +- src/gridcoin/scraper/http.cpp | 2 +- src/gridcoin/scraper/http.h | 2 +- src/gridcoin/scraper/scraper.cpp | 2 +- src/gridcoin/scraper/scraper.h | 2 +- src/gridcoin/scraper/scraper_net.cpp | 2 +- src/gridcoin/scraper/scraper_net.h | 2 +- src/gridcoin/staking/chain_trust.h | 2 +- src/gridcoin/staking/difficulty.cpp | 2 +- src/gridcoin/staking/difficulty.h | 2 +- src/gridcoin/staking/exceptions.cpp | 2 +- src/gridcoin/staking/exceptions.h | 2 +- src/gridcoin/staking/kernel.cpp | 2 +- src/gridcoin/staking/kernel.h | 2 +- src/gridcoin/staking/reward.cpp | 2 +- src/gridcoin/staking/reward.h | 2 +- src/gridcoin/staking/spam.h | 2 +- src/gridcoin/staking/status.cpp | 2 +- src/gridcoin/staking/status.h | 2 +- src/gridcoin/superblock.cpp | 2 +- src/gridcoin/superblock.h | 2 +- src/gridcoin/support/block_finder.cpp | 2 +- src/gridcoin/support/block_finder.h | 2 +- src/gridcoin/support/enumbytes.h | 2 +- src/gridcoin/support/filehash.h | 2 +- src/gridcoin/support/xml.h | 2 +- src/gridcoin/tally.cpp | 2 +- src/gridcoin/tally.h | 2 +- src/gridcoin/tx_message.cpp | 2 +- src/gridcoin/tx_message.h | 2 +- src/gridcoin/upgrade.cpp | 2 +- src/gridcoin/upgrade.h | 2 +- src/gridcoin/voting/builders.cpp | 2 +- src/gridcoin/voting/builders.h | 2 +- src/gridcoin/voting/claims.cpp | 2 +- src/gridcoin/voting/claims.h | 2 +- src/gridcoin/voting/filter.h | 2 +- src/gridcoin/voting/fwd.h | 2 +- src/gridcoin/voting/payloads.h | 2 +- src/gridcoin/voting/poll.cpp | 2 +- src/gridcoin/voting/poll.h | 2 +- src/gridcoin/voting/registry.cpp | 2 +- src/gridcoin/voting/registry.h | 2 +- src/gridcoin/voting/result.cpp | 2 +- src/gridcoin/voting/result.h | 2 +- src/gridcoin/voting/vote.cpp | 2 +- src/gridcoin/voting/vote.h | 2 +- src/gridcoinresearchd-res.rc | 2 +- src/gridcoinresearchd.cpp | 2 +- src/hash.h | 2 +- src/index/disktxpos.h | 2 +- src/index/txindex.h | 2 +- src/init.cpp | 2 +- src/init.h | 2 +- src/key.cpp | 2 +- src/key.h | 2 +- src/keystore.cpp | 2 +- src/keystore.h | 2 +- src/logging.cpp | 2 +- src/logging.h | 2 +- src/main.cpp | 2 +- src/main.h | 2 +- src/miner.cpp | 2 +- src/miner.h | 2 +- src/mruset.h | 2 +- src/net.cpp | 2 +- src/net.h | 2 +- src/netbase.cpp | 2 +- src/netbase.h | 2 +- src/noui.cpp | 2 +- src/policy/fees.h | 2 +- src/policy/policy.cpp | 2 +- src/policy/policy.h | 2 +- src/prevector.h | 2 +- src/primitives/transaction.cpp | 2 +- src/primitives/transaction.h | 2 +- src/protocol.cpp | 2 +- src/protocol.h | 2 +- src/qt/bantablemodel.cpp | 2 +- src/qt/bantablemodel.h | 2 +- src/qt/decoration.cpp | 2 +- src/qt/decoration.h | 2 +- src/qt/diagnosticsdialog.cpp | 2 +- src/qt/diagnosticsdialog.h | 2 +- src/qt/favoritespage.cpp | 2 +- src/qt/favoritespage.h | 2 +- src/qt/intro.cpp | 2 +- src/qt/intro.h | 2 +- src/qt/locale/bitcoin_pl.ts | 2 +- src/qt/macos_appnap.h | 2 +- src/qt/macos_appnap.mm | 2 +- src/qt/noresult.cpp | 2 +- src/qt/noresult.h | 2 +- src/qt/notificator.cpp | 2 +- src/qt/peertablemodel.cpp | 2 +- src/qt/peertablemodel.h | 2 +- src/qt/qtipcserver.cpp | 2 +- src/qt/receivecoinspage.cpp | 2 +- src/qt/receivecoinspage.h | 2 +- src/qt/res/gridcoinresearch.rc | 2 +- src/qt/res/stylesheets/dark_stylesheet.qss | 2 +- src/qt/res/stylesheets/light_stylesheet.qss | 2 +- src/qt/researcher/projecttablemodel.cpp | 2 +- src/qt/researcher/projecttablemodel.h | 2 +- src/qt/researcher/researchermodel.cpp | 2 +- src/qt/researcher/researchermodel.h | 2 +- src/qt/researcher/researcherwizard.cpp | 2 +- src/qt/researcher/researcherwizard.h | 2 +- src/qt/researcher/researcherwizardauthpage.cpp | 2 +- src/qt/researcher/researcherwizardauthpage.h | 2 +- src/qt/researcher/researcherwizardbeaconpage.cpp | 2 +- src/qt/researcher/researcherwizardbeaconpage.h | 2 +- src/qt/researcher/researcherwizardemailpage.cpp | 2 +- src/qt/researcher/researcherwizardemailpage.h | 2 +- src/qt/researcher/researcherwizardinvestorpage.cpp | 2 +- src/qt/researcher/researcherwizardinvestorpage.h | 2 +- src/qt/researcher/researcherwizardmodedetailpage.cpp | 2 +- src/qt/researcher/researcherwizardmodedetailpage.h | 2 +- src/qt/researcher/researcherwizardmodepage.cpp | 2 +- src/qt/researcher/researcherwizardmodepage.h | 2 +- src/qt/researcher/researcherwizardpoolpage.cpp | 2 +- src/qt/researcher/researcherwizardpoolpage.h | 2 +- src/qt/researcher/researcherwizardpoolsummarypage.cpp | 2 +- src/qt/researcher/researcherwizardpoolsummarypage.h | 2 +- src/qt/researcher/researcherwizardprojectspage.cpp | 2 +- src/qt/researcher/researcherwizardprojectspage.h | 2 +- src/qt/researcher/researcherwizardsummarypage.cpp | 2 +- src/qt/researcher/researcherwizardsummarypage.h | 2 +- src/qt/upgradeqt.cpp | 2 +- src/qt/upgradeqt.h | 2 +- src/qt/voting/poll_types.cpp | 2 +- src/qt/voting/poll_types.h | 2 +- src/qt/voting/pollcard.cpp | 2 +- src/qt/voting/pollcard.h | 2 +- src/qt/voting/pollcardview.cpp | 2 +- src/qt/voting/pollcardview.h | 2 +- src/qt/voting/polldetails.cpp | 2 +- src/qt/voting/polldetails.h | 2 +- src/qt/voting/pollresultchoiceitem.cpp | 2 +- src/qt/voting/pollresultchoiceitem.h | 2 +- src/qt/voting/pollresultdialog.cpp | 2 +- src/qt/voting/pollresultdialog.h | 2 +- src/qt/voting/polltab.cpp | 2 +- src/qt/voting/polltab.h | 2 +- src/qt/voting/polltablemodel.cpp | 2 +- src/qt/voting/polltablemodel.h | 2 +- src/qt/voting/pollwizard.cpp | 2 +- src/qt/voting/pollwizard.h | 2 +- src/qt/voting/pollwizarddetailspage.cpp | 2 +- src/qt/voting/pollwizarddetailspage.h | 2 +- src/qt/voting/pollwizardprojectpage.cpp | 2 +- src/qt/voting/pollwizardprojectpage.h | 2 +- src/qt/voting/pollwizardsummarypage.cpp | 2 +- src/qt/voting/pollwizardsummarypage.h | 2 +- src/qt/voting/pollwizardtypepage.cpp | 2 +- src/qt/voting/pollwizardtypepage.h | 2 +- src/qt/voting/votewizard.cpp | 2 +- src/qt/voting/votewizard.h | 2 +- src/qt/voting/votewizardballotpage.cpp | 2 +- src/qt/voting/votewizardballotpage.h | 2 +- src/qt/voting/votewizardsummarypage.cpp | 2 +- src/qt/voting/votewizardsummarypage.h | 2 +- src/qt/voting/votingmodel.cpp | 2 +- src/qt/voting/votingmodel.h | 2 +- src/qt/voting/votingpage.cpp | 2 +- src/qt/voting/votingpage.h | 2 +- src/qt/winshutdownmonitor.cpp | 2 +- src/qt/winshutdownmonitor.h | 2 +- src/reverselock.h | 2 +- src/rpc/blockchain.cpp | 2 +- src/rpc/blockchain.h | 2 +- src/rpc/client.cpp | 2 +- src/rpc/client.h | 2 +- src/rpc/dataacq.cpp | 2 +- src/rpc/mining.cpp | 2 +- src/rpc/misc.cpp | 2 +- src/rpc/net.cpp | 2 +- src/rpc/protocol.cpp | 2 +- src/rpc/protocol.h | 2 +- src/rpc/rawtransaction.cpp | 2 +- src/rpc/server.cpp | 2 +- src/rpc/server.h | 2 +- src/scheduler.cpp | 2 +- src/scheduler.h | 2 +- src/script.cpp | 2 +- src/script.h | 2 +- src/serialize.h | 2 +- src/span.h | 2 +- src/streams.h | 2 +- src/support/allocators/secure.h | 2 +- src/support/allocators/zeroafterfree.h | 2 +- src/support/cleanse.cpp | 2 +- src/support/cleanse.h | 2 +- src/support/lockedpool.cpp | 2 +- src/support/lockedpool.h | 2 +- src/sync.cpp | 2 +- src/sync.h | 2 +- src/test/allocator_tests.cpp | 2 +- src/test/fs_tests.cpp | 2 +- src/test/gridcoin/appcache_tests.cpp | 2 +- src/test/gridcoin/beacon_tests.cpp | 2 +- src/test/gridcoin/block_finder_tests.cpp | 2 +- src/test/gridcoin/claim_tests.cpp | 2 +- src/test/gridcoin/contract_tests.cpp | 2 +- src/test/gridcoin/cpid_tests.cpp | 2 +- src/test/gridcoin/enumbytes_tests.cpp | 2 +- src/test/gridcoin/magnitude_tests.cpp | 2 +- src/test/gridcoin/project_tests.cpp | 2 +- src/test/gridcoin/researcher_tests.cpp | 2 +- src/test/gridcoin/superblock_tests.cpp | 2 +- src/test/gridcoin_tests.cpp | 2 +- src/test/merkle_tests.cpp | 2 +- src/test/serialize_tests.cpp | 2 +- src/test/uint256_tests.cpp | 2 +- src/threadsafety.h | 2 +- src/txdb-leveldb.cpp | 2 +- src/txdb-leveldb.h | 2 +- src/txdb.h | 2 +- src/ui_interface.h | 2 +- src/uint256.cpp | 2 +- src/uint256.h | 2 +- src/univalue/gen/gen.cpp | 2 +- src/univalue/include/univalue.h | 2 +- src/univalue/lib/univalue.cpp | 2 +- src/univalue/lib/univalue_get.cpp | 2 +- src/univalue/lib/univalue_read.cpp | 2 +- src/univalue/lib/univalue_utffilter.h | 2 +- src/univalue/lib/univalue_write.cpp | 2 +- src/univalue/test/object.cpp | 2 +- src/univalue/test/unitester.cpp | 2 +- src/util.cpp | 2 +- src/util.h | 2 +- src/util/check.h | 2 +- src/util/settings.cpp | 2 +- src/util/settings.h | 2 +- src/util/strencodings.cpp | 2 +- src/util/strencodings.h | 2 +- src/util/string.cpp | 2 +- src/util/string.h | 2 +- src/util/system.cpp | 2 +- src/util/system.h | 2 +- src/util/threadnames.cpp | 2 +- src/util/threadnames.h | 2 +- src/util/time.cpp | 2 +- src/util/time.h | 2 +- src/validation.cpp | 2 +- src/validation.h | 2 +- src/version.cpp | 2 +- src/version.h | 2 +- src/wallet/db.cpp | 2 +- src/wallet/db.h | 2 +- src/wallet/generated_type.h | 2 +- src/wallet/ismine.h | 2 +- src/wallet/rpcdump.cpp | 2 +- src/wallet/rpcwallet.cpp | 2 +- src/wallet/wallet.cpp | 2 +- src/wallet/wallet.h | 2 +- src/wallet/walletdb.cpp | 2 +- src/wallet/walletdb.h | 2 +- test/lint/0lint-rpc-help.sh | 2 +- test/lint/check-doc.py | 2 +- test/lint/check-rpc-mappings.py | 2 +- test/lint/commit-script-check.sh | 2 +- test/lint/extended-lint-all.sh | 2 +- test/lint/extended-lint-cppcheck.sh | 2 +- test/lint/git-subtree-check.sh | 2 +- test/lint/lint-all.sh | 2 +- test/lint/lint-assertions.sh | 2 +- test/lint/lint-circular-dependencies.sh | 2 +- test/lint/lint-filenames.sh | 2 +- test/lint/lint-format-strings.py | 2 +- test/lint/lint-format-strings.sh | 2 +- test/lint/lint-git-commit-check.sh | 2 +- test/lint/lint-include-guards.sh | 2 +- test/lint/lint-includes.sh | 2 +- test/lint/lint-locale-dependence.sh | 2 +- test/lint/lint-python-mutable-default-parameters.sh | 2 +- test/lint/lint-python-utf8-encoding.sh | 2 +- test/lint/lint-python.sh | 2 +- test/lint/lint-qt.sh | 2 +- test/lint/lint-shebang.sh | 2 +- test/lint/lint-shell-locale.sh | 2 +- test/lint/lint-shell.sh | 2 +- test/lint/lint-spelling.sh | 2 +- test/lint/lint-submodule.sh | 2 +- test/lint/lint-tests.sh | 2 +- test/lint/lint-whitespace.sh | 2 +- 418 files changed, 420 insertions(+), 420 deletions(-) diff --git a/Makefile.am b/Makefile.am index a21f80b4ef..4d9f16c498 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Copyright (c) 2013-2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. ACLOCAL_AMFLAGS = -I build-aux/m4 SUBDIRS = src diff --git a/autogen.sh b/autogen.sh index de16260b56..a0c323ce9e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2013-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C set -e diff --git a/build-aux/m4/bitcoin_find_bdb48.m4 b/build-aux/m4/bitcoin_find_bdb48.m4 index b9bf7bf46e..518267ba6b 100644 --- a/build-aux/m4/bitcoin_find_bdb48.m4 +++ b/build-aux/m4/bitcoin_find_bdb48.m4 @@ -1,6 +1,6 @@ dnl Copyright (c) 2013-2015 The Bitcoin Core developers dnl Distributed under the MIT software license, see the accompanying -dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. +dnl file COPYING or https://opensource.org/licenses/mit-license.php. AC_DEFUN([BITCOIN_FIND_BDB48],[ AC_ARG_VAR(BDB_CFLAGS, [C compiler flags for BerkeleyDB, bypasses autodetection]) diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 96be384bc2..9600f80935 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -1,6 +1,6 @@ dnl Copyright (c) 2013-2016 The Bitcoin Core developers dnl Distributed under the MIT software license, see the accompanying -dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. +dnl file COPYING or https://opensource.org/licenses/mit-license.php. dnl Helper for cases where a qt dependency is not met. dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit. diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 index 7841042ac8..213a92a7cc 100644 --- a/build-aux/m4/bitcoin_subdir_to_include.m4 +++ b/build-aux/m4/bitcoin_subdir_to_include.m4 @@ -1,6 +1,6 @@ dnl Copyright (c) 2013-2014 The Bitcoin Core developers dnl Distributed under the MIT software license, see the accompanying -dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. +dnl file COPYING or https://opensource.org/licenses/mit-license.php. dnl BITCOIN_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE]) dnl SUBDIRECTORY-NAME must end with a path separator diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh index 8ca784dc90..57fb4bcf15 100755 --- a/ci/lint/04_install.sh +++ b/ci/lint/04_install.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C diff --git a/ci/lint/05_before_script.sh b/ci/lint/05_before_script.sh index 2987812c8e..401c41f1c2 100755 --- a/ci/lint/05_before_script.sh +++ b/ci/lint/05_before_script.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index 0a0687da80..7965dde78c 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index 715df99f2e..2ca6d99559 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh index eac57c1118..7b75c95285 100755 --- a/ci/test/00_setup_env_arm.sh +++ b/ci/test/00_setup_env_arm.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_linux_i386.sh b/ci/test/00_setup_env_linux_i386.sh index 04fa30f470..ac4361d63c 100755 --- a/ci/test/00_setup_env_linux_i386.sh +++ b/ci/test/00_setup_env_linux_i386.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index 6db8264016..541ddd23f2 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh index 126530d84a..e3c7bbbeea 100755 --- a/ci/test/00_setup_env_mac_host.sh +++ b/ci/test/00_setup_env_mac_host.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_native.sh b/ci/test/00_setup_env_native.sh index cd40b39c9f..fed5f7ce11 100755 --- a/ci/test/00_setup_env_native.sh +++ b/ci/test/00_setup_env_native.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_native_old.sh b/ci/test/00_setup_env_native_old.sh index 4afc05d32d..188ab9cd8a 100755 --- a/ci/test/00_setup_env_native_old.sh +++ b/ci/test/00_setup_env_native_old.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_win32.sh b/ci/test/00_setup_env_win32.sh index c721a9af61..725867eed4 100755 --- a/ci/test/00_setup_env_win32.sh +++ b/ci/test/00_setup_env_win32.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index f7e62b17e7..74e9540199 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/03_before_install.sh b/ci/test/03_before_install.sh index 7cedd53c8f..b0dcbbd5e1 100755 --- a/ci/test/03_before_install.sh +++ b/ci/test/03_before_install.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 6757403979..5502ca545a 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh index 0bb93b2ae0..89c49fb19a 100755 --- a/ci/test/05_before_script.sh +++ b/ci/test/05_before_script.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/06_script_a.sh b/ci/test/06_script_a.sh index b8f67c28ea..1c752fb518 100755 --- a/ci/test/06_script_a.sh +++ b/ci/test/06_script_a.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index f87389e874..02979b8fe1 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/wrap-qemu.sh b/ci/test/wrap-qemu.sh index be7d7fcc1f..4eee932cc7 100755 --- a/ci/test/wrap-qemu.sh +++ b/ci/test/wrap-qemu.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2018-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test/wrap-wine.sh b/ci/test/wrap-wine.sh index 0195574f00..e15147ca7d 100755 --- a/ci/test/wrap-wine.sh +++ b/ci/test/wrap-wine.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/ci/test_run_all.sh b/ci/test_run_all.sh index a1d4bd1952..f4ad1e03c2 100755 --- a/ci/test_run_all.sh +++ b/ci/test_run_all.sh @@ -2,7 +2,7 @@ # # Copyright (c) 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. +# file COPYING or https://opensource.org/licenses/mit-license.php. export LC_ALL=C.UTF-8 diff --git a/contrib/devtools/circular-dependencies.py b/contrib/devtools/circular-dependencies.py index 08c64e0791..e5a381e9df 100755 --- a/contrib/devtools/circular-dependencies.py +++ b/contrib/devtools/circular-dependencies.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (c) 2018-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. import sys import re diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index f596dd1e5b..c244cac96b 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (c) 2016-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. import re import fnmatch @@ -454,7 +454,7 @@ def get_header_lines(header, start_year, end_year): CPP_HEADER = ''' // Copyright (c) %s The Gridcoin developers // Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. +// file COPYING or https://opensource.org/licenses/mit-license.php. ''' def get_cpp_header_lines_to_insert(start_year, end_year): @@ -463,7 +463,7 @@ def get_cpp_header_lines_to_insert(start_year, end_year): SCRIPT_HEADER = ''' # Copyright (c) %s The Gridcoin developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. ''' def get_script_header_lines_to_insert(start_year, end_year): diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 6949cb7ced..3ae8cab500 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (c) 2014 Wladimir J. van der Laan # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. ''' A script to check that the executables produced by gitian only contain certain symbols and are only linked against allowed libraries. diff --git a/contrib/devtools/test_deterministic_coverage.sh b/contrib/devtools/test_deterministic_coverage.sh index 8501c72f04..d377da748f 100755 --- a/contrib/devtools/test_deterministic_coverage.sh +++ b/contrib/devtools/test_deterministic_coverage.sh @@ -2,7 +2,7 @@ # # Copyright (c) 2019-2020 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. # # Test for deterministic coverage across unit test runs. diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index 761cf61310..fb729a1fc0 100755 --- a/contrib/gitian-build.sh +++ b/contrib/gitian-build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Copyright (c) 2016 The gridcoin Core developers # Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# file COPYING or https://opensource.org/licenses/mit-license.php. # What to do sign=true diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh index 4037936404..cfc29654cb 100755 --- a/contrib/install_db4.sh +++ b/contrib/install_db4.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2017-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. +# file COPYING or https://opensource.org/licenses/mit-license.php. # Install libdb4.8 (Berkeley DB). diff --git a/contrib/macdeploy/background.svg b/contrib/macdeploy/background.svg index 9c330af451..55b31d729b 100644 --- a/contrib/macdeploy/background.svg +++ b/contrib/macdeploy/background.svg @@ -5,7 +5,7 @@