Revert "Merge branch 'dev' into test/handler-cov"

This reverts commit a3b8f1c, reversing changes made to c0ffeea.
defi-wonderland · Dec 18, 2024 · c0ffee8 · c0ffee8
1 parent a3b8f1c
commit c0ffee8
Show file tree

Hide file tree

Showing 26 changed files with 341 additions and 972 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -177,7 +177,7 @@ The deployments are stored in ./broadcast
 See the [Foundry Book for available options](https://book.getfoundry.sh/reference/forge/forge-create.html).
 
 ## Licensing
-The primary license for EBO contracts is GPL-3.0, see [`LICENSE`](./LICENSE).
+TODO
 
 ## Contributors
 

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 --ir-minimum --report summary --report lcov --match-path 'test/unit/*'",
+    "coverage": "forge coverage --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-819e5fe9",
-    "@defi-wonderland/prophet-modules": "0.0.0-022dfec8"
+    "@defi-wonderland/prophet-core": "0.0.0-96d1084b",
+    "@defi-wonderland/prophet-modules": "0.0.0-b72dcda6"
   },
   "devDependencies": {
     "@commitlint/cli": "19.3.0",

diff --git a/script/Constants.sol b/script/Constants.sol
@@ -13,6 +13,7 @@ address constant _ARBITRUM_MAINNET_COUNCIL = address(0x101);
 address constant _ARBITRUM_SEPOLIA_GRAPH_TOKEN = 0x1A1af8B44fD59dd2bbEb456D1b7604c7bd340702;
 address constant _ARBITRUM_SEPOLIA_HORIZON_STAKING = 0x3F53F9f9a5d7F36dCC869f8D2F227499c411c0cf;
 address constant _ARBITRUM_SEPOLIA_EPOCH_MANAGER = 0x7975475801BEf845f10Ce7784DC69aB1e0344f11;
+address constant _ARBITRUM_SEPOLIA_GOVERNOR = 0xadE6B8EB69a49B56929C1d4F4b428d791861dB6f;
 address constant _ARBITRUM_SEPOLIA_ARBITRATOR = address(0x100);
 address constant _ARBITRUM_SEPOLIA_COUNCIL = address(0x101);
 

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -19,13 +19,11 @@ import {
   IBondEscalationAccounting
 } from '@defi-wonderland/prophet-modules/solidity/interfaces/extensions/IBondEscalationAccounting.sol';
 import {IERC20} from '@openzeppelin/contracts/interfaces/IERC20.sol';
-
-import {Arbitrable, IArbitrable} from 'contracts/Arbitrable.sol';
-import {CouncilArbitrator, ICouncilArbitrator} from 'contracts/CouncilArbitrator.sol';
 import {IEpochManager} from 'interfaces/external/IEpochManager.sol';
 import {IHorizonStaking} from 'interfaces/external/IHorizonStaking.sol';
 
-import {EBOAccessModule, IEBOAccessModule} from 'contracts/EBOAccessModule.sol';
+import {Arbitrable, IArbitrable} from 'contracts/Arbitrable.sol';
+import {CouncilArbitrator, ICouncilArbitrator} from 'contracts/CouncilArbitrator.sol';
 import {EBOFinalityModule, IEBOFinalityModule} from 'contracts/EBOFinalityModule.sol';
 import {EBORequestCreator, IEBORequestCreator} from 'contracts/EBORequestCreator.sol';
 import {EBORequestModule, IEBORequestModule} from 'contracts/EBORequestModule.sol';
@@ -44,7 +42,7 @@ import {
 import 'forge-std/Script.sol';
 
 contract Deploy is Script {
-  uint256 public constant DEPLOYMENT_COUNT = 11;
+  uint256 public constant DEPLOYMENT_COUNT = 10;
   uint256 public constant OFFSET_EBO_REQUEST_CREATOR = DEPLOYMENT_COUNT - 1;
 
   // Oracle
@@ -56,7 +54,6 @@ contract Deploy is Script {
   IBondEscalationModule public bondEscalationModule;
   IArbitratorModule public arbitratorModule;
   IEBOFinalityModule public eboFinalityModule;
-  IEBOAccessModule public eboAccessModule;
 
   // Extensions
   IHorizonAccountingExtension public horizonAccountingExtension;
@@ -158,10 +155,6 @@ contract Deploy is Script {
     councilArbitrator = new CouncilArbitrator(arbitratorModule, arbitrable);
     console.log('`CouncilArbitrator` deployed at:', address(councilArbitrator));
 
-    // Deploy `EBOAccessModule`
-    eboAccessModule = new EBOAccessModule(oracle, arbitrable, horizonAccountingExtension);
-    console.log('`EBOAccessModule` deployed at:', address(eboAccessModule));
-
     // Deploy `EBORequestCreator`
     IOracle.Request memory _requestData = _instantiateRequestData();
     eboRequestCreator = new EBORequestCreator(oracle, epochManager, arbitrable, _requestData);
@@ -178,9 +171,7 @@ contract Deploy is Script {
     _requestData.nonce = 0;
 
     // Set requester and modules
-
     _requestData.requester = address(eboRequestCreator);
-    _requestData.accessModule = address(eboAccessModule);
     _requestData.requestModule = address(eboRequestModule);
     _requestData.responseModule = address(bondedResponseModule);
     _requestData.disputeModule = address(bondEscalationModule);

diff --git a/src/contracts/CouncilArbitrator.sol b/src/contracts/CouncilArbitrator.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
-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';
 
@@ -69,20 +68,16 @@ contract CouncilArbitrator is ICouncilArbitrator {
     if (getAnswer[_disputeId] != IOracle.DisputeStatus.None) revert CouncilArbitrator_DisputeAlreadyArbitrated();
 
     getAnswer[_disputeId] = _award;
-    IAccessController.AccessControl memory _accessControl =
-      IAccessController.AccessControl({user: address(this), data: bytes('')});
 
-    ORACLE.resolveDispute(
-      _resolutionParams.request, _resolutionParams.response, _resolutionParams.dispute, _accessControl
-    );
+    ORACLE.resolveDispute(_resolutionParams.request, _resolutionParams.response, _resolutionParams.dispute);
 
     // If the request was not finalized, finalize it
     if (ORACLE.finalizedAt(_resolutionParams.dispute.requestId) == 0) {
       // If the dispute was lost, finalize with response
       if (_award != IOracle.DisputeStatus.Lost) {
         _resolutionParams.response.requestId = 0;
       }
-      ORACLE.finalize(_resolutionParams.request, _resolutionParams.response, _accessControl);
+      ORACLE.finalize(_resolutionParams.request, _resolutionParams.response);
     }
 
     emit DisputeArbitrated(_disputeId, _award);

diff --git a/src/contracts/EBOAccessModule.sol b/src/contracts/EBOAccessModule.sol
diff --git a/src/contracts/EBORequestCreator.sol b/src/contracts/EBORequestCreator.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.26;
 
-import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/access/IAccessController.sol';
 import {EnumerableSet} from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
 import {
@@ -82,11 +81,10 @@ contract EBORequestCreator is IEBORequestCreator {
     ) revert EBORequestCreator_RequestAlreadyCreated();
 
     _requestModuleData.chainId = _chainId;
+
     _requestData.requestModuleData = abi.encode(_requestModuleData);
 
-    IAccessController.AccessControl memory _accessControl =
-      IAccessController.AccessControl({user: address(this), data: bytes('')});
-    _requestId = ORACLE.createRequest(_requestData, bytes32(0), _accessControl);
+    _requestId = ORACLE.createRequest(_requestData, bytes32(0));
 
     requestIdPerChainAndEpoch[_chainId][_epoch] = _requestId;
 

diff --git a/src/contracts/EBORequestModule.sol b/src/contracts/EBORequestModule.sol
@@ -2,6 +2,7 @@
 pragma solidity 0.8.26;
 
 import {IModule, Module} from '@defi-wonderland/prophet-core/solidity/contracts/Module.sol';
+
 import {EnumerableSet} from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
 import {IArbitrable, IEBORequestCreator, IEBORequestModule, IOracle} from 'interfaces/IEBORequestModule.sol';

diff --git a/src/contracts/HorizonAccountingExtension.sol b/src/contracts/HorizonAccountingExtension.sol
@@ -232,6 +232,7 @@ contract HorizonAccountingExtension is Validator, IHorizonAccountingExtension {
 
       // Check the balance in the contract
       // If not enough balance, slash some users to get enough balance
+      // TODO: How many iterations should we do?
       while (disputeBalance[_disputeId] < _rewardAmount) {
         _slash(_disputeId, MAX_USERS_TO_SLASH, maxUsersToCheck, _result, _status);
       }
@@ -406,6 +407,8 @@ contract HorizonAccountingExtension is Validator, IHorizonAccountingExtension {
       if (_slashAmount > 0) {
         // Slash the user
         HORIZON_STAKING.slash(_user, _slashAmount, _slashAmount, address(this));
+        // TODO: What if `MIN_THAWING_PERIOD` has passed, all provision tokens have been thawed
+        //       and slashing is skipped or reverts (bricking `claimEscalationReward()`)?
 
         _unbond(_user, _slashAmount);
 

diff --git a/src/interfaces/IEBOAccessModule.sol b/src/interfaces/IEBOAccessModule.sol
diff --git a/src/interfaces/IEBORequestCreator.sol b/src/interfaces/IEBORequestCreator.sol
@@ -153,7 +153,6 @@ interface IEBORequestCreator {
    * @return _disputeModule The dispute module address
    * @return _resolutionModule The resolution module address
    * @return _finalityModule The finality module address
-   * @return _accessModule The address of the access module
    * @return _requestModuleData The request module data
    * @return _responseModuleData The response module data
    * @return _disputeModuleData The dispute module data
@@ -171,7 +170,6 @@ interface IEBORequestCreator {
       address _disputeModule,
       address _resolutionModule,
       address _finalityModule,
-      address _accessModule,
       bytes memory _requestModuleData,
       bytes memory _responseModuleData,
       bytes memory _disputeModuleData,

diff --git a/src/interfaces/external/IHorizonStaking.sol b/src/interfaces/external/IHorizonStaking.sol
@@ -132,13 +132,4 @@ 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);
 }