Merge remote-tracking branch 'origin/main' into vaults-poc

core/.solhint.json

@@ -1,5 +1,5 @@
 {
   "extends": "thesis",
   "plugins": [],
-  "rules": { "func-visibility": ["error", { "ignoreConstructors": true }] }
+  "rules": {}
 }

core/contracts/Dispatcher.sol

@@ -7,16 +7,74 @@ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol
 
 import "./Router.sol";
 
-contract Dispatcher is Router, Ownable {
+///         a given vault and back. Vaults supply yield strategies with TBTC that
+///         generate yield for Bitcoin holders.
+contract Dispatcher is Ownable {
     using SafeERC20 for IERC20;
 
+    error VaultAlreadyAuthorized();
+    error VaultUnauthorized();
+
+    struct VaultInfo {
+        bool authorized;
+    }
+
     Acre acre;
 
+    /// @notice Authorized Yield Vaults that implement ERC4626 standard. These
+    ///         vaults deposit assets to yield strategies, e.g. Uniswap V3
+    ///         WBTC/TBTC pool. Vault can be a part of Acre ecosystem or can be
+    ///         implemented externally. As long as it complies with ERC4626
+    ///         standard and is authorized by the owner it can be plugged into
+    ///         Acre.
+    address[] public vaults;
+    mapping(address => VaultInfo) public vaultsInfo;
+
+    event VaultAuthorized(address indexed vault);
+    event VaultDeauthorized(address indexed vault);
+
     constructor(Acre _acre) Ownable(msg.sender) {
         acre = _acre;
     }
 
-    function assetsHolder() public virtual override returns (address){
+    /// @notice Adds a vault to the list of authorized vaults.
+    /// @param vault Address of the vault to add.
+    function authorizeVault(address vault) external onlyOwner {
+        if (vaultsInfo[vault].authorized) {
+            revert VaultAlreadyAuthorized();
+        }
+
+        vaults.push(vault);
+        vaultsInfo[vault].authorized = true;
+
+        emit VaultAuthorized(vault);
+    }
+
+    /// @notice Removes a vault from the list of authorized vaults.
+    /// @param vault Address of the vault to remove.
+    function deauthorizeVault(address vault) external onlyOwner {
+        if (!vaultsInfo[vault].authorized) {
+            revert VaultUnauthorized();
+        }
+
+        vaultsInfo[vault].authorized = false;
+
+        for (uint256 i = 0; i < vaults.length; i++) {
+            if (vaults[i] == vault) {
+                vaults[i] = vaults[vaults.length - 1];
+                // slither-disable-next-line costly-loop
+                vaults.pop();
+                break;
+            }
+        }
+
+        emit VaultDeauthorized(vault);
+    }
+
+    function getVaults() external view returns (address[] memory) {
+        return vaults;
+    }
+
         return address(acre);
     }
 
@@ -32,5 +90,4 @@ contract Dispatcher is Router, Ownable {
         for (uint i=0; i<_vaults.length; i++) {
             _vaults[i].transfer(newDispatcher, _vaults[i].balanceOf(address(this)));
         }
-    }
 }

core/deploy/02_deploy_acre_router.ts

@@ -5,7 +5,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { getNamedAccounts, deployments } = hre
   const { deployer } = await getNamedAccounts()
 
-  await deployments.deploy("AcreRouter", {
+  await deployments.deploy("Dispatcher", {
     from: deployer,
     args: [],
     log: true,
@@ -18,5 +18,5 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 
 export default func
 
-func.tags = ["AcreRouter"]
+func.tags = ["Dispatcher"]
 func.dependencies = ["Acre"]

core/deploy/22_transfer_ownership_acre_router.ts

@@ -6,10 +6,10 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { deployer, governance } = await getNamedAccounts()
   const { log } = deployments
 
-  log(`transferring ownership of AcreRouter contract to ${governance}`)
+  log(`transferring ownership of Dispatcher contract to ${governance}`)
 
   await deployments.execute(
-    "AcreRouter",
+    "Dispatcher",
     { from: deployer, log: true, waitConfirmations: 1 },
     "transferOwnership",
     governance,
@@ -19,3 +19,4 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 export default func
 
 func.tags = ["TransferOwnershipAcreRouter"]
+func.dependencies = ["Dispatcher"]

core/scripts/fetch_external_artifacts.sh

@@ -1,7 +1,10 @@
 #! /bin/bash
 set -eou pipefail
 
-ROOT_DIR="$(realpath "$(dirname $0)/../")"
+ROOT_DIR=$(
+    cd "$(dirname $0)/../"
+    pwd -P
+)
 TMP_DIR=${ROOT_DIR}/tmp/external-artifacts
 EXTERNAL_ARTIFACTS_DIR=${ROOT_DIR}/external