Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposed 2.2.0-rc3 #5023

Merged
merged 3 commits into from
May 21, 2024
Merged

Proposed 2.2.0-rc3 #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2d37da
Fix Oracle's token pair deterministic order: (#5021)
gregtatcam May 20, 2024
0c971b4
Add xrpl.libpp as an exported lib in conan (#5022)
godexsoft May 20, 2024
40b4adc
Set version to 2.2.0-rc3
seelabs May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ def package_info(self):
libxrpl = self.cpp_info.components['libxrpl']
libxrpl.libs = [
'xrpl_core',
'xrpl.libpb',
'ed25519',
'secp256k1',
]
Expand Down
7 changes: 3 additions & 4 deletions src/ripple/app/tx/impl/SetOracle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <ripple/ledger/View.h>
#include <ripple/protocol/Feature.h>
#include <ripple/protocol/InnerObjectFormats.h>
#include <ripple/protocol/Rules.h>
#include <ripple/protocol/TxFlags.h>
#include <ripple/protocol/digest.h>

Expand Down Expand Up @@ -97,10 +96,10 @@ SetOracle::preclaim(PreclaimContext const& ctx)
ctx.tx.getAccountID(sfAccount), ctx.tx[sfOracleDocumentID]));

// token pairs to add/update
hash_set<std::pair<Currency, Currency>> pairs;
std::set<std::pair<Currency, Currency>> pairs;
// token pairs to delete. if a token pair doesn't include
// the price then this pair should be deleted from the object.
hash_set<std::pair<Currency, Currency>> pairsDel;
std::set<std::pair<Currency, Currency>> pairsDel;
for (auto const& entry : ctx.tx.getFieldArray(sfPriceDataSeries))
{
if (entry[sfBaseAsset] == entry[sfQuoteAsset])
Expand Down Expand Up @@ -216,7 +215,7 @@ SetOracle::doApply()
// the token pair that doesn't have their price updated will not
// include neither price nor scale in the updated PriceDataSeries

hash_map<std::pair<Currency, Currency>, STObject> pairs;
std::map<std::pair<Currency, Currency>, STObject> pairs;
// collect current token pairs
for (auto const& entry : sle->getFieldArray(sfPriceDataSeries))
{
Expand Down
2 changes: 1 addition & 1 deletion src/ripple/protocol/impl/BuildInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-rc2"
char const* const versionString = "2.2.0-rc3"
// clang-format on

#if defined(DEBUG) || defined(SANITIZER)
Expand Down
Loading