Merge master into develop

[Bronek]

This PR must be merged manually using a --ff-only merge. Do not use the Github UI.

High Level Overview of Change

Merge rippled fixes released in 2.2.1 from master branch

This PR intentionally reverts change in BuildInfo.cpp, for obvious reason.

Context of Change

Type of Change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• Refactor (non-breaking change that only restructures code)
• Performance (increase or change in throughput and/or latency)
• Tests (you added tests for code that already exists, or your new feature included in this PR)
• Documentation update
• Chore (no impact to binary, e.g. .gitignore, formatting, dropping support for older tooling)
• Release

[codecov]

Codecov Report

Attention: Patch coverage is 81.96721% with 11 lines in your changes missing coverage. Please review.

Project coverage is 71.3%. Comparing base (f5a3495) to head (8b181ed).

Files	Patch %	Lines
src/libxrpl/protocol/tokens.cpp	70.0%	3 Missing ⚠️
src/xrpld/rpc/handlers/AccountOffers.cpp	57.1%	3 Missing ⚠️
include/xrpl/protocol/detail/b58_utils.h	75.0%	2 Missing ⚠️
src/xrpld/rpc/handlers/AccountObjects.cpp	77.8%	2 Missing ⚠️
...rc/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp	90.9%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##           develop   #5085     +/-   ##
=========================================
- Coverage     71.4%   71.3%   -0.0%     
=========================================
  Files          796     796             
  Lines        67042   67073     +31     
  Branches     10865   10884     +19     
=========================================
+ Hits         47842   47852     +10     
- Misses       19200   19221     +21     

Files	Coverage Δ
include/xrpl/protocol/detail/token_errors.h	17.2% <ø> (ø)
src/xrpld/rpc/handlers/AccountChannels.cpp	82.2% <100.0%> (+0.4%)	⬆️
src/xrpld/rpc/handlers/AccountInfo.cpp	88.2% <100.0%> (+0.4%)	⬆️
src/xrpld/rpc/handlers/AccountLines.cpp	87.5% <100.0%> (+0.2%)	⬆️
src/xrpld/rpc/handlers/AccountTx.cpp	85.1% <100.0%> (+0.1%)	⬆️
src/xrpld/rpc/handlers/NoRippleCheck.cpp	100.0% <100.0%> (ø)
...rc/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp	97.5% <90.9%> (-2.5%)	⬇️
include/xrpl/protocol/detail/b58_utils.h	95.5% <75.0%> (+4.6%)	⬆️
src/xrpld/rpc/handlers/AccountObjects.cpp	95.4% <77.8%> (+1.7%)	⬆️
src/libxrpl/protocol/tokens.cpp	93.7% <70.0%> (-1.0%)	⬇️
... and 1 more

... and 9 files with indirect coverage changes

[intelliot]

I confirmed the 2 parent commits are correct.

2 parents f5a3495 + e6ef0fc
commit 8b181ed

[ximinez]

Comparing the two diffs (git diff 2.2.0..upstream/master vs git diff upstream/develop..), there are only two changes that did not come over in this merge:

diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake
index 6b7b2aae68..44d7061d73 100644
--- a/Builds/CMake/RippledCore.cmake
+++ b/Builds/CMake/RippledCore.cmake
@@ -1119,7 +1119,7 @@ if (tests)
     #]===============================]
     src/test/rpc/AccountCurrencies_test.cpp
     src/test/rpc/AccountInfo_test.cpp
-    src/test/rpc/AccountLinesRPC_test.cpp
+    src/test/rpc/AccountLines_test.cpp
     src/test/rpc/AccountObjects_test.cpp
     src/test/rpc/AccountOffers_test.cpp
     src/test/rpc/AccountSet_test.cpp

This one is not relevant, since the file lists were removed by the restructure.

diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp
index 8a83011e90..e6359cd3a5 100644
--- a/src/ripple/protocol/impl/BuildInfo.cpp
+++ b/src/ripple/protocol/impl/BuildInfo.cpp
@@ -33,7 +33,7 @@ namespace BuildInfo {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
-char const* const versionString = "2.2.0"
+char const* const versionString = "2.2.1"
 // clang-format on
 
 #if defined(DEBUG) || defined(SANITIZER)

As you mentioned, we don't want to change the version number.