👷🏻‍♂️ H-2: Rework delegate permission logic

Kwenta · Sep 15, 2023 · b4ddb7d · kingofclubstroyDev · Sep 15, 2023 · kingofclubstroyDev
1 parent a040ecb
commit b4ddb7d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/src/Engine.sol b/src/Engine.sol
@@ -96,7 +96,7 @@ contract Engine is IEngine, Multicallable, EIP712 {
         returns (bool)
     {
         return PERPS_MARKET_PROXY.hasPermission(
-            _accountId, Constants.ADMIN_PERMISSION, _caller
+            _accountId, Constants.PERPS_COMMIT_ASYNC_ORDER_PERMISSION, _caller
         );
     }
 

diff --git a/src/interfaces/IEngine.sol b/src/interfaces/IEngine.sol
@@ -91,6 +91,8 @@ interface IEngine {
 
     /// @notice check if the msg.sender is a delegate of the account
     /// identified by the accountId
+    /// @dev a delegate is an address that has been given
+    /// PERPS_COMMIT_ASYNC_ORDER_PERMISSION permission
     /// @param _accountId the id of the account to check
     /// @param _caller the address to check
     /// @return true if the msg.sender is a delegate of the account

diff --git a/test/Authentication.t.sol b/test/Authentication.t.sol
@@ -52,7 +52,7 @@ contract AccountDelegate is AuthenticationTest {
 
         perpsMarketProxy.grantPermission({
             accountId: accountId,
-            permission: ADMIN_PERMISSION,
+            permission: PERPS_COMMIT_ASYNC_ORDER_PERMISSION,
             user: NEW_ACTOR
         });
 
@@ -70,7 +70,7 @@ contract AccountDelegate is AuthenticationTest {
 
         perpsMarketProxy.grantPermission({
             accountId: accountId,
-            permission: ADMIN_PERMISSION,
+            permission: PERPS_COMMIT_ASYNC_ORDER_PERMISSION,
             user: NEW_ACTOR
         });
 
@@ -96,9 +96,11 @@ contract AccountDelegate is AuthenticationTest {
             )
         );
 
+        // only admin and owner can grant permission
+
         perpsMarketProxy.grantPermission({
             accountId: accountId,
-            permission: ADMIN_PERMISSION,
+            permission: PERPS_COMMIT_ASYNC_ORDER_PERMISSION,
             user: NEW_ACTOR
         });
     }

diff --git a/test/ConditionalOrder.t.sol b/test/ConditionalOrder.t.sol
@@ -384,9 +384,17 @@ contract VerifyConditions is ConditionalOrderTest {
     function test_verifyConditions_public_non_condition_isAccountDelegate()
         public
     {
+        vm.prank(signer);
+
+        perpsMarketProxy.grantPermission({
+            accountId: accountId,
+            permission: PERPS_COMMIT_ASYNC_ORDER_PERMISSION,
+            user: DELEGATE_1
+        });
+
         bytes[] memory conditions = new bytes[](1);
         conditions[0] = abi.encodeWithSelector(
-            IEngine.isAccountDelegate.selector, accountId, address(engine)
+            IEngine.isAccountDelegate.selector, accountId, DELEGATE_1
         );
 
         IEngine.OrderDetails memory orderDetails;

diff --git a/test/NonceBitmap.t.sol b/test/NonceBitmap.t.sol
@@ -127,7 +127,7 @@ contract NonceBitmap is Bootstrap, ConditionalOrderSignature {
 
         perpsMarketProxy.grantPermission({
             accountId: accountId,
-            permission: ADMIN_PERMISSION,
+            permission: PERPS_COMMIT_ASYNC_ORDER_PERMISSION,
             user: NEW_ACTOR
         });
 

diff --git a/test/utils/Constants.sol b/test/utils/Constants.sol
@@ -13,6 +13,9 @@ contract Constants {
 
     bytes32 internal constant ADMIN_PERMISSION = "ADMIN";
 
+    bytes32 internal constant PERPS_COMMIT_ASYNC_ORDER_PERMISSION =
+        "PERPS_COMMIT_ASYNC_ORDER";
+
     address internal constant MOCK_MARGIN_ENGINE = address(0xE1);
 
     address internal constant ACTOR = address(0xa1);