feat: epoch

.env.example

@@ -1,7 +1,4 @@
-MAINNET_RPC=
-MAINNET_DEPLOYER_PK=
-
-SEPOLIA_RPC=
-SEPOLIA_DEPLOYER_PK=
+ARBITRUM_RPC=
+ARBITRUM_DEPLOYER_PK=
 
 ETHERSCAN_API_KEY=

.github/workflows/tests.yml

@@ -7,8 +7,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  MAINNET_RPC: ${{ secrets.MAINNET_RPC }}
-  SEPOLIA_RPC: ${{ secrets.SEPOLIA_RPC }}
+  ARBITRUM_RPC: ${{ secrets.ARBITRUM_RPC }}
 
 jobs:
   unit-tests:
@@ -26,7 +25,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Install dependencies
         run: yarn --frozen-lockfile --network-concurrency 1
@@ -53,7 +52,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Install dependencies
         run: yarn --frozen-lockfile --network-concurrency 1
@@ -83,7 +82,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Install dependencies
         run: yarn --frozen-lockfile --network-concurrency 1
@@ -92,14 +91,6 @@ jobs:
         run: |
           forge build --build-info
 
-      - name: Run Echidna
-        uses: crytic/echidna-action@v2
-        with:
-          files: .
-          contract: InvariantGreeter
-          test-mode: assertion
-          crytic-args: --ignore-compile
-
   halmos-tests:
     name: Run symbolic execution tests
     runs-on: ubuntu-latest
@@ -115,7 +106,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Install dependencies
         run: yarn --frozen-lockfile --network-concurrency 1
@@ -146,9 +137,9 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: Install dependencies
         run: yarn --frozen-lockfile --network-concurrency 1
 
-      - run: yarn lint:check
+      - run: yarn lint:check

README.md

@@ -106,16 +106,10 @@ yarn coverage
 
 Configure the `.env` variables.
 
-### Sepolia
+### Arbitrum
 
 ```bash
-yarn deploy:sepolia
-```
-
-### Mainnet
-
-```bash
-yarn deploy:mainnet
+yarn deploy:arbitrum
 ```
 
 The deployments are stored in ./broadcast

foundry.toml

@@ -9,7 +9,7 @@ multiline_func_header = 'params_first'
 sort_imports = true
 
 [profile.default]
-solc_version = '0.8.23'
+solc_version = '0.8.26'
 libs = ['node_modules', 'lib']
 optimizer_runs = 10_000
 
@@ -28,9 +28,7 @@ src = 'src/interfaces/'
 runs = 1000
 
 [rpc_endpoints]
-mainnet = "${MAINNET_RPC}"
-sepolia = "${SEPOLIA_RPC}"
+arbitrum = "${ARBITRUM_RPC}"
 
 [etherscan]
-mainnet = { key = "${ETHERSCAN_API_KEY}", chain = "mainnet" }
-sepolia = { key = "${ETHERSCAN_API_KEY}", chain = "sepolia" }
+arbitrum = { key = "${ARBITRUM_API_KEY}", chain = "arbitrum" }

package.json

@@ -13,8 +13,7 @@
     "build": "forge build",
     "build:optimized": "FOUNDRY_PROFILE=optimized forge build",
     "coverage": "forge coverage --report summary --report lcov --match-path 'test/unit/*'",
-    "deploy:mainnet": "bash -c 'source .env && forge script Deploy -vvvvv --rpc-url $MAINNET_RPC --broadcast --chain mainnet --private-key $MAINNET_DEPLOYER_PK'",
-    "deploy:sepolia": "bash -c 'source .env && forge script Deploy -vvvvv --rpc-url $SEPOLIA_RPC --broadcast --chain sepolia --private-key $SEPOLIA_DEPLOYER_PK'",
+    "deploy:arbitrum": "bash -c 'source .env && forge script Deploy -vvvvv --rpc-url $ARBITRUM_RPC --broadcast --chain arbitrum --private-key $ARBITRUM_DEPLOYER_PK'",
     "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",
     "lint:natspec": "npx @defi-wonderland/natspec-smells --config natspec-smells.config.js",
@@ -35,8 +34,8 @@
     "package.json": "sort-package-json"
   },
   "dependencies": {
-    "@defi-wonderland/prophet-core-contracts": "0.0.0-438de1c5",
-    "@defi-wonderland/prophet-modules-contracts": "0.0.0-1197c328"
+    "@defi-wonderland/prophet-core": "0.0.0-2e39539b",
+    "@defi-wonderland/prophet-modules": "0.0.0-e52f8cce"
   },
   "devDependencies": {
     "@commitlint/cli": "19.3.0",

remappings.txt

@@ -1,6 +1,6 @@
 forge-std/=node_modules/forge-std/src
 halmos-cheatcodes=node_modules/halmos-cheatcodes
-@defi-wonderland/prophet-core-contracts/=node_modules/@defi-wonderland/prophet-core-contracts
+@defi-wonderland/prophet-core/=node_modules/@defi-wonderland/prophet-core
 @defi-wonderland/prophet-modules-contracts/=node_modules/@defi-wonderland/prophet-modules-contracts
 
 contracts/=src/contracts

src/contracts/Arbitrable.sol

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.19;
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.26;
 
 import {IArbitrable} from 'interfaces/IArbitrable.sol';
 
@@ -62,7 +62,7 @@
   }
 
   /// @inheritdoc IArbitrable
   function setArbitrator(address __arbitrator) external onlyCouncil {
     _setArbitrator(__arbitrator);
   }
 

src/contracts/EBORequestCreator.sol

@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.26;
+
+import {EnumerableSet} from '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
+
+import {Arbitrable} from 'contracts/Arbitrable.sol';
+import {IEBORequestCreator, IEpochManager, IOracle} from 'interfaces/IEBORequestCreator.sol';
+
+contract EBORequestCreator is IEBORequestCreator, Arbitrable {
+  using EnumerableSet for EnumerableSet.Bytes32Set;
+
+  /// @inheritdoc IEBORequestCreator
+  IOracle public oracle;
+
+  /// @inheritdoc IEBORequestCreator
+  IEpochManager public epochManager;
+
+  /// @inheritdoc IEBORequestCreator
+  IOracle.Request public requestData;
+
+  /// @inheritdoc IEBORequestCreator
+  uint256 public startEpoch;
+
+  /// @inheritdoc IEBORequestCreator
+  mapping(string _chainId => mapping(uint256 _epoch => bytes32 _requestId)) public requestIdPerChainAndEpoch;
+
+  /**
+   * @notice The set of chain ids allowed
+   */
+  EnumerableSet.Bytes32Set internal _chainIdsAllowed;
+
+  constructor(
+    IOracle _oracle,
+    IEpochManager _epochManager,
+    address _arbitrator,
+    address _council
+  ) Arbitrable(_arbitrator, _council) {
+    oracle = _oracle;
+    epochManager = _epochManager;
+
+    startEpoch = epochManager.currentEpoch();
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function createRequests(uint256 _epoch, string[] calldata _chainIds) external {
+    if (_epoch > epochManager.currentEpoch() || startEpoch > _epoch) revert EBORequestCreator_InvalidEpoch();
+
+    bytes32 _encodedChainId;
+
+    IOracle.Request memory _requestData = requestData;
+
+    _requestData.nonce = uint96(0);
+    _requestData.requester = address(this);
+
+    for (uint256 _i; _i < _chainIds.length; _i++) {
+      _encodedChainId = _encodeChainId(_chainIds[_i]);
+      if (!_chainIdsAllowed.contains(_encodedChainId)) revert EBORequestCreator_ChainNotAdded();
+
+      if (requestIdPerChainAndEpoch[_chainIds[_i]][_epoch] == bytes32(0)) {
+        // TODO: CREATE REQUEST DATA
+        bytes32 _requestId = oracle.createRequest(_requestData, bytes32(0));
+
+        requestIdPerChainAndEpoch[_chainIds[_i]][_epoch] = _requestId;
+
+        emit RequestCreated(_requestId, _epoch, _chainIds[_i]);
+      }
+    }
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function addChain(string calldata _chainId) external onlyArbitrator {
+    bytes32 _encodedChainId = _encodeChainId(_chainId);
+    if (!_chainIdsAllowed.add(_encodedChainId)) {
+      revert EBORequestCreator_ChainAlreadyAdded();
+    }
+
+    emit ChainAdded(_chainId);
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function removeChain(string calldata _chainId) external onlyArbitrator {
+    bytes32 _encodedChainId = _encodeChainId(_chainId);
+    if (!_chainIdsAllowed.remove(_encodedChainId)) {
+      revert EBORequestCreator_ChainNotAdded();
+    }
+
+    emit ChainRemoved(_chainId);
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function setRequestModuleData(address _requestModule, bytes calldata _requestModuleData) external onlyArbitrator {
+    requestData.requestModule = _requestModule;
+    requestData.requestModuleData = _requestModuleData;
+
+    emit RequestModuleDataSet(_requestModule, _requestModuleData);
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function setResponseModuleData(address _responseModule, bytes calldata _responseModuleData) external onlyArbitrator {
+    requestData.responseModule = _responseModule;
+    requestData.responseModuleData = _responseModuleData;
+
+    emit ResponseModuleDataSet(_responseModule, _responseModuleData);
+  }
+
+  /// TODO: Change module data to the specific interface when we have
+  /// @inheritdoc IEBORequestCreator
+  function setDisputeModuleData(address _disputeModule, bytes calldata _disputeModuleData) external onlyArbitrator {
+    requestData.disputeModule = _disputeModule;
+    requestData.disputeModuleData = _disputeModuleData;
+
+    emit DisputeModuleDataSet(_disputeModule, _disputeModuleData);
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function setResolutionModuleData(
+    address _resolutionModule,
+    bytes calldata _resolutionModuleData
+  ) external onlyArbitrator {
+    requestData.resolutionModule = _resolutionModule;
+    requestData.resolutionModuleData = _resolutionModuleData;
+
+    emit ResolutionModuleDataSet(_resolutionModule, _resolutionModuleData);
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function setFinalityModuleData(address _finalityModule, bytes calldata _finalityModuleData) external onlyArbitrator {
+    requestData.finalityModule = _finalityModule;
+    requestData.finalityModuleData = _finalityModuleData;
+
+    emit FinalityModuleDataSet(_finalityModule, _finalityModuleData);
+  }
+
+  /// @inheritdoc IEBORequestCreator
+  function setEpochManager(IEpochManager _epochManager) external onlyArbitrator {
+    epochManager = _epochManager;
+
+    emit EpochManagerSet(_epochManager);
+  }
+
+  /**
+   * @notice Encodes the chain id
+   * @dev The chain id is hashed to have a enumerable set to avoid duplicates
+   */
+  function _encodeChainId(string calldata _chainId) internal pure returns (bytes32 _encodedChainId) {
+    _encodedChainId = keccak256(abi.encodePacked(_chainId));
+  }
+}