fix

packages/docs-site/src/content/docs/network-reference/network-configuration.md

@@ -5,7 +5,7 @@ description: The network configuration page describes many of the configuration
 
 ## Tier configuration
 
-You can view the full `TierProviderV1` tier configuration [here](https://github.com/taikoxyz/taiko-mono/blob/main/packages/protocol/contracts/L1/tiers/TierProviderV1.sol):
+You can view the full `TestTierProvider` tier configuration [here](https://github.com/taikoxyz/taiko-mono/blob/main/packages/protocol/contracts/L1/TestTierProvider.sol):
 
 Here is a diagram of the proof tier configuration:
 

packages/protocol/contracts/L1/tiers/DevnetTierProvider.sol

@@ -1,51 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import "../../common/LibStrings.sol";
-import "./ITierProvider.sol";
+import "./TierProviderBase.sol";
 
 /// @title DevnetTierProvider
 /// @dev Labeled in AddressResolver as "tier_provider"
 /// @custom:security-contact [email protected]
-contract DevnetTierProvider is ITierProvider {
-    /// @inheritdoc ITierProvider
-    function getTier(uint16 _tierId) public pure override returns (ITierProvider.Tier memory) {
-        if (_tierId == LibTiers.TIER_OPTIMISTIC) {
-            return ITierProvider.Tier({
-                verifierName: "",
-                validityBond: 250 ether, // TKO
-                contestBond: 500 ether, // TKO
-                cooldownWindow: 1440, //24 hours
-                provingWindow: 120, // 2 hours
-                maxBlocksToVerifyPerProof: 16
-            });
-        }
-
-        if (_tierId == LibTiers.TIER_GUARDIAN_MINORITY) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_GUARDIAN_MINORITY,
-                validityBond: 500 ether, // TKO
-                contestBond: 3280 ether, // =500TKO * 6.5625
-                cooldownWindow: 60, //1 hours
-                provingWindow: 2880, // 48 hours
-                maxBlocksToVerifyPerProof: 16
-            });
-        }
-
-        if (_tierId == LibTiers.TIER_GUARDIAN) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_GUARDIAN,
-                validityBond: 0, // must be 0 for top tier
-                contestBond: 0, // must be 0 for top tier
-                cooldownWindow: 60, //1 hours
-                provingWindow: 2880, // 48 hours
-                maxBlocksToVerifyPerProof: 16
-            });
-        }
-
-        revert TIER_NOT_FOUND();
-    }
-
+contract DevnetTierProvider is TierProviderBase {
     /// @inheritdoc ITierProvider
     function getTierIds() public pure override returns (uint16[] memory tiers_) {
         tiers_ = new uint16[](3);

packages/protocol/contracts/L1/tiers/TierProviderBase.sol

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.24;
+
+import "../../common/LibStrings.sol";
+import "./ITierProvider.sol";
+
+/// @title TierProviderBase
+/// @custom:security-contact [email protected]
+abstract contract TierProviderBase is ITierProvider {
+    /// @inheritdoc ITierProvider
+    function getTier(uint16 _tierId)
+        public
+        pure
+        virtual
+        override
+        returns (ITierProvider.Tier memory)
+    {
+        if (_tierId == LibTiers.TIER_OPTIMISTIC) {
+            return ITierProvider.Tier({
+                verifierName: "",
+                validityBond: 250 ether, // TKO
+                contestBond: 500 ether, // TKO
+                cooldownWindow: 1440, //24 hours
+                provingWindow: 120, // 2 hours
+                maxBlocksToVerifyPerProof: 16
+            });
+        }
+
+        if (_tierId == LibTiers.TIER_SGX) {
+            return ITierProvider.Tier({
+                verifierName: LibStrings.B_TIER_SGX,
+                validityBond: 250 ether, // TKO
+                contestBond: 1640 ether, // =250TKO * 6.5625
+                cooldownWindow: 1440, //24 hours
+                provingWindow: 60, // 1 hours
+                maxBlocksToVerifyPerProof: 8
+            });
+        }
+
+        if (_tierId == LibTiers.TIER_SGX_ZKVM) {
+            return ITierProvider.Tier({
+                verifierName: LibStrings.B_TIER_SGX_ZKVM,
+                validityBond: 500 ether, // TKO
+                contestBond: 3280 ether, // =500TKO * 6.5625
+                cooldownWindow: 1440, //24 hours
+                provingWindow: 240, // 4 hours
+                maxBlocksToVerifyPerProof: 4
+            });
+        }
+
+        if (_tierId == LibTiers.TIER_GUARDIAN_MINORITY) {
+            return ITierProvider.Tier({
+                verifierName: LibStrings.B_TIER_GUARDIAN_MINORITY,
+                validityBond: 500 ether, // TKO
+                contestBond: 3280 ether, // =500TKO * 6.5625
+                cooldownWindow: 1440, //24 hours
+                provingWindow: 2880, // 48 hours
+                maxBlocksToVerifyPerProof: 16
+            });
+        }
+
+        if (_tierId == LibTiers.TIER_GUARDIAN) {
+            return ITierProvider.Tier({
+                verifierName: LibStrings.B_TIER_GUARDIAN,
+                validityBond: 0, // must be 0 for top tier
+                contestBond: 0, // must be 0 for top tier
+                cooldownWindow: 60, //1 hours
+                provingWindow: 2880, // 48 hours
+                maxBlocksToVerifyPerProof: 16
+            });
+        }
+
+        revert TIER_NOT_FOUND();
+    }
+}

packages/protocol/contracts/L1/tiers/TierProviderV2.sol

@@ -1,51 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import "../../common/LibStrings.sol";
-import "./ITierProvider.sol";
+import "./TierProviderBase.sol";
 
 /// @title TierProviderV2
 /// @dev Labeled in AddressResolver as "tier_provider"
 /// @custom:security-contact [email protected]
-contract TierProviderV2 is ITierProvider {
-    /// @inheritdoc ITierProvider
-    function getTier(uint16 _tierId) public pure override returns (ITierProvider.Tier memory) {
-        if (_tierId == LibTiers.TIER_SGX) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_SGX,
-                validityBond: 250 ether, // TKO
-                contestBond: 1640 ether, // =250TKO * 6.5625
-                cooldownWindow: 1440, //24 hours
-                provingWindow: 60, // 1 hours
-                maxBlocksToVerifyPerProof: 8
-            });
-        }
-
-        if (_tierId == LibTiers.TIER_GUARDIAN_MINORITY) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_GUARDIAN_MINORITY,
-                validityBond: 500 ether, // TKO
-                contestBond: 3280 ether, // =500TKO * 6.5625
-                cooldownWindow: 60, //1 hours
-                provingWindow: 2880, // 48 hours
-                maxBlocksToVerifyPerProof: 16
-            });
-        }
-
-        if (_tierId == LibTiers.TIER_GUARDIAN) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_GUARDIAN,
-                validityBond: 0, // must be 0 for top tier
-                contestBond: 0, // must be 0 for top tier
-                cooldownWindow: 60, //1 hours
-                provingWindow: 2880, // 48 hours
-                maxBlocksToVerifyPerProof: 16
-            });
-        }
-
-        revert TIER_NOT_FOUND();
-    }
-
+contract TierProviderV2 is TierProviderBase {
     /// @inheritdoc ITierProvider
     function getTierIds() public pure override returns (uint16[] memory tiers_) {
         tiers_ = new uint16[](3);

packages/protocol/contracts/L1/tiers/TierProviderV3.sol

@@ -1,62 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import "../../common/LibStrings.sol";
-import "./ITierProvider.sol";
+import "./TierProviderBase.sol";
 
 /// @title TierProviderV3
 /// @dev Labeled in AddressResolver as "tier_provider"
 /// @custom:security-contact [email protected]
-contract TierProviderV3 is ITierProvider {
-    /// @inheritdoc ITierProvider
-    function getTier(uint16 _tierId) public pure override returns (ITierProvider.Tier memory) {
-        if (_tierId == LibTiers.TIER_SGX) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_SGX,
-                validityBond: 250 ether, // TKO
-                contestBond: 1640 ether, // =250TKO * 6.5625
-                cooldownWindow: 1440, //24 hours
-                provingWindow: 60, // 1 hours
-                maxBlocksToVerifyPerProof: 8
-            });
-        }
-
-        if (_tierId == LibTiers.TIER_SGX_ZKVM) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_SGX_ZKVM,
-                validityBond: 500 ether, // TKO
-                contestBond: 3280 ether, // =500TKO * 6.5625
-                cooldownWindow: 1440, //24 hours
-                provingWindow: 240, // 4 hours
-                maxBlocksToVerifyPerProof: 4
-            });
-        }
-
-        if (_tierId == LibTiers.TIER_GUARDIAN_MINORITY) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_GUARDIAN_MINORITY,
-                validityBond: 500 ether, // TKO
-                contestBond: 3280 ether, // =500TKO * 6.5625
-                cooldownWindow: 60, //1 hours
-                provingWindow: 2880, // 48 hours
-                maxBlocksToVerifyPerProof: 16
-            });
-        }
-
-        if (_tierId == LibTiers.TIER_GUARDIAN) {
-            return ITierProvider.Tier({
-                verifierName: LibStrings.B_TIER_GUARDIAN,
-                validityBond: 0, // must be 0 for top tier
-                contestBond: 0, // must be 0 for top tier
-                cooldownWindow: 60, //1 hours
-                provingWindow: 2880, // 48 hours
-                maxBlocksToVerifyPerProof: 16
-            });
-        }
-
-        revert TIER_NOT_FOUND();
-    }
-
+contract TierProviderV3 is TierProviderBase {
     /// @inheritdoc ITierProvider
     function getTierIds() public pure override returns (uint16[] memory tiers_) {
         tiers_ = new uint16[](4);

packages/protocol/deployments/gen-layouts.sh

@@ -18,7 +18,7 @@ contracts=(
     "BridgedERC1155"
     "AssignmentHook"
     "DevnetTierProvider"
-    "TierProviderV1"
+    "TestTierProvider"
     "TierProviderV2"
     "TierProviderV3"
     "ERC20Airdrop"

packages/protocol/package.json

@@ -31,7 +31,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "ethers": "^5.7.2",
     "solc": "0.8.24",
-    "solhint": "^4.5.4",
+    "solhint": "^5.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.2.2"
   },

packages/protocol/script/DeployOnL1.s.sol

@@ -8,7 +8,6 @@ import "../contracts/tko/TaikoToken.sol";
 import "../contracts/L1/TaikoL1.sol";
 import "../contracts/L1/provers/GuardianProver.sol";
 import "../contracts/L1/tiers/DevnetTierProvider.sol";
-import "../contracts/L1/tiers/TierProviderV1.sol";
 import "../contracts/L1/tiers/TierProviderV2.sol";
 import "../contracts/L1/hooks/AssignmentHook.sol";
 import "../contracts/bridge/Bridge.sol";
@@ -25,6 +24,7 @@ import "../contracts/automata-attestation/lib/PEMCertChainLib.sol";
 import "../contracts/verifiers/SgxVerifier.sol";
 import "../test/common/erc20/FreeMintERC20.sol";
 import "../test/common/erc20/MayFailFreeMintERC20.sol";
+import "../test/L1/TestTierProvider.sol";
 import "../test/DeployCapability.sol";
 
 // Actually this one is deployed already on mainnet, but we are now deploying our own (non via-ir)
@@ -303,7 +303,7 @@ contract DeployOnL1 is DeployCapability {
 
         register(rollupAddressManager, "tier_guardian_minority", guardianProverMinority);
         register(rollupAddressManager, "tier_guardian", guardianProver);
-        register(rollupAddressManager, "tier_provider", address(new TierProviderV1()));
+        register(rollupAddressManager, "tier_provider", address(new TestTierProvider()));
 
         address[] memory guardians = vm.envAddress("GUARDIAN_PROVERS", ",");
 
@@ -341,7 +341,7 @@ contract DeployOnL1 is DeployCapability {
         if (keccak256(abi.encode(tierProviderName)) == keccak256(abi.encode("devnet"))) {
             return address(new DevnetTierProvider());
         } else if (keccak256(abi.encode(tierProviderName)) == keccak256(abi.encode("testnet"))) {
-            return address(new TierProviderV1());
+            return address(new TestTierProvider());
         } else if (keccak256(abi.encode(tierProviderName)) == keccak256(abi.encode("mainnet"))) {
             return address(new TierProviderV2());
         } else {

packages/protocol/script/upgrade/UpgradeTierProvider.s.sol

@@ -2,16 +2,15 @@
 pragma solidity 0.8.24;
 
 import "../../test/DeployCapability.sol";
-import "../../contracts/L1/tiers/ITierProvider.sol";
-import "../../contracts/L1/tiers/TierProviderV1.sol";
+import "../../test/L1/TestTierProvider.sol";
 
 contract UpgradeTierProvider is DeployCapability {
     uint256 public privateKey = vm.envUint("PRIVATE_KEY");
     address public addressManager = vm.envAddress("ADDRESS_MANAGER_ADDRESS");
 
     function run() external {
         vm.startBroadcast(privateKey);
-        address impl = address(new TierProviderV1());
+        address impl = address(new TestTierProvider());
         AddressManager(addressManager).setAddress(uint64(block.chainid), "tier_provider", impl);
         vm.stopBroadcast();
         console2.log("> tier_provider@", addressManager);

packages/protocol/test/L1/TaikoL1TestBase.sol

@@ -14,7 +14,7 @@ abstract contract TaikoL1TestBase is TaikoTest {
     RiscZeroVerifier public rv;
     SgxVerifier public sv;
     GuardianProver public gp;
-    TierProviderV1 public cp;
+    TestTierProvider public cp;
     Bridge public bridge;
 
     bytes32 public GENESIS_BLOCK_HASH = keccak256("GENESIS_BLOCK_HASH");
@@ -74,7 +74,7 @@ abstract contract TaikoL1TestBase is TaikoTest {
 
         setupGuardianProverMultisig();
 
-        cp = new TierProviderV1();
+        cp = new TestTierProvider();
 
         bridge = Bridge(
             payable(