Fix legitimate Slither findings (#82)

MultiMessageAggregation · Sep 22, 2023 · d7a877c · d7a877c
1 parent 3c98349
commit d7a877c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/src/adapters/BaseSenderAdapter.sol b/src/adapters/BaseSenderAdapter.sol
@@ -85,15 +85,7 @@ abstract contract BaseSenderAdapter is IMessageSenderAdapter {
     /// @param _toChainId is the destination chainId.
     /// @param _to is the contract address on the destination chain.
     function _getNewMessageId(uint256 _toChainId, address _to) internal returns (bytes32 messageId) {
-        messageId = keccak256(abi.encodePacked(getChainId(), _toChainId, nonce, address(this), _to));
+        messageId = keccak256(abi.encodePacked(block.chainid, _toChainId, nonce, address(this), _to));
         ++nonce;
     }
-
-    /// @dev returns the chain id of the deployed adapter
-    /// @return cid is the chain identifier
-    function getChainId() public view virtual returns (uint256 cid) {
-        assembly {
-            cid := chainid()
-        }
-    }
 }
diff --git a/src/adapters/axelar/AxelarSenderAdapter.sol b/src/adapters/axelar/AxelarSenderAdapter.sol
@@ -19,7 +19,7 @@ contract AxelarSenderAdapter is BaseSenderAdapter {
     /*/////////////////////////////////////////////////////////////////
                             STATE VARIABLES
     ////////////////////////////////////////////////////////////////*/
-    IAxelarGasService public gasService;
+    IAxelarGasService public immutable gasService;
     mapping(uint256 => string) public chainIdMap;
 
     /*/////////////////////////////////////////////////////////////////

diff --git a/test/unit-tests/adapters/BaseSenderAdapter.t.sol b/test/unit-tests/adapters/BaseSenderAdapter.t.sol
@@ -58,9 +58,4 @@ contract AxelarSenderAdapterTest is Setup {
         vm.expectRevert(Error.ARRAY_LENGTH_MISMATCHED.selector);
         adapter.updateReceiverAdapter(new uint256[](0), new address[](1));
     }
-
-    /// @dev gets chian ID
-    function test_get_chain_id() public {
-        assertEq(adapter.getChainId(), SRC_CHAIN_ID);
-    }
 }