ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-03 18:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Use xrpl/2.6.0 (#2496)

Browse Source
This commit is contained in:
Ayaz Salikhov
2025-09-02 17:10:15 +01:00
committed by GitHub
parent e86178b523
commit 0a2930d861
6 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
conan.lock
View File

@@ -1,57 +1,60 @@
{ {
"version": "0.5", "version": "0.5",
"requires": [ "requires": [
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1754412218.488", "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497",
"xxhash/0.8.2#7856c968c985b2981b707ee8f2413b2b%1754325010.01", "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1756234289.683",
"xrpl/2.5.0@clio/boost-odr#f68e48da1490c0a583052e4f068ada55%1754325014.392", "xrpl/2.6.0#57b93b5a6c99dc8511fccb3bb5390352%1756820296.642",
"sqlite3/3.47.0#7a0904fd061f5f8a2366c294f9387830%1754325009.708", "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1756234266.869",
"spdlog/1.15.3#3ca0e9e6b83af4d0151e26541d140c86%1754401846.61", "spdlog/1.15.3#3ca0e9e6b83af4d0151e26541d140c86%1754401846.61",
"soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1754412158.144", "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1756234262.318",
"re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1754412148.014", "re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1756234257.976",
"rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1754325007.656", "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1754325007.656",
"protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1754412120.055", "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1756234251.614",
"openssl/1.1.1v#216374e4fb5b2e0f5ab1fb6f27b5b434%1754325006.553", "openssl/1.1.1w#a8f0792d7c5121b954578a7149d23e03%1756223730.729",
"nudb/2.0.8#63990d3e517038e04bf529eb8167f69f%1754325004.398", "nudb/2.0.9#c62cfd501e57055a7e0d8ee3d5e5427d%1756234237.107",
"minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1754325004.374", "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1754325004.374",
"lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1754412069.24", "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1756234228.999",
"libuv/1.46.0#dc28c1f653fa197f00db5b577a6f6011%1754325003.592", "libuv/1.46.0#dc28c1f653fa197f00db5b577a6f6011%1754325003.592",
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1754325002.385", "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1756223727.64",
"libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1754410401.723", "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1756230911.03",
"libarchive/3.7.6#7e902bb4ac1d20504fb330c0dd040192%1754325001.673", "libarchive/3.8.1#5cf685686322e906cb42706ab7e099a8%1756234256.696",
"http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1754325001.385", "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1754325001.385",
"gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1754325000.842", "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1754325000.842",
"grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1754412166.358", "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1756234248.958",
"fmt/11.2.0#579bb2cdf4a7607621beea4eb4651e0f%1754324999.086", "fmt/11.2.0#579bb2cdf4a7607621beea4eb4651e0f%1754324999.086",
"date/3.0.3#cf28fe9c0aab99fe12da08aa42df65e1%1754324996.727", "doctest/2.4.11#a4211dfc329a16ba9f280f9574025659%1756234220.819",
"date/3.0.4#f74bbba5a08fa388256688743136cb6f%1756234217.493",
"cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1754324997.363", "cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1754324997.363",
"c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1754412042.679", "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1756234217.915",
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1754412214.559", "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1756234261.716",
"boost/1.83.0#5d975011d65b51abb2d2f6eb8386b368%1754325043.336", "boost/1.83.0#5d975011d65b51abb2d2f6eb8386b368%1754325043.336",
"benchmark/1.9.4#ce4403f7a24d3e1f907cd9da4b678be4%1749892625.885", "benchmark/1.9.4#ce4403f7a24d3e1f907cd9da4b678be4%1754578869.672",
"abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1754412054.336" "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1756234220.907"
], ],
"build_requires": [ "build_requires": [
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1754412218.488", "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497",
"protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1754412120.055", "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1756234251.614",
"protobuf/3.21.9#64ce20e1d9ea24f3d6c504015d5f6fa8%1754325048.831", "cmake/3.31.8#dde3bde00bb843687e55aea5afa0e220%1756234232.89",
"cmake/3.31.8#dde3bde00bb843687e55aea5afa0e220%1754412060.968", "b2/5.3.3#107c15377719889654eb9a162a673975%1756234226.28"
"b2/5.3.3#107c15377719889654eb9a162a673975%1754412065.321"
], ],
"python_requires": [], "python_requires": [],
"overrides": { "overrides": {
"boost/1.83.0": [ "boost/1.83.0": [
null, null,
"boost/1.83.0#5d975011d65b51abb2d2f6eb8386b368" "boost/1.83.0"
], ],
"protobuf/3.21.9": [ "protobuf/3.21.12": [
null, null,
"protobuf/3.21.12" "protobuf/3.21.12"
], ],
"boost/1.86.0": [
"boost/1.83.0#5d975011d65b51abb2d2f6eb8386b368"
],
"lz4/1.9.4": [ "lz4/1.9.4": [
"lz4/1.10.0" "lz4/1.10.0"
], ],
"sqlite3/3.44.2": [ "sqlite3/3.44.2": [
"sqlite3/3.47.0" "sqlite3/3.49.1"
] ]
}, },
"config_requires": [] "config_requires": []

4
conanfile.py
View File

@@ -30,8 +30,8 @@ class ClioConan(ConanFile):
'fmt/11.2.0', 'fmt/11.2.0',
'protobuf/3.21.12', 'protobuf/3.21.12',
'grpc/1.50.1', 'grpc/1.50.1',
'openssl/1.1.1v', 'openssl/1.1.1w',
'xrpl/2.5.0@clio/boost-odr', 'xrpl/2.6.0',
'zlib/1.3.1', 'zlib/1.3.1',
'libbacktrace/cci.20210118', 'libbacktrace/cci.20210118',
'spdlog/1.15.3', 'spdlog/1.15.3',

5
src/data/AmendmentCenter.hpp
View File

@@ -68,7 +68,6 @@ struct Amendments {
/** @cond */ /** @cond */
// NOLINTBEGIN(readability-identifier-naming) // NOLINTBEGIN(readability-identifier-naming)
REGISTER(OwnerPaysFee);
REGISTER(Flow); REGISTER(Flow);
REGISTER(FlowCross); REGISTER(FlowCross);
REGISTER(fix1513); REGISTER(fix1513);
@@ -145,6 +144,9 @@ struct Amendments {
REGISTER(TokenEscrow); REGISTER(TokenEscrow);
REGISTER(fixAMMv1_3); REGISTER(fixAMMv1_3);
REGISTER(fixEnforceNFTokenTrustlineV2); REGISTER(fixEnforceNFTokenTrustlineV2);
REGISTER(fixAMMClawbackRounding);
REGISTER(fixMPTDeliveredAmount);
REGISTER(fixPriceOracleOrder);
// Obsolete but supported by libxrpl // Obsolete but supported by libxrpl
REGISTER(CryptoConditionsSuite); REGISTER(CryptoConditionsSuite);
@@ -153,6 +155,7 @@ struct Amendments {
REGISTER(fixNFTokenNegOffer); REGISTER(fixNFTokenNegOffer);
// Retired amendments // Retired amendments
REGISTER(OwnerPaysFee); // Removed in xrpl 2.6.0 (https://github.com/XRPLF/rippled/pull/5435)
REGISTER(MultiSign); REGISTER(MultiSign);
REGISTER(TrustSetAuth); REGISTER(TrustSetAuth);
REGISTER(FeeEscalation); REGISTER(FeeEscalation);

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

@@ -210,7 +210,7 @@ TransactionFeed::pub(
rpc::insertMPTIssuanceID(pubObj[JS(meta)].as_object(), tx, meta); rpc::insertMPTIssuanceID(pubObj[JS(meta)].as_object(), tx, meta);
Json::Value nftJson; Json::Value nftJson;
ripple::insertNFTSyntheticInJson(nftJson, tx, *meta); ripple::RPC::insertNFTSyntheticInJson(nftJson, tx, *meta);
auto const nftBoostJson = rpc::toBoostJson(nftJson).as_object(); auto const nftBoostJson = rpc::toBoostJson(nftJson).as_object();
if (nftBoostJson.contains(JS(meta)) && nftBoostJson.at(JS(meta)).is_object()) { if (nftBoostJson.contains(JS(meta)) && nftBoostJson.at(JS(meta)).is_object()) {
auto& metaObjInPub = pubObj.at(JS(meta)).as_object(); auto& metaObjInPub = pubObj.at(JS(meta)).as_object();

2
src/rpc/RPCHelpers.cpp
View File

@@ -266,7 +266,7 @@ toExpandedJson(
if (nftEnabled == NFTokenjson::ENABLE) { if (nftEnabled == NFTokenjson::ENABLE) {
Json::Value nftJson; Json::Value nftJson;
ripple::insertNFTSyntheticInJson(nftJson, txn, *meta); ripple::RPC::insertNFTSyntheticInJson(nftJson, txn, *meta);
// if there is no nft fields, the nftJson will be {"meta":null} // if there is no nft fields, the nftJson will be {"meta":null}
auto const nftBoostJson = toBoostJson(nftJson).as_object(); auto const nftBoostJson = toBoostJson(nftJson).as_object();
if (nftBoostJson.contains(JS(meta)) and nftBoostJson.at(JS(meta)).is_object()) { if (nftBoostJson.contains(JS(meta)) and nftBoostJson.at(JS(meta)).is_object()) {

4
tests/unit/data/AmendmentCenterTests.cpp
View File

@@ -68,8 +68,8 @@ TEST_F(AmendmentCenterTest, Accessors)
EXPECT_EQ(am.feature, ripple::uint256("47C3002ABA31628447E8E9A8B315FAA935CE30183F9A9B86845E469CA2CDC3DF")); EXPECT_EQ(am.feature, ripple::uint256("47C3002ABA31628447E8E9A8B315FAA935CE30183F9A9B86845E469CA2CDC3DF"));
} }
auto const a = amendmentCenter[Amendments::OwnerPaysFee]; auto const a = amendmentCenter[Amendments::Flow];
auto const b = amendmentCenter["OwnerPaysFee"]; auto const b = amendmentCenter["Flow"];
EXPECT_EQ(a, b); EXPECT_EQ(a, b);
} }