roll back some more

roll back unrelated changes
Merge branch 'develop' into mvadari/move-more-helpers
2026-04-07 20:42:49 +00:00 · 2026-04-07 09:13:51 -04:00 · 2026-04-07 09:12:10 -04:00 · 2026-04-07 09:08:04 -04:00 · 2026-04-03 11:08:57 -04:00 · 2026-04-03 10:58:26 -04:00
14 changed files with 36 additions and 29 deletions
--- a/include/xrpl/tx/transactors/lending/LendingHelpers.h
+++ b/include/xrpl/tx/transactors/lending/LendingHelpers.h
@@ -1,15 +1,14 @@
 #pragma once

 #include <xrpl/ledger/View.h>
+#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/st.h>

 namespace xrpl {

-struct PreflightContext;
-
 // Lending protocol has dependencies, so capture them here.
 bool
-checkLendingProtocolDependencies(PreflightContext const& ctx);
+checkLendingProtocolDependencies(Rules const& rules, STTx const& tx);

 static constexpr std::uint32_t secondsInYear = 365 * 24 * 60 * 60;

--- a/include/xrpl/tx/transactors/lending/LoanSet.h
+++ b/include/xrpl/tx/transactors/lending/LoanSet.h
@@ -1,7 +1,7 @@
 #pragma once

+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/tx/Transactor.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

--- a/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp
+++ b/src/libxrpl/tx/transactors/lending/LendingHelpers.cpp
@@ -1,13 +1,21 @@
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>
-// DO NOT REMOVE forces header file include to sort first
-#include <xrpl/tx/transactors/vault/VaultCreate.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
+//

 namespace xrpl {

 bool
-checkLendingProtocolDependencies(PreflightContext const& ctx)
+checkLendingProtocolDependencies(Rules const& rules, STTx const& tx)
 {
-    return ctx.rules.enabled(featureSingleAssetVault) && VaultCreate::checkExtraFeatures(ctx);
+    if (!rules.enabled(featureSingleAssetVault))
+        return false;
+
+    if (!rules.enabled(featureMPTokensV1))
+        return false;
+
+    if (tx.isFieldPresent(sfDomainID) && !rules.enabled(featurePermissionedDomains))
+        return false;
+
+    return true;
 }

 LoanPaymentParts&
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
@@ -1,15 +1,15 @@
 #include <xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h>
 //
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

 bool
 LoanBrokerCoverClawback::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 NotTEC
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
@@ -1,15 +1,15 @@
 #include <xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h>
 //
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

 bool
 LoanBrokerCoverDeposit::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 NotTEC
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
@@ -2,9 +2,9 @@
 //
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/CredentialHelpers.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>
 #include <xrpl/tx/transactors/payment/Payment.h>

 namespace xrpl {
@@ -12,7 +12,7 @@ namespace xrpl {
 bool
 LoanBrokerCoverWithdraw::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 NotTEC
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
@@ -1,16 +1,16 @@
 #include <xrpl/tx/transactors/lending/LoanBrokerDelete.h>
 //
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

 bool
 LoanBrokerDelete::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 NotTEC
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
@@ -1,16 +1,16 @@
 #include <xrpl/tx/transactors/lending/LoanBrokerSet.h>
 //
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

 bool
 LoanBrokerSet::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 NotTEC
--- a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
@@ -1,15 +1,15 @@
 #include <xrpl/tx/transactors/lending/LoanDelete.h>
 //
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

 bool
 LoanDelete::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 NotTEC
--- a/src/libxrpl/tx/transactors/lending/LoanManage.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanManage.cpp
@@ -1,16 +1,16 @@
 #include <xrpl/tx/transactors/lending/LoanManage.h>
 //
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
 #include <xrpl/protocol/TxFlags.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

 bool
 LoanManage::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 std::uint32_t
--- a/src/libxrpl/tx/transactors/lending/LoanPay.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
@@ -1,11 +1,11 @@
 #include <xrpl/tx/transactors/lending/LoanPay.h>
 //
 #include <xrpl/json/to_string.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/STTakesAsset.h>
 #include <xrpl/protocol/TxFlags.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>
 #include <xrpl/tx/transactors/lending/LoanManage.h>

 #include <bit>
@@ -15,7 +15,7 @@ namespace xrpl {
 bool
 LoanPay::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 std::uint32_t
--- a/src/libxrpl/tx/transactors/lending/LoanSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
@@ -1,17 +1,17 @@
 #include <xrpl/tx/transactors/lending/LoanSet.h>
 //
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/protocol/STTakesAsset.h>
 #include <xrpl/protocol/TxFlags.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>

 namespace xrpl {

 bool
 LoanSet::checkExtraFeatures(PreflightContext const& ctx)
 {
-    return checkLendingProtocolDependencies(ctx);
+    return checkLendingProtocolDependencies(ctx.rules, ctx.tx);
 }

 std::uint32_t
--- a/src/test/app/LendingHelpers_test.cpp
+++ b/src/test/app/LendingHelpers_test.cpp
@@ -6,9 +6,9 @@
 #include <test/jtx/mpt.h>

 #include <xrpl/beast/xor_shift_engine.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/server/LoadFeeTrack.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>
 #include <xrpl/tx/transactors/lending/LoanSet.h>
 #include <xrpl/tx/transactors/system/Batch.h>

--- a/src/test/app/Loan_test.cpp
+++ b/src/test/app/Loan_test.cpp
@@ -4,9 +4,9 @@
 #include <test/jtx/mpt.h>

 #include <xrpl/beast/xor_shift_engine.h>
+#include <xrpl/ledger/helpers/LendingHelpers.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/server/LoadFeeTrack.h>
-#include <xrpl/tx/transactors/lending/LendingHelpers.h>
 #include <xrpl/tx/transactors/lending/LoanSet.h>
 #include <xrpl/tx/transactors/system/Batch.h>
Author	SHA1	Message	Date
Mayukha Vadari	068c583a20	roll back some more	2026-04-07 09:13:51 -04:00
Mayukha Vadari	691bcb2bea	roll back unrelated changes	2026-04-07 09:12:10 -04:00
Mayukha Vadari	b452bd0b44	Merge branch 'develop' into mvadari/move-more-helpers	2026-04-07 09:08:04 -04:00
Mayukha Vadari	3bbe525d3d	fix import	2026-04-03 11:08:57 -04:00
Mayukha Vadari	0fc901ec7e	remove undeclared function	2026-04-03 10:58:26 -04:00
Mayukha Vadari	bca7c2925b	Merge branch 'develop' into mvadari/move-more-helpers	2026-04-03 10:24:09 -04:00
Mayukha Vadari	0ccc59268b	fix pre-commit issues	2026-03-24 21:12:16 -07:00
Mayukha Vadari	4103fd87a8	Merge branch 'develop' into mvadari/move-more-helpers	2026-03-24 20:55:29 -07:00
Mayukha Vadari	2b60bf9ab9	Update src/libxrpl/ledger/helpers/LendingHelpers.cpp Co-authored-by: xrplf-ai-reviewer[bot] <266832837+xrplf-ai-reviewer[bot]@users.noreply.github.com>	2026-03-24 20:51:52 -07:00
Mayukha Vadari	e8f5ee9e67	fix clang-tidy issues	2026-03-24 16:16:38 -07:00
Mayukha Vadari	396a4812a6	fix more build issues	2026-03-24 15:29:51 -07:00
Mayukha Vadari	6b0f230573	fix NFT includes	2026-03-24 15:16:03 -07:00
Mayukha Vadari	155f2e8f44	fix more stuff	2026-03-24 12:56:48 -07:00
Mayukha Vadari	24fa6b5ac4	fix copy paste issues	2026-03-24 12:55:15 -07:00
Mayukha Vadari	29eb6ed47b	move DelegateUtils	2026-03-24 12:49:09 -07:00
Mayukha Vadari	e2d913eb6e	move remaining cpp files	2026-03-24 12:48:08 -07:00
Mayukha Vadari	7517d013b2	move EscrowHelpers	2026-03-24 12:47:29 -07:00
Mayukha Vadari	f441563747	move PermissionedDEXHelpers	2026-03-24 12:45:37 -07:00
Mayukha Vadari	f2a36a2433	move AMMUtils	2026-03-24 12:44:50 -07:00
Mayukha Vadari	05d661cb3f	move AMMHelpers	2026-03-24 12:43:33 -07:00
Mayukha Vadari	fd0ebc85d2	move NFTokenUtils	2026-03-24 12:42:36 -07:00
Mayukha Vadari	8e45eddc62	move PaymentChannelHelpers	2026-03-24 12:41:13 -07:00
Mayukha Vadari	21dfb60bf1	move LendingHelpers	2026-03-24 12:40:01 -07:00