Add AccountPermission

yinyiqian1 · Nov 4, 2024 · abceb0a · abceb0a
1 parent 50dbe3d
commit abceb0a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/include/xrpl/protocol/detail/sfields.macro b/include/xrpl/protocol/detail/sfields.macro
@@ -263,6 +263,7 @@ TYPED_SFIELD(sfUnauthorize,              ACCOUNT,    6)
 TYPED_SFIELD(sfRegularKey,               ACCOUNT,    8)
 TYPED_SFIELD(sfNFTokenMinter,            ACCOUNT,    9)
 TYPED_SFIELD(sfEmitCallback,             ACCOUNT,   10)
+TYPED_SFIELD(sfOnBehalfOf,               ACCOUNT,   11)
 
 // account (uncommon)
 TYPED_SFIELD(sfHookAccount,              ACCOUNT,   16)

diff --git a/src/libxrpl/protocol/InnerObjectFormats.cpp b/src/libxrpl/protocol/InnerObjectFormats.cpp
@@ -147,6 +147,10 @@ InnerObjectFormats::InnerObjectFormats()
             {sfAssetPrice, soeOPTIONAL},
             {sfScale, soeDEFAULT},
         });
+
+    add(sfPermission.jsonName.c_str(),
+        sfPermission.getCode(),
+        {{sfPermissionValue, soeREQUIRED}});
 }
 
 InnerObjectFormats const&

diff --git a/src/libxrpl/protocol/TxFormats.cpp b/src/libxrpl/protocol/TxFormats.cpp
@@ -45,6 +45,7 @@ TxFormats::TxFormats()
         {sfTxnSignature, soeOPTIONAL},
         {sfSigners, soeOPTIONAL},  // submit_multisigned
         {sfNetworkID, soeOPTIONAL},
+        {sfOnBehalfOf, soeOPTIONAL},
     };
 
 #pragma push_macro("UNWRAP")

diff --git a/src/xrpld/app/tx/detail/AMMCreate.cpp b/src/xrpld/app/tx/detail/AMMCreate.cpp
@@ -88,6 +88,49 @@ AMMCreate::calculateBaseFee(ReadView const& view, STTx const& tx)
 TER
 AMMCreate::preclaim(PreclaimContext const& ctx)
 {
+    // if (ctx.rules.enabled(featureAccountPermission))
+    // {
+    auto const onBehalfOfAccount =
+        ctx.view.read(keylet::account(ctx.tx[sfOnBehalfOf]));
+    if (!onBehalfOfAccount)
+        return terNO_ACCOUNT;
+
+    auto const accountPermissionKey =
+        keylet::accountPermission(ctx.tx[sfAccount], ctx.tx[sfOnBehalfOf]);
+    auto const sle = ctx.view.read(accountPermissionKey);
+    if (!sle)
+        return temMALFORMED;  // todo: change error code
+
+    auto const permissions = sle->getFieldArray(sfPermissions);
+    bool grantedPermission = false;
+    for (auto const& permissionObj : permissions)
+    {
+        // auto permissionObj = dynamic_cast<STObject const*>(&permission);
+        auto const permissionValue =
+            permissionObj.getFieldU32(sfPermissionValue);
+        std::cout << "perimssionValue = " << permissionValue << std::endl;
+        auto const transactionType = ctx.tx.getTxnType();
+        std::cout << "transactionType = " << transactionType << std::endl;
+        if (permissionValue == transactionType + 1)
+            grantedPermission = true;
+        // for (auto const& permissionElement : *permissionObj)
+        // {
+        //     auto permissionStr = permissionElement.getText();
+        //     auto const& name = permissionElement.getFName();
+
+        //     auto const permissionValue =
+        //     permissionElement.getFieldU32(sfPermissionValue); auto const
+        //     transactionType = ctx.tx.getTxnType(); if (permissionValue ==
+        //     transactionType + 1)
+        //         grantedPermission = true;
+        // }
+    }
+
+    if (!grantedPermission)
+        return terNO_AUTH;
+
+    //}
+
     auto const accountID = ctx.tx[sfAccount];
     auto const amount = ctx.tx[sfAmount];
     auto const amount2 = ctx.tx[sfAmount2];