refactor

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

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import "./TierProviderBase.sol";
+import "./TierProviderV2.sol";
 import "./ITierRouter.sol";
 
 /// @title DevnetTierProvider
 /// @custom:security-contact security@taiko.xyz
-contract DevnetTierProvider is TierProviderBase, ITierRouter {
+contract DevnetTierProvider is TierProviderV2, ITierRouter {
     /// @inheritdoc ITierRouter
     function getProvider(uint256) external view returns (address) {
         return address(this);
@@ -15,13 +15,13 @@ contract DevnetTierProvider is TierProviderBase, ITierRouter {
     /// @inheritdoc ITierProvider
     function getTierIds() public pure override returns (uint16[] memory tiers_) {
         tiers_ = new uint16[](3);
-        tiers_[0] = LibTiers.TIER_OPTIMISTIC;
-        tiers_[1] = LibTiers.TIER_GUARDIAN_MINORITY;
-        tiers_[2] = LibTiers.TIER_GUARDIAN;
+        tiers_[0] = LibTierId.TIER_OPTIMISTIC;
+        tiers_[1] = LibTierId.TIER_GUARDIAN_MINORITY;
+        tiers_[2] = LibTierId.TIER_GUARDIAN;
     }
 
     /// @inheritdoc ITierProvider
     function getMinTier(address, uint256) public pure override returns (uint16) {
-        return LibTiers.TIER_OPTIMISTIC;
+        return LibTierId.TIER_OPTIMISTIC;
     }
 }

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

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
+import "./LibTierId.sol";
+
 /// @title ITierProvider
 /// @notice Defines interface to return tier configuration.
 /// @custom:security-contact security@taiko.xyz
@@ -33,25 +35,3 @@ interface ITierProvider {
     /// @return The tier id.
     function getMinTier(address proposer, uint256 rand) external view returns (uint16);
 }
-
-/// @dev Tier ID cannot be zero!
-library LibTiers {
-    /// @notice Optimistic tier ID.
-    uint16 public constant TIER_OPTIMISTIC = 100;
-
-    /// @notice SGX tier ID.
-    uint16 public constant TIER_SGX = 200;
-    uint16 public constant TIER_SGX2 = 200;
-
-    // @notice ZKVM risc0 tier ID
-    uint16 public constant TIER_ZKVM_RISC0 = 290;
-
-    /// @notice SGX + ZKVM tier ID.
-    uint16 public constant TIER_SGX_ZKVM = 300;
-
-    /// @notice Guardian tier ID with minority approval.
-    uint16 public constant TIER_GUARDIAN_MINORITY = 900;
-
-    /// @notice Guardian tier ID with majority approval.
-    uint16 public constant TIER_GUARDIAN = 1000;
-}

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

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.24;
+
+/// @title LibTierId
+/// @dev Unique identifiers for all supported tiers. Each tier must have a distinct ID to avoid
+/// conflicts.
+/// @custom:security-contact security@taiko.xyz
+library LibTierId {
+    /// @notice Optimistic tier ID.
+    uint16 public constant TIER_OPTIMISTIC = 100;
+
+    /// @notice TEE tier
+    uint16 public constant TIER_TEE = 200;
+
+    /// @notice ZKVM tier
+    uint16 public constant TIER_ZKVM = 290;
+
+    /// @notice TEE + ZK tier
+    uint16 public constant TIER_ZKVM_PLUS_TEE = 300;
+
+    /// @notice Guardian tier ID with minority approval.
+    uint16 public constant TIER_GUARDIAN_MINORITY = 900;
+
+    /// @notice Guardian tier ID with majority approval.
+    uint16 public constant TIER_GUARDIAN = 1000;
+}

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

@@ -1,21 +1,104 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import "./TierProviderBase.sol";
+import "../../common/LibStrings.sol";
+import "./ITierProvider.sol";
 
 /// @title TierProviderV2
 /// @custom:security-contact security@taiko.xyz
-contract TierProviderV2 is TierProviderBase {
+contract TierProviderV2 is ITierProvider {
+    /// @dev Grace period for block proving service.
+    /// @notice This constant defines the time window (in minutes) during which the block proving
+    /// service may be paused if gas prices are excessively high. Since block proving is
+    /// asynchronous, this grace period allows provers to defer submissions until gas
+    /// prices become more favorable, potentially reducing transaction costs.
+    uint16 public constant GRACE_PERIOD = 240; // 4 hours
+
+    /// @inheritdoc ITierProvider
+    /// @notice Each tier, except the top tier, has a validity bond that is 50 TAIKO higher than the
+    /// previous tier. Additionally, each tier's contest bond is 6.5625 times its validity bond.
+    function getTier(uint16 _tierId) public pure override returns (ITierProvider.Tier memory) {
+        if (_tierId == LibTierId.TIER_OPTIMISTIC) {
+            return ITierProvider.Tier({
+                verifierName: "",
+                validityBond: 100 ether, // TAIKO
+                contestBond: 656.25 ether, // = 100 TAIKO * 6.5625
+                cooldownWindow: 1440, // 24 hours
+                provingWindow: GRACE_PERIOD + 15, // 15 minutes
+                maxBlocksToVerifyPerProof: 0
+            });
+        }
+
+        if (_tierId == LibTierId.TIER_TEE) {
+            return ITierProvider.Tier({
+                // verifierName can also be B_TIER_TEE
+                verifierName: LibStrings.B_TIER_TEE_SGX,
+                validityBond: 150 ether, // TAIKO
+                contestBond: 984.375 ether, // = 150 TAIKO * 6.5625
+                cooldownWindow: 1440, // 24 hours
+                provingWindow: GRACE_PERIOD + 60, // 1 hour
+                maxBlocksToVerifyPerProof: 0
+            });
+        }
+
+        if (_tierId == LibTierId.TIER_ZKVM) {
+            return ITierProvider.Tier({
+                // verifierName can also be B_TIER_ZKVM and B_TIER_ZKVM_SP1
+                verifierName: LibStrings.B_TIER_ZKVM_RISC0,
+                validityBond: 250 ether, // TAIKO
+                contestBond: 1640.625 ether, // = 250 TAIKO * 6.5625
+                cooldownWindow: 1440, // 24 hours
+                provingWindow: GRACE_PERIOD + 180, // 3 hours
+                maxBlocksToVerifyPerProof: 0
+            });
+        }
+
+        if (_tierId == LibTierId.TIER_ZKVM_PLUS_TEE) {
+            return ITierProvider.Tier({
+                verifierName: LibStrings.B_TIER_ZKVM_AND_TEE,
+                validityBond: 300 ether, // TAIKO
+                contestBond: 1968.75 ether, // = 300 TAIKO * 6.5625
+                cooldownWindow: 1440, // 24 hours
+                provingWindow: GRACE_PERIOD + 240, // 4 hours
+                maxBlocksToVerifyPerProof: 0
+            });
+        }
+
+        if (_tierId == LibTierId.TIER_GUARDIAN_MINORITY) {
+            return ITierProvider.Tier({
+                verifierName: LibStrings.B_TIER_GUARDIAN_MINORITY,
+                validityBond: 350 ether, // TAIKO
+                contestBond: 2296.875 ether, // = 350 TAIKO * 6.5625
+                cooldownWindow: GRACE_PERIOD + 240, // 4 hours
+                provingWindow: 2880, // 48 hours
+                maxBlocksToVerifyPerProof: 0
+            });
+        }
+
+        if (_tierId == LibTierId.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: 1440, // 24 hours
+                provingWindow: GRACE_PERIOD + 2880, // 48 hours
+                maxBlocksToVerifyPerProof: 0
+            });
+        }
+
+        revert TIER_NOT_FOUND();
+    }
+
     /// @inheritdoc ITierProvider
-    function getTierIds() public pure override returns (uint16[] memory tiers_) {
+    function getTierIds() public pure virtual override returns (uint16[] memory tiers_) {
         tiers_ = new uint16[](3);
-        tiers_[0] = LibTiers.TIER_SGX;
-        tiers_[1] = LibTiers.TIER_GUARDIAN_MINORITY;
-        tiers_[2] = LibTiers.TIER_GUARDIAN;
+        tiers_[0] = LibTierId.TIER_TEE;
+        tiers_[1] = LibTierId.TIER_GUARDIAN_MINORITY;
+        tiers_[2] = LibTierId.TIER_GUARDIAN;
     }
 
     /// @inheritdoc ITierProvider
-    function getMinTier(address, uint256) public pure override returns (uint16) {
-        return LibTiers.TIER_SGX;
+    function getMinTier(address, uint256) public pure virtual override returns (uint16) {
+        return LibTierId.TIER_TEE;
     }
 }

packages/protocol/contracts/common/LibStrings.sol

@@ -18,6 +18,7 @@ library LibStrings {
     bytes32 internal constant B_PROVER_ASSIGNMENT = bytes32("PROVER_ASSIGNMENT");
     bytes32 internal constant B_PROVER_SET = bytes32("prover_set");
     bytes32 internal constant B_QUOTA_MANAGER = bytes32("quota_manager");
+    bytes32 internal constant B_RISCZERO_GROTH16_VERIFIER = bytes32("risc0_groth16_verifier");
     bytes32 internal constant B_SGX_WATCHDOG = bytes32("sgx_watchdog");
     bytes32 internal constant B_SIGNAL_SERVICE = bytes32("signal_service");
     bytes32 internal constant B_SP1_REMOTE_VERIFIER = bytes32("sp1_remote_verifier");
@@ -26,11 +27,15 @@ library LibStrings {
     bytes32 internal constant B_TIER_GUARDIAN = bytes32("tier_guardian");
     bytes32 internal constant B_TIER_GUARDIAN_MINORITY = bytes32("tier_guardian_minority");
     bytes32 internal constant B_TIER_ROUTER = bytes32("tier_router");
-    bytes32 internal constant B_TIER_SGX = bytes32("tier_sgx");
-    bytes32 internal constant B_TIER_SGX2 = bytes32("tier_sgx2");
+    bytes32 internal constant B_TIER_TEE = bytes32("tier_tee");
+
+    // keep the value to maintain backward compatibility.
+    bytes32 internal constant B_TIER_TEE_SGX = bytes32("tier_sgx");
+
+    bytes32 internal constant B_TIER_ZKVM = bytes32("tier_zkvm");
+    bytes32 internal constant B_TIER_ZKVM_AND_TEE = bytes32("tier_zkvm_and_tee");
     bytes32 internal constant B_TIER_ZKVM_RISC0 = bytes32("tier_zkvm_risc0");
-    bytes32 internal constant B_TIER_SGX_ZKVM = bytes32("tier_sgx_zkvm");
-    bytes32 internal constant B_RISCZERO_GROTH16_VERIFIER = bytes32("risc0_groth16_verifier");
+    bytes32 internal constant B_TIER_ZKVM_SP1 = bytes32("tier_zkvm_sp1");
     bytes32 internal constant B_WITHDRAWER = bytes32("withdrawer");
     bytes32 internal constant H_RETURN_LIVENESS_BOND = keccak256("RETURN_LIVENESS_BOND");
     bytes32 internal constant H_SIGNAL_ROOT = keccak256("SIGNAL_ROOT");