Add uint32 to string parse

XRPLF · yinyiqian1 · Mar 19, 2025 · Mar 21, 2025 · Mar 21, 2025 · Mar 21, 2025
commit 2da1590090b3a7a58870dfef7113f99a3f7eb083
diff --git a/include/xrpl/protocol/Permissions.h b/include/xrpl/protocol/Permissions.h
@@ -55,6 +55,8 @@ class Permission
     std::unordered_map<std::string, GranularPermissionType>
         granularPermissionMap;
 
+    std::unordered_map<GranularPermissionType, std::string> granularNameMap;
+
     std::unordered_map<GranularPermissionType, TxType> granularTxTypeMap;
 
     std::unordered_set<std::string> supportedTransactions;
@@ -70,6 +72,9 @@ class Permission
     std::optional<std::uint32_t>
     getGranularValue(std::string const& name) const;
 
+    std::optional<std::string>
+    getGranularName(GranularPermissionType const& value) const;
+
     std::optional<TxType>
     getGranularTxType(GranularPermissionType const& gpType) const;
 

diff --git a/src/libxrpl/protocol/Permissions.cpp b/src/libxrpl/protocol/Permissions.cpp
@@ -33,11 +33,23 @@
 
 #include <xrpl/protocol/detail/permissions.macro>
 
+#undef PERMISSION
+#pragma pop_macro("PERMISSION")
+    };
+
+    granularNameMap = {
+#pragma push_macro("PERMISSION")
+#undef PERMISSION
+
+#define PERMISSION(type, txType, value) {type, #type},
+
+#include <xrpl/protocol/detail/permissions.macro>
+
 #undef PERMISSION
 #pragma pop_macro("PERMISSION")
     };

    granularTxTypeMap = {
 #pragma push_macro("PERMISSION")
 #undef PERMISSION

@@ -73,6 +85,16 @@
     return std::nullopt;
 }
 
+std::optional<std::string>
+Permission::getGranularName(GranularPermissionType const& value) const
+{
+    auto const it = granularNameMap.find(value);
+    if (it != granularNameMap.end())
+        return it->second;
+
+    return std::nullopt;
+}
+
 std::optional<TxType>
 Permission::getGranularTxType(GranularPermissionType const& gpType) const
 {

diff --git a/src/libxrpl/protocol/STInteger.cpp b/src/libxrpl/protocol/STInteger.cpp
@@ -22,6 +22,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/LedgerFormats.h>
+#include <xrpl/protocol/Permissions.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STBase.h>
 #include <xrpl/protocol/STInteger.h>
@@ -177,6 +178,27 @@ template <>
 Json::Value
 STUInt32::getJson(JsonOptions) const
 {
+    if (getFName() == sfPermissionValue)
+    {
+        auto const permissionValue =
+            static_cast<GranularPermissionType>(value_);
+        auto const granular =
+            Permission::getInstance().getGranularName(permissionValue);
+
+        if (granular)
+        {
+            return *granular;
+        }
+        else
+        {
+            auto item = TxFormats::getInstance().findByType(
+                static_cast<TxType>(value_ - 1));
+
+            if (item != nullptr)
+                return item->getName();
+        }
+    }
+
     return value_;
 }
 

diff --git a/src/test/app/Delegate_test.cpp b/src/test/app/Delegate_test.cpp
@@ -119,22 +119,9 @@ class Delegate_test : public beast::unit_test::suite
                 unsigned i = 0;
                 for (auto const& permission : permissions)
                 {
-                    auto const granularVal =
-                        Permission::getInstance().getGranularValue(permission);
-                    if (granularVal)
-                        BEAST_EXPECT(
-                            jPermissions[i][sfPermission.jsonName]
-                                        [sfPermissionValue.jsonName] ==
-                            *granularVal);
-                    else
-                    {
-                        auto const transVal =
-                            TxFormats::getInstance().findTypeByName(permission);
-                        BEAST_EXPECT(
-                            jPermissions[i][sfPermission.jsonName]
-                                        [sfPermissionValue.jsonName] ==
-                            transVal + 1);
-                    }
+                    BEAST_EXPECT(
+                        jPermissions[i][sfPermission.jsonName]
+                                    [sfPermissionValue.jsonName] == permission);
                     i++;
                 }
             };

diff --git a/src/xrpld/app/misc/detail/DelegateUtils.cpp b/src/xrpld/app/misc/detail/DelegateUtils.cpp
 checkTxPermission(std::shared_ptr<SLE const> const& delegate, STTx const& tx)
 {
    if (!delegate)
        return tesSUCCESS;

    auto const permissionArray = delegate->getFieldArray(sfPermissions);
    auto const transactionType = tx.getTxnType();
    std::unordered_set<GranularPermissionType>& granularPermissions)
 {
    if (!delegate)
        return;

    auto const permissionArray = delegate->getFieldArray(sfPermissions);
    for (auto const& permission : permissionArray)
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
    auto const sle = view.read(delegateKey);

    if (!sle)
        return tecNO_PERMISSION;

    if (checkTxPermission(sle, tx) == tesSUCCESS)
        return tesSUCCESS;
diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp
    auto const sle = view.read(delegateKey);

    if (!sle)
        return tecNO_PERMISSION;

    if (checkTxPermission(sle, tx) == tesSUCCESS)
        return tesSUCCESS;
diff --git a/src/xrpld/app/tx/detail/SetTrust.cpp b/src/xrpld/app/tx/detail/SetTrust.cpp
    auto const sle = view.read(delegateKey);

    if (!sle)
        return tecNO_PERMISSION;

    if (checkTxPermission(sle, tx) == tesSUCCESS)
        return tesSUCCESS;
        return tecNO_PERMISSION;

    if (tx.isFieldPresent(sfQualityIn) || tx.isFieldPresent(sfQualityOut))
        return tecNO_PERMISSION;

    auto const saLimitAmount = tx.getFieldAmount(sfLimitAmount);
    auto const sleRippleState = view.read(keylet::line(
diff --git a/src/xrpld/app/tx/detail/Transactor.cpp b/src/xrpld/app/tx/detail/Transactor.cpp
    auto const sle = view.read(delegateKey);

    if (!sle)
        return tecNO_PERMISSION;

    return checkTxPermission(sle, tx);
 }
        auto const delegate = ctx_.tx.getAccountID(sfDelegate);
        auto const delegatedSle = view().peek(keylet::account(delegate));
        if (!delegatedSle)
            return tefINTERNAL;

        delegatedSle->setFieldAmount(
            sfBalance, delegatedSle->getFieldAmount(sfBalance) - feePaid);
    {
        auto const sle = view().peek(keylet::account(account_));
        if (!sle)
            return tefINTERNAL;

        // Deduct the fee, so it's not available during the transaction.
        // Will only write the account back if the transaction succeeds.
        ? view().peek(keylet::account(ctx_.tx.getAccountID(sfDelegate)))
        : txnAcct;
    if (!payerSle)
        return {tefINTERNAL, beast::zero};

    auto const balance = payerSle->getFieldAmount(sfBalance).xrp();
	checkTxPermission(std::shared_ptr<SLE const> const& delegate, STTx const& tx)
	{
	if (!delegate)
	return tesSUCCESS;
Check warning on line 29 in src/xrpld/app/misc/detail/DelegateUtils.cpp Codecov / codecov/patch src/xrpld/app/misc/detail/DelegateUtils.cpp#L29 `Added line #L29 was not covered by tests`

	auto const permissionArray = delegate->getFieldArray(sfPermissions);
	auto const transactionType = tx.getTxnType();
	std::unordered_set<GranularPermissionType>& granularPermissions)
	{
	if (!delegate)
	return;
Check warning on line 51 in src/xrpld/app/misc/detail/DelegateUtils.cpp Codecov / codecov/patch src/xrpld/app/misc/detail/DelegateUtils.cpp#L51 `Added line #L51 was not covered by tests`

	auto const permissionArray = delegate->getFieldArray(sfPermissions);
	for (auto const& permission : permissionArray)
	auto const sle = view.read(delegateKey);

	if (!sle)
	return tecNO_PERMISSION;
Check warning on line 65 in src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp Codecov / codecov/patch src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp#L65 `Added line #L65 was not covered by tests`

	if (checkTxPermission(sle, tx) == tesSUCCESS)
	return tesSUCCESS;