Fix missing validations (#98)

* Add zero parameter value checks for MMR constructor * Add missing validations for sender adapter constructors
MultiMessageAggregation · Oct 5, 2023 · e614b4c · e614b4c
1 parent 16e7dcb
commit e614b4c
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 1 deletion.
diff --git a/src/MultiBridgeMessageReceiver.sol b/src/MultiBridgeMessageReceiver.sol
@@ -74,8 +74,16 @@ contract MultiBridgeMessageReceiver is IMultiBridgeMessageReceiver, ExecutorAwar
 
  /// @notice sets the initial parameters
  constructor(uint256 _srcChainId, address _gac) {
- srcChainId = _srcChainId;
+ if (_gac == address(0)) {
+ revert Error.ZERO_ADDRESS_INPUT();
+ }
+
+ if (_srcChainId == 0) {
+ revert Error.INVALID_SENDER_CHAIN_ID();
+ }
+
  gac = IGAC(_gac);
+ srcChainId = _srcChainId;
  }
 
  /*/////////////////////////////////////////////////////////////////

diff --git a/src/adapters/axelar/AxelarSenderAdapter.sol b/src/adapters/axelar/AxelarSenderAdapter.sol
@@ -26,6 +26,10 @@ contract AxelarSenderAdapter is BaseSenderAdapter {
  CONSTRUCTOR
  ////////////////////////////////////////////////////////////////*/
  constructor(address _gasService, address _gateway, address _gac) BaseSenderAdapter(_gac) {
+ if (_gasService == address(0) || _gateway == address(0)) {
+ revert Error.ZERO_ADDRESS_INPUT();
+ }
+
  gasService = IAxelarGasService(_gasService);
  gateway = IAxelarGateway(_gateway);
  }

diff --git a/src/adapters/wormhole/WormholeSenderAdapter.sol b/src/adapters/wormhole/WormholeSenderAdapter.sol
@@ -24,6 +24,9 @@ contract WormholeSenderAdapter is BaseSenderAdapter {
  CONSTRUCTOR
  ////////////////////////////////////////////////////////////////*/
  constructor(address _wormholeRelayer, address _gac) BaseSenderAdapter(_gac) {
+ if (_wormholeRelayer == address(0)) {
+ revert Error.ZERO_ADDRESS_INPUT();
+ }
  relayer = IWormholeRelayer(_wormholeRelayer);
  }
 

diff --git a/test/unit-tests/MultiBridgeMessageReceiver.t.sol b/test/unit-tests/MultiBridgeMessageReceiver.t.sol
@@ -37,6 +37,18 @@ contract MultiBridgeMessageReceiverTest is Setup {
  timelockAddr = contractAddress[DST_CHAIN_ID]["TIMELOCK"];
  }
 
+ /// @dev cannot be called with zero source chain id
+ function test_constructor_zero_chain_id_input() public {
+ vm.expectRevert(Error.INVALID_SENDER_CHAIN_ID.selector);
+ new MultiBridgeMessageReceiver(0, address(42));
+ }
+
+ /// @dev cannot be called with zero address GAC
+ function test_constructor_zero_gac_address_input() public {
+ vm.expectRevert(Error.ZERO_ADDRESS_INPUT.selector);
+ new MultiBridgeMessageReceiver(1, address(0));
+ }
+
  /// @dev receives message from one adapter
  function test_receive_message() public {
  vm.startPrank(wormholeAdapterAddr);

diff --git a/test/unit-tests/adapters/axelar/AxelarSenderAdapter.t.sol b/test/unit-tests/adapters/axelar/AxelarSenderAdapter.t.sol
@@ -34,6 +34,24 @@ contract AxelarSenderAdapterTest is Setup {
  assertEq(address(adapter.senderGAC()), contractAddress[SRC_CHAIN_ID]["GAC"]);
  }
 
+ /// @dev constructor cannot be called with zero address gas service
+ function test_constructor_zero_address_relayer() public {
+ vm.expectRevert(Error.ZERO_ADDRESS_INPUT.selector);
+ new AxelarSenderAdapter(address(0), address(42), address(42));
+ }
+
+ /// @dev constructor cannot be called with zero address gateway
+ function test_constructor_zero_address_gateway() public {
+ vm.expectRevert(Error.ZERO_ADDRESS_INPUT.selector);
+ new AxelarSenderAdapter(address(42), address(0), address(42));
+ }
+
+ /// @dev constructor cannot be called with zero address GAC
+ function test_constructor_zero_address_gac() public {
+ vm.expectRevert(Error.ZERO_ADDRESS_INPUT.selector);
+ new AxelarSenderAdapter(address(42), address(42), address(0));
+ }
+
  /// @dev dispatches message
  function test_dispatch_message() public {
  vm.startPrank(senderAddr);

diff --git a/test/unit-tests/adapters/wormhole/WormholeSenderAdapter.t.sol b/test/unit-tests/adapters/wormhole/WormholeSenderAdapter.t.sol
@@ -33,6 +33,18 @@ contract WormholeSenderAdapterTest is Setup {
  assertEq(address(adapter.senderGAC()), contractAddress[SRC_CHAIN_ID]["GAC"]);
  }
 
+ /// @dev constructor cannot be called with zero address relayer
+ function test_constructor_zero_address_relayer() public {
+ vm.expectRevert(Error.ZERO_ADDRESS_INPUT.selector);
+ new WormholeSenderAdapter(address(0), address(42));
+ }
+
+ /// @dev constructor cannot be called with zero address GAC
+ function test_constructor_zero_address_gac() public {
+ vm.expectRevert(Error.ZERO_ADDRESS_INPUT.selector);
+ new WormholeSenderAdapter(address(42), address(0));
+ }
+
  /// @dev dispatches message
  function test_dispatch_message() public {
  vm.startPrank(senderAddr);