ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-10-04 18:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Gate lending transactions in Batch on LendingProtocolV1_2

Browse Source
This commit is contained in:
Timur Ialymov
2026-09-19 18:43:19 +01:00
parent be00473579
commit 1f3acb7a14
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libxrpl/tx/transactors/system/Batch.cpp
View File

@@ -298,9 +298,9 @@ Batch::preflight(PreflightContext const& ctx)
}
auto const txType = stx.getFieldU16(sfTransactionType);
// Pre-LendingProtocolV1_1: SAV and Lending transactions cannot be Batch inners.
// Post-LendingProtocolV1_1: they continue through the normal Batch checks.
bool const isDisabledTxType = !ctx.rules.enabled(featureLendingProtocolV1_1) &&
// Pre-LendingProtocolV1_2: SAV and Lending transactions cannot be Batch inners.
// Post-LendingProtocolV1_2: they continue through the normal Batch checks.
bool const isDisabledTxType = !ctx.rules.enabled(featureLendingProtocolV1_2) &&
std::ranges::any_of(
kDisabledTxTypes, [txType](auto const& disabled) { return txType == disabled; });
if (isDisabledTxType)

14
src/test/app/Batch_test.cpp
View File

@@ -3138,7 +3138,7 @@ class Batch_test : public beast::unit_test::Suite
{
testcase("loan");
bool const lendingBatchEnabled = features[featureLendingProtocolV1_1];
bool const lendingBatchEnabled = features[featureLendingProtocolV1_2];
using namespace test::jtx;
@@ -3325,7 +3325,9 @@ class Batch_test : public beast::unit_test::Suite
using namespace test::jtx;
auto const run = [this](FeatureBitset amendments, TER expected, bool expectVault) {
// Before LendingProtocolV1_2 a Vault inner transaction rejects the whole batch.
auto const checkVaultBatch = [this](FeatureBitset amendments) {
bool const lendingBatchEnabled = amendments[featureLendingProtocolV1_2];
Env env{*this, amendments};
Account const payer{"payer"};
@@ -3341,7 +3343,7 @@ class Batch_test : public beast::unit_test::Suite
auto const batchFee = batch::calcBatchFee(env, 1, 2);
submitBatch(
env,
expected,
lendingBatchEnabled ? TER{tesSUCCESS} : TER{temINVALID_INNER_BATCH},
batch::outer(payer, payerSeq, batchFee, tfAllOrNothing),
batch::Inner(create, lenderSeq),
batch::Inner(
@@ -3351,11 +3353,11 @@ class Batch_test : public beast::unit_test::Suite
batch::Sig(lender));
env.close();
BEAST_EXPECT(static_cast<bool>(env.le(vaultKeylet)) == expectVault);
BEAST_EXPECT(static_cast<bool>(env.le(vaultKeylet)) == lendingBatchEnabled);
};
run(features - featureLendingProtocolV1_1, temINVALID_INNER_BATCH, false);
run(features, tesSUCCESS, true);
checkVaultBatch(features - featureLendingProtocolV1_2);
checkVaultBatch(features);
}
void

2
src/test/app/lending/LoanLifecycle_test.cpp
View File

@@ -495,7 +495,7 @@ private:
// From FIND-001
testcase << "Batch Bypass Counterparty";
bool const lendingBatchEnabled = features[featureLendingProtocolV1_1];
bool const lendingBatchEnabled = features[featureLendingProtocolV1_2];
using namespace jtx;
using namespace std::chrono_literals;