feat: Operator Access Module (#52)

# 🤖 Linear Closes GRT-227 --------- Co-authored-by: Ashitaka <[email protected]>
defi-wonderland · Nov 18, 2024 · 03282d6 · 03282d6
1 parent 992c835
commit 03282d6
Show file tree

Hide file tree

Showing 15 changed files with 439 additions and 60 deletions.
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   "scripts": {
     "build": "forge build",
     "build:optimized": "FOUNDRY_PROFILE=optimized forge build",
-    "coverage": "forge coverage --report summary --report lcov --match-path 'test/unit/*'",
+    "coverage": "forge coverage --ir-minimum --report summary --report lcov --match-path 'test/unit/*'",
     "deploy:arbitrum": "bash -c 'source .env && forge script Deploy --rpc-url arbitrum --account $ARBITRUM_DEPLOYER_NAME --broadcast --verify --chain arbitrum -vvvvv'",
     "lint:check": "yarn lint:sol-tests && yarn lint:sol-logic && forge fmt --check",
     "lint:fix": "sort-package-json && forge fmt && yarn lint:sol-tests --fix && yarn lint:sol-logic --fix",
@@ -34,8 +34,8 @@
     "package.json": "sort-package-json"
   },
   "dependencies": {
-    "@defi-wonderland/prophet-core": "0.0.0-8bb062e0",
-    "@defi-wonderland/prophet-modules": "0.0.0-86078350"
+    "@defi-wonderland/prophet-core": "0.0.0-819e5fe9",
+    "@defi-wonderland/prophet-modules": "0.0.0-022dfec8"
   },
   "devDependencies": {
     "@commitlint/cli": "19.3.0",

diff --git a/src/contracts/CouncilArbitrator.sol b/src/contracts/CouncilArbitrator.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
-import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/IAccessController.sol';
+import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/access/IAccessController.sol';
 import {ValidatorLib} from '@defi-wonderland/prophet-core/solidity/libraries/ValidatorLib.sol';
 import {IArbitrator} from '@defi-wonderland/prophet-modules/solidity/interfaces/IArbitrator.sol';
 
@@ -49,8 +49,7 @@ contract CouncilArbitrator is ICouncilArbitrator {
   function resolve(
     IOracle.Request calldata _request,
     IOracle.Response calldata _response,
-    IOracle.Dispute calldata _dispute,
-    IAccessController.AccessControl calldata _accessControl
+    IOracle.Dispute calldata _dispute
   ) external onlyArbitratorModule returns (bytes memory /* _data */ ) {
     bytes32 _disputeId = _dispute._getId();
 

diff --git a/src/contracts/EBOAccessModule.sol b/src/contracts/EBOAccessModule.sol
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.26;
+
+import {
+  IAccessModule,
+  IArbitrable,
+  IEBOAccessModule,
+  IHorizonAccountingExtension,
+  IHorizonStaking,
+  IOracle
+} from 'interfaces/IEBOAccessModule.sol';
+
+import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
+
+contract EBOAccessModule is IEBOAccessModule, Module {
+  /// @inheritdoc IEBOAccessModule
+  IArbitrable public immutable ARBITRABLE;
+  /// @inheritdoc IEBOAccessModule
+  IHorizonStaking public horizonStaking;
+  /// @inheritdoc IEBOAccessModule
+  IHorizonAccountingExtension public horizonAccountingExtension;
+
+  /**
+   * @notice Constructor
+   * @param _oracle The address of the Oracle
+   * @param _arbitrable The address of the Arbitrable contract
+   * @param _horizonAccountingExtension The address of the Horizon Accounting Extension contract
+   */
+  constructor(
+    IOracle _oracle,
+    IArbitrable _arbitrable,
+    IHorizonAccountingExtension _horizonAccountingExtension
+  ) Module(_oracle) {
+    ARBITRABLE = _arbitrable;
+    _setHorizonAccountingExtension(_horizonAccountingExtension);
+  }
+
+  /// @inheritdoc IAccessModule
+  function decodeAccessControlParameters(bytes calldata _data)
+    public
+    pure
+    returns (IAccessModule.AccessControlParameters memory _params)
+  {
+    _params = abi.decode(_data, (IAccessModule.AccessControlParameters));
+  }
+
+  /// @inheritdoc IAccessModule
+  function hasAccess(bytes calldata _data) external view returns (bool _hasAccess) {
+    IAccessModule.AccessControlParameters memory _params = decodeAccessControlParameters(_data);
+    _hasAccess =
+      horizonStaking.isAuthorized(_params.accessControl.user, address(horizonAccountingExtension), _params.sender);
+  }
+
+  /// @inheritdoc IEBOAccessModule
+  function setHorizonAccountingExtension(IHorizonAccountingExtension _horizonAccountingExtension) external {
+    ARBITRABLE.validateArbitrator(msg.sender);
+
+    _setHorizonAccountingExtension(_horizonAccountingExtension);
+  }
+
+  /// @inheritdoc IModule
+  function moduleName() external pure returns (string memory _moduleName) {
+    _moduleName = 'EBOAccessModule';
+  }
+
+  /**
+   * @notice Internal function to set the horizon accounting extension contract.
+   * @dev It also updates the `horizonStaking` address.
+   * @param _horizonAccountingExtension The new horizon accounting extension contract.
+   */
+  function _setHorizonAccountingExtension(IHorizonAccountingExtension _horizonAccountingExtension) internal {
+    horizonAccountingExtension = _horizonAccountingExtension;
+
+    // also update horizon staking address using the accounting extension view function
+    horizonStaking = _horizonAccountingExtension.HORIZON_STAKING();
+
+    emit HorizonAccountingExtensionSet(_horizonAccountingExtension);
+  }
+}
diff --git a/src/contracts/EBORequestCreator.sol b/src/contracts/EBORequestCreator.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
-import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/IAccessController.sol';
+import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/access/IAccessController.sol';
 import {EnumerableSet} from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
 import {
@@ -84,7 +84,6 @@ contract EBORequestCreator is IEBORequestCreator {
     _requestModuleData.chainId = _chainId;
     _requestData.requestModuleData = abi.encode(_requestModuleData);
 
-    // default access control
     IAccessController.AccessControl memory _accessControl =
       IAccessController.AccessControl({user: address(this), data: bytes('')});
     _requestId = ORACLE.createRequest(_requestData, bytes32(0), _accessControl);

diff --git a/src/interfaces/IEBOAccessModule.sol b/src/interfaces/IEBOAccessModule.sol
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.26;
+
+import {IOracle} from '@defi-wonderland/prophet-core/solidity/interfaces/IOracle.sol';
+import {IAccessModule} from '@defi-wonderland/prophet-core/solidity/interfaces/modules/access/IAccessModule.sol';
+
+import {IHorizonAccountingExtension} from 'interfaces/IHorizonAccountingExtension.sol';
+
+import {IHorizonStaking} from 'interfaces/external/IHorizonStaking.sol';
+
+import {IArbitrable} from 'interfaces/IArbitrable.sol';
+
+interface IEBOAccessModule is IAccessModule {
+  /*///////////////////////////////////////////////////////////////
+                            EVENTS
+  //////////////////////////////////////////////////////////////*/
+
+  /**
+   * @notice Emitted when the Horizon Accounting Extension contract is set
+   * @param _horizonAccountingExtension The new Horizon Accounting Extension contract
+   */
+  event HorizonAccountingExtensionSet(IHorizonAccountingExtension indexed _horizonAccountingExtension);
+
+  /*///////////////////////////////////////////////////////////////
+                            VARIABLES
+  //////////////////////////////////////////////////////////////*/
+
+  /**
+   * @notice The Arbitrable contract
+   * @return _arbitrable The Arbitrable contract
+   */
+  function ARBITRABLE() external view returns (IArbitrable _arbitrable);
+
+  /**
+   * @notice The Horizon Accounting Extension contract
+   * @return _horizonAccountingExtension The Horizon Accounting Extension contract
+   */
+  function horizonAccountingExtension() external view returns (IHorizonAccountingExtension _horizonAccountingExtension);
+
+  /**
+   * @notice The Horizon Staking contract
+   * @return _horizonStaking The Horizon Staking contract
+   */
+  function horizonStaking() external view returns (IHorizonStaking _horizonStaking);
+
+  /*///////////////////////////////////////////////////////////////
+                            LOGIC
+  //////////////////////////////////////////////////////////////*/
+
+  /**
+   * @notice Sets the Horizon Accounting Extension contract
+   * @param _horizonAccountingExtension The new Horizon Accounting Extension contract
+   */
+  function setHorizonAccountingExtension(IHorizonAccountingExtension _horizonAccountingExtension) external;
+}
diff --git a/src/interfaces/external/IHorizonStaking.sol b/src/interfaces/external/IHorizonStaking.sol
@@ -132,4 +132,13 @@ interface IHorizonStaking {
    * @param verifierDestination The address to transfer the verifier cut to
    */
   function slash(address serviceProvider, uint256 tokens, uint256 tokensVerifier, address verifierDestination) external;
+
+  /**
+   * @notice Check if an operator is authorized for the caller on a specific verifier / data service.
+   * @param serviceProvider The service provider on behalf of whom they're claiming to act
+   * @param verifier The verifier / data service on which they're claiming to act
+   * @param operator The address to check for auth
+   * @return Whether the operator is authorized or not
+   */
+  function isAuthorized(address serviceProvider, address verifier, address operator) external view returns (bool);
 }
diff --git a/test/integration/arbitrum/BondEscalation.t.sol b/test/integration/arbitrum/BondEscalation.t.sol
@@ -54,7 +54,7 @@ contract IntegrationBondEscalation is IntegrationBase {
     _pledgeForDispute(_requestId, _disputeId);
 
     // Do not pass the dispute deadline nor the tying buffer
-    vm.warp(_disputeCreatedAt + disputeDeadline);
+    vm.warp(_disputeCreatedAt + disputeDeadline - 1);
 
     // Thaw some tokens
     uint256 _tokensToThaw = disputeBondSize * (maxNumberOfEscalations - 1) + 1;
@@ -101,7 +101,7 @@ contract IntegrationBondEscalation is IntegrationBase {
     _pledgeAgainstDispute(_requestId, _disputeId);
 
     // Do not pass the dispute deadline nor the tying buffer
-    vm.warp(_disputeCreatedAt + disputeDeadline);
+    vm.warp(_disputeCreatedAt + disputeDeadline - 1);
 
     // Thaw some tokens
     uint256 _tokensToThaw = disputeBondSize * (maxNumberOfEscalations - 1) + 1;
@@ -226,7 +226,7 @@ contract IntegrationBondEscalation is IntegrationBase {
     _settleBondEscalation(_requestId, _responseId, _disputeId);
 
     // Do not pass the dispute deadline nor the tying buffer
-    vm.warp(_disputeCreatedAt + disputeDeadline);
+    vm.warp(_disputeCreatedAt + disputeDeadline - 1);
 
     // Pledge against the dispute
     _pledgeAgainstDispute(_requestId, _disputeId);
@@ -291,7 +291,7 @@ contract IntegrationBondEscalation is IntegrationBase {
     _settleBondEscalation(_requestId, _responseId, _disputeId);
 
     // Do not pass the dispute deadline nor the tying buffer
-    vm.warp(_disputeCreatedAt + disputeDeadline);
+    vm.warp(_disputeCreatedAt + disputeDeadline - 1);
 
     // Pledge for the dispute
     _pledgeForDispute(_requestId, _disputeId);

diff --git a/test/integration/arbitrum/DisputeResponse.t.sol b/test/integration/arbitrum/DisputeResponse.t.sol
@@ -40,7 +40,7 @@ contract IntegrationDisputeResponse is IntegrationBase {
     _disputeResponse(_requestId, _responseId);
 
     // Do not pass the dispute window
-    vm.warp(_responseCreation + disputeDisputeWindow);
+    vm.warp(_responseCreation + disputeDisputeWindow - 1);
 
     // Thaw some tokens
     _thaw(_disputer, 1);

diff --git a/test/integration/arbitrum/IntegrationBase.t.sol b/test/integration/arbitrum/IntegrationBase.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
-import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/IAccessController.sol';
+import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/access/IAccessController.sol';
 import {ValidatorLib} from '@defi-wonderland/prophet-core/solidity/libraries/ValidatorLib.sol';
 
 import {_ARBITRUM_SEPOLIA_GOVERNOR} from 'script/Constants.sol';

diff --git a/test/unit/CouncilArbitrator.t.sol b/test/unit/CouncilArbitrator.t.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
-import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/IAccessController.sol';
 import {IValidator} from '@defi-wonderland/prophet-core/solidity/interfaces/IValidator.sol';
+import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/access/IAccessController.sol';
 
 import {Helpers} from 'test/utils/Helpers.sol';
 
@@ -116,11 +116,11 @@ contract CouncilArbitrator_Unit_Resolve is CouncilArbitrator_Unit_BaseTest {
     changePrank(_caller);
 
     vm.expectRevert(ICouncilArbitrator.CouncilArbitrator_OnlyArbitratorModule.selector);
-    councilArbitrator.resolve(_params.request, _params.response, _params.dispute, _createAccessControl());
+    councilArbitrator.resolve(_params.request, _params.response, _params.dispute);
   }
 
   function test_setResolutions(ICouncilArbitrator.ResolutionParameters calldata _params) public happyPath {
-    councilArbitrator.resolve(_params.request, _params.response, _params.dispute, _createAccessControl());
+    councilArbitrator.resolve(_params.request, _params.response, _params.dispute);
 
     bytes32 _disputeId = _params.dispute._getId();
     (IOracle.Request memory _request, IOracle.Response memory _response, IOracle.Dispute memory _dispute) =
@@ -136,7 +136,7 @@ contract CouncilArbitrator_Unit_Resolve is CouncilArbitrator_Unit_BaseTest {
 
     vm.expectEmit();
     emit ResolutionStarted(_disputeId, _params.request, _params.response, _params.dispute);
-    councilArbitrator.resolve(_params.request, _params.response, _params.dispute, _createAccessControl());
+    councilArbitrator.resolve(_params.request, _params.response, _params.dispute);
   }
 }