Add invalid MPT amount check in STTx::passesLocalChecks()

to provide one single check for all tx.
Update unit-tests.

include/xrpl/protocol/MPTIssue.h

@@ -84,6 +84,9 @@ isXRP(uint192 const&)
     return false;
 }
 
+Json::Value
+to_json(MPTIssue const& issue);
+
 }  // namespace ripple
 
 #endif  // RIPPLE_PROTOCOL_MPTISSUE_H_INCLUDED

include/xrpl/protocol/SOTemplate.h

@@ -69,9 +69,7 @@ class SOElement
 
 public:
     SOElement(SField const& fieldName, SOEStyle style)
-        : sField_(fieldName)
-        , style_(style)
-        , supportMpt_(SOETxMPTAmount::soeMPTNone)
+        : sField_(fieldName), style_(style), supportMpt_(soeMPTNone)
     {
         init(fieldName);
     }
@@ -101,10 +99,10 @@ class SOElement
         return style_;
     }
 
-    bool
+    SOETxMPTAmount
     supportMPT() const
     {
-        return supportMpt_ == soeMPTSupported;
+        return supportMpt_;
     }
 };
 

include/xrpl/protocol/STEitherAmount.h

@@ -205,9 +205,6 @@ operator==(STEitherAmount const& lhs, STEitherAmount const& rhs)
         },
         lhs.getValue(),
         rhs.getValue());
-    if (lhs.isIssue() == rhs.isIssue())
-        return lhs.getValue() == rhs.getValue();
-    return false;
 }
 
 inline bool

include/xrpl/protocol/STObject.h

@@ -240,6 +240,8 @@ class STObject : public STBase, public CountedObject<STObject>
     Blob
     getFieldVL(SField const& field) const;
     STEitherAmount const&
+    getFieldEitherAmount(SField const& field) const;
+    STEitherAmount const&
     getFieldAmount(SField const& field) const;
     STAmount const&
     getFieldAmount(TypedFieldAmount<SFieldMPT::No> const& field) const;

include/xrpl/protocol/XChainAttestations.h

@@ -143,7 +143,7 @@ struct AttestationClaim : AttestationBase
     message(
         STXChainBridge const& bridge,
         AccountID const& sendingAccount,
-        STAmount const& sendingAmount,
+        STEitherAmount const& sendingAmount,
         AccountID const& rewardAccount,
         bool wasLockingChainSend,
         std::uint64_t claimID,
@@ -226,8 +226,8 @@ struct AttestationCreateAccount : AttestationBase
     message(
         STXChainBridge const& bridge,
         AccountID const& sendingAccount,
-        STAmount const& sendingAmount,
-        STAmount const& rewardAmount,
+        STEitherAmount const& sendingAmount,
+        STEitherAmount const& rewardAmount,
         AccountID const& rewardAccount,
         bool wasLockingChainSend,
         std::uint64_t createCount,

src/libxrpl/protocol/MPTIssue.cpp

@@ -19,6 +19,7 @@
 
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/jss.h>
 
 namespace ripple {
 
@@ -67,4 +68,12 @@ getMPT(uint192 const& id)
     return std::make_pair(sequence, account);
 }
 
+Json::Value
+to_json(MPTIssue const& issue)
+{
+    Json::Value jv;
+    jv[jss::mpt_issuance_id] = to_string(issue.getMptID());
+    return jv;
+}
+
 }  // namespace ripple

src/libxrpl/protocol/STEitherAmount.cpp

@@ -18,8 +18,6 @@
 //==============================================================================
 
 #include <xrpl/basics/Log.h>
-#include <xrpl/protocol/Feature.h>
-#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/STEitherAmount.h>
 #include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/protocol/jss.h>
@@ -246,14 +244,10 @@ amountFromJson(SField const& name, Json::Value const& v)
         value = v[jss::value];
         if (v.isMember(jss::mpt_issuance_id))
         {
-            std::optional<Rules> const& rules = getCurrentTransactionRules();
-            if (!rules || (rules && rules->enabled(featureMPTokensV1)))
-            {
-                isMPT = true;
-                currencyOrMPTID = v[jss::mpt_issuance_id];
-            }
+            isMPT = true;
+            currencyOrMPTID = v[jss::mpt_issuance_id];
         }
-        if (!isMPT)
+        else
         {
             currencyOrMPTID = v[jss::currency];
             issuer = v[jss::issuer];

src/libxrpl/protocol/STObject.cpp

@@ -165,18 +165,6 @@ STObject::applyTemplate(const SOTemplate& type)
                     e.sField().fieldName,
                     "may not be explicitly set to default.");
             }
-            if (iter->get().getSType() == STI_AMOUNT && !e.supportMPT())
-            {
-                if (auto const v = dynamic_cast<STEitherAmount*>(&iter->get());
-                    v && v->isMPT())
-                {
-                    std::optional<Rules> const& rules =
-                        getCurrentTransactionRules();
-                    if (!rules || rules->enabled(featureMPTokensV1))
-                        throwFieldErr(
-                            e.sField().fieldName, "doesn't support MPT");
-                }
-            }
             v.emplace_back(std::move(*iter));
             v_.erase(iter);
         }
@@ -642,6 +630,13 @@ STObject::getFieldVL(SField const& field) const
     return Blob(b.data(), b.data() + b.size());
 }
 
+STEitherAmount const&
+STObject::getFieldEitherAmount(SField const& field) const
+{
+    static STEitherAmount const empty{};
+    return getFieldByConstRef<STEitherAmount>(field, empty);
+}
+
 STEitherAmount const&
 STObject::getFieldAmount(SField const& field) const
 {

src/libxrpl/protocol/STTx.cpp

@@ -543,6 +543,31 @@ isAccountFieldOkay(STObject const& st)
     return true;
 }
 
+static bool
+invalidMPTAmountInTx(STObject const& tx)
+{
+    auto const txType = tx[~sfTransactionType];
+    if (!txType)
+        return false;
+    if (auto const* item = TxFormats::getInstance().findByType(safe_cast<TxType>(*txType)))
+    {
+        for (auto const& e : item->getSOTemplate())
+        {
+            if (tx.isFieldPresent(e.sField()) && e.supportMPT() != soeMPTNone)
+            {
+                if (auto const& field = tx.peekAtField(e.sField());
+                    field.getSType() == STI_AMOUNT &&
+                    static_cast<STEitherAmount const&>(field).isMPT())
+                {
+                    if (e.supportMPT() == soeMPTNotSupported)
+                        return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
 bool
 passesLocalChecks(STObject const& st, std::string& reason)
 {
@@ -560,6 +585,13 @@ passesLocalChecks(STObject const& st, std::string& reason)
         reason = "Cannot submit pseudo transactions.";
         return false;
     }
+
+    if (invalidMPTAmountInTx(st))
+    {
+        reason = "Amount can not be MPT.";
+        return false;
+    }
+
     return true;
 }
 

src/libxrpl/protocol/XChainAttestations.cpp

@@ -216,7 +216,7 @@ std::vector<std::uint8_t>
 AttestationClaim::message(
     STXChainBridge const& bridge,
     AccountID const& sendingAccount,
-    STAmount const& sendingAmount,
+    STEitherAmount const& sendingAmount,
     AccountID const& rewardAccount,
     bool wasLockingChainSend,
     std::uint64_t claimID,
@@ -225,7 +225,7 @@ AttestationClaim::message(
     STObject o{sfGeneric};
     // Serialize in SField order to make python serializers easier to write
     o[sfXChainClaimID] = claimID;
-    o[sfAmount] = STEitherAmount{sendingAmount};
+    o[sfAmount] = sendingAmount;
     if (dst)
         o[sfDestination] = *dst;
     o[sfOtherChainSource] = sendingAccount;
@@ -361,8 +361,8 @@ std::vector<std::uint8_t>
 AttestationCreateAccount::message(
     STXChainBridge const& bridge,
     AccountID const& sendingAccount,
-    STAmount const& sendingAmount,
-    STAmount const& rewardAmount,
+    STEitherAmount const& sendingAmount,
+    STEitherAmount const& rewardAmount,
     AccountID const& rewardAccount,
     bool wasLockingChainSend,
     std::uint64_t createCount,