Merge branch 'mpt-direct-pay' into mpt-dex-integration-dev

gregtatcam · Mar 7, 2024 · 39cb392 · 39cb392
2 parents 14cd015 + b00eab6
commit 39cb392
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/ripple/protocol/Asset.h b/src/ripple/protocol/Asset.h
@@ -206,6 +206,9 @@ validAsset(Asset const& asset);
 bool
 equalAssets(Asset const& asset1, Asset const& asset2);
 
+bool
+validJSONAsset(Json::Value const& jv);
+
 }  // namespace ripple
 
 #endif  // RIPPLE_PROTOCOL_ASSET_H_INCLUDED
diff --git a/src/ripple/protocol/impl/Asset.cpp b/src/ripple/protocol/impl/Asset.cpp
@@ -137,4 +137,12 @@ equalAssets(Asset const& asset1, Asset const& asset2)
     return asset1.mptIssue().mpt() == asset2.mptIssue().mpt();
 }
 
+bool
+validJSONAsset(Json::Value const& jv)
+{
+    return (jv.isMember(jss::currency) && !jv.isMember(jss::mpt_issuance_id)) ||
+        (!jv.isMember(jss::currency) && !jv.isMember(jss::issuer) &&
+         jv.isMember(jss::mpt_issuance_id));
+}
+
 }  // namespace ripple
diff --git a/src/ripple/protocol/impl/STAmount.cpp b/src/ripple/protocol/impl/STAmount.cpp
@@ -1047,9 +1047,8 @@ amountFromJson(SField const& name, Json::Value const& v)
     }
     else if (v.isObject())
     {
-        if ((!v.isMember(jss::currency) && !v.isMember(jss::mpt_issuance_id)) ||
-            (v.isMember(jss::currency) && v.isMember(jss::mpt_issuance_id)))
-            Throw<std::runtime_error>("invalid asset");
+        if (!validJSONAsset(v))
+            Throw<std::runtime_error>("Invalid Asset's Json specification");
 
         value = v[jss::value];
         if (v.isMember(jss::mpt_issuance_id))