- build: add stack-clash and control-flow protection options to hard…

…ening flags, don't enable it for Windows gridcoin-community#2284 (@barton2526) - build: add upstream compiler warnings gridcoin-community#2288 (@jamescowens) - rpc: Create getblockbymintime gridcoin-community#2290 (@RoboticMind) - cd: generate release binaries using GitHub actions gridcoin-community#2249 (@div72) - util: port upstream span changes gridcoin-community#2323 (@div72) - rpc: add additional ban time fields to listbanned gridcoin-community#2334 (@barton2526) - test: Add sanity_tests from upstream gridcoin-community#2343 (@barton2526) - util, test: Don't allow Base58 decoding of non-Base58 strings. Add Base58 tests. Add whitespace tests. gridcoin-community#2345 (@barton2526) - test: Add tests for monetary value formatting and parsing. Clean up includes in rpc_tests gridcoin-community#2348 (@barton2526) - rpc: Implement -rpcwait and -rpcwaittimeout gridcoin-community#2349 (@jamescowens) - test: Add crypto_tests (@upstream gridcoin-community#2372 from barton2526) - test: Add test for GCC bug 90348 gridcoin-community#2380 (@barton2526) - build: add python3.10, 3.11 alias to AC_PATH_PROGS call in configure gridcoin-community#2386 (@barton2526) - wallet, contract: Implement contract change option gridcoin-community#2388 (@jamescowens) - gui: Implement privacy mode gridcoin-community#2399 (@jamescowens) - util: Implement -reindex option, improve -loadblock option gridcoin-community#2394 (@jamescowens) - gui: Implement Alt-7 for unlock and lock of wallet gridcoin-community#2406 (@jamescowens) - gui, voting: Add a one minute timer to check for current poll expiring and update gui gridcoin-community#2416 (@jamescowens) - gui: Implement a warning about split CPID/email mismatch condition gridcoin-community#2414 (@jamescowens) - util: clean obsolete config keys gridcoin-community#2424 (@div72) - net: Implement an upper limit of 950 for max network connections gridcoin-community#2426 (@jamescowens) - build: libevent 2.1.12-stable gridcoin-community#2226 (@barton2526) - build: Bump minimum QT support to 5.9.5, Remove obsolete checks gridcoin-community#2251 (@barton2526) - doc: Update to https where possible gridcoin-community#2230 (@barton2526) - refactor: Replace fprintf with tfm::format gridcoin-community#2262 (@barton2526) - qt: Replace deprecated QSignalMapper by lambda expressions gridcoin-community#2261 (@barton2526) - refactor: Use functions guaranteed to be locale independent (ToLower, IsDigit, IsSpace) gridcoin-community#2265 (@barton2526) - refactor: Replace std::to_string with locale-independent alternative gridcoin-community#2266 (@barton2526) - refactor: small python cleanup gridcoin-community#2267 (@barton2526) - refactor: Replace local dependent string functions with non-locale versions in strencodings.h/cpp gridcoin-community#2270 (@amescowens) - ci: Update KNOWN_VIOLATIONS list for the linter for functions we don't care are locale-dependent gridcoin-community#2271 (@barton2526) - refactor: move block storage functions to src/node/blockstorage gridcoin-community#2273 (@div72) - refactor: Replace deprecated Qt::SystemLocale{Short,Long}Date, Fix 'QDateTime is deprecated' warnings gridcoin-community#2275 (@barton2526) - rpc: optimize getblockbynumber gridcoin-community#2289 (@barton2526) - gui: Update connect statements to conform to Qt 5 standard gridcoin-community#2281 (@jamescowens) - depends: Bump ccache and curl gridcoin-community#2297 (@barton2526) - ci: only print depends/apt output if the step fails gridcoin-community#2287 (@div72) - depends: Update to openSSL 1.1.1l gridcoin-community#2302 (@barton2526) - rpc: Don't use floating point in getreceivedbyaddress gridcoin-community#2310 (@barton2526) - LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead gridcoin-community#2306 (@barton2526) - build: update m4 gridcoin-community#2317 (@div72) - qt: Replace deprecated Qt functions gridcoin-community#2316 (@barton2526) - build: set minimum required Boost to 1.60 gridcoin-community#2318 (@barton2526) - util: Don't use gmtime() or localtime() gridcoin-community#2319 (@barton2526) - build: Update univalue subtree gridcoin-community#2335 (@barton2526) - refactor: use include guards instead of #pragma once gridcoin-community#2336 (@div72) - refactor: Scraper thread safety and code cleanup gridcoin-community#2315 (@jamescowens) - qt: Follow Qt docs when implementing rowCount and columnCount gridcoin-community#2333 (@barton2526) - qt: Notificator class refactoring. Notificator always takes 3 args. Remove Growl support. gridcoin-community#2352 (@barton2526) - build: pin OpenSSL version for MacOS gridcoin-community#2354 (@div72) - build, util: Update leveldb to 1.22 (@upstream Bitcoin gridcoin-community#2353 from jamescowens) - test: Update transaction_tests and associated JSON files from upstream gridcoin-community#2356 (@barton2526) - test: Update script_p2sh_tests from upstream gridcoin-community#2357 (@barton2526) - refactor: port upstream ui_interface changes gridcoin-community#2355 (@div72) - contract: parse strings for claim and message types gridcoin-community#2359 (@div72) - test: Update sigopcount_tests and transaction_tests from upstream gridcoin-community#2361 (@barton2526) - test, refactor: Update script_tests from upstream gridcoin-community#2360 (@barton2526) - test: Update util_tests from upstream gridcoin-community#2363 (@barton2526) - test: Update script test JSON files from upstream gridcoin-community#2364 @barton2526) - refactor: split clientversion from version gridcoin-community#2367 (@div72) - random: port upstream random changes gridcoin-community#2368 (@div72) - refactor: convert C-style (void) parameter lists to C++ style () gridcoin-community#2373 (@barton2526) - build: Disable -fcf-protection for mingw win32 gridcoin-community#2377 (@jamescowens) - gui: Add text output and dialog boxes for -help and -version in GUI client gridcoin-community#2378 (@jamescowens) - test, refactor: Use FastRandomContext for all tests. Add a header for test_gridcoin gridcoin-community#2381 (@barton2526) - depends: avoid system harfbuzz and bz2 gridcoin-community#2382 (@barton2526) - doc: Update Windows build instructions gridcoin-community#2383 (@barton2526) - refactor: replace QDateTime::fromTime_t with QDateTime::fromSecsSinceEpoch gridcoin-community#2387 (@barton2526) - util: Port of Bitcoin upstream base58.h/cpp at a85442f62bf157b07849accd495c55c73535dc73 gridcoin-community#2384 (@jamescowens) - test: update base58_encode_decode.json from upstream gridcoin-community#2391 (@barton2526) - depends: Port libdmg-hfsplus changes from upstream gridcoin-community#2389 (@barton2526) - doc: Port newer build documentation from Bitcoin gridcoin-community#2162 (@nathanielcwm) - rpc: Change getmininginfo to getstakinginfo gridcoin-community#2393 (@jamescowens) - researcher: Prefer CPID with active beacon for primary CPID gridcoin-community#2404 (@scribblemaniac) - contract: separate legacy type parsing gridcoin-community#2396 (@div72) - refactor: Pass values by reference gridcoin-community#2408 (@Pythonix) - net: only adjust time with data from outbound nodes gridcoin-community#2411 (@div72) - rpc: Change call to FormatISO8601DateTime to FormatISO8601DateTimeDashSep in scanforunspent gridcoin-community#2413 (@jamescowens) - build: Adjust depends packages to successfully compile on OpenSUSE gridcoin-community#2260 (@jamescowens) - gui: Enable masking of cpid in privacy mode gridcoin-community#2420 (@jamescowens) - doc: Update license year range to 2022 gridcoin-community#2421 (@barton2526) - contrib: install_db4: use local config.guess/sub gridcoin-community#2436 (@div72) - gui: update translations gridcoin-community#2442 (@div72, @3man001) - qt: Remove stray QT4 references gridcoin-community#2220 (@barton2526) - util: Remove old boost hacks/workarounds gridcoin-community#2231 (@barton2526) - refactor: Remove sprintf and printf gridcoin-community#2269 (@jamescowens) - depends: Remove boost::program_options dependency gridcoin-community#2277 (@barton2526) - refactor: Drop noop gcc version checks gridcoin-community#2278 (@barton2526) - util: Remove unused itostr gridcoin-community#2280 (@barton2526) - util: Remove deprecated random number generator functions gridcoin-community#2236 (@jamescowens) - depends: cleanup package configure flags gridcoin-community#2279 (@barton2526) - rpc: remove 'label' filter for rpc command help gridcoin-community#2282 (@barton2526) - wallet: remove unused fNoncriticalErrors variable from CWalletDB::FindWalletTx gridcoin-community#2283 (@barton2526) - refactor: Optimize and Cleanup CScript::FindAndDelete gridcoin-community#2294 (@barton2526) - wallet: Remove unused AskPassphraseDialog::Decrypt gridcoin-community#2299 (@barton2526) - refactor, qt: Drop redundant setEditTriggers(NoEditTriggers) calls, Fix typo in QtInputSupport check gridcoin-community#2308 (@barton2526) - release: Remove gitian gridcoin-community#2293 (@jamescowens) - util: Update scheduler and remove Boost chrono gridcoin-community#2330 (@jamescowens) - qt: remove gridcoinresearch.pro gridcoin-community#2332 (@div72) - test: Remove unused function dumpKeyInfo gridcoin-community#2347 (@barton2526) - build: remove glibc back compat gridcoin-community#2351 (@barton2526) - net: remove SOCKS4 support (@core and GUI gridcoin-community#2385 from barton2526) - net: remove obsolete "reply" command gridcoin-community#2366 (@div72) - net: Remove I2P support from netbase & Correct HE IPv6 Tunnel Broker gridcoin-community#2409 (@Pythonix) - qt: Remove locked coins loop gridcoin-community#2410 (@Pythonix) - wallet: Close DB on error, use memory_cleanse gridcoin-community#2221 (@barton2526) - build: Clean remnants of QTBUG-34748 fix gridcoin-community#2224 (@barton2526) - build: use -isysroot over --sysroot on macOS gridcoin-community#2225 (@barton2526) - trivial, rpc: Fix and cleanup listreceivedbyX documentation, General Typos gridcoin-community#2227 (@barton2526) - trivial: Unbreak build with Boost 1.72.0 gridcoin-community#2228 (@barton2526) - doc: Large collection of typos, grammar fixes, and proper capitalization gridcoin-community#2247 (@barton2526) - lint: Fix linter warning, fix typo gridcoin-community#2276 (@barton2526) - qt: Do not translate file extensions gridcoin-community#2295 (@barton2526) - refactor: Drop redundant QString calls gridcoin-community#2296 (@barton2526) - rpc: Print OpenSSL version fix gridcoin-community#2298 (@barton2526) - gui: Add back in accidentally deleted condition for UnlockStaking and Unlock cases in AskPassphraseDialog::textChanged() gridcoin-community#2305 (@jamescowens) - rpc: ParseHash: Fail when length is not 64 gridcoin-community#2313 (@barton2526) - Fix locking on WSL using flock instead of fcntl gridcoin-community#2314 (@barton2526) - rpc: Fix breakage in protocol.cpp caused by change atoi to ParseInt gridcoin-community#2307 (@jamescowens) - net: Small upstream FIXME gridcoin-community#2320 (@barton2526) - refactor: Fix advanced compiler warnings gridcoin-community#2292 (@jamescowens) - poll: Fix the possible infinite loop warning on GetChoices() in result.cpp gridcoin-community#2322 (@jamescowens) - qt: fix broken research wizard signal gridcoin-community#2324 (@div72) - refactor: Fix three minor code scanner findings gridcoin-community#2327 (@barton2526) - Fix build with Boost 1.77.0 gridcoin-community#2329 (@barton2526) - build: Misc upstream depends fixes gridcoin-community#2331 (@barton2526) - wallet: Fix improper indent in encryptWallet gridcoin-community#2339 (@jamescowens) - wallet: Bugfix - Fundrawtransaction: don't terminate when keypool is empty gridcoin-community#2337 (@barton2526) - depends: Fix build for Apple Silicon gridcoin-community#2342 (@div72) - build: fix -fstack-clash-protection spam for Clang gridcoin-community#2340 (@div72) - util, test: Don't allow Base32/64-decoding or ParseMoney(…) on strings with embedded NUL characters. Add tests. Add negative test case. gridcoin-community#2344 (@barton2526) - test: Repair transaction_tests.cpp (baseline) gridcoin-community#2350 (@jamescowens) - scraper: Fix scraper deadlock and make activebeforesb dynamic (not require restart) gridcoin-community#2358 (@jamescowens) - scraper: Move lock on cs_mapParts in RecvManifest gridcoin-community#2370 (@jamescowens) - build: Make changes to use Gridcoin x.y.z.w client versions gridcoin-community#2371 (@jamescowens) - refactor, build: Upstream fixes for the /crypto files. Implement Keccak and SHA3 gridcoin-community#2365 (@barton2526) - util: fix FormatVersion gridcoin-community#2376 (@div72) - net: initialize nMessageSize to uint32_t max gridcoin-community#2390 (@barton2526) - contract: fix double usage of contract change addresses gridcoin-community#2395 (@div72) - build: patch qt to explicitly define previously implicit header include gridcoin-community#2397 (@div72) - Fix breakage introduced by use of FormatISO8601DateTime gridcoin-community#2398 (@jamescowens) - gui: Fix bug in recent transaction list gridcoin-community#2403 (@jamescowens) - build: Drop macports support gridcoin-community#2401 (@barton2526) - util: Check if specified config file cannot be opened gridcoin-community#2400 (@barton2526) - net: Fix masking of irrelevant bits in address groups gridcoin-community#2412 (@Pythonix) - rpc: accept int block number for getblocksbatch gridcoin-community#2415 (@scribblemaniac) - staking, gui: Fixes a missing miner search interval update for no coins corner case gridcoin-community#2430 (@jamescowens) - gui: Add uiInterface.BeaconChanged() call after ActivatePending gridcoin-community#2438 (@jamescowens)
jamescowens · Feb 27, 2022 · 86e4d1e · 86e4d1e
2 parents fe6ab87 + 00cc297
commit 86e4d1e
Show file tree

Hide file tree

Showing 943 changed files with 46,562 additions and 41,064 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
-src/version.cpp export-subst
+src/clientversion.cpp export-subst
 
 # Auto detect text files and perform LF normalization
 *        text=auto

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -0,0 +1,35 @@
+name: CD
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        script-id: [win32, win64, mac]
+    env:
+      FILE_ENV: ./cd/00_setup_env_${{ matrix.script-id }}.sh
+      OS_NAME: linux
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: cache
+        uses: actions/cache@v2
+        with:
+          path: |
+              ./depends/built
+              ./ci/scratch/.ccache
+          key: ${{ runner.os }}-${{ matrix.script-id }}
+      - name: build
+        run: |
+          ./cd/run_all.sh
+      - name: release
+        uses: softprops/action-gh-release@5e3f23f92c903aac25270f66388fdcb366c5b549
+        with:
+          files: '/tmp/release/*'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
           # an explicit declaration. This breaks the mutex detection in the BDB
           # configure script so we switch it back to a warning:
           run: |
-            brew install autoconf automake boost miniupnpc qrencode ccache leveldb librsvg libtool libzip openssl pkg-config python qt@5 xquartz
+            brew install autoconf automake boost miniupnpc qrencode ccache leveldb librsvg libtool libzip openssl@1.1 pkg-config python qt@5 xquartz
             CFLAGS="-Wno-error=implicit-function-declaration" contrib/install_db4.sh .
         - name: test
           run: |

diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[gridcoin.src-qt-locale-bitcoin-en-ts--development]
+file_filter = src/qt/locale/bitcoin_<lang>.xlf
+source_file = src/qt/locale/bitcoin_en.xlf
+source_lang = en
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,164 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [5.3.3.0] 2022-02-27, leisure, "Janice"
+
+### Added
+ - build: add stack-clash and control-flow protection options to hardening flags, don't enable it for Windows #2284 (@barton2526)
+ - build: add upstream compiler warnings #2288 (@jamescowens)
+ - rpc: Create getblockbymintime #2290 (@RoboticMind)
+ - cd: generate release binaries using GitHub actions #2249 (@div72)
+ - util: port upstream span changes #2323 (@div72)
+ - rpc: add additional ban time fields to listbanned #2334 (@barton2526)
+ - test: Add sanity_tests from upstream #2343 (@barton2526)
+ - util, test: Don't allow Base58 decoding of non-Base58 strings. Add Base58 tests. Add whitespace tests. #2345 (@barton2526)
+ - test: Add tests for monetary value formatting and parsing.  Clean up includes in rpc_tests #2348 (@barton2526)
+ - rpc: Implement -rpcwait and -rpcwaittimeout #2349 (@jamescowens)
+ - test: Add crypto_tests (@upstream #2372 from barton2526)
+ - test: Add test for GCC bug 90348 #2380 (@barton2526)
+ - build: add python3.10, 3.11 alias to AC_PATH_PROGS call in configure #2386 (@barton2526)
+ - wallet, contract: Implement contract change option #2388 (@jamescowens)
+ - gui: Implement privacy mode #2399 (@jamescowens)
+ - util: Implement -reindex option, improve -loadblock option #2394 (@jamescowens)
+ - gui: Implement Alt-7 for unlock and lock of wallet #2406 (@jamescowens)
+ - gui, voting: Add a one minute timer to check for current poll expiring and update gui #2416 (@jamescowens)
+ - gui: Implement a warning about split CPID/email mismatch condition #2414 (@jamescowens)
+ - util: clean obsolete config keys #2424 (@div72)
+ - net: Implement an upper limit of 950 for max network connections #2426 (@jamescowens)
+
+### Changed
+ - build: libevent 2.1.12-stable #2226 (@barton2526)
+ - build: Bump minimum QT support to 5.9.5, Remove obsolete checks #2251 (@barton2526)
+ - doc: Update to https where possible #2230 (@barton2526)
+ - refactor: Replace fprintf with tfm::format #2262 (@barton2526)
+ - qt: Replace deprecated QSignalMapper by lambda expressions #2261 (@barton2526)
+ - refactor: Use functions guaranteed to be locale independent (ToLower, IsDigit, IsSpace) #2265 (@barton2526)
+ - refactor: Replace std::to_string with locale-independent alternative #2266 (@barton2526)
+ - refactor: small python cleanup #2267 (@barton2526)
+ - refactor: Replace local dependent string functions with non-locale versions in strencodings.h/cpp #2270 (@amescowens)
+ - ci: Update KNOWN_VIOLATIONS list for the linter for functions we don't care are locale-dependent #2271 (@barton2526)
+ - refactor: move block storage functions to src/node/blockstorage #2273 (@div72)
+ - refactor: Replace deprecated Qt::SystemLocale{Short,Long}Date, Fix 'QDateTime is deprecated' warnings #2275 (@barton2526)
+ - rpc: optimize getblockbynumber #2289 (@barton2526)
+ - gui: Update connect statements to conform to Qt 5 standard #2281 (@jamescowens)
+ - depends: Bump ccache and curl #2297 (@barton2526)
+ - ci: only print depends/apt output if the step fails #2287 (@div72)
+ - depends: Update to openSSL 1.1.1l #2302 (@barton2526)
+ - rpc: Don't use floating point in getreceivedbyaddress #2310 (@barton2526)
+ - LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead #2306 (@barton2526)
+ - build: update m4 #2317 (@div72)
+ - qt: Replace deprecated Qt functions #2316 (@barton2526)
+ - build: set minimum required Boost to 1.60 #2318 (@barton2526)
+ - util: Don't use gmtime() or localtime() #2319 (@barton2526)
+ - build: Update univalue subtree #2335 (@barton2526)
+ - refactor: use include guards instead of #pragma once #2336 (@div72)
+ - refactor: Scraper thread safety and code cleanup #2315 (@jamescowens)
+ - qt: Follow Qt docs when implementing rowCount and columnCount #2333 (@barton2526)
+ - qt: Notificator class refactoring.  Notificator always takes 3 args.  Remove Growl support. #2352 (@barton2526)
+ - build: pin OpenSSL version for MacOS #2354 (@div72)
+ - build, util: Update leveldb to 1.22 (@upstream Bitcoin #2353 from jamescowens)
+ - test: Update transaction_tests and associated JSON files from upstream #2356 (@barton2526)
+ - test: Update script_p2sh_tests from upstream #2357 (@barton2526)
+ - refactor: port upstream ui_interface changes #2355 (@div72)
+ - contract: parse strings for claim and message types #2359 (@div72)
+ - test: Update sigopcount_tests and transaction_tests from upstream #2361 (@barton2526)
+ - test, refactor: Update script_tests from upstream #2360 (@barton2526)
+ - test: Update util_tests from upstream #2363 (@barton2526)
+ - test: Update script test JSON files from upstream #2364 @barton2526)
+ - refactor: split clientversion from version #2367 (@div72)
+ - random: port upstream random changes #2368 (@div72)
+ - refactor: convert C-style (void) parameter lists to C++ style () #2373 (@barton2526)
+ - build: Disable -fcf-protection for mingw win32 #2377 (@jamescowens)
+ - gui: Add text output and dialog boxes for -help and -version in GUI client #2378 (@jamescowens)
+ - test, refactor: Use FastRandomContext for all tests. Add a header for test_gridcoin #2381 (@barton2526)
+ - depends: avoid system harfbuzz and bz2 #2382 (@barton2526)
+ - doc: Update Windows build instructions #2383 (@barton2526)
+ - refactor: replace QDateTime::fromTime_t with QDateTime::fromSecsSinceEpoch #2387 (@barton2526)
+ - util: Port of Bitcoin upstream base58.h/cpp at a85442f62bf157b07849accd495c55c73535dc73 #2384 (@jamescowens)
+ - test: update base58_encode_decode.json from upstream #2391 (@barton2526)
+ - depends: Port libdmg-hfsplus changes from upstream #2389 (@barton2526)
+ - doc: Port newer build documentation from Bitcoin #2162 (@nathanielcwm)
+ - rpc: Change getmininginfo to getstakinginfo #2393 (@jamescowens)
+ - researcher: Prefer CPID with active beacon for primary CPID #2404 (@scribblemaniac)
+ - contract: separate legacy type parsing #2396 (@div72)
+ - refactor: Pass values by reference #2408 (@Pythonix)
+ - net: only adjust time with data from outbound nodes #2411 (@div72)
+ - rpc: Change call to FormatISO8601DateTime to FormatISO8601DateTimeDashSep in scanforunspent #2413 (@jamescowens)
+ - build: Adjust depends packages to successfully compile on OpenSUSE #2260 (@jamescowens)
+ - gui: Enable masking of cpid in privacy mode #2420 (@jamescowens)
+ - doc: Update license year range to 2022 #2421 (@barton2526)
+ - contrib: install_db4: use local config.guess/sub #2436 (@div72)
+ - gui: update translations #2442 (@div72, @3man001)
+
+### Removed
+ - qt: Remove stray QT4 references #2220 (@barton2526)
+ - util: Remove old boost hacks/workarounds #2231 (@barton2526)
+ - refactor: Remove sprintf and printf #2269 (@jamescowens)
+ - depends: Remove boost::program_options dependency #2277 (@barton2526)
+ - refactor: Drop noop gcc version checks #2278 (@barton2526)
+ - util: Remove unused itostr #2280 (@barton2526)
+ - util: Remove deprecated random number generator functions #2236 (@jamescowens)
+ - depends: cleanup package configure flags #2279 (@barton2526)
+ - rpc: remove 'label' filter for rpc command help #2282 (@barton2526)
+ - wallet: remove unused fNoncriticalErrors variable from CWalletDB::FindWalletTx #2283 (@barton2526)
+ - refactor: Optimize and Cleanup CScript::FindAndDelete #2294 (@barton2526)
+ - wallet: Remove unused AskPassphraseDialog::Decrypt #2299 (@barton2526)
+ - refactor, qt: Drop redundant setEditTriggers(NoEditTriggers) calls, Fix typo in QtInputSupport check #2308 (@barton2526)
+ - release: Remove gitian #2293 (@jamescowens)
+ - util: Update scheduler and remove Boost chrono #2330 (@jamescowens)
+ - qt: remove gridcoinresearch.pro #2332 (@div72)
+ - test: Remove unused function dumpKeyInfo #2347 (@barton2526)
+ - build: remove glibc back compat #2351 (@barton2526)
+ - net: remove SOCKS4 support (@core and GUI #2385 from barton2526)
+ - net: remove obsolete "reply" command #2366 (@div72)
+ - net: Remove I2P support from netbase & Correct HE IPv6 Tunnel Broker #2409 (@Pythonix)
+ - qt: Remove locked coins loop #2410 (@Pythonix)
+
+### Fixed
+ - wallet: Close DB on error, use memory_cleanse #2221 (@barton2526)
+ - build: Clean remnants of QTBUG-34748 fix #2224 (@barton2526)
+ - build: use -isysroot over --sysroot on macOS #2225 (@barton2526)
+ - trivial, rpc: Fix and cleanup listreceivedbyX documentation, General Typos #2227 (@barton2526)
+ - trivial: Unbreak build with Boost 1.72.0 #2228 (@barton2526)
+ - doc: Large collection of typos, grammar fixes, and proper capitalization #2247 (@barton2526)
+ - lint: Fix linter warning, fix typo #2276 (@barton2526)
+ - qt: Do not translate file extensions #2295 (@barton2526)
+ - refactor: Drop redundant QString calls #2296 (@barton2526)
+ - rpc: Print OpenSSL version fix #2298 (@barton2526)
+ - gui: Add back in accidentally deleted condition for UnlockStaking and Unlock cases in AskPassphraseDialog::textChanged() #2305 (@jamescowens)
+ - rpc: ParseHash: Fail when length is not 64 #2313 (@barton2526)
+ - Fix locking on WSL using flock instead of fcntl #2314 (@barton2526)
+ - rpc: Fix breakage in protocol.cpp caused by change atoi to ParseInt #2307 (@jamescowens)
+ - net: Small upstream FIXME #2320 (@barton2526)
+ - refactor: Fix advanced compiler warnings #2292 (@jamescowens)
+ - poll: Fix the possible infinite loop warning on GetChoices() in result.cpp #2322 (@jamescowens)
+ - qt: fix broken research wizard signal #2324 (@div72)
+ - refactor: Fix three minor code scanner findings #2327 (@barton2526)
+ - Fix build with Boost 1.77.0 #2329 (@barton2526)
+ - build: Misc upstream depends fixes #2331 (@barton2526)
+ - wallet: Fix improper indent in encryptWallet #2339 (@jamescowens)
+ - wallet: Bugfix - Fundrawtransaction: don't terminate when keypool is empty #2337 (@barton2526)
+ - depends: Fix build for Apple Silicon #2342 (@div72)
+ - build: fix -fstack-clash-protection spam for Clang #2340 (@div72)
+ - util, test: Don't allow Base32/64-decoding or ParseMoney(…) on strings with embedded NUL characters. Add tests.  Add negative test case. #2344 (@barton2526)
+ - test: Repair transaction_tests.cpp (baseline) #2350 (@jamescowens)
+ - scraper: Fix scraper deadlock and make activebeforesb dynamic (not require restart) #2358 (@jamescowens)
+ - scraper: Move lock on cs_mapParts in RecvManifest #2370 (@jamescowens)
+ - build: Make changes to use Gridcoin x.y.z.w client versions #2371 (@jamescowens)
+ - refactor, build: Upstream fixes for the /crypto files. Implement Keccak and SHA3 #2365 (@barton2526)
+ - util: fix FormatVersion #2376 (@div72)
+ - net: initialize nMessageSize to uint32_t max #2390 (@barton2526)
+ - contract: fix double usage of contract change addresses #2395 (@div72)
+ - build: patch qt to explicitly define previously implicit header include #2397 (@div72)
+ - Fix breakage introduced by use of FormatISO8601DateTime #2398 (@jamescowens)
+ - gui: Fix bug in recent transaction list #2403 (@jamescowens)
+ - build: Drop macports support #2401 (@barton2526)
+ - util: Check if specified config file cannot be opened #2400 (@barton2526)
+ - net: Fix masking of irrelevant bits in address groups #2412 (@Pythonix)
+ - rpc: accept int block number for getblocksbatch #2415 (@scribblemaniac)
+ - staking, gui: Fixes a missing miner search interval update for no coins corner case #2430 (@jamescowens)
+ - gui: Add uiInterface.BeaconChanged() call after ActivatePending #2438 (@jamescowens)
+
 ## [5.3.2.0] 2021-08-01, leisure, "Ingrid"
 ### Added
  - util, rpc. gui: Changes for snapshotdownload and add feature sync from zero #2093 (@iFoggz)
@@ -195,7 +353,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
  - mining, rpc: Implement staking efficiency measure and improve SelectCoinsForStaking and CreateCoinStake #1992 (@jamescowens)
  - accrual, rpc: Implement auditsnapshotaccruals #2001 (@jamescowens)
  - docs: add doxygen support #2000 (@div72)
- - beacon: Specialized beacon storage in leveldb #2009 (@jamescowens)
+ - beacon: Specialized beacon storage in LevelDB #2009 (@jamescowens)
  - rpc: Add a call to dump contracts in binary form #2011 (@div72)
  - rpc: Add boolean option to report active beacons only in beaconreport #2013 (@jamescowens)
  - consensus: Set Hilda mainnet hardfork height to 2197000 #2022 (@jamescowens)
@@ -682,7 +840,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
  - Add freedesktop.org desktop file and icon set #1438 (@a123b).
 
 ### Changed
- - Disable Qt for windows Travis builds #1276 (@TheCharlatan).
+ - Disable Qt for Windows Travis builds #1276 (@TheCharlatan).
  - Replace use of AppCache PROJECT section with strongly-typed structures #1415
    (@cyrossignol).
  - Change dumpwallet to use appropriate data directory #1416 (@jamescowens).
@@ -837,7 +995,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
  - investor cpid's appearing as zeros in block index (@tomasbrod)
  - ensure that daemon functionality is correct when built together with gui wallet (@jamescowens)
  - improve logging, remove empty lines (@jamescowens) (@Foggyx420) (@tomasbrod) (@denravonska)
- - windows socket warnings (@thecharlatan)
+ - Windows socket warnings (@thecharlatan)
 
 ### Removed
  - unused components of neural network (@Foggyx420)
@@ -1106,7 +1264,7 @@ Internal test version used to sort out the forks.
 ### Removed
  - Remove RPC commands:
     - DAO #486 (@denravonska).
-    - volatilecode, testnet0917, testboinckey, chainrsa, testcpidv2, testcpid, windows
+    - volatilecode, testnet0917, testboinckey, chainrsa, testcpidv2, testcpid, Windows
       error report disabling, list betatest, fDebug4/fDebug5 flags (@Foggyx420).
  - Set magnitude boost to be removed at 2017-Sep-07 00:00:00 UTC
 

diff --git a/COPYING b/COPYING
@@ -1,8 +1,8 @@
 Copyright (c) 2014 Black-Coin Developers
 Copyright (c) 2013-2014 NovaCoin Developers
 Copyright (c) 2011-2012 PPCoin Developers
-Copyright (c) 2009-2021 Bitcoin Developers
-Copyright (c) 2014-2021 Gridcoin Developers
+Copyright (c) 2009-2022 Bitcoin Developers
+Copyright (c) 2014-2022 Gridcoin Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,10 @@
 # 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.
+
+# Pattern rule to print variables, e.g. make print-top_srcdir
+print-%: FORCE
+	@echo '$*'='$($*)'
 
 ACLOCAL_AMFLAGS = -I build-aux/m4
 SUBDIRS = src
@@ -57,7 +61,7 @@ nobase_icons_DATA = $(DIST_ICONS)
 endif
 
 dist-hook:
-	-$(GIT) archive --format=tar HEAD -- src/version.cpp | $(AMTAR) -C $(top_distdir) -xf -
+	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
 
 $(BITCOIN_WIN_INSTALLER): all-recursive
 	$(MKDIR_P) $(top_builddir)/release
@@ -66,6 +70,8 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
 	@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
 	  echo error: could not build $@
 	@echo built $@
+	@rm release/gridcoinresearch.exe release/gridcoinresearchd.exe
+	@mv $@ $(top_builddir)/release/$@
 
 $(OSX_APP)/Contents/PkgInfo:
 	$(MKDIR_P) $(@D)
@@ -124,7 +130,9 @@ $(OSX_TEMP_ISO): $(APP_DIST_EXTRAS)
 	$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ dist -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
 
 $(OSX_DMG): $(OSX_TEMP_ISO)
+	$(MKDIR_P) $(top_builddir)/release
 	$(DMG) dmg "$<" "$@"
+	@mv $@ $(top_builddir)/release/$(PACKAGE)-$(PACKAGE_VERSION)-macos.dmg
 
 dpi%.$(OSX_BACKGROUND_IMAGE): contrib/macdeploy/$(OSX_BACKGROUND_SVG)
 	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d $* -p $* | $(IMAGEMAGICK_CONVERT) - $@
@@ -154,7 +162,7 @@ $(BITCOIND_BIN): FORCE
 	$(MAKE) -C src $(@F)
 
 if USE_LCOV
-LCOV_FILTER_PATTERN=-p "/usr/include/" -p "src/leveldb/" -p "src/univalue"
+LCOV_FILTER_PATTERN=-p "/usr/include/" -p "src/leveldb/" -p "src/crc32c/" -p "src/univalue"
 
 baseline.info:
 	$(LCOV) -c -i -d $(abs_builddir)/src -o $@

diff --git 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