refactor(protocol): delete duplicate event and error definition from …

…TaikoL1 (#17722)

packages/protocol/contracts/L1/TaikoL1.sol

@@ -6,8 +6,6 @@ import "./libs/LibProposing.sol";
 import "./libs/LibProving.sol";
 import "./libs/LibVerifying.sol";
 import "./ITaikoL1.sol";
-import "./TaikoErrors.sol";
-import "./TaikoEvents.sol";
 
 /// @title TaikoL1
 /// @notice This contract serves as the "base layer contract" of the Taiko protocol, providing
@@ -18,14 +16,21 @@ import "./TaikoEvents.sol";
 /// by the Bridge contract.
 /// @dev Labeled in AddressResolver as "taiko"
 /// @custom:security-contact [email protected]
-contract TaikoL1 is EssentialContract, ITaikoL1, TaikoEvents, TaikoErrors {
+contract TaikoL1 is EssentialContract, ITaikoL1 {
     /// @notice The TaikoL1 state.
     TaikoData.State public state;
 
     uint256[50] private __gap;
 
+    /// @notice Emitted when some state variable values changed.
+    /// @dev This event is currently used by Taiko node/client for block proposal/proving.
+    /// @param slotB The SlotB data structure.
+    event StateVariablesUpdated(TaikoData.SlotB slotB);
+
+    error L1_RECEIVE_DISABLED();
+
     modifier whenProvingNotPaused() {
-        if (state.slotB.provingPaused) revert L1_PROVING_PAUSED();
+        if (state.slotB.provingPaused) revert LibProving.L1_PROVING_PAUSED();
         _;
     }
 

packages/protocol/contracts/L1/libs/LibProposing.sol

@@ -23,7 +23,6 @@ library LibProposing {
         bytes32 parentMetaHash;
     }
 
-    // Warning: Any events defined here must also be defined in TaikoEvents.sol.
     /// @notice Emitted when a block is proposed.
     /// @param blockId The ID of the proposed block.
     /// @param assignedProver The address of the assigned prover.
@@ -44,7 +43,6 @@ library LibProposing {
     /// @param txList The txList.
     event CalldataTxList(uint256 indexed blockId, bytes txList);
 
-    // Warning: Any errors defined here must also be defined in TaikoErrors.sol.
     error L1_BLOB_NOT_AVAILABLE();
     error L1_BLOB_NOT_FOUND();
     error L1_INVALID_SIG();

packages/protocol/contracts/L1/libs/LibProving.sol

@@ -30,7 +30,6 @@ library LibProving {
         bool sameTransition;
     }
 
-    // Warning: Any events defined here must also be defined in TaikoEvents.sol.
     /// @notice Emitted when a transition is proved.
     /// @param blockId The block ID.
     /// @param tran The transition data.
@@ -63,16 +62,14 @@ library LibProving {
     /// @param paused The pause status.
     event ProvingPaused(bool paused);
 
-    // Warning: Any errors defined here must also be defined in TaikoErrors.sol.
     error L1_ALREADY_CONTESTED();
     error L1_ALREADY_PROVED();
-    error L1_BLOCK_MISMATCH();
     error L1_CANNOT_CONTEST();
-    error L1_INVALID_BLOCK_ID();
     error L1_INVALID_PAUSE_STATUS();
     error L1_INVALID_TIER();
     error L1_INVALID_TRANSITION();
     error L1_NOT_ASSIGNED_PROVER();
+    error L1_PROVING_PAUSED();
 
     /// @notice Pauses or unpauses the proving process.
     /// @param _state Current TaikoData.State.
@@ -110,7 +107,7 @@ library LibProving {
             TaikoData.TierProof memory proof
         ) = abi.decode(_input, (TaikoData.BlockMetadata, TaikoData.Transition, TaikoData.TierProof));
 
-        if (_blockId != meta.id) revert L1_INVALID_BLOCK_ID();
+        if (_blockId != meta.id) revert LibUtils.L1_INVALID_BLOCK_ID();
 
         // Make sure parentHash is not zero
         // To contest an existing transition, simply use any non-zero value as
@@ -124,7 +121,7 @@ library LibProving {
 
         // Check that the block has been proposed but has not yet been verified.
         if (meta.id <= local.b.lastVerifiedBlockId || meta.id >= local.b.numBlocks) {
-            revert L1_INVALID_BLOCK_ID();
+            revert LibUtils.L1_INVALID_BLOCK_ID();
         }
 
         local.slot = meta.id % _config.blockRingBufferSize;
@@ -148,7 +145,7 @@ library LibProving {
         // theory, this check may be skipped, but it's included for added
         // caution.
         if (local.blockId != meta.id || local.metaHash != LibUtils.hashMetadata(meta)) {
-            revert L1_BLOCK_MISMATCH();
+            revert LibUtils.L1_BLOCK_MISMATCH();
         }
 
         // Each transition is uniquely identified by the parentHash, with the

packages/protocol/contracts/L1/libs/LibUtils.sol

@@ -31,7 +31,6 @@ library LibUtils {
         uint16 tier
     );
 
-    // Warning: Any errors defined here must also be defined in TaikoErrors.sol.
     error L1_BLOCK_MISMATCH();
     error L1_INVALID_BLOCK_ID();
     error L1_INVALID_GENESIS_HASH();

packages/protocol/contracts/L1/libs/LibVerifying.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.24;
 
 import "../../signal/ISignalService.sol";
-import "./LibUtils.sol";
 import "./LibBonds.sol";
+import "./LibUtils.sol";
 
 /// @title LibVerifying
 /// @notice A library for handling block verification in the Taiko protocol.
@@ -27,7 +27,6 @@ library LibVerifying {
         ITierRouter tierRouter;
     }
 
-    // Warning: Any errors defined here must also be defined in TaikoErrors.sol.
     error L1_BLOCK_MISMATCH();
     error L1_INVALID_CONFIG();
     error L1_TRANSITION_ID_ZERO();

packages/protocol/contracts/tko/TaikoToken.sol

@@ -27,28 +27,4 @@ contract TaikoToken is TaikoTokenBase {
         // Mint 1 billion tokens
         _mint(_recipient, 1_000_000_000 ether);
     }
-
-    /// @notice Batch transfers tokens
-    /// @param recipients The list of addresses to transfer tokens to.
-    /// @param amounts The list of amounts for transfer.
-    /// @return true if the transfer is successful.
-    function batchTransfer(
-        address[] calldata recipients,
-        uint256[] calldata amounts
-    )
-        external
-        returns (bool)
-    {
-        if (recipients.length != amounts.length) revert TT_INVALID_PARAM();
-        for (uint256 i; i < recipients.length; ++i) {
-            _transfer(msg.sender, recipients[i], amounts[i]);
-        }
-        return true;
-    }
-
-    function delegates(address account) public view virtual override returns (address) {
-        // Special checks to avoid reading from storage slots
-        if (account == _TAIKO_L1 || account == _ERC20_VAULT) return address(0);
-        else return super.delegates(account);
-    }
 }

packages/protocol/test/L1/TaikoL1.t.sol

@@ -156,7 +156,7 @@ contract TaikoL1Test is TaikoL1TestBase {
                     secondTransitionHash,
                     stateRoot,
                     meta.minTier,
-                    TaikoErrors.L1_NOT_ASSIGNED_PROVER.selector
+                    LibProving.L1_NOT_ASSIGNED_PROVER.selector
                 );
 
                 // Only guardian or assigned prover is allowed
@@ -205,7 +205,7 @@ contract TaikoL1Test is TaikoL1TestBase {
             bytes32("01"),
             bytes32("02"),
             meta.minTier,
-            TaikoErrors.L1_PROVING_PAUSED.selector
+            LibProving.L1_PROVING_PAUSED.selector
         );
     }
 

packages/protocol/test/L1/TaikoL1LibProvingWithTiers.t.sol

@@ -72,7 +72,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                 blockHash,
                 stateRoot,
                 meta.minTier,
-                TaikoErrors.L1_ALREADY_PROVED.selector
+                LibProving.L1_ALREADY_PROVED.selector
             );
 
             vm.roll(block.number + 15 * 12);
@@ -265,7 +265,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                     0,
                     stateRoot,
                     LibTiers.TIER_GUARDIAN,
-                    TaikoErrors.L1_INVALID_TRANSITION.selector
+                    LibProving.L1_INVALID_TRANSITION.selector
                 );
             }
 
@@ -305,7 +305,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                 blockHash,
                 stateRoot,
                 meta.minTier,
-                TaikoErrors.L1_NOT_ASSIGNED_PROVER.selector
+                LibProving.L1_NOT_ASSIGNED_PROVER.selector
             );
             vm.roll(block.number + 15 * 12);
 
@@ -398,7 +398,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                 0,
                 stateRoot,
                 LibTiers.TIER_GUARDIAN,
-                TaikoErrors.L1_INVALID_TRANSITION.selector
+                LibProving.L1_INVALID_TRANSITION.selector
             );
 
             vm.roll(block.number + 15 * 12);
@@ -452,7 +452,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                     blockHash,
                     stateRoot,
                     LibTiers.TIER_GUARDIAN,
-                    TaikoErrors.L1_ALREADY_PROVED.selector
+                    LibProving.L1_ALREADY_PROVED.selector
                 );
             }
             blockHash = bytes32(1_000_000 + blockId + 200);
@@ -495,7 +495,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                 blockHash,
                 stateRoot,
                 LibTiers.TIER_SGX,
-                TaikoErrors.L1_INVALID_BLOCK_ID.selector
+                LibUtils.L1_INVALID_BLOCK_ID.selector
             );
 
             parentHash = blockHash;
@@ -532,7 +532,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                 blockHash,
                 stateRoot,
                 LibTiers.TIER_SGX,
-                TaikoErrors.L1_BLOCK_MISMATCH.selector
+                LibUtils.L1_BLOCK_MISMATCH.selector
             );
 
             parentHash = blockHash;
@@ -569,7 +569,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
                 stateRoot,
                 stateRoot,
                 LibTiers.TIER_SGX,
-                TaikoErrors.L1_INVALID_TIER.selector
+                LibProving.L1_INVALID_TIER.selector
             );
 
             vm.roll(block.number + 15 * 12);
@@ -607,7 +607,7 @@ contract TaikoL1LibProvingWithTiers is TaikoL1TestBase {
             blockHash,
             stateRoot,
             LibTiers.TIER_SGX,
-            TaikoErrors.L1_INVALID_TIER.selector
+            LibProving.L1_INVALID_TIER.selector
         );
 
         printVariables("");

packages/protocol/test/L1/TaikoL1TestGroup1.t.sol

@@ -50,7 +50,7 @@ contract TaikoL1TestGroup1 is TaikoL1TestGroupBase {
             blockHash,
             stateRoot,
             meta.minTier,
-            TaikoErrors.L1_NOT_ASSIGNED_PROVER.selector
+            LibProving.L1_NOT_ASSIGNED_PROVER.selector
         );
 
         console2.log("====== Alice proves the block");