Merge pull request #11 from zkLinkProtocol/abdk_audit_6_fix

Abdk audit 6 fix
zkLinkProtocol · Jun 19, 2024 · 2fbed2d · 2fbed2d
2 parents df2abae + 8d52ef8
commit 2fbed2d
Showing 1 changed file with 22 additions and 24 deletions.
diff --git a/l1-contracts/contracts/zksync/facets/Mailbox.sol b/l1-contracts/contracts/zksync/facets/Mailbox.sol
@@ -240,30 +240,28 @@ contract MailboxFacet is Base, IMailbox {
         uint256 gatewayLength = _secondaryChainGateways.length;
         bytes[] memory gatewayDataList = new bytes[](gatewayLength);
         uint256 totalForwardEthAmount = 0;
-        unchecked {
-            for (uint256 i = 0; i < gatewayLength; ++i) {
-                // Secondary chain should be registered
-                address _secondaryChainGateway = _secondaryChainGateways[i];
-                SecondaryChain memory secondaryChain = s.secondaryChains[_secondaryChainGateway];
-                require(secondaryChain.valid, "bsc");
-                uint256 _forwardEthAmount = s.secondaryChains[_secondaryChainGateway].totalPendingWithdraw;
-                // Withdraw eth amount impossible overflow
-                totalForwardEthAmount += _forwardEthAmount;
-                s.secondaryChains[_secondaryChainGateway].totalPendingWithdraw = 0;
-                // Send range batch root to secondary chain
-                bytes memory gatewayCallData = abi.encodeCall(
-                    IZkLink.syncRangeBatchRoot,
-                    (_fromBatchNumber, _toBatchNumber, rangeBatchRootHash, _forwardEthAmount)
-                );
-                gatewayDataList[i] = abi.encode(_secondaryChainGateway, _forwardEthAmount, gatewayCallData);
-                emit SyncRangeBatchRoot(
-                    _secondaryChainGateway,
-                    _fromBatchNumber,
-                    _toBatchNumber,
-                    rangeBatchRootHash,
-                    _forwardEthAmount
-                );
-            }
+        for (uint256 i = 0; i < gatewayLength; i = i.uncheckedInc()) {
+            // Secondary chain should be registered
+            address _secondaryChainGateway = _secondaryChainGateways[i];
+            SecondaryChain memory secondaryChain = s.secondaryChains[_secondaryChainGateway];
+            require(secondaryChain.valid, "bsc");
+            uint256 _forwardEthAmount = secondaryChain.totalPendingWithdraw;
+            // Withdraw eth amount impossible overflow
+            totalForwardEthAmount += _forwardEthAmount;
+            s.secondaryChains[_secondaryChainGateway].totalPendingWithdraw = 0;
+            // Send range batch root to secondary chain
+            bytes memory gatewayCallData = abi.encodeCall(
+                IZkLink.syncRangeBatchRoot,
+                (_fromBatchNumber, _toBatchNumber, rangeBatchRootHash, _forwardEthAmount)
+            );
+            gatewayDataList[i] = abi.encode(_secondaryChainGateway, _forwardEthAmount, gatewayCallData);
+            emit SyncRangeBatchRoot(
+                _secondaryChainGateway,
+                _fromBatchNumber,
+                _toBatchNumber,
+                rangeBatchRootHash,
+                _forwardEthAmount
+            );
         }
 
         // Forward fee to gateway