Add missing validation in chain id mapping updates

MultiMessageAggregation · Oct 8, 2023 · 8a99e67 · 8a99e67
1 parent f85f71e
commit 8a99e67
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/src/adapters/axelar/AxelarSenderAdapter.sol b/src/adapters/axelar/AxelarSenderAdapter.sol
@@ -81,6 +81,10 @@ contract AxelarSenderAdapter is BaseSenderAdapter {
         }
 
         for (uint256 i; i < arrLength;) {
+            if (_origIds[i] == 0) {
+                revert Error.ZERO_CHAIN_ID();
+            }
+
             chainIdMap[_origIds[i]] = _axlIds[i];
 
             unchecked {

diff --git a/src/adapters/wormhole/WormholeSenderAdapter.sol b/src/adapters/wormhole/WormholeSenderAdapter.sol
@@ -83,6 +83,10 @@ contract WormholeSenderAdapter is BaseSenderAdapter {
         }
 
         for (uint256 i; i < arrLength;) {
+            if (_origIds[i] == 0) {
+                revert Error.ZERO_CHAIN_ID();
+            }
+
             chainIdMap[_origIds[i]] = _whIds[i];
 
             unchecked {

diff --git a/test/unit-tests/adapters/axelar/AxelarSenderAdapter.t.sol b/test/unit-tests/adapters/axelar/AxelarSenderAdapter.t.sol
@@ -133,4 +133,12 @@ contract AxelarSenderAdapterTest is Setup {
         vm.expectRevert(Error.ARRAY_LENGTH_MISMATCHED.selector);
         adapter.setChainIdMap(new uint256[](0), new string[](1));
     }
+
+    /// @dev cannot set chain ID map with invalid chain ID
+    function test_set_chain_id_map_zero_chain_id() public {
+        vm.startPrank(owner);
+
+        vm.expectRevert(Error.ZERO_CHAIN_ID.selector);
+        adapter.setChainIdMap(new uint256[](1), new string[](1));
+    }
 }
diff --git a/test/unit-tests/adapters/wormhole/WormholeSenderAdapter.t.sol b/test/unit-tests/adapters/wormhole/WormholeSenderAdapter.t.sol
@@ -130,4 +130,12 @@ contract WormholeSenderAdapterTest is Setup {
         vm.expectRevert(Error.ARRAY_LENGTH_MISMATCHED.selector);
         adapter.setChainIdMap(new uint256[](0), new uint16[](1));
     }
+
+    /// @dev cannot set chain ID map with invalid chain ID
+    function test_set_chain_id_map_zero_chain_id() public {
+        vm.startPrank(owner);
+
+        vm.expectRevert(Error.ZERO_CHAIN_ID.selector);
+        adapter.setChainIdMap(new uint256[](1), new uint16[](1));
+    }
 }