URITokenTransferFee Amendment [DO NOT MERGE]

hook/sfcodes.h

@@ -242,6 +242,7 @@
 #define sfLockingChainDoor ((8U << 16U) + 22U)
 #define sfIssuingChainDoor ((8U << 16U) + 23U)
 #define sfSubject ((8U << 16U) + 24U)
+#define sfTransferFeeRecipient ((8U << 16U) + 98U)
 #define sfInform ((8U << 16U) + 99U)
 #define sfIndexes ((19U << 16U) + 1U)
 #define sfHashes ((19U << 16U) + 2U)

include/xrpl/protocol/detail/features.macro

@@ -34,6 +34,7 @@
 // If you add an amendment here, then do not forget to increment `numFeatures`
 // in include/xrpl/protocol/Feature.h.
 
+XRPL_FEATURE(URITokenTransferFee,        Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (HookMap,                    Supported::yes, VoteBehavior::DefaultYes)
 XRPL_FIX    (GuardDepth32,               Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(NamedHooks,                 Supported::yes, VoteBehavior::DefaultNo)

include/xrpl/protocol/detail/ledger_entries.macro

@@ -219,6 +219,8 @@ LEDGER_ENTRY(ltURI_TOKEN, 0x0055, URIToken, uri_token, ({
     {sfDigest,               soeOPTIONAL},
     {sfAmount,               soeOPTIONAL},
     {sfDestination,          soeOPTIONAL},
+    {sfTransferFee,          soeOPTIONAL},
+    {sfTransferFeeRecipient, soeOPTIONAL},
     {sfPreviousTxnID,        soeREQUIRED},
     {sfPreviousTxnLgrSeq,    soeREQUIRED},
 }))

include/xrpl/protocol/detail/sfields.macro

@@ -319,6 +319,7 @@ TYPED_SFIELD(sfAttestationRewardAccount, ACCOUNT,   21)
 TYPED_SFIELD(sfLockingChainDoor,         ACCOUNT,   22)
 TYPED_SFIELD(sfIssuingChainDoor,         ACCOUNT,   23)
 TYPED_SFIELD(sfSubject,                  ACCOUNT,   24)
+TYPED_SFIELD(sfTransferFeeRecipient,     ACCOUNT,   98)
 TYPED_SFIELD(sfInform,                   ACCOUNT,   99)
 
 // vector of 256-bit

include/xrpl/protocol/detail/transactions.macro

@@ -305,6 +305,8 @@ TRANSACTION(ttURITOKEN_MINT, 45, URITokenMint, ({
     {sfDigest, soeOPTIONAL},
     {sfAmount, soeOPTIONAL},
     {sfDestination, soeOPTIONAL},
+    {sfTransferFee, soeOPTIONAL},
+    {sfTransferFeeRecipient, soeOPTIONAL},
 }))
 
 TRANSACTION(ttURITOKEN_BURN, 46, URITokenBurn, ({

src/libxrpl/protocol/InnerObjectFormats.cpp

@@ -155,6 +155,8 @@ InnerObjectFormats::InnerObjectFormats()
             {sfURI, soeREQUIRED},
             {sfDigest, soeOPTIONAL},
             {sfFlags, soeOPTIONAL},
+            {sfTransferFee, soeOPTIONAL},
+            {sfTransferFeeRecipient, soeOPTIONAL},
         });
 
     add(sfRemark.jsonName,

src/test/app/Remit_test.cpp

@@ -2844,6 +2844,128 @@ struct Remit_test : public beast::unit_test::suite
         }
     }
 
+    void
+    testURITokenTransferFee(FeatureBitset features)
+    {
+        testcase("uritoken transfer fee");
+        using namespace test::jtx;
+
+        // Remit with TransferFee, amendment disabled
+        {
+            auto const noXferFee = features - featureURITokenTransferFee;
+            Env env{*this, noXferFee};
+            auto const alice = Account("alice");
+            auto const bob = Account("bob");
+            env.fund(XRP(10000), alice, bob);
+            env.close();
+
+            std::string const uri(8, '?');
+            env(remit::remit(alice, bob),
+                remit::uri(uri, std::nullopt, std::nullopt, 5000),
+                ter(temDISABLED));
+        }
+
+        // Remit with TransferFee = 0 or > 50000 fails
+        {
+            Env env{*this, features};
+            auto const alice = Account("alice");
+            auto const bob = Account("bob");
+            env.fund(XRP(10000), alice, bob);
+            env.close();
+
+            std::string const uri(4, '?');
+            for (auto const fee : {0, 50001})
+            {
+                env(remit::remit(alice, bob),
+                    remit::uri(uri, std::nullopt, std::nullopt, fee),
+                    ter(temBAD_TRANSFER_FEE));
+            }
+        }
+
+        // Remit with TransferFeeRecipient but no TransferFee
+        {
+            Env env{*this, features};
+            auto const alice = Account("alice");
+            auto const bob = Account("bob");
+            auto const carol = Account("carol");
+            env.fund(XRP(10000), alice, bob, carol);
+            env.close();
+
+            std::string const uri(6, '?');
+            env(remit::remit(alice, bob),
+                remit::uri(
+                    uri, std::nullopt, std::nullopt, std::nullopt, carol),
+                ter(temMALFORMED));
+        }
+
+        // Remit with TransferFeeRecipient non-existent account
+        {
+            Env env{*this, features};
+            auto const alice = Account("alice");
+            auto const bob = Account("bob");
+            auto const phantom = Account("phantom");
+            env.fund(XRP(10000), alice, bob);
+            env.close();
+
+            std::string const uri(7, '?');
+            env(remit::remit(alice, bob),
+                remit::uri(uri, std::nullopt, std::nullopt, 2500, phantom),
+                ter(tecNO_TARGET));
+        }
+
+        // Remit with MintURIToken including TransferFee
+        {
+            Env env{*this, features};
+            auto const alice = Account("alice");
+            auto const bob = Account("bob");
+            env.fund(XRP(10000), alice, bob);
+            env.close();
+
+            std::string const uri(2, '?');
+            auto const tid =
+                keylet::uritoken(alice, Blob(uri.begin(), uri.end())).key;
+
+            // Remit with inline mint including TransferFee
+            env(remit::remit(alice, bob),
+                remit::uri(uri, std::nullopt, std::nullopt, 5000));
+            env.close();
+
+            // Verify the minted URIToken has TransferFee
+            auto const sleU = env.le(Keylet{ltURI_TOKEN, tid});
+            BEAST_EXPECT(sleU);
+            BEAST_EXPECT(sleU->isFieldPresent(sfTransferFee));
+            BEAST_EXPECT(sleU->getFieldU16(sfTransferFee) == 5000);
+            BEAST_EXPECT(sleU->getAccountID(sfIssuer) == alice.id());
+            BEAST_EXPECT(sleU->getAccountID(sfOwner) == bob.id());
+        }
+
+        // Remit with TransferFee and TransferFeeRecipient
+        {
+            Env env{*this, features};
+            auto const alice = Account("alice");
+            auto const bob = Account("bob");
+            auto const carol = Account("carol");
+            env.fund(XRP(10000), alice, bob, carol);
+            env.close();
+
+            std::string const uri(3, '?');
+            auto const tid =
+                keylet::uritoken(alice, Blob(uri.begin(), uri.end())).key;
+
+            env(remit::remit(alice, bob),
+                remit::uri(uri, std::nullopt, std::nullopt, 10000, carol));
+            env.close();
+
+            auto const sleU = env.le(Keylet{ltURI_TOKEN, tid});
+            BEAST_EXPECT(sleU);
+            BEAST_EXPECT(sleU->isFieldPresent(sfTransferFee));
+            BEAST_EXPECT(sleU->getFieldU16(sfTransferFee) == 10000);
+            BEAST_EXPECT(sleU->isFieldPresent(sfTransferFeeRecipient));
+            BEAST_EXPECT(
+                sleU->getAccountID(sfTransferFeeRecipient) == carol.id());
+        }
+    }
+
     void
     testOptionals(FeatureBitset features)
     {
@@ -2944,6 +3066,7 @@ struct Remit_test : public beast::unit_test::suite
         testTLDeepFreeze(features);
         testRippling(features);
         testURIToken(features);
+        testURITokenTransferFee(features);
         testOptionals(features);
         testDestAMM(features);
     }