From f605ee1682848ff0e37a31dc277f8dbae0dbef9b Mon Sep 17 00:00:00 2001
From: Samyak Jain <sjain0410@gmail.com>
Date: Sun, 2 Jun 2019 17:20:51 +0530
Subject: [PATCH] enter market when borrow

---
 contracts/ProxyLogics/InstaCompound.sol | 27 ++++++++++++-------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/contracts/ProxyLogics/InstaCompound.sol b/contracts/ProxyLogics/InstaCompound.sol
index 5c179d9..3f75a84 100644
--- a/contracts/ProxyLogics/InstaCompound.sol
+++ b/contracts/ProxyLogics/InstaCompound.sol
@@ -129,20 +129,6 @@ contract CompoundResolver is Helpers {
     event LogRepay(address erc20, address cErc20, uint tokenAmt, address owner);
     event LogRepayBehalf(address erc20, address cErc20, uint tokenAmt, address owner, address borrower);
 
-    /**
-     * @dev Enter Compound Market to start borrowing
-     */
-    function enterMarkets(address[] calldata cTokensAdd) external returns (uint[] memory isSuccess) {
-        isSuccess = ComptrollerInterface(getComptrollerAddress()).enterMarkets(cTokensAdd);
-    }
-
-    /**
-     * @dev Exit Compound Market to stop borrowing
-     */
-    function exitMarket(address cTokensAdd) external returns (uint isSuccess) {
-        isSuccess = ComptrollerInterface(getComptrollerAddress()).exitMarket(cTokensAdd);
-    }
-
     /**
      * @dev Deposit ETH/ERC20 and mint Compound Tokens
      */
@@ -212,6 +198,19 @@ contract CompoundResolver is Helpers {
      * @dev borrow ETH/ERC20
      */
     function borrow(address erc20, address cErc20, uint tokenAmt) external {
+        ComptrollerInterface troller = ComptrollerInterface(getComptrollerAddress());
+        address[] memory markets = troller.getAssetsIn(address(this));
+        bool isEntered = false;
+        for (uint i = 0; i < markets.length; i++) {
+            if (markets[i] == cErc20) {
+                isEntered = true;
+            }
+        }
+        if (!isEntered) {
+            address[] memory toEnter;
+            toEnter[0] = cErc20;
+            troller.enterMarkets(toEnter);
+        }
         require(CTokenInterface(cErc20).borrow(tokenAmt) == 0, "got collateral?");
         transferToken(erc20);
         emit LogBorrow(