Improve chain id mapping update events

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

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/src/MultiBridgeMessageReceiver.sol b/src/MultiBridgeMessageReceiver.sol
@@ -181,7 +181,7 @@ contract MultiBridgeMessageReceiver is IMultiBridgeMessageReceiver, ExecutorAwar
         }
         address oldGovernanceTimelock = governanceTimelock;
         governanceTimelock = _governanceTimelock;
-        emit GovernanceTimelockUpdated(oldGovernanceTimelock, governanceTimelock);
+        emit GovernanceTimelockUpdated(oldGovernanceTimelock, _governanceTimelock);
     }
 
     /// @notice Update bridge receiver adapters.

diff --git a/src/adapters/axelar/AxelarSenderAdapter.sol b/src/adapters/axelar/AxelarSenderAdapter.sol
@@ -12,8 +12,8 @@ import "./interfaces/IAxelarGasService.sol";
 import "./libraries/StringAddressConversion.sol";
 
 contract AxelarSenderAdapter is BaseSenderAdapter {
-    /// @notice event emitted when chain id mapping is updated
-    event ChainIDMappingUpdated(uint256[] origIds, string[] axlIds);
+    /// @notice event emitted when a chain id mapping is updated
+    event ChainIDMappingUpdated(uint256 indexed origId, string oldAxlId, string newAxlId);
 
     string public constant name = "AXELAR";
 
@@ -85,13 +85,15 @@ contract AxelarSenderAdapter is BaseSenderAdapter {
                 revert Error.ZERO_CHAIN_ID();
             }
 
+            string memory oldAxlId = chainIdMap[_origIds[i]];
             chainIdMap[_origIds[i]] = _axlIds[i];
 
+            emit ChainIDMappingUpdated(_origIds[i], oldAxlId, _axlIds[i]);
+
             unchecked {
                 ++i;
             }
         }
-        emit ChainIDMappingUpdated(_origIds, _axlIds);
     }
 
     /*/////////////////////////////////////////////////////////////////

diff --git a/src/adapters/wormhole/WormholeSenderAdapter.sol b/src/adapters/wormhole/WormholeSenderAdapter.sol
@@ -12,8 +12,8 @@ import "../../libraries/Types.sol";
 
 /// @notice sender adapter for wormhole bridge
 contract WormholeSenderAdapter is BaseSenderAdapter {
-    /// @notice event emitted when chain id mapping is updated
-    event ChainIDMappingUpdated(uint256[] origIds, uint16[] whIds);
+    /// @notice event emitted when a chain id mapping is updated
+    event ChainIDMappingUpdated(uint256 indexed origId, uint16 oldWhId, uint16 newWhId);
 
     string public constant name = "WORMHOLE";
     IWormholeRelayer public immutable relayer;
@@ -87,12 +87,14 @@ contract WormholeSenderAdapter is BaseSenderAdapter {
                 revert Error.ZERO_CHAIN_ID();
             }
 
+            uint16 oldWhId = chainIdMap[_origIds[i]];
             chainIdMap[_origIds[i]] = _whIds[i];
 
+            emit ChainIDMappingUpdated(_origIds[i], oldWhId, _whIds[i]);
+
             unchecked {
                 ++i;
             }
         }
-        emit ChainIDMappingUpdated(_origIds, _whIds);
     }
 }
diff --git a/test/unit-tests/adapters/axelar/AxelarSenderAdapter.t.sol b/test/unit-tests/adapters/axelar/AxelarSenderAdapter.t.sol
@@ -13,7 +13,7 @@ contract AxelarSenderAdapterTest is Setup {
     event MessageDispatched(
         bytes32 indexed messageId, address indexed from, uint256 indexed receiverChainId, address to, bytes data
     );
-    event ChainIDMappingUpdated(uint256[] origIds, string[] axlIds);
+    event ChainIDMappingUpdated(uint256 indexed origId, string oldAxlId, string newAxlId);
 
     address senderAddr;
     AxelarSenderAdapter adapter;
@@ -111,7 +111,7 @@ contract AxelarSenderAdapterTest is Setup {
         axlIds[0] = "42";
 
         vm.expectEmit(true, true, true, true, address(adapter));
-        emit ChainIDMappingUpdated(origIds, axlIds);
+        emit ChainIDMappingUpdated(origIds[0], adapter.chainIdMap(DST_CHAIN_ID), axlIds[0]);
 
         adapter.setChainIdMap(origIds, axlIds);
 

diff --git a/test/unit-tests/adapters/wormhole/WormholeSenderAdapter.t.sol b/test/unit-tests/adapters/wormhole/WormholeSenderAdapter.t.sol
@@ -14,7 +14,7 @@ contract WormholeSenderAdapterTest is Setup {
     event MessageDispatched(
         bytes32 indexed messageId, address indexed from, uint256 indexed receiverChainId, address to, bytes data
     );
-    event ChainIDMappingUpdated(uint256[] origIds, uint16[] whIds);
+    event ChainIDMappingUpdated(uint256 indexed origId, uint16 oldWhId, uint16 newWhId);
 
     address senderAddr;
     WormholeSenderAdapter adapter;
@@ -108,7 +108,7 @@ contract WormholeSenderAdapterTest is Setup {
         whIds[0] = 42;
 
         vm.expectEmit(true, true, true, true, address(adapter));
-        emit ChainIDMappingUpdated(origIds, whIds);
+        emit ChainIDMappingUpdated(origIds[0], adapter.chainIdMap(DST_CHAIN_ID), whIds[0]);
 
         adapter.setChainIdMap(origIds, whIds);