restrict use of setAxelarChainId

wormhole-foundation · Jun 25, 2024 · 2c000b2 · 2c000b2
1 parent 56ff882
commit 2c000b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/axelar/AxelarTransceiver.sol b/src/axelar/AxelarTransceiver.sol
@@ -80,9 +80,10 @@ contract AxelarTransceiver is IAxelarTransceiver, AxelarGMPExecutable, Transceiv
         string calldata transceiverAddress
     ) external virtual onlyOwner {
         // We allow empty chainName and transceiverAddress to allow removing chains.
-        if (chainId == 0) revert ZeroChainId();
+        if (chainId == 0 || bytes(chainName).length == 0 || bytes(transceiverAddress).length == 0) revert InvalidChainIdParams();
 
         AxelarTransceiverStorage storage slot = _storage();
+        if(bytes(slot.idToAxelarChainId[chainId]).length != 0) revert ChainIdAlreadySet(chainId);
         slot.idToAxelarChainId[chainId] = chainName;
         slot.axelarChainIdToId[chainName] = chainId;
         slot.idToTransceiverAddress[chainId] = transceiverAddress;

diff --git a/src/axelar/interfaces/IAxelarTransceiver.sol b/src/axelar/interfaces/IAxelarTransceiver.sol
@@ -16,8 +16,11 @@ interface IAxelarTransceiver is ITransceiver {
     /// @param transceiverAddress The address of the Transceiver as a string.
     error InvalidChainId(uint16 chainId, string chainName, string transceiverAddress);
 
-    /// @notice Chain Id passed is zero.
-    error ZeroChainId();
+    /// @notice Chain Id passed is zero, or Axelar Chain Id or Transceiver Address were empty.
+    error InvalidChainIdParams();
+
+    /// @notice Chain Id is already being used.
+    error ChainIdAlreadySet(uint16 chainId);
 
     /// @notice Emmited when a transceiver message is sent.
     /// @param recipientChainId The wormhole chainId of the destination chain.