Merge branch 'main' into feat/taikoon-alt-networks

taikoxyz · May 14, 2024 · 48ae093 · 48ae093
2 parents cb134b9 + 149b7ae
commit 48ae093
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 109 deletions.
diff --git a/packages/protocol/contracts/L1/tiers/HeklaTierProvider.sol b/packages/protocol/contracts/L1/tiers/HeklaTierProvider.sol
@@ -65,9 +65,7 @@ contract HeklaTierProvider is EssentialContract, ITierProvider {
 
     /// @inheritdoc ITierProvider
     function getMinTier(uint256 _rand) public pure override returns (uint16) {
-        // 50% will be selected to require SGX proofs.
-        if (_rand % 2 == 0) return LibTiers.TIER_SGX;
-        // Other blocks are optimistic, without validity proofs.
-        return LibTiers.TIER_OPTIMISTIC;
+        // All blocks require SGX proofs.
+        return LibTiers.TIER_SGX;
     }
 }
diff --git a/packages/protocol/contracts/bridge/IQuotaManager.sol b/packages/protocol/contracts/bridge/IQuotaManager.sol
@@ -6,6 +6,13 @@ pragma solidity 0.8.24;
 interface IQuotaManager {
     /// @notice Consumes a specific amount of quota for a given address.
     /// This function must revert if available quota is smaller than the given amount of quota.
+    ///
+    /// @dev Note that IQuotaManager is used by vaults and bridge, and should be registered in a
+    /// shared address manager on the L1, therefore, a registered IQuotaManager and its per-token
+    /// quota settings will be shared by all Taiko L2s. To enable a per-L2 quota, we need to modify
+    /// this function to:
+    ///  `function consumeQuota(uint256 _srcChainId, address _token, uint256 _amount) `
+    ///
     /// @param _token The token address. Ether is represented with address(0).
     /// @param _amount The amount of quota to consume.
     function consumeQuota(address _token, uint256 _amount) external;

diff --git a/packages/protocol/deployments/hekla-contract-logs.md b/packages/protocol/deployments/hekla-contract-logs.md
@@ -106,9 +106,9 @@
 
 ### tierProvider
 
-- impl: `0x02932D1c8C9EBf283aA809E7591A070c82b1696D`
+- impl: `0x750D885DCAB712bA808D66D934CF315D0D98d04c.`
 - logs:
-  - upgraded on May 10, 2024 at commit `4903bec`
+  - upgraded on May 14, 2024 at commit `0ef7b8caa`
 
 ### guardian_prover_minority