From f2f5a6ab19be096d97e3c7fd4f2d970caf345911 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Wed, 10 Dec 2025 16:06:21 +0000 Subject: [PATCH] chore: Switch to xrpl/3.0.0 (#2843) --- conan.lock | 2 +- conanfile.py | 2 +- src/data/AmendmentCenter.hpp | 1 + tests/common/util/TestObject.cpp | 2 +- tests/unit/rpc/handlers/VaultInfoTests.cpp | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conan.lock b/conan.lock index 05a801578..cb5ca4911 100644 --- a/conan.lock +++ b/conan.lock @@ -3,7 +3,7 @@ "requires": [ "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497", "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1756234289.683", - "xrpl/3.0.0-rc1#f5c8ecd42bdf511ad36f57bc702dacd2%1762975621.294", + "xrpl/3.0.0#534d3f65a336109eee929b88962bae4e%1765375071.547", "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1756234266.869", "spdlog/1.16.0#942c2c39562ae25ba575d9c8e2bdf3b6%1763984117.108", "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1756234262.318", diff --git a/conanfile.py b/conanfile.py index ba032c06b..de5a45052 100644 --- a/conanfile.py +++ b/conanfile.py @@ -17,7 +17,7 @@ class ClioConan(ConanFile): "protobuf/3.21.12", "grpc/1.50.1", "openssl/1.1.1w", - "xrpl/3.0.0-rc1", + "xrpl/3.0.0", "zlib/1.3.1", "libbacktrace/cci.20210118", "spdlog/1.16.0", diff --git a/src/data/AmendmentCenter.hpp b/src/data/AmendmentCenter.hpp index 6a6595586..7b990d877 100644 --- a/src/data/AmendmentCenter.hpp +++ b/src/data/AmendmentCenter.hpp @@ -152,6 +152,7 @@ struct Amendments { REGISTER(fixDirectoryLimit); REGISTER(fixIncludeKeyletFields); REGISTER(fixTokenEscrowV1); + REGISTER(LendingProtocol); // Obsolete but supported by libxrpl REGISTER(CryptoConditionsSuite); diff --git a/tests/common/util/TestObject.cpp b/tests/common/util/TestObject.cpp index 9c2f04e0d..2db24dffd 100644 --- a/tests/common/util/TestObject.cpp +++ b/tests/common/util/TestObject.cpp @@ -1792,7 +1792,7 @@ createVault( vault[ripple::sfShareMPTID] = shareMPTID; vault.setFieldNumber(ripple::sfAssetsTotal, ripple::STNumber{ripple::sfAssetsTotal, 300}); vault.setFieldNumber(ripple::sfAssetsAvailable, ripple::STNumber{ripple::sfAssetsAvailable, 300}); - vault.setFieldNumber(ripple::sfLossUnrealized, ripple::STNumber{ripple::sfLossUnrealized, 0}); + vault.setFieldNumber(ripple::sfLossUnrealized, ripple::STNumber{ripple::sfLossUnrealized, 1}); vault.setFieldU8(ripple::sfWithdrawalPolicy, 200); vault.setFieldU32(ripple::sfFlags, 0); diff --git a/tests/unit/rpc/handlers/VaultInfoTests.cpp b/tests/unit/rpc/handlers/VaultInfoTests.cpp index 17bd794d1..a7aa80f33 100644 --- a/tests/unit/rpc/handlers/VaultInfoTests.cpp +++ b/tests/unit/rpc/handlers/VaultInfoTests.cpp @@ -295,7 +295,7 @@ TEST_F(RPCVaultInfoHandlerTest, ValidVaultObjectQueryByVaultID) "AssetsTotal": "300", "Flags": 0, "LedgerEntryType": "Vault", - "LossUnrealized": "0", + "LossUnrealized": "1", "Owner": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "OwnerNode": "4", "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000002", @@ -378,7 +378,7 @@ TEST_F(RPCVaultInfoHandlerTest, ValidVaultObjectQueryByOwnerAndSeq) "AssetsTotal": "300", "Flags": 0, "LedgerEntryType": "Vault", - "LossUnrealized": "0", + "LossUnrealized": "1", "Owner": "rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn", "OwnerNode": "4", "PreviousTxnID": "0000000000000000000000000000000000000000000000000000000000000002",