From b9b2fad21d57edc38dc7a563a8079cddcf35c912 Mon Sep 17 00:00:00 2001
From: Sowmayjain <champ.sowmay@gmail.com>
Date: Sun, 27 Jan 2019 04:59:17 +0530
Subject: [PATCH] Completed Leverage CDP.

---
 contracts/v2/DAI2ETH.sol     |  1 -
 contracts/v2/LeverageCDP.sol | 23 +++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/contracts/v2/DAI2ETH.sol b/contracts/v2/DAI2ETH.sol
index 59f088f..06684d6 100644
--- a/contracts/v2/DAI2ETH.sol
+++ b/contracts/v2/DAI2ETH.sol
@@ -2,7 +2,6 @@ pragma solidity ^0.4.24;
 
 interface IERC20 {
     function balanceOf(address who) external view returns (uint256);
-    // function transfer(address to, uint256 value) external returns (bool);
     function approve(address spender, uint256 value) external returns (bool);
 }
 
diff --git a/contracts/v2/LeverageCDP.sol b/contracts/v2/LeverageCDP.sol
index aa323cd..91c04b6 100644
--- a/contracts/v2/LeverageCDP.sol
+++ b/contracts/v2/LeverageCDP.sol
@@ -48,7 +48,11 @@ interface WETHFace {
 
 interface Swap {
     function dai2eth(uint srcDAI) external payable returns (uint destETH);
-    function expectedETH(uint srcDAI) external view returns (uint, uint);
+}
+
+interface InstaBank {
+    function claimCDP(uint cdpNum) external;
+    function transferCDPInternal(uint cdpNum, address nextOwner) external;
 }
 
 
@@ -107,7 +111,7 @@ contract LoopNewCDP is GlobalVar {
     }
 
     // useETH = msg.sender + personal ETH used to assist the operation
-    function riskNewCDP(uint eth2Lock, uint dai2Mint) public payable {
+    function riskNewCDP(uint eth2Lock, uint dai2Mint, bool isCDP2Sender) public payable {
         require(!freezed, "Operation Disabled");
 
         uint ethBal = address(this).balance;
@@ -124,9 +128,10 @@ contract LoopNewCDP is GlobalVar {
         loanMaster.draw(cup, dai2Mint);
         IERC20 daiTkn = IERC20(getAddress("dai"));
 
-        address dai2eth = getAddress("dai2eth"); // DAI to ETH swapper
-        daiTkn.transfer(dai2eth, dai2Mint);
-        // SWAP DAI 2 ETH
+        address dai2eth = getAddress("dai2eth");
+        daiTkn.transfer(dai2eth, dai2Mint); // DAI >>> dai2eth
+        Swap resolveSwap = Swap(dai2eth);
+        resolveSwap.dai2eth(dai2Mint); // DAI >>> ETH
 
         uint nowBal = address(this).balance;
         if (ethBal > nowBal) {
@@ -134,7 +139,13 @@ contract LoopNewCDP is GlobalVar {
         }
         require(ethBal == nowBal, "No Refund of Contract ETH");
 
-        // transfer CDP to v2 InstaBank
+        if (isCDP2Sender) { // CDP >>> msg.sender
+            loanMaster.give(cup, msg.sender);
+        } else { // CDP >>> InstaBank
+            InstaBank resolveBank = InstaBank(dai2eth);
+            resolveBank.claimCDP(uint(cup));
+            resolveBank.transferCDPInternal(uint(cup), msg.sender);
+        }
 
         emit LevNewCDP(uint(cup), eth2Lock, dai2Mint);
     }