From 87cfe8f4a7ad9e010483da5c4124114499bb66cc Mon Sep 17 00:00:00 2001
From: Sowmayjain <champ.sowmay@gmail.com>
Date: Sun, 24 Mar 2019 05:46:50 +0530
Subject: [PATCH] renamed contract.

---
 contracts/ProxyLogics/InstaKyber.sol | 48 ++++++++++++++--------------
 contracts/UserWallet.sol             |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/contracts/ProxyLogics/InstaKyber.sol b/contracts/ProxyLogics/InstaKyber.sol
index 0e29133..13e4fe5 100644
--- a/contracts/ProxyLogics/InstaKyber.sol
+++ b/contracts/ProxyLogics/InstaKyber.sol
@@ -52,6 +52,28 @@ contract Helper {
     uint public maxCap = 2**255;
     uint public fees = 200; // 0.2% => 200/1000
 
+    /**
+     * @dev getting rates from Kyber
+     * @param src is the token being sold
+     * @param dest is the token being bought
+     * @param srcAmt is the amount of token being sold
+     * @return expectedRate - the current rate
+     * @return slippageRate - rate with 3% slippage
+     */
+    function getExpectedRate(
+        address src,
+        address dest,
+        uint srcAmt
+    ) public view returns (
+        uint expectedRate,
+        uint slippageRate
+    ) 
+    {
+        KyberInterface swapCall = KyberInterface(kyber);
+        (expectedRate, slippageRate) = swapCall.getExpectedRate(src, dest, srcAmt);
+        slippageRate = (slippageRate / 97) * 99; // changing slippage rate upto 99%
+    }
+
     /**
      * @dev fetching token from the trader if ERC20
      * @param trader is the trader
@@ -88,28 +110,6 @@ contract Helper {
             setApproval(token);
         }
     }
-
-    /**
-     * @dev getting rates from Kyber
-     * @param src is the token being sold
-     * @param dest is the token being bought
-     * @param srcAmt is the amount of token being sold
-     * @return expectedRate - the current rate
-     * @return slippageRate - rate with 3% slippage
-     */
-    function getExpectedRate(
-        address src,
-        address dest,
-        uint srcAmt
-    ) internal view returns (
-        uint expectedRate,
-        uint slippageRate
-    ) 
-    {
-        KyberInterface swapCall = KyberInterface(kyber);
-        (expectedRate, slippageRate) = swapCall.getExpectedRate(src, dest, srcAmt);
-        slippageRate = (slippageRate / 97) * 99; // changing slippage rate upto 99%
-    }
     
 }
 
@@ -231,10 +231,10 @@ contract InstaTrade is Swap {
     /**
      * @dev setting up variables on deployment
      */
-    constructor(address _eth, address _kyber, address _admin) public {
+    constructor(address _eth, address _kyber) public {
         eth = _eth; // 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
         kyber = _kyber; // 0x818E6FECD516Ecc3849DAf6845e3EC868087B755
-        admin = _admin; // 0x7284a8451d9a0e7Dc62B3a71C0593eA2eC5c5638
+        admin = msg.sender; // 0x7284a8451d9a0e7Dc62B3a71C0593eA2eC5c5638
     }
 
 }
\ No newline at end of file
diff --git a/contracts/UserWallet.sol b/contracts/UserWallet.sol
index 8b7567f..fdf7ba7 100644
--- a/contracts/UserWallet.sol
+++ b/contracts/UserWallet.sol
@@ -292,7 +292,7 @@ contract UserNote {
 /**
  * @title User Owned Contract Wallet
  */
-contract UserWallet is UserManager, UserNote {
+contract InstaWallet is UserManager, UserNote {
 
     event LogExecute(address sender, address target, uint srcNum, uint sessionNum);