fix(MToken): handle mint reverts in Portal

m0-foundation · Aug 19, 2024 · 8067bd4 · 8067bd4
1 parent 524d98a
commit 8067bd4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 41 deletions.
diff --git a/src/MToken.sol b/src/MToken.sol
@@ -181,7 +181,7 @@ contract MToken is IMToken, ContinuousIndexing, ERC20Extended {
      * @param amount_  The present amount to burn.
      */
     function _burn(address account_, uint256 amount_) internal {
-        _revertIfInsufficientAmount(amount_);
+        if (amount_ == 0) revert InsufficientAmount(amount_);
 
         emit Transfer(account_, address(0), amount_);
 
@@ -199,9 +199,6 @@ contract MToken is IMToken, ContinuousIndexing, ERC20Extended {
      * @param amount_    The present amount to mint.
      */
     function _mint(address recipient_, uint256 amount_) internal {
-        _revertIfInsufficientAmount(amount_);
-        _revertIfInvalidRecipient(recipient_);
-
         emit Transfer(address(0), recipient_, amount_);
 
         uint240 safeAmount_ = UIntMath.safe240(amount_);
@@ -327,7 +324,7 @@ contract MToken is IMToken, ContinuousIndexing, ERC20Extended {
      * @param amount_    The present amount to transfer.
      */
     function _transfer(address sender_, address recipient_, uint256 amount_) internal override {
-        _revertIfInvalidRecipient(recipient_);
+        if (recipient_ == address(0)) revert InvalidRecipient(recipient_);
 
         emit Transfer(sender_, recipient_, amount_);
 
@@ -411,22 +408,6 @@ contract MToken is IMToken, ContinuousIndexing, ERC20Extended {
         return RegistrarReader.isEarnersListIgnored(registrar) || RegistrarReader.isApprovedEarner(registrar, account_);
     }
 
-    /**
-     * @dev   Reverts if the amount of a `mint` or `burn` is equal to 0.
-     * @param amount_ Amount to check.
-     */
-    function _revertIfInsufficientAmount(uint256 amount_) internal pure {
-        if (amount_ == 0) revert InsufficientAmount(amount_);
-    }
-
-    /**
-     * @dev   Reverts if the recipient of a `mint` or `transfer` is address(0).
-     * @param recipient_ Address of the recipient to check.
-     */
-    function _revertIfInvalidRecipient(address recipient_) internal pure {
-        if (recipient_ == address(0)) revert InvalidRecipient(recipient_);
-    }
-
     /// @dev Reverts if the caller is not the portal.
     function _revertIfNotPortal() internal view {
         if (msg.sender != portal) revert NotPortal();

diff --git a/test/MToken.t.sol b/test/MToken.t.sol
@@ -70,20 +70,6 @@ contract MTokenTests is TestUtils {
         _mToken.mint(_alice, 0, 0);
     }
 
-    function test_mint_insufficientAmount() external {
-        vm.expectRevert(abi.encodeWithSelector(IERC20Extended.InsufficientAmount.selector, 0));
-
-        vm.prank(_portal);
-        _mToken.mint(_alice, 0, 0);
-    }
-
-    function test_mint_invalidRecipient() external {
-        vm.expectRevert(abi.encodeWithSelector(IERC20Extended.InvalidRecipient.selector, address(0)));
-
-        vm.prank(_portal);
-        _mToken.mint(address(0), 1_000, 0);
-    }
-
     function test_mint_toNonEarner() external {
         vm.prank(_portal);
         _mToken.mint(_alice, 1_000, 0);
@@ -207,12 +193,6 @@ contract MTokenTests is TestUtils {
         _mToken.burn(_alice, 0);
     }
 
-    function test_burn_insufficientAmount() external {
-        vm.expectRevert(abi.encodeWithSelector(IERC20Extended.InsufficientAmount.selector, 0));
-        vm.prank(_portal);
-        _mToken.burn(_alice, 0);
-    }
-
     function test_burn_insufficientBalance_fromNonEarner() external {
         _mToken.setInternalBalanceOf(_alice, 999);
 
@@ -221,6 +201,12 @@ contract MTokenTests is TestUtils {
         _mToken.burn(_alice, 1_000);
     }
 
+    function test_burn_insufficientAmount() external {
+        vm.expectRevert(abi.encodeWithSelector(IERC20Extended.InsufficientAmount.selector, 0));
+        vm.prank(_portal);
+        _mToken.burn(_alice, 0);
+    }
+
     function test_burn_insufficientBalance_fromEarner() external {
         _mToken.setIsEarning(_alice, true);
         _mToken.setInternalBalanceOf(_alice, 908);