Merge branch 'ximinez/lending-XLS-66' into ximinez/lending-enabled

include/xrpl/protocol/detail/features.macro

@@ -16,7 +16,7 @@
 // Add new amendments to the top of this list.
 // Keep it sorted in reverse chronological order.
 
-XRPL_FEATURE(LendingProtocol,            Supported::no,  VoteBehavior::DefaultNo)
+XRPL_FEATURE(LendingProtocol,            Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PermissionDelegationV1_1,   Supported::no,  VoteBehavior::DefaultNo)
 XRPL_FIX    (DirectoryLimit,             Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (IncludeKeyletFields,        Supported::yes, VoteBehavior::DefaultNo)
@@ -30,7 +30,7 @@ XRPL_FIX    (EnforceNFTokenTrustlineV2,  Supported::yes, VoteBehavior::DefaultNo
 XRPL_FIX    (AMMv1_3,                    Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PermissionedDEX,            Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(Batch,                      Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(SingleAssetVault,           Supported::no,  VoteBehavior::DefaultNo)
+XRPL_FEATURE(SingleAssetVault,           Supported::yes,  VoteBehavior::DefaultNo)
 XRPL_FIX    (PayChanCancelAfter,         Supported::yes, VoteBehavior::DefaultNo)
 // Check flags in Credential transactions
 XRPL_FIX    (InvalidTxFlags,             Supported::yes, VoteBehavior::DefaultNo)

src/libxrpl/ledger/View.cpp

@@ -3176,24 +3176,6 @@ requireAuth(
                 !isTesSuccess(err))
                 return err;
         }
-
-        // requireAuth is also recursive if the _account_ is a vault
-        auto const sleAccount = view.read(keylet::account(account));
-        if (!sleAccount)
-            return tefINTERNAL;  // LCOV_EXCL_LINE
-
-        if (sleAccount->isFieldPresent(sfVaultID))
-        {
-            auto const sleVault =
-                view.read(keylet::vault(sleAccount->getFieldH256(sfVaultID)));
-            if (!sleVault)
-                return tefINTERNAL;  // LCOV_EXCL_LINE
-            auto const ownerAcct = sleVault->getAccountID(sfOwner);
-            if (auto const err =
-                    requireAuth(view, mptIssue, ownerAcct, authType, depth + 1);
-                !isTesSuccess(err))
-                return err;
-        }
     }
 
     auto const mptokenID = keylet::mptoken(mptID.key, account);

src/test/app/Vault_test.cpp

@@ -2358,18 +2358,6 @@ class Vault_test : public beast::unit_test::suite
                      .amount = asset(100)});
                 env(tx, ter(tecNO_AUTH));
 
-                // Withdrawal to other (authorized) accounts doesn't work.
-                // Issuer would have to VaultClawback
-                tx[sfDestination] = issuer.human();
-                env(tx, ter(tecNO_AUTH));
-                tx[sfDestination] = owner.human();
-                env(tx, ter(tecNO_AUTH));
-                env.close();
-
-                // Issuer reauthorizes
-                mptt.authorize({.account = issuer, .holder = depositor});
-                env.close();
-
                 // Withdrawal to other (authorized) accounts works
                 tx[sfDestination] = issuer.human();
                 env(tx);
@@ -2380,13 +2368,6 @@ class Vault_test : public beast::unit_test::suite
                 env.close();
             }
 
-            // Re-unauthorize
-            mptt.authorize(
-                {.account = issuer,
-                 .holder = depositor,
-                 .flags = tfMPTUnauthorize});
-            env.close();
-
             {
                 // Cannot deposit some more
                 auto tx = vault.deposit(

src/test/rpc/Feature_test.cpp

@@ -187,9 +187,9 @@ class Feature_test : public beast::unit_test::suite
         BEAST_EXPECTS(jrr[jss::status] == jss::success, "status");
         jrr.removeMember(jss::status);
         BEAST_EXPECT(jrr.size() == 1);
-        BEAST_EXPECT(jrr.isMember(
-            "740352F2412A9909880C23A559FCECEDA3BE2126FED62FC7660D6"
-            "28A06927F11"));
+        BEAST_EXPECT(
+            jrr.isMember("12523DF04B553A0B1AD74F42DDB741DE8DC06A03FC089A0EF197E"
+                         "2A87F1D8107"));
         auto feature = *(jrr.begin());
 
         BEAST_EXPECTS(feature[jss::name] == "fixAMMOverflowOffer", "name");

src/xrpld/app/tx/detail/VaultWithdraw.cpp

@@ -1,6 +1,4 @@
 #include <xrpld/app/tx/detail/VaultWithdraw.h>
-//
-#include <xrpld/app/tx/detail/Payment.h>
 
 #include <xrpl/ledger/CredentialHelpers.h>
 #include <xrpl/ledger/View.h>
@@ -199,7 +197,7 @@ VaultWithdraw::doApply()
     assetsAvailable -= assetsWithdrawn;
     view().update(vault);
 
-    AccountID const& vaultAccount = vault->at(sfAccount);
+    auto const& vaultAccount = vault->at(sfAccount);
     // Transfer shares from depositor to vault.
     if (auto const ter = accountSend(
             view(),