fix(protocol): fix chainid check to allow the case where `chainid = t…

…ype(uint64).max` to still be valid, per the implied intention of type downcasting (#15792)
taikoxyz · Feb 14, 2024 · a401622 · a401622
1 parent 005a37a
commit a401622
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/protocol/contracts/L2/TaikoL2.sol b/packages/protocol/contracts/L2/TaikoL2.sol
@@ -78,7 +78,7 @@ contract TaikoL2 is CrossChainOwned, ICrossChainSync {
     {
         __CrossChainOwned_init(_addressManager, _l1ChainId);
 
-        if (block.chainid <= 1 || block.chainid >= type(uint64).max) {
+        if (block.chainid <= 1 || block.chainid > type(uint64).max) {
             revert L2_INVALID_CHAIN_ID();
         }
 

diff --git a/packages/protocol/contracts/common/AddressResolver.sol b/packages/protocol/contracts/common/AddressResolver.sol
@@ -94,7 +94,7 @@ abstract contract AddressResolver {
     /// @param _addressManager Address of the AddressManager.
     // solhint-disable-next-line func-name-mixedcase
     function __AddressResolver_init(address _addressManager) internal virtual {
-        if (block.chainid >= type(uint64).max) {
+        if (block.chainid > type(uint64).max) {
             revert RESOLVER_UNEXPECTED_CHAINID();
         }
         addressManager = _addressManager;