fixed pnpm-lock.yaml

taikoxyz · May 14, 2024 · ef610b4 · ef610b4
1 parent 9b0a70d
commit ef610b4
Show file tree

Hide file tree

Showing 12 changed files with 198 additions and 337 deletions.
diff --git a/packages/protocol/contracts/L1/provers/GuardianProver.sol b/packages/protocol/contracts/L1/provers/GuardianProver.sol
@@ -76,10 +76,6 @@ contract GuardianProver is IVerifier, Guardians {
         nonReentrant
         returns (bool approved_)
     {
-        if (_proof.tier != LibTiers.TIER_GUARDIAN) {
-            revert INVALID_PROOF();
-        }
-
         bytes32 hash = keccak256(abi.encode(_meta, _tran, _proof.data));
         approved_ = approve(_meta.id, hash);
 

diff --git a/packages/protocol/contracts/L1/provers/Guardians.sol b/packages/protocol/contracts/L1/provers/Guardians.sol
@@ -42,7 +42,6 @@ abstract contract Guardians is EssentialContract {
     error INVALID_GUARDIAN();
     error INVALID_GUARDIAN_SET();
     error INVALID_MIN_GUARDIANS();
-    error INVALID_PROOF();
 
     /// @notice Set the set of guardians
     /// @param _newGuardians The new set of guardians

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