feat(protocol): add proposer address to getMinTier func (#17919)

Co-authored-by: David <[email protected]>
taikoxyz · Aug 15, 2024 · d6ea6f3 · d6ea6f3
1 parent d559ce8
commit d6ea6f3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/packages/protocol/contracts/L1/libs/LibProposing.sol b/packages/protocol/contracts/L1/libs/LibProposing.sol
@@ -208,7 +208,7 @@ library LibProposing {
         );
 
         // Use the difficulty as a random number
-        meta_.minTier = local.tierProvider.getMinTier(uint256(meta_.difficulty));
+        meta_.minTier = local.tierProvider.getMinTier(meta_.proposer, uint256(meta_.difficulty));
 
         if (!local.postFork) {
             metaV1_ = LibData.blockMetadataV2toV1(meta_);

diff --git a/packages/protocol/contracts/L1/tiers/DevnetTierProvider.sol b/packages/protocol/contracts/L1/tiers/DevnetTierProvider.sol
@@ -21,7 +21,7 @@ contract DevnetTierProvider is TierProviderBase, ITierRouter {
     }
 
     /// @inheritdoc ITierProvider
-    function getMinTier(uint256) public pure override returns (uint16) {
+    function getMinTier(address, uint256) public pure override returns (uint16) {
         return LibTiers.TIER_OPTIMISTIC;
     }
 }
diff --git a/packages/protocol/contracts/L1/tiers/ITierProvider.sol b/packages/protocol/contracts/L1/tiers/ITierProvider.sol
@@ -28,9 +28,10 @@ interface ITierProvider {
     function getTierIds() external view returns (uint16[] memory);
 
     /// @dev Determines the minimal tier for a block based on a random input.
+    /// @param proposer The address of the block proposer.
     /// @param rand A pseudo-random number.
     /// @return The tier id.
-    function getMinTier(uint256 rand) external view returns (uint16);
+    function getMinTier(address proposer, uint256 rand) external view returns (uint16);
 }
 
 /// @dev Tier ID cannot be zero!

diff --git a/packages/protocol/contracts/L1/tiers/TierProviderV2.sol b/packages/protocol/contracts/L1/tiers/TierProviderV2.sol
@@ -15,7 +15,7 @@ contract TierProviderV2 is TierProviderBase {
     }
 
     /// @inheritdoc ITierProvider
-    function getMinTier(uint256) public pure override returns (uint16) {
+    function getMinTier(address, uint256) public pure override returns (uint16) {
         return LibTiers.TIER_SGX;
     }
 }
diff --git a/packages/protocol/contracts/L1/tiers/TierProviderV3.sol b/packages/protocol/contracts/L1/tiers/TierProviderV3.sol
@@ -15,7 +15,7 @@ contract TierProviderV3 is TierProviderBase {
     }
 
     /// @inheritdoc ITierProvider
-    function getMinTier(uint256) public pure override returns (uint16) {
+    function getMinTier(address, uint256) public pure override returns (uint16) {
         return LibTiers.TIER_SGX2;
     }
 }
diff --git a/packages/protocol/contracts/hekla/HeklaTierProvider.sol b/packages/protocol/contracts/hekla/HeklaTierProvider.sol
@@ -6,6 +6,8 @@ import "../L1/tiers/TierProviderBase.sol";
 /// @title HeklaTierProvider
 /// @custom:security-contact [email protected]
 contract HeklaTierProvider is TierProviderBase {
+    address public constant LAB_PROPOSER = 0xD3f681bD6B49887A48cC9C9953720903967E9DC0;
+
     /// @inheritdoc ITierProvider
     function getTierIds() public pure override returns (uint16[] memory tiers_) {
         tiers_ = new uint16[](5);
@@ -17,14 +19,15 @@ contract HeklaTierProvider is TierProviderBase {
     }
 
     /// @inheritdoc ITierProvider
-    function getMinTier(uint256 _rand) public pure override returns (uint16) {
-        if (_rand % 1000 == 0) {
+    function getMinTier(address _proposer, uint256 _rand) public pure override returns (uint16) {
+        if (_proposer == LAB_PROPOSER && _rand % 1000 == 0) {
             // 0.1% of the total blocks will require ZKVM proofs.
             return LibTiers.TIER_ZKVM_RISC0;
         } else if (_rand % 2 == 0) {
             // 50% of the total blocks will require SGX proofs.
             return LibTiers.TIER_SGX;
+        } else {
+            return LibTiers.TIER_OPTIMISTIC;
         }
-        return LibTiers.TIER_OPTIMISTIC;
     }
 }
diff --git a/packages/protocol/test/L1/TestTierProvider.sol b/packages/protocol/test/L1/TestTierProvider.sol
@@ -63,7 +63,7 @@ contract TestTierProvider is ITierProvider, ITierRouter {
     }
 
     /// @inheritdoc ITierProvider
-    function getMinTier(uint256 _rand) public pure override returns (uint16) {
+    function getMinTier(address, uint256 _rand) public pure override returns (uint16) {
         // 10% will be selected to require SGX proofs.
         if (_rand % 10 == 0) return LibTiers.TIER_SGX;
         // Other blocks are optimistic, without validity proofs.