remove mpt dir

gregtatcam · Jan 15, 2024 · d34508e · d34508e
1 parent 2ed6874
commit d34508e
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 360 deletions.
diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake
@@ -682,7 +682,6 @@ target_sources (rippled PRIVATE
   src/ripple/rpc/handlers/BlackList.cpp
   src/ripple/rpc/handlers/BookOffers.cpp
   src/ripple/rpc/handlers/CanDelete.cpp
-  src/ripple/rpc/handlers/MPTHolders.cpp
   src/ripple/rpc/handlers/Connect.cpp
   src/ripple/rpc/handlers/ConsensusInfo.cpp
   src/ripple/rpc/handlers/CrawlShards.cpp

diff --git a/src/ripple/app/tx/impl/MPTokenAuthorize.cpp b/src/ripple/app/tx/impl/MPTokenAuthorize.cpp
@@ -182,13 +182,6 @@ MPTokenAuthorize::doApply()
                 false))
             return tecINTERNAL;
 
-        if (!view().dirRemove(
-                keylet::mpt_dir(mptIssuanceID),
-                (*sleMpt)[sfMPTokenNode],
-                sleMpt->key(),
-                false))
-            return tecINTERNAL;
-
         adjustOwnerCount(view(), sleAcct, -1, j_);
 
         view().erase(sleMpt);
@@ -214,22 +207,11 @@ MPTokenAuthorize::doApply()
     if (!ownerNode)
         return tecDIR_FULL;
 
-    auto const mptNode = view().dirInsert(
-        keylet::mpt_dir(mptIssuanceID),
-        mptokenKey,
-        [&mptIssuanceID](std::shared_ptr<SLE> const& sle) {
-            (*sle)[sfMPTokenIssuanceID] = mptIssuanceID;
-        });
-
-    if (!mptNode)
-        return tecDIR_FULL;
-
     auto mptoken = std::make_shared<SLE>(mptokenKey);
     (*mptoken)[sfAccount] = account_;
     (*mptoken)[sfMPTokenIssuanceID] = mptIssuanceID;
     (*mptoken)[sfFlags] = 0;
     (*mptoken)[sfOwnerNode] = *ownerNode;
-    (*mptoken)[sfMPTokenNode] = *mptNode;
     view().insert(mptoken);
 
     // Update owner count.

diff --git a/src/ripple/protocol/SField.h b/src/ripple/protocol/SField.h
@@ -451,7 +451,6 @@ extern SF_UINT64 const sfCookie;
 extern SF_UINT64 const sfServerVersion;
 extern SF_UINT64 const sfNFTokenOfferNode;
 extern SF_UINT64 const sfEmitBurden;
-extern SF_UINT64 const sfMPTokenNode;
 
 // 64-bit integers (uncommon)
 extern SF_UINT64 const sfHookOn;

diff --git a/src/ripple/protocol/impl/LedgerFormats.cpp b/src/ripple/protocol/impl/LedgerFormats.cpp
@@ -74,7 +74,6 @@ LedgerFormats::LedgerFormats()
             {sfIndexNext,            soeOPTIONAL},
             {sfIndexPrevious,        soeOPTIONAL},
             {sfNFTokenID,            soeOPTIONAL},
-            {sfMPTokenIssuanceID,    soeOPTIONAL},
         },
         commonFields);
 
@@ -366,7 +365,6 @@ LedgerFormats::LedgerFormats()
             {sfMPTAmount, soeDEFAULT},
             {sfLockedAmount, soeDEFAULT},
             {sfOwnerNode,            soeREQUIRED},
-            {sfMPTokenNode,            soeREQUIRED},
             {sfPreviousTxnID,        soeREQUIRED},
             {sfPreviousTxnLgrSeq,    soeREQUIRED}
         },

diff --git a/src/ripple/protocol/impl/SField.cpp b/src/ripple/protocol/impl/SField.cpp
@@ -180,7 +180,6 @@ CONSTRUCT_TYPED_SFIELD(sfCookie,                "Cookie",               UINT64,
 CONSTRUCT_TYPED_SFIELD(sfServerVersion,         "ServerVersion",        UINT64,    11);
 CONSTRUCT_TYPED_SFIELD(sfNFTokenOfferNode,      "NFTokenOfferNode",     UINT64,    12);
 CONSTRUCT_TYPED_SFIELD(sfEmitBurden,            "EmitBurden",           UINT64,    13);
-CONSTRUCT_TYPED_SFIELD(sfMPTokenNode,           "MPTokenNode",          UINT64,    14);
 
 // 64-bit integers (uncommon)
 CONSTRUCT_TYPED_SFIELD(sfHookOn,                   "HookOn",                   UINT64, 16);

diff --git a/src/ripple/rpc/handlers/MPTHolders.cpp b/src/ripple/rpc/handlers/MPTHolders.cpp
diff --git a/src/ripple/rpc/impl/Handler.cpp b/src/ripple/rpc/impl/Handler.cpp
@@ -95,7 +95,7 @@ Handler const handlerArray[]{
     {"book_changes", byRef(&doBookChanges), Role::USER, NO_CONDITION},
     {"book_offers", byRef(&doBookOffers), Role::USER, NO_CONDITION},
     {"can_delete", byRef(&doCanDelete), Role::ADMIN, NO_CONDITION},
-    {"mpt_holders", byRef(&doMPTHolders), Role::USER, NO_CONDITION},
+    //{"mpt_holders", byRef(&doMPTHolders), Role::ADMIN, NO_CONDITION},
     {"channel_authorize", byRef(&doChannelAuthorize), Role::USER, NO_CONDITION},
     {"channel_verify", byRef(&doChannelVerify), Role::USER, NO_CONDITION},
     {"connect", byRef(&doConnect), Role::ADMIN, NO_CONDITION},