Merge remote-tracking branch 'origin/main' into stake-rename

thesis · Apr 10, 2024 · c40e456 · c40e456
2 parents fd154c0 + c64e9f8
commit c40e456
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 667 deletions.
diff --git a/core/contracts/Dispatcher.sol b/core/contracts/Dispatcher.sol
diff --git a/core/contracts/Router.sol b/core/contracts/Router.sol
diff --git a/core/contracts/stBTC.sol b/core/contracts/stBTC.sol
@@ -5,7 +5,6 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import "@thesis-co/solidity-contracts/contracts/token/IReceiveApproval.sol";
 
-import "./Dispatcher.sol";
 import "./PausableOwnable.sol";
 import "./lib/ERC4626Fees.sol";
 import "./interfaces/IDispatcher.sol";

diff --git a/core/contracts/test/TestERC4626.sol b/core/contracts/test/TestERC4626.sol
diff --git a/core/contracts/test/upgrades/stBTCV2.sol b/core/contracts/test/upgrades/stBTCV2.sol
@@ -5,9 +5,9 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import "@thesis-co/solidity-contracts/contracts/token/IReceiveApproval.sol";
 
-import "../../Dispatcher.sol";
 import "../../PausableOwnable.sol";
 import "../../lib/ERC4626Fees.sol";
+import "../../interfaces/IDispatcher.sol";
 import {ZeroAddress} from "../../utils/Errors.sol";
 
 /// @title stBTCV2
@@ -17,7 +17,7 @@ contract stBTCV2 is ERC4626Fees, PausableOwnable {
     using SafeERC20 for IERC20;
 
     /// Dispatcher contract that routes tBTC from stBTC to a given vault and back.
-    Dispatcher public dispatcher;
+    IDispatcher public dispatcher;
 
     /// Address of the treasury wallet, where fees should be transferred to.
     address public treasury;
@@ -119,7 +119,7 @@ contract stBTCV2 is ERC4626Fees, PausableOwnable {
     /// @notice Updates the dispatcher contract and gives it an unlimited
     ///         allowance to transfer deposited tBTC.
     /// @param newDispatcher Address of the new dispatcher contract.
-    function updateDispatcher(Dispatcher newDispatcher) external onlyOwner {
+    function updateDispatcher(IDispatcher newDispatcher) external onlyOwner {
         if (address(newDispatcher) == address(0)) {
             revert ZeroAddress();
         }

diff --git a/core/deploy/00_resolve_testing_erc4626.ts b/core/deploy/00_resolve_testing_erc4626.ts
diff --git a/core/deploy/02_deploy_dispatcher.ts b/core/deploy/02_deploy_dispatcher.ts
diff --git a/core/deploy/12_mezo_allocator_update_maintainer.ts b/core/deploy/12_mezo_allocator_update_maintainer.ts
@@ -20,5 +20,5 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 
 export default func
 
+func.dependencies = ["MezoAllocator"]
 func.tags = ["MezoAllocatorAddMaintainer"]
-func.dependencies = ["Dispatcher"]
diff --git a/core/deploy/22_transfer_ownership_dispatcher.ts b/core/deploy/22_transfer_ownership_dispatcher.ts