break into multiple require-statements

taikoxyz · Feb 6, 2025 · 2ccb06a · 2ccb06a
1 parent fb34324
commit 2ccb06a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/protocol/contracts/layer1/based/TaikoInbox.sol b/packages/protocol/contracts/layer1/based/TaikoInbox.sol
@@ -339,7 +339,9 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
         external
         onlyOwner
     {
-        require(_blockHash != 0 && _parentHash != 0 && _stateRoot != 0, InvalidParams());
+        require(_blockHash != 0, InvalidParams());
+        require(_parentHash != 0, InvalidParams());
+        require(_stateRoot != 0, InvalidParams());
         require(_batchId > state.stats2.lastVerifiedBatchId, BatchVerified());
 
         Config memory config = pacayaConfig();
@@ -424,7 +426,8 @@ abstract contract TaikoInbox is EssentialContract, ITaikoInbox, ITaiko {
         uint256 slot = _batchId % config.batchRingBufferSize;
         Batch storage batch = state.batches[slot];
         require(batch.batchId == _batchId, BatchNotFound());
-        require(_tid != 0 && _tid < batch.nextTransitionId, TransitionNotFound());
+        require(_tid != 0, TransitionNotFound());
+        require(_tid < batch.nextTransitionId, TransitionNotFound());
         return state.transitions[slot][_tid];
     }
 

diff --git a/packages/protocol/contracts/layer1/forced-inclusion/ForcedInclusionStore.sol b/packages/protocol/contracts/layer1/forced-inclusion/ForcedInclusionStore.sol
@@ -38,7 +38,8 @@ contract ForcedInclusionStore is EssentialContract, IForcedInclusionStore {
     )
         EssentialContract(_resolver)
     {
-        require(_inclusionDelay != 0 && _inclusionDelay % SECONDS_PER_BLOCK == 0, InvalidParams());
+        require(_inclusionDelay != 0, InvalidParams());
+        require(_inclusionDelay % SECONDS_PER_BLOCK == 0, InvalidParams());
         require(_feeInGwei != 0, InvalidParams());
 
         inclusionDelay = _inclusionDelay;

diff --git a/packages/protocol/contracts/layer1/fork-router/ForkRouter.sol b/packages/protocol/contracts/layer1/fork-router/ForkRouter.sol
@@ -19,7 +19,8 @@ contract ForkRouter is UUPSUpgradeable, Ownable2StepUpgradeable {
     error ZeroForkAddress();
 
     constructor(address _oldFork, address _newFork) {
-        require(_newFork != address(0) && _newFork != _oldFork, InvalidParams());
+        require(_newFork != address(0), InvalidParams());
+        require(_newFork != _oldFork, InvalidParams());
 
         oldFork = _oldFork;
         newFork = _newFork;