From 3969d4af740da05a33993b3b2b2423cfdc364db6 Mon Sep 17 00:00:00 2001
From: Samyak Jain <sjain0410@gmail.com>
Date: Mon, 24 Jun 2019 02:38:02 +0530
Subject: [PATCH] loopSwap completed

---
 contracts/ProxyLogics/InstaSave.sol | 63 ++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 10 deletions(-)

diff --git a/contracts/ProxyLogics/InstaSave.sol b/contracts/ProxyLogics/InstaSave.sol
index e14293a..0b8028a 100644
--- a/contracts/ProxyLogics/InstaSave.sol
+++ b/contracts/ProxyLogics/InstaSave.sol
@@ -267,6 +267,7 @@ contract MakerHelpers is Helpers {
             ink = rmul(ink, tub.per()) <= jam ? ink : ink - 1;
             tub.free(cup, ink);
 
+            setAllowance(weth, tubAddr);
             setAllowance(peth, tubAddr);
 
             tub.exit(ink);
@@ -484,6 +485,17 @@ contract GetDetails is MakerHelpers {
 
 contract SaveResolver is GetDetails {
 
+    /**
+     * @param what 0 for ETH2DAI & 1 for Kyber
+     */
+    event LogSwap(
+        uint what,
+        address src,
+        uint srcAmt,
+        address dest,
+        uint destAmt
+    );
+
     function saveSwap(uint srcAmt, uint daiDebt) internal returns (uint destAmt) {
         (,uint isBest) = getBest(getAddressETH(), getAddressDAI(), srcAmt);
         if (isBest == 0) {
@@ -505,6 +517,46 @@ contract SaveResolver is GetDetails {
                 getAddressAdmin()
             );
         }
+        emit LogSwap(
+            isBest,
+            getAddressETH(),
+            srcAmt,
+            getAddressDAI(),
+            destAmt
+        );
+    }
+
+    function loopSwap(uint srcAmt) internal returns (uint destAmt) {
+        (,uint isBest) = getBest(getAddressETH(), getAddressDAI(), srcAmt);
+        if (isBest == 0) {
+            destAmt = Eth2DaiInterface(getAddressEth2Dai()).sellAllAmount(
+                getAddressDAI(),
+                srcAmt,
+                getAddressWETH(),
+                0
+            );
+            TokenInterface weth = TokenInterface(getAddressWETH());
+            setAllowance(weth, getSaiTubAddress());
+            weth.withdraw(destAmt);
+        } else {
+            setAllowance(TokenInterface(getAddressDAI()), getAddressKyber());
+            destAmt = KyberInterface(getAddressKyber()).trade.value(srcAmt)(
+                getAddressDAI(),
+                srcAmt,
+                getAddressETH(),
+                address(this),
+                2**255,
+                0,
+                getAddressAdmin()
+            );
+        }
+        emit LogSwap(
+            isBest,
+            getAddressDAI(),
+            srcAmt,
+            getAddressETH(),
+            destAmt
+        );
     }
 
 }
@@ -589,16 +641,7 @@ contract Save is SaveResolver {
             debtToBorrow = daiToSwap;
         }
         draw(cdpID, debtToBorrow);
-        setAllowance(TokenInterface(getAddressDAI()), getAddressKyber());
-        uint destAmt = KyberInterface(getAddressKyber()).trade.value(0)(
-            getAddressDAI(),
-            debtToBorrow,
-            getAddressETH(),
-            address(this),
-            2**255,
-            0,
-            getAddressAdmin()
-        );
+        uint destAmt = loopSwap(debtToBorrow);
         lock(cdpID, destAmt);
 
         emit LogLeverageCDP(cdpID, debtToBorrow, destAmt);