Merge branch 'main' into update-b-tier

taikoxyz · Jun 4, 2024 · cf2c3d6 · cf2c3d6
2 parents 945125a + d9dd337
commit cf2c3d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/protocol/contracts/L1/tiers/DevnetTierProvider.sol b/packages/protocol/contracts/L1/tiers/DevnetTierProvider.sol
@@ -2,10 +2,16 @@
 pragma solidity 0.8.24;
 
 import "./TierProviderBase.sol";
+import "./ITierRouter.sol";
 
 /// @title DevnetTierProvider
 /// @custom:security-contact [email protected]
-contract DevnetTierProvider is TierProviderBase {
+contract DevnetTierProvider is TierProviderBase, ITierRouter {
+    /// @inheritdoc ITierRouter
+    function getProvider(uint256) external view returns (address) {
+        return address(this);
+    }
+
     /// @inheritdoc ITierProvider
     function getTierIds() public pure override returns (uint16[] memory tiers_) {
         tiers_ = new uint16[](3);

diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol
@@ -295,7 +295,7 @@ contract DeployOnL1 is DeployCapability {
         register(rollupAddressManager, "tier_guardian", guardianProver);
         register(
             rollupAddressManager,
-            "tier_provider",
+            "tier_router",
             address(deployTierProvider(vm.envString("TIER_PROVIDER")))
         );