ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-06 17:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update libxrpl (#2186)

Browse Source
This commit is contained in:
Peter Chen
2025-06-06 10:25:21 -04:00
committed by GitHub
parent 4994f9db92
commit ed47db7d39
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@@ -31,7 +31,7 @@ class Clio(ConanFile):
'protobuf/3.21.9', 'protobuf/3.21.9',
'grpc/1.50.1', 'grpc/1.50.1',
'openssl/1.1.1v', 'openssl/1.1.1v',
'xrpl/2.5.0-b1', 'xrpl/2.5.0-rc1',
'zlib/1.3.1', 'zlib/1.3.1',
'libbacktrace/cci.20210118' 'libbacktrace/cci.20210118'
] ]

5
src/data/AmendmentCenter.hpp
View File

@@ -140,6 +140,11 @@ struct Amendments {
REGISTER(PermissionDelegation); REGISTER(PermissionDelegation);
REGISTER(fixPayChanCancelAfter); REGISTER(fixPayChanCancelAfter);
REGISTER(Batch); REGISTER(Batch);
REGISTER(PermissionedDEX);
REGISTER(SingleAssetVault);
REGISTER(TokenEscrow);
REGISTER(fixAMMv1_3);
REGISTER(fixEnforceNFTokenTrustlineV2);
// Obsolete but supported by libxrpl // Obsolete but supported by libxrpl
REGISTER(CryptoConditionsSuite); REGISTER(CryptoConditionsSuite);

3
src/feed/impl/TransactionFeed.cpp
View File

@@ -277,7 +277,8 @@ TransactionFeed::pub(
// determine the OrderBook // determine the OrderBook
ripple::Book const book{ ripple::Book const book{
data->getFieldAmount(ripple::sfTakerGets).issue(), data->getFieldAmount(ripple::sfTakerGets).issue(),
data->getFieldAmount(ripple::sfTakerPays).issue() data->getFieldAmount(ripple::sfTakerPays).issue(),
std::nullopt
}; };
if (affectedBooks.find(book) == affectedBooks.end()) { if (affectedBooks.find(book) == affectedBooks.end()) {
affectedBooks.insert(book); affectedBooks.insert(book);

4
src/rpc/RPCHelpers.cpp
View File

@@ -1338,7 +1338,7 @@ parseBook(ripple::Currency pays, ripple::AccountID payIssuer, ripple::Currency g
if (pays == gets && payIssuer == getIssuer) if (pays == gets && payIssuer == getIssuer)
return std::unexpected{Status{RippledError::rpcBAD_MARKET, "badMarket"}}; return std::unexpected{Status{RippledError::rpcBAD_MARKET, "badMarket"}};
return ripple::Book{{pays, payIssuer}, {gets, getIssuer}}; return ripple::Book{{pays, payIssuer}, {gets, getIssuer}, std::nullopt};
} }
std::expected<ripple::Book, Status> std::expected<ripple::Book, Status>
@@ -1446,7 +1446,7 @@ parseBook(boost::json::object const& request)
if (payCurrency == getCurrency && payIssuer == getIssuer) if (payCurrency == getCurrency && payIssuer == getIssuer)
return std::unexpected{Status{RippledError::rpcBAD_MARKET, "badMarket"}}; return std::unexpected{Status{RippledError::rpcBAD_MARKET, "badMarket"}};
return ripple::Book{{payCurrency, payIssuer}, {getCurrency, getIssuer}}; return ripple::Book{{payCurrency, payIssuer}, {getCurrency, getIssuer}, std::nullopt};
} }
std::expected<ripple::AccountID, Status> std::expected<ripple::AccountID, Status>

5
tests/unit/feed/SubscriptionManagerTests.cpp
View File

@@ -43,6 +43,7 @@
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>
#include <optional>
#include <vector> #include <vector>
namespace { namespace {
@@ -161,7 +162,7 @@ TEST_F(SubscriptionManagerTest, ReportCurrentSubscriber)
subscriptionManagerPtr_->subProposedAccount(account, session1); subscriptionManagerPtr_->subProposedAccount(account, session1);
subscriptionManagerPtr_->subProposedAccount(account, session2); subscriptionManagerPtr_->subProposedAccount(account, session2);
auto const issue1 = getIssue(kCURRENCY, kISSUER); auto const issue1 = getIssue(kCURRENCY, kISSUER);
ripple::Book const book{ripple::xrpIssue(), issue1}; ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
subscriptionManagerPtr_->subBook(book, session1); subscriptionManagerPtr_->subBook(book, session1);
subscriptionManagerPtr_->subBook(book, session2); subscriptionManagerPtr_->subBook(book, session2);
EXPECT_EQ(subscriptionManagerPtr_->report(), json::parse(kREPORT_RETURN)); EXPECT_EQ(subscriptionManagerPtr_->report(), json::parse(kREPORT_RETURN));
@@ -327,7 +328,7 @@ TEST_F(SubscriptionManagerTest, TransactionTest)
{ {
auto const issue1 = getIssue(kCURRENCY, kISSUER); auto const issue1 = getIssue(kCURRENCY, kISSUER);
auto const account = getAccountIdWithString(kISSUER); auto const account = getAccountIdWithString(kISSUER);
ripple::Book const book{ripple::xrpIssue(), issue1}; ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
EXPECT_CALL(*sessionPtr_, onDisconnect).Times(3); EXPECT_CALL(*sessionPtr_, onDisconnect).Times(3);
subscriptionManagerPtr_->subBook(book, session_); subscriptionManagerPtr_->subBook(book, session_);
subscriptionManagerPtr_->subTransactions(session_); subscriptionManagerPtr_->subTransactions(session_);

11
tests/unit/feed/TransactionFeedTests.cpp
View File

@@ -43,6 +43,7 @@
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <optional>
#include <vector> #include <vector>
using namespace data; using namespace data;
@@ -350,7 +351,7 @@ TEST_F(FeedTransactionTest, SubBothTransactionAndAccount)
TEST_F(FeedTransactionTest, SubBookV1) TEST_F(FeedTransactionTest, SubBookV1)
{ {
auto const issue1 = getIssue(kCURRENCY, kISSUER); auto const issue1 = getIssue(kCURRENCY, kISSUER);
ripple::Book const book{ripple::xrpIssue(), issue1}; ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
EXPECT_CALL(*mockSessionPtr, onDisconnect); EXPECT_CALL(*mockSessionPtr, onDisconnect);
testFeedPtr->sub(book, sessionPtr); testFeedPtr->sub(book, sessionPtr);
@@ -554,7 +555,7 @@ TEST_F(FeedTransactionTest, SubBookV1)
TEST_F(FeedTransactionTest, SubBookV2) TEST_F(FeedTransactionTest, SubBookV2)
{ {
auto const issue1 = getIssue(kCURRENCY, kISSUER); auto const issue1 = getIssue(kCURRENCY, kISSUER);
ripple::Book const book{ripple::xrpIssue(), issue1}; ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
EXPECT_CALL(*mockSessionPtr, onDisconnect); EXPECT_CALL(*mockSessionPtr, onDisconnect);
testFeedPtr->sub(book, sessionPtr); testFeedPtr->sub(book, sessionPtr);
@@ -785,7 +786,7 @@ TEST_F(FeedTransactionTest, SubRepeat)
EXPECT_EQ(testFeedPtr->accountSubCount(), 0); EXPECT_EQ(testFeedPtr->accountSubCount(), 0);
auto const issue1 = getIssue(kCURRENCY, kISSUER); auto const issue1 = getIssue(kCURRENCY, kISSUER);
ripple::Book const book{ripple::xrpIssue(), issue1}; ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
EXPECT_CALL(*mockSessionPtr, onDisconnect); EXPECT_CALL(*mockSessionPtr, onDisconnect);
testFeedPtr->sub(book, sessionPtr); testFeedPtr->sub(book, sessionPtr);
@@ -1233,7 +1234,7 @@ TEST_F(TransactionFeedMockPrometheusTest, subUnsub)
testFeedPtr_->unsub(account, sessionPtr_); testFeedPtr_->unsub(account, sessionPtr_);
auto const issue1 = getIssue(kCURRENCY, kISSUER); auto const issue1 = getIssue(kCURRENCY, kISSUER);
ripple::Book const book{ripple::xrpIssue(), issue1}; ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
EXPECT_CALL(*mockSessionPtr_, onDisconnect); EXPECT_CALL(*mockSessionPtr_, onDisconnect);
testFeedPtr_->sub(book, sessionPtr_); testFeedPtr_->sub(book, sessionPtr_);
testFeedPtr_->unsub(book, sessionPtr_); testFeedPtr_->unsub(book, sessionPtr_);
@@ -1263,7 +1264,7 @@ TEST_F(TransactionFeedMockPrometheusTest, AutoDisconnect)
testFeedPtr_->sub(account, sessionPtr_); testFeedPtr_->sub(account, sessionPtr_);
auto const issue1 = getIssue(kCURRENCY, kISSUER); auto const issue1 = getIssue(kCURRENCY, kISSUER);
ripple::Book const book{ripple::xrpIssue(), issue1}; ripple::Book const book{ripple::xrpIssue(), issue1, std::nullopt};
testFeedPtr_->sub(book, sessionPtr_); testFeedPtr_->sub(book, sessionPtr_);
// Emulate onDisconnect signal is called // Emulate onDisconnect signal is called