From 2a8af2f1a90bf06e31bdc2e4f838c8a7476caa87 Mon Sep 17 00:00:00 2001
From: Barry Gitarts <bgitarts@gmail.com>
Date: Thu, 10 Oct 2019 15:59:41 -0400
Subject: [PATCH] update contracts for solidity version

add deploy params
---
 contracts/SwapProxy.sol   | 35 ++++++++++++++++++++---------------
 embarkConfig/contracts.js |  9 +++++++++
 yarn.lock                 |  2 +-
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/contracts/SwapProxy.sol b/contracts/SwapProxy.sol
index c6d12a5..a992f35 100644
--- a/contracts/SwapProxy.sol
+++ b/contracts/SwapProxy.sol
@@ -36,8 +36,10 @@ contract SwapProxy {
      * @param _kyberProxy Kyber Network Proxy address
      * @param _ETH Kyber ETH address
      * @param _vault address that receives swap fees
+     * @param _maxSlippage most slippage as a percentage
      */
-    constructor(address _liquidPledging, address _kyberProxy, address _ETH, address _vault, uint _maxSlippage) public {
+    function SwapProxy(address _liquidPledging, address _kyberProxy, address _ETH, address _vault, uint _maxSlippage) public {
+      require(_maxSlippage < 100);
       if (_vault == address(0)){
         _vault = address(this);
       }
@@ -74,17 +76,19 @@ contract SwapProxy {
      * @param token token to convert from ETH
      */
     function fundWithETH(uint64 idReceiver, address token) public payable {
-      require(msg.value > 0, "Not enough ETH");
+      require(msg.value > 0);
 
-      (uint expectedRate, uint slippageRate) = kyberProxy.getExpectedRate(ETH, token, msg.value);
-      require(expectedRate > 0, "expected rate can not be 0");
+      uint expectedRate;
+      uint slippageRate;
+      (expectedRate, slippageRate) = kyberProxy.getExpectedRate(ETH, token, msg.value);
+      require(expectedRate > 0);
       uint slippagePercent = (slippageRate * 100) / expectedRate;
-      require(slippagePercent <= maxSlippage, "slippage exceeds maximum, try a smaller amount");
+      require(slippagePercent <= maxSlippage);
       uint maxDestinationAmount = (slippageRate / (10**18)) * msg.value;
       uint amount = kyberProxy.trade.value(msg.value)(ETH, msg.value, token, address(this), maxDestinationAmount, slippageRate, vault);
-      require(amount > 0, "Not enough tokens for funding");
+      require(amount > 0);
 
-      ERC20Token(token).approve(address(LiquidPledging), amount);
+      ERC20Token(token).approve(address(liquidPledging), amount);
       liquidPledging.addGiverAndDonate(idReceiver, token, amount);
     }
 
@@ -97,20 +101,21 @@ contract SwapProxy {
      */
     function fundWithToken(uint64 idReceiver, address token, uint amount, address receiverToken) public {
       require(ERC20Token(token).transferFrom(msg.sender, address(this), amount));
-      (uint expectedRate, uint slippageRate) = kyberProxy.getExpectedRate(ETH, token, msg.value);
 
-      (uint expectedRate, uint slippageRate) = kyberProxy.getExpectedRate(token, receiverToken, amount);
-      require(expectedRate > 0, "expected rate can not be 0");
+      uint expectedRate;
+      uint slippageRate;
+      (expectedRate, slippageRate) = kyberProxy.getExpectedRate(token, receiverToken, amount);
+      require(expectedRate > 0);
       uint slippagePercent = (slippageRate * 100) / expectedRate;
-      require(slippagePercent <= maxSlippage, "slippage exceeds maximum, try a smaller amount");
-      require(ERC20Token(token).approve(address(kyberProxy), 0), "Could not reset approval");
-      require(ERC20Token(token).approve(address(kyberProxy), amount), "Could not approve amount");
+      require(slippagePercent <= maxSlippage);
+      require(ERC20Token(token).approve(address(kyberProxy), 0));
+      require(ERC20Token(token).approve(address(kyberProxy), amount));
 
       uint maxDestinationAmount = (slippageRate / (10**18)) * amount;
       uint receiverAmount = kyberProxy.trade(token, amount, receiverToken, address(this), maxDestinationAmount, slippageRate, vault);
-      require(receiverAmount > 0, "Not enough tokens for funding");
+      require(receiverAmount > 0);
 
-      ERC20Token(token).approve(address(LiquidPledging), receiverAmount);
+      ERC20Token(token).approve(address(liquidPledging), receiverAmount);
       liquidPledging.addGiverAndDonate(idReceiver, receiverToken, receiverAmount);
     }
 
diff --git a/embarkConfig/contracts.js b/embarkConfig/contracts.js
index be8b549..f625c57 100644
--- a/embarkConfig/contracts.js
+++ b/embarkConfig/contracts.js
@@ -178,6 +178,15 @@ module.exports = {
       StandardToken: {},
       SNT: {
         address: "0x8aA3672a99C489E5Dc5dfDb40e607bE49970cbF7"
+      },
+      SwapProxy: {
+        args: [
+          '$LiquidPledging',
+          "0x818E6FECD516Ecc3849DAf6845e3EC868087B755",
+          "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+          "0",
+          20
+        ]
       }
     },
     afterDeploy: async (dependencies) => {
diff --git a/yarn.lock b/yarn.lock
index 83af88b..60040a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11122,7 +11122,7 @@ ipfs-http-client@^37.0.1:
     tar-stream "^2.0.1"
     through2 "^3.0.1"
 
-ipfs-http-client@^38.2.1:
+ipfs-http-client@^38.2.0:
   version "38.2.0"
   resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-38.2.0.tgz#f8f9777a64342ae87505c96e14fbceb95c351684"
   integrity sha512-fREBfEKJGb0egN10NTjwSiz2HQ+e6RKRcqtL+mlzlmrt8o2jzYSHhizVvv5yPZcQ+2WmEUf1d9WJGXO+S6KY9A==