refactor(protocol): multiple improvements on implementation and tests

.github/workflows/guardian-prover-health-check-ui.yml

@@ -28,8 +28,6 @@ jobs:
   #     vercel_org_id: ${{ secrets.VERCEL_ORG_ID }}
   #     vercel_token: ${{ secrets.VERCEL_TOKEN }}
 
-
-
   deploy_guardians-ui_hekla_preview:
     if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
     needs: build-and-test

.github/workflows/protocol.yml

@@ -10,6 +10,13 @@ on:
       - "!packages/protocol/docs/**"
       - "!packages/protocol/simulation/**"
       - "!packages/protocol/deployments/**"
+      - "!packages/protocol/script/layer2/hekla/**"
+      - "!packages/protocol/script/layer2/mainnet/**"
+      - "!packages/protocol/script/layer1/hekla/**"
+      - "!packages/protocol/script/layer1/mainnet/**"
+      - "!packages/protocol/script/layer1/preconf/**"
+      - "!packages/protocol/script/layer1/provers/**"
+      - "!packages/protocol/script/layer1/team/**"
     branches-ignore:
       - release-please--branches--**
 

packages/protocol/contracts/layer1/automata-attestation/AutomataDcapV3Attestation.sol

@@ -437,7 +437,7 @@ contract AutomataDcapV3Attestation is IAttestation, EssentialContract {
             for (uint256 i; i < 3; ++i) {
                 bool isPckCert = i == 0; // additional parsing for PCKCert
                 bool certDecodedSuccessfully;
-                // todo! move decodeCert offchain
+                // TODO(Yue): move decodeCert offchain
                 (certDecodedSuccessfully, parsedQuoteCerts[i]) = pemCertLib.decodeCert(
                     authDataV3.certification.decodedCertDataArray[i], isPckCert
                 );

packages/protocol/contracts/layer1/automata-attestation/lib/QuoteV3Auth/V3Struct.sol

@@ -37,7 +37,7 @@ library V3Struct {
 
     struct CertificationData {
         uint16 certType;
-        // todo! In encoded path, we need to calculate the size of certDataArray
+        // TODO(Yue): In encoded path, we need to calculate the size of certDataArray
         // certDataSize = len(join((BEGIN_CERT, certArray[i], END_CERT) for i in 0..3))
         // But for plain bytes path, we don't need that.
         uint32 certDataSize;

packages/protocol/contracts/layer1/based/ITaikoL1.sol

@@ -93,5 +93,5 @@ interface ITaikoL1 {
 
     /// @notice Gets the configuration of the TaikoL1 contract.
     /// @return Config struct containing configuration parameters.
-    function getConfig() external pure returns (TaikoData.Config memory);
+    function getConfig() external view returns (TaikoData.Config memory);
 }

packages/protocol/contracts/layer1/based/LibBonds.sol

@@ -3,9 +3,9 @@ pragma solidity ^0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import "src/shared/common/IAddressResolver.sol";
-import "src/shared/common/LibAddress.sol";
-import "src/shared/common/LibStrings.sol";
+import "src/shared/common/IResolver.sol";
+import "src/shared/libs/LibAddress.sol";
+import "src/shared/libs/LibStrings.sol";
 import "./TaikoData.sol";
 
 /// @title LibBonds
@@ -43,7 +43,7 @@ library LibBonds {
     /// @param _amount The amount of tokens to deposit.
     function depositBond(
         TaikoData.State storage _state,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         uint256 _amount
     )
         public
@@ -58,7 +58,7 @@ library LibBonds {
     /// @param _amount The amount of tokens to withdraw.
     function withdrawBond(
         TaikoData.State storage _state,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         uint256 _amount
     )
         public
@@ -97,7 +97,7 @@ library LibBonds {
     /// @param _amount The amount of tokens to debit.
     function debitBond(
         TaikoData.State storage _state,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         address _user,
         uint256 _blockId,
         uint256 _amount
@@ -142,7 +142,7 @@ library LibBonds {
     /// @param _resolver The address resolver.
     /// @param _user The user who made the deposit
     /// @param _amount The amount of tokens or Ether to deposit.
-    function _handleDeposit(IAddressResolver _resolver, address _user, uint256 _amount) private {
+    function _handleDeposit(IResolver _resolver, address _user, uint256 _amount) private {
         address bondToken = _bondToken(_resolver);
 
         if (bondToken != address(0)) {
@@ -158,7 +158,7 @@ library LibBonds {
     /// is used as bond asset.
     /// @param _resolver The address resolver.
     /// @return The IERC20 interface of the TAIKO token.
-    function _bondToken(IAddressResolver _resolver) private view returns (address) {
-        return _resolver.resolve(LibStrings.B_BOND_TOKEN, true);
+    function _bondToken(IResolver _resolver) private view returns (address) {
+        return _resolver.resolve(block.chainid, LibStrings.B_BOND_TOKEN, true);
     }
 }

packages/protocol/contracts/layer1/based/LibProposing.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import "src/shared/common/LibAddress.sol";
-import "src/shared/common/LibNetwork.sol";
+import "src/shared/libs/LibAddress.sol";
+import "src/shared/libs/LibNetwork.sol";
 import "./LibBonds.sol";
 import "./LibData.sol";
 import "./LibUtils.sol";
@@ -55,7 +55,7 @@ library LibProposing {
     function proposeBlocks(
         TaikoData.State storage _state,
         TaikoData.Config memory _config,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         bytes[] calldata _paramsArr,
         bytes[] calldata _txListArr
     )
@@ -91,7 +91,7 @@ library LibProposing {
     function proposeBlock(
         TaikoData.State storage _state,
         TaikoData.Config memory _config,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         bytes calldata _params,
         bytes calldata _txList
     )
@@ -117,7 +117,7 @@ library LibProposing {
     function _proposeBlock(
         TaikoData.State storage _state,
         TaikoData.Config memory _config,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         bytes calldata _params,
         bytes calldata _txList
     )
@@ -139,7 +139,8 @@ library LibProposing {
             );
         }
 
-        address preconfTaskManager = _resolver.resolve(LibStrings.B_PRECONF_TASK_MANAGER, true);
+        address preconfTaskManager =
+            _resolver.resolve(block.chainid, LibStrings.B_PRECONF_TASK_MANAGER, true);
         if (preconfTaskManager != address(0)) {
             require(preconfTaskManager == msg.sender, L1_INVALID_PROPOSER());
             local.allowCustomProposer = true;
@@ -191,14 +192,13 @@ library LibProposing {
             emit CalldataTxList(meta_.id, _txList);
         }
 
-        local.tierProvider = ITierProvider(
-            ITierRouter(_resolver.resolve(LibStrings.B_TIER_ROUTER, false)).getProvider(
-                local.b.numBlocks
-            )
-        );
+        local.tierProvider =
+            ITierProvider(_resolver.resolve(block.chainid, LibStrings.B_TIER_PROVIDER, false));
 
         // Use the difficulty as a random number
-        meta_.minTier = local.tierProvider.getMinTier(meta_.proposer, uint256(meta_.difficulty));
+        meta_.minTier = local.tierProvider.getMinTier(
+            local.b.numBlocks, meta_.proposer, uint256(meta_.difficulty)
+        );
 
         // Create the block that will be stored onchain
         TaikoData.BlockV2 memory blk = TaikoData.BlockV2({

packages/protocol/contracts/layer1/based/LibProving.sol

@@ -105,7 +105,7 @@ library LibProving {
     function proveBlocks(
         TaikoData.State storage _state,
         TaikoData.Config memory _config,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         uint64[] calldata _blockIds,
         bytes[] calldata _inputs,
         bytes calldata _batchProof
@@ -145,7 +145,7 @@ library LibProving {
 
         // If batch verifier name is not empty, verify the batch proof.
         if (batchVerifierName != LibStrings.B_TIER_OPTIMISTIC) {
-            IVerifier(_resolver.resolve(batchVerifierName, false)).verifyBatchProof(
+            IVerifier(_resolver.resolve(block.chainid, batchVerifierName, false)).verifyBatchProof(
                 ctxs, batchProof
             );
         }
@@ -162,7 +162,7 @@ library LibProving {
     function proveBlock(
         TaikoData.State storage _state,
         TaikoData.Config memory _config,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         uint64 _blockId,
         bytes calldata _input
     )
@@ -187,7 +187,7 @@ library LibProving {
     function _proveBlock(
         TaikoData.State storage _state,
         TaikoData.Config memory _config,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         uint64 _blockId,
         bytes calldata _input,
         TaikoData.TierProof memory _batchProof
@@ -248,11 +248,11 @@ library LibProving {
         // Retrieve the tier configurations. If the tier is not supported, the subsequent action
         // will result in a revert.
         {
-            ITierRouter tierRouter = ITierRouter(_resolver.resolve(LibStrings.B_TIER_ROUTER, false));
-            ITierProvider tierProvider = ITierProvider(tierRouter.getProvider(local.blockId));
+            ITierProvider tierProvider =
+                ITierProvider(_resolver.resolve(block.chainid, LibStrings.B_TIER_PROVIDER, false));
 
-            local.tier = tierProvider.getTier(local.proof.tier);
-            local.minTier = tierProvider.getTier(local.meta.minTier);
+            local.tier = tierProvider.getTier(local.blockId, local.proof.tier);
+            local.minTier = tierProvider.getTier(local.blockId, local.meta.minTier);
             local.isTopTier = local.tier.contestBond == 0;
         }
 
@@ -295,9 +295,8 @@ library LibProving {
 
             if (_batchProof.tier == 0) {
                 // In the case of per-transition proof, we verify the proof.
-                IVerifier(_resolver.resolve(local.tier.verifierName, false)).verifyProof(
-                    LibData.verifierContextV2ToV1(ctx_), ctx_.tran, local.proof
-                );
+                IVerifier(_resolver.resolve(block.chainid, local.tier.verifierName, false))
+                    .verifyProof(LibData.verifierContextV2ToV1(ctx_), ctx_.tran, local.proof);
             }
         }
 
@@ -468,7 +467,7 @@ library LibProving {
     /// @param _local Current Local struct.
     function _overrideWithHigherProof(
         TaikoData.State storage _state,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         TaikoData.BlockV2 storage _blk,
         TaikoData.TransitionState memory _ts,
         TaikoData.Transition memory _tran,

packages/protocol/contracts/layer1/based/LibUtils.sol

@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import "src/shared/common/IAddressResolver.sol";
-import "src/shared/common/LibStrings.sol";
-import "src/shared/common/LibMath.sol";
+import "src/shared/common/IResolver.sol";
+import "src/shared/libs/LibStrings.sol";
+import "src/shared/libs/LibMath.sol";
 import "../tiers/ITierProvider.sol";
-import "../tiers/ITierRouter.sol";
 import "./TaikoData.sol";
 
 /// @title LibUtils

packages/protocol/contracts/layer1/based/LibVerifying.sol

@@ -24,7 +24,7 @@ library LibVerifying {
         uint64 syncBlockId;
         uint24 syncTransitionId;
         address prover;
-        ITierRouter tierRouter;
+        ITierProvider tierProvider;
     }
 
     error L1_BLOCK_MISMATCH();
@@ -38,7 +38,7 @@ library LibVerifying {
     function verifyBlocks(
         TaikoData.State storage _state,
         TaikoData.Config memory _config,
-        IAddressResolver _resolver,
+        IResolver _resolver,
         uint64 _maxBlocksToVerify
     )
         internal
@@ -95,14 +95,14 @@ library LibVerifying {
                     break;
                 }
 
-                if (local.tierRouter == ITierRouter(address(0))) {
-                    local.tierRouter =
-                        ITierRouter(_resolver.resolve(LibStrings.B_TIER_ROUTER, false));
+                if (local.tierProvider == ITierProvider(address(0))) {
+                    local.tierProvider = ITierProvider(
+                        _resolver.resolve(block.chainid, LibStrings.B_TIER_PROVIDER, false)
+                    );
                 }
 
-                uint24 cooldown = ITierProvider(local.tierRouter.getProvider(local.blockId)).getTier(
-                    local.tier
-                ).cooldownWindow;
+                uint24 cooldown =
+                    local.tierProvider.getTier(local.blockId, local.tier).cooldownWindow;
 
                 if (!LibUtils.isPostDeadline(ts.timestamp, local.b.lastUnpausedAt, cooldown)) {
                     // If cooldownWindow is 0, the block can theoretically be proved and verified
@@ -162,8 +162,9 @@ library LibVerifying {
                     }
 
                     // Ask signal service to write cross chain signal
-                    ISignalService(_resolver.resolve(LibStrings.B_SIGNAL_SERVICE, false))
-                        .syncChainData(
+                    ISignalService(
+                        _resolver.resolve(block.chainid, LibStrings.B_SIGNAL_SERVICE, false)
+                    ).syncChainData(
                         _config.chainId,
                         LibStrings.H_STATE_ROOT,
                         local.syncBlockId,

packages/protocol/contracts/layer1/based/TaikoData.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import "src/shared/data/LibSharedData.sol";
+import "src/shared/based/LibSharedData.sol";
 
 /// @title TaikoData
 /// @notice This library defines various data structures used in the Taiko protocol.