progress

Author: thejohnfreeman

src/test/app/Vault_test.cpp

@@ -45,6 +45,13 @@ class Vault_test : public beast::unit_test::suite
             Asset asset = issuer["IOU"];
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
 
+            SUBCASE("nothing to delete")
+            {
+                tx = vault.del({.owner = issuer, .id = keylet.key});
+                env(tx, ter(tecOBJECT_NOT_FOUND));
+                env.close();
+            }
+
             SUBCASE("create")
             {
                 env(tx);
@@ -117,12 +124,20 @@ class Vault_test : public beast::unit_test::suite
                 env(tx, ter(temMALFORMED));
                 env.close();
             }
+
+            SUBCASE("metadata too large")
+            {
+                // This metadata is for the share token.
+                tx[sfMPTokenMetadata] = blob1025;
+                env(tx, ter(temMALFORMED));
+                env.close();
+            }
         }
 
         SUBCASE("MPT")
         {
             MPTTester mptt{env, issuer, {.fund = false}};
-            mptt.create();
+            mptt.create({.flags = tfMPTCanTransfer | tfMPTCanLock});
             Asset asset = mptt.issuanceID();
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
 
@@ -132,15 +147,23 @@ class Vault_test : public beast::unit_test::suite
                 env.close();
             }
 
-            SUBCASE("metadata too large")
+            SUBCASE("global lock")
             {
-                tx[sfMPTokenMetadata] = blob1025;
-                env(tx, ter(temMALFORMED));
-                env.close();
+                mptt.set({.account = issuer, .flags = tfMPTLock});
+                env(tx, ter(tecLOCKED));
             }
+
+        }
+
+        SUBCASE("MPT cannot transfer")
+        {
+            MPTTester mptt{env, issuer, {.fund = false}};
+            mptt.create();
+            Asset asset = mptt.issuanceID();
+            auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
+            env(tx, ter(tecLOCKED));
         }
 
-        // (update) => sfVaultID
         // TODO: VaultSet (update) succeed
         // TODO: VaultSet (update) fail: wrong owner
         // TODO: VaultSet (update) fail: Data too large
@@ -149,13 +172,8 @@ class Vault_test : public beast::unit_test::suite
         // TODO: VaultSet (update) fail: tfPrivate flag
         // TODO: VaultSet (update) fail: tfShareNonTransferable flag
         // TODO: Payment to VaultSet.PA fail
-        // TODO: VaultDelete succeed
-        // TODO: VaultDelete fail: missing vault
         // TODO: VaultSet (update) fail: missing vault
 
-        // TODO: VaultSet (create) fail: Asset is MPT but !CanTransfer
-        // TODO: VaultSet (create) fail: Asset is MPT but Locked
-
         BEAST_EXPECT(true);
     }
 

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

@@ -65,6 +65,17 @@ VaultCreate::calculateBaseFee(ReadView const& view, STTx const& tx)
 TER
 VaultCreate::preclaim(PreclaimContext const& ctx)
 {
+    auto asset = ctx.tx[sfAsset];
+    if (asset.holds<MPTIssue>())
+    {
+        auto mptID = asset.get<MPTIssue>().getMptID();
+        auto issuance = ctx.view.read(keylet::mptIssuance(mptID));
+        if (issuance->getFlags() & lsfMPTLocked)
+            return tecLOCKED;
+        if ((issuance->getFlags() & lsfMPTCanTransfer) == 0)
+            return tecLOCKED;
+    }
+
     return tesSUCCESS;
 }