Merge pull request #10 from traderjoe-xyz/redeem-claim-fix

Redeem claim fix
traderjoe-xyz · Dec 5, 2021 · 8f98610 · 8f98610
2 parents 4a2ebe6 + bcfc027
commit 8f98610
Show file tree

Hide file tree

Showing 4 changed files with 2,714 additions and 5 deletions.
diff --git a/contracts/JCollateralCapErc20.sol b/contracts/JCollateralCapErc20.sol
@@ -686,6 +686,7 @@ contract JCollateralCapErc20 is JToken, JCollateralCapErc20Interface, JProtocolS
             vars.redeemAmount = redeemAmountIn;
         }
 
+
         /**
          * For every user, accountTokens must be greater than or equal to accountCollateralTokens.
          * The buffer between the two values will be redeemed first.
@@ -698,6 +699,11 @@ contract JCollateralCapErc20 is JToken, JCollateralCapErc20Interface, JProtocolS
             collateralTokens = vars.redeemTokens - bufferTokens;
         }
 
+        uint256 allowed = joetroller.redeemAllowed(address(this), redeemer, collateralTokens);
+        if (allowed != 0) {
+            return failOpaque(Error.JOETROLLER_REJECTION, FailureInfo.REDEEM_JOETROLLER_REJECTION, allowed);
+        }
+
         /* Verify market's block timestamp equals current block timestamp */
         if (accrualBlockTimestamp != getBlockTimestamp()) {
             return fail(Error.MARKET_NOT_FRESH, FailureInfo.REDEEM_FRESHNESS_CHECK);

diff --git a/deployments/avalanche/JUsdcDelegate.json b/deployments/avalanche/JUsdcDelegate.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
   "address": "0x4A586DAA5D5EDCD8182339C24291FB510fA4d271",
-=======
-  "address": "0xeBeA851D28722E53AaCdC831d2894E25f460e62E",
->>>>>>> df7b2b5 (Update JUsdcDelegate address)
   "abi": [
     {
       "inputs": [],
@@ -2566,4 +2562,3 @@
     }
   }
 }
-