fix: Update infinite approval checks (#62)

maple-labs · Mar 29, 2022 · 000174a · 000174a
1 parent 889dbf7
commit 000174a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/contracts/RevenueDistributionToken.sol b/contracts/RevenueDistributionToken.sol
@@ -168,7 +168,7 @@ contract RevenueDistributionToken is IRevenueDistributionToken, ERC20 {
         require(assets_   != uint256(0), "RDT:B:ZERO_ASSETS");
 
         if (caller_ != owner_) {
-            _reduceCallerAllowance(caller_, owner_, shares_);
+            _decreaseAllowance(owner_, caller_, shares_);
         }
 
         _burn(owner_, shares_);
@@ -276,16 +276,6 @@ contract RevenueDistributionToken is IRevenueDistributionToken, ERC20 {
     /*** Internal Functions ***/
     /**************************/
 
-    function _reduceCallerAllowance(address caller_, address owner_, uint256 shares_) internal {
-        uint256 callerAllowance = allowance[owner_][caller_];  // Cache to stack.
-
-        require(callerAllowance >= shares_, "RDT:CALLER_ALLOWANCE");
-
-        if (callerAllowance == type(uint256).max) return;
-
-        allowance[owner_][caller_] = callerAllowance - shares_;
-    }
-
     function _divRoundUp(uint256 numerator_, uint256 divisor_) internal pure returns (uint256 result_) {
        return (numerator_ / divisor_) + (numerator_ % divisor_ > 0 ? 1 : 0);
     }

diff --git a/contracts/test/RevenueDistributionToken.t.sol b/contracts/test/RevenueDistributionToken.t.sol
@@ -2521,7 +2521,7 @@ contract RedeemFailureTests is RDTTestBase {
         shareOwner.rdToken_deposit(address(rdToken), depositAmount);
 
         shareOwner.erc20_approve(address(rdToken), address(notShareOwner), depositAmount - 1);
-        vm.expectRevert("RDT:CALLER_ALLOWANCE");
+        vm.expectRevert(ARITHMETIC_ERROR);
         notShareOwner.rdToken_redeem(address(rdToken), depositAmount, address(shareOwner), address(shareOwner));
 
         shareOwner.erc20_approve(address(rdToken), address(notShareOwner), depositAmount);
@@ -3373,7 +3373,7 @@ contract WithdrawFailureTests is RDTTestBase {
         shareOwner.rdToken_deposit(address(rdToken), depositAmount);
 
         shareOwner.erc20_approve(address(rdToken), address(notShareOwner), depositAmount - 1);
-        vm.expectRevert("RDT:CALLER_ALLOWANCE");
+        vm.expectRevert(ARITHMETIC_ERROR);
         notShareOwner.rdToken_withdraw(address(rdToken), depositAmount, address(shareOwner), address(shareOwner));
 
         shareOwner.erc20_approve(address(rdToken), address(notShareOwner), depositAmount);