diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro index 4cece9fc23..af4ccf0cc8 100644 --- a/include/xrpl/protocol/detail/features.macro +++ b/include/xrpl/protocol/detail/features.macro @@ -15,7 +15,7 @@ // Add new amendments to the top of this list. // Keep it sorted in reverse chronological order. -XRPL_FEATURE(LendingProtocolV1_2, Supported::No, VoteBehavior::DefaultNo) +XRPL_FEATURE(LendingProtocolV1_2, Supported::Yes, VoteBehavior::DefaultNo) XRPL_FIX (Cleanup3_5_0, Supported::Yes, VoteBehavior::DefaultNo) XRPL_FEATURE(ConfidentialMPTKeyRotation, Supported::No, VoteBehavior::DefaultNo) XRPL_FIX (Cleanup3_4_0, Supported::Yes, VoteBehavior::DefaultNo) diff --git a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp index 8d690c0e3d..cac7f9dd92 100644 --- a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp @@ -55,7 +55,7 @@ VaultCreate::checkExtraFeatures(PreflightContext const& ctx) std::uint32_t VaultCreate::getFlagsMask(PreflightContext const& ctx) { - if (ctx.rules.enabled(featureLendingProtocolV1_1)) + if (ctx.rules.enabled(featureLendingProtocolV1_2)) return tfVaultCreateMask; return tfVaultCreateMask | tfVaultOwnerCanBlockDeposit; @@ -256,7 +256,7 @@ VaultCreate::doApply() if (tx.isFlag(tfVaultPrivate)) vault->setFlag(lsfVaultPrivate); - if (view().rules().enabled(featureLendingProtocolV1_1) && + if (view().rules().enabled(featureLendingProtocolV1_2) && tx.isFlag(tfVaultOwnerCanBlockDeposit)) vault->setFlag(lsfVaultOwnerCanBlockDeposit); diff --git a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp index 7dfd6f5bac..b5d7edbbd6 100644 --- a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp @@ -158,7 +158,7 @@ VaultDeposit::preclaim(PreclaimContext const& ctx) // LCOV_EXCL_STOP } - if (ctx.view.rules().enabled(featureLendingProtocolV1_1)) + if (ctx.view.rules().enabled(featureLendingProtocolV1_2)) { // Perform these checks early to avoid unnecessary processing diff --git a/src/libxrpl/tx/transactors/vault/VaultSet.cpp b/src/libxrpl/tx/transactors/vault/VaultSet.cpp index d2b8d92f9d..f4e0c2694a 100644 --- a/src/libxrpl/tx/transactors/vault/VaultSet.cpp +++ b/src/libxrpl/tx/transactors/vault/VaultSet.cpp @@ -29,7 +29,7 @@ VaultSet::checkExtraFeatures(PreflightContext const& ctx) std::uint32_t VaultSet::getFlagsMask(PreflightContext const& ctx) { - if (ctx.rules.enabled(featureLendingProtocolV1_1)) + if (ctx.rules.enabled(featureLendingProtocolV1_2)) return tfVaultSetMask; // Add tfVaultDepositBlock and tfVaultDepositUnblock flags to indicate they are disabled @@ -142,7 +142,7 @@ VaultSet::preclaim(PreclaimContext const& ctx) } } - if (ctx.view.rules().enabled(featureLendingProtocolV1_1)) + if (ctx.view.rules().enabled(featureLendingProtocolV1_2)) { // The Vault is not configured to support deposit blocking if (!vault->isFlag(lsfVaultOwnerCanBlockDeposit) && @@ -222,7 +222,7 @@ VaultSet::doApply() view().update(sleIssuance); } - if (view().rules().enabled(featureLendingProtocolV1_1)) + if (view().rules().enabled(featureLendingProtocolV1_2)) { if (tx.isFlag(tfVaultDepositBlock)) vault->setFlag(lsfVaultDepositBlocked); diff --git a/src/test/app/vault/VaultValidation_test.cpp b/src/test/app/vault/VaultValidation_test.cpp index dcc07cb1ac..8613520e4c 100644 --- a/src/test/app/vault/VaultValidation_test.cpp +++ b/src/test/app/vault/VaultValidation_test.cpp @@ -166,11 +166,11 @@ private: env(tx, Ter{temINVALID_FLAG}); { - env.disableFeature(featureLendingProtocolV1_1); + env.disableFeature(featureLendingProtocolV1_2); auto [tx, keylet] = vault.create({.owner = owner, .asset = asset}); tx[sfFlags] = tfVaultOwnerCanBlockDeposit; env(tx, Ter(temINVALID_FLAG)); - env.enableFeature(featureLendingProtocolV1_1); + env.enableFeature(featureLendingProtocolV1_2); } { @@ -479,18 +479,18 @@ private: testCase( [&](Env& env, Account const&, Account const& owner, Asset const& asset, Vault& vault) { - testcase("set flags fail without featureLendingProtocolV1_1"); + testcase("set flags fail without featureLendingProtocolV1_2"); auto [tx, keylet] = vault.create({.owner = owner, .asset = asset}); { - env.disableFeature(featureLendingProtocolV1_1); + env.disableFeature(featureLendingProtocolV1_2); env(vault.set({.owner = owner, .id = keylet.key, .flags = tfVaultDepositBlock}), Ter(temINVALID_FLAG)); env(vault.set( {.owner = owner, .id = keylet.key, .flags = tfVaultDepositUnblock}), Ter(temINVALID_FLAG)); - env.enableFeature(featureLendingProtocolV1_1); + env.enableFeature(featureLendingProtocolV1_2); } }); @@ -1245,7 +1245,7 @@ private: { testcase(prefix + "block/unblock fails when amendment is disabled"); - env.disableFeature(featureLendingProtocolV1_1); + env.disableFeature(featureLendingProtocolV1_2); auto const [tx, keylet] = vault.create( {.owner = owner, .asset = asset, .flags = tfVaultOwnerCanBlockDeposit}); env(tx, Ter(temINVALID_FLAG)); @@ -1254,7 +1254,7 @@ private: blockVault(temINVALID_FLAG, keylet); unblockVault(temINVALID_FLAG, keylet); - env.enableFeature(featureLendingProtocolV1_1); + env.enableFeature(featureLendingProtocolV1_2); } {