Merge branch 'main' into vault-message-owner

taikoxyz · Feb 14, 2024 · 44e6ffa · 44e6ffa
2 parents 4f25211 + a401622
commit 44e6ffa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/protocol/contracts/L1/libs/LibDepositing.sol b/packages/protocol/contracts/L1/libs/LibDepositing.sol
@@ -153,7 +153,7 @@ library LibDepositing {
     /// @param amount The amount of the deposit.
     /// @return The encoded deposit.
     function _encodeEthDeposit(address addr, uint256 amount) private pure returns (uint256) {
-        if (amount >= type(uint96).max) revert L1_INVALID_ETH_DEPOSIT();
+        if (amount > type(uint96).max) revert L1_INVALID_ETH_DEPOSIT();
         return (uint256(uint160(addr)) << 96) | amount;
     }
 }
diff --git a/packages/protocol/contracts/L1/libs/LibVerifying.sol b/packages/protocol/contracts/L1/libs/LibVerifying.sol
@@ -99,9 +99,9 @@ library LibVerifying {
                 || config.ethDepositMaxCountPerBlock < config.ethDepositMinCountPerBlock
                 || config.ethDepositMinAmount == 0
                 || config.ethDepositMaxAmount <= config.ethDepositMinAmount
-                || config.ethDepositMaxAmount >= type(uint96).max || config.ethDepositGas == 0
+                || config.ethDepositMaxAmount > type(uint96).max || config.ethDepositGas == 0
                 || config.ethDepositMaxFee == 0
-                || config.ethDepositMaxFee >= type(uint96).max / config.ethDepositMaxCountPerBlock
+                || config.ethDepositMaxFee > type(uint96).max / config.ethDepositMaxCountPerBlock
         ) return false;
 
         return true;

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;