rename

Author: dantaik

Diff for: packages/protocol/contracts/layer1/based/ITaikoProposerEntryPoint.sol renamed to packages/protocol/contracts/layer1/based/IProposeBatch.sol

@@ -3,9 +3,9 @@ pragma solidity ^0.8.24;
 
 import "./ITaikoInbox.sol";
 
-/// @title ITaikoProposerEntryPoint
+/// @title IProposeBatch
 /// @custom:security-contact [email protected]
-interface ITaikoProposerEntryPoint {
+interface IProposeBatch {
     /// @notice Proposes a batch of blocks.
     /// @param _params ABI-encoded parameters.
     /// @param _txList The transaction list in calldata. If the txList is empty, blob will be used

Diff for: packages/protocol/contracts/layer1/forced-inclusion/TaikoWrapper.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "src/layer1/based/ITaikoProposerEntryPoint.sol";
+import "src/layer1/based/IProposeBatch.sol";
 import "./ForcedInclusionStore.sol";
 
 /// @title TaikoWrapper
@@ -31,7 +31,7 @@ import "./ForcedInclusionStore.sol";
 /// consumption.
 ///
 /// @custom:security-contact [email protected]
-contract TaikoWrapper is EssentialContract, ITaikoProposerEntryPoint {
+contract TaikoWrapper is EssentialContract, IProposeBatch {
     using LibMath for uint256;
 
     /// @dev Event emitted when a forced inclusion is processed.
@@ -52,7 +52,7 @@ contract TaikoWrapper is EssentialContract, ITaikoProposerEntryPoint {
         __Essential_init(_owner);
     }
 
-    /// @inheritdoc ITaikoProposerEntryPoint
+    /// @inheritdoc IProposeBatch
     function proposeBatch(
         bytes calldata _params,
         bytes calldata _txList

Diff for: packages/protocol/contracts/layer1/preconf/iface/IPreconfRouter.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import "src/layer1/based/ITaikoProposerEntryPoint.sol";
+import "src/layer1/based/IProposeBatch.sol";
 
 /// @title IPreconfRouter
 /// @custom:security-contact [email protected]
-interface IPreconfRouter is ITaikoProposerEntryPoint {
+interface IPreconfRouter is IProposeBatch {
     error ForcedInclusionNotSupported();
     error NotTheOperator();
     error ProposerIsNotTheSender();

Diff for: packages/protocol/contracts/layer1/preconf/impl/PreconfRouter.sol

@@ -9,27 +9,27 @@ import "../iface/IPreconfWhitelist.sol";
 /// @title PreconfRouter
 /// @custom:security-contact [email protected]
 contract PreconfRouter is EssentialContract, IPreconfRouter {
-    address public immutable proposerEntryPoint;
+    address public immutable inbox;
     address public immutable preconfWhitelist;
 
     uint256[50] private __gap;
 
     constructor(
         address _resolver,
-        address _proposerEntryPoint,
+        address _inbox,
         address _preconfWhitelist
     )
         EssentialContract(_resolver)
     {
-        proposerEntryPoint = _proposerEntryPoint;
+        inbox = _inbox;
         preconfWhitelist = _preconfWhitelist;
     }
 
     function init(address _owner) external initializer {
         __Essential_init(_owner);
     }
 
-    /// @inheritdoc ITaikoProposerEntryPoint
+    /// @inheritdoc IProposeBatch
     function proposeBatch(
         bytes calldata _params,
         bytes calldata _txList
@@ -42,7 +42,7 @@ contract PreconfRouter is EssentialContract, IPreconfRouter {
         require(msg.sender == selectedOperator, NotTheOperator());
 
         // Both TaikoInbox and TaikoWrapper implement the same ABI for proposeBatch.
-        (info_, meta_) = ITaikoProposerEntryPoint(proposerEntryPoint).proposeBatch(_params, _txList);
+        (info_, meta_) = IProposeBatch(inbox).proposeBatch(_params, _txList);
 
         // Verify that the sender had set itself as the proposer
         require(meta_.proposer == msg.sender, ProposerIsNotTheSender());

Diff for: packages/protocol/contracts/layer1/provers/ProverSet.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.24;
 
 import "./ProverSetBase.sol";
-import "../based/ITaikoProposerEntryPoint.sol";
+import "../based/IProposeBatch.sol";
 
-contract ProverSet is ProverSetBase, ITaikoProposerEntryPoint {
+contract ProverSet is ProverSetBase, IProposeBatch {
     using Address for address;
 
     error ForcedInclusionParamsNotAllowed();
@@ -22,7 +22,8 @@ contract ProverSet is ProverSetBase, ITaikoProposerEntryPoint {
         onlyProver
         returns (ITaikoInbox.BatchInfo memory, ITaikoInbox.BatchMetadata memory)
     {
-        return ITaikoProposerEntryPoint(proposerEntryPoint()).proposeBatch(_params, _txList);
+        address entrypoint = resolve(LibStrings.B_PROPOSE_BLOCK_ENTRYPOINT, false);
+        return IProposeBatch(entrypoint).proposeBatch(_params, _txList);
     }
 
     /// @notice Proves multiple Taiko batches.

Diff for: packages/protocol/contracts/layer1/provers/ProverSetBase.sol

@@ -125,10 +125,6 @@ abstract contract ProverSetBase is EssentialContract, IERC1271 {
         return resolve(LibStrings.B_TAIKO, false);
     }
 
-    function proposerEntryPoint() internal view virtual returns (address) {
-        return resolve(LibStrings.B_PROPOSER_ENTRY_POINT, false);
-    }
-
     function bondToken() internal view virtual returns (address) {
         return resolve(LibStrings.B_BOND_TOKEN, true);
     }

Diff for: packages/protocol/contracts/shared/libs/LibStrings.sol

@@ -21,7 +21,7 @@ library LibStrings {
     bytes32 internal constant B_PRECONF_WHITELIST = bytes32("preconf_whitelist");
     bytes32 internal constant B_PRECONF_WHITELIST_OWNER = bytes32("preconf_whitelist_owner");
     bytes32 internal constant B_PROOF_VERIFIER = bytes32("proof_verifier");
-    bytes32 internal constant B_PROPOSER_ENTRY_POINT = bytes32("proposer_entry_point");
+    bytes32 internal constant B_PROPOSE_BLOCK_ENTRYPOINT = bytes32("propose_block_entrypoint");
     bytes32 internal constant B_PROVER_SET = bytes32("prover_set");
     bytes32 internal constant B_QUOTA_MANAGER = bytes32("quota_manager");
     bytes32 internal constant B_SGX_WATCHDOG = bytes32("sgx_watchdog");