Merge pull request #58 from ionicprotocol/fix/lens-collateral-zero

Lens calcs zero div fix

Author: rhlsthrm

contracts/ionic/levered/LeveredPosition.sol

@@ -223,6 +223,7 @@ contract LeveredPosition is LeveredPositionStorage, IFlashLoanReceiver {
       debtValue = (borrowedAssetPrice * debtAmount) / 1e18;
     }
 
+    // TODO check if positionValue > debtValue
     // s / ( s - b )
     return (positionValue * 1e18) / (positionValue - debtValue);
   }
@@ -378,7 +379,7 @@ contract LeveredPosition is LeveredPositionStorage, IFlashLoanReceiver {
       stableAssetPrice
     );
 
-    ICErc20(address(collateralMarket)).flash(flashLoanCollateralAmount, abi.encode(stableToBorrow));
+    collateralMarket.flash(flashLoanCollateralAmount, abi.encode(stableToBorrow));
     // the execution will first receive a callback to receiveFlashLoan()
     // then it continues from here
 

contracts/ionic/strategies/flywheel/IonicFlywheelLensRouter.sol

@@ -203,6 +203,7 @@ contract IonicFlywheelLensRouter {
     uint256 yieldValuePerBlock = (collateralValue * supplyRatePerBlock) / 1e18;
     uint256 interestOwedValuePerBlock = (borrowsValue * borrowRatePerBlock) / 1e18;
 
+    if (collateralValue == 0) return 0;
     return ((int256(yieldValuePerBlock) - int256(interestOwedValuePerBlock)) * blocksPerYear) / int256(collateralValue);
   }
 

contracts/test/FLRTest.t.sol

@@ -144,6 +144,13 @@ contract FLRTest is BaseTest {
     emit log_named_int("apr", apr);
   }
 
+  function testNetAprMode() public fork(MODE_MAINNET) {
+    address user = 0xf0AC0F92E7da747E6757379771e5c9e5ea35D85A;
+    int256 blocks = 30 * 24 * 365 * 60;
+    int256 apr = lensRouter.getUserNetApr(user, blocks);
+    emit log_named_int("apr", apr);
+  }
+
   function testNetAprChapel() public fork(BSC_CHAPEL) {
     address user = 0x8982aa50bb919E42e9204f12e5b59D053Eb2A602;
     int256 blocks = 26 * 24 * 365 * 60;