Merge branch 'ilan/updateStepSetterContract' of github.com:KyberNetwork/smart-contracts into ilan/deployEnhancedStepFunctionsRate

Author: ilanDoron

contracts/wrappers/SetStepFunctionWrapper.sol

@@ -3,17 +3,18 @@ pragma solidity ^0.4.18;
 import "../ERC20Interface.sol";
 import "../Withdrawable.sol";
 
+
 interface SetStepFunctionInterface {
-  function setImbalanceStepFunction(
-      ERC20 token,
-      int[] xBuy,
-      int[] yBuy,
-      int[] xSell,
-      int[] ySell
-  ) public;
+    function setImbalanceStepFunction(
+        ERC20 token,
+        int[] xBuy,
+        int[] yBuy,
+        int[] xSell,
+        int[] ySell
+    ) public;
 }
 
-contract SetStepFunctionWrapper is Withdrawable {
+contract SetStepFunctionWrapper2 is Withdrawable {
     SetStepFunctionInterface public rateContract;
     function SetStepFunctionWrapper(address admin, address operator) public {
         addOperator(operator);
@@ -25,22 +26,32 @@ contract SetStepFunctionWrapper is Withdrawable {
     }
 
     function setImbalanceStepFunction(ERC20 token,
-                                      int[] xBuy,
-                                      int[] yBuy,
-                                      int[] xSell,
-                                      int[] ySell) public onlyOperator {
+        int[] xBuy,
+        int[] yBuy,
+        int[] xSell,
+        int[] ySell)
+    public onlyOperator
+    {
         uint i;
 
-        // check all x for buy are positive and y are negative
+        // check all x for buy are positiv
         for( i = 0 ; i < xBuy.length ; i++ ) {
-          require(xBuy[i] >= 0 );
-          require(yBuy[i] <= 0 );
+            require(xBuy[i] >= 0 );
+        }
+
+        // check all y for buy are negative
+        for( i = 0 ; i < yBuy.length ; i++ ) {
+            require(yBuy[i] <= 0 );
         }
 
-        // check all x for sell are negative and y are negative
+        // check all x for sell are negative
         for( i = 0 ; i < xSell.length ; i++ ) {
-          require(xSell[i] <= 0 );
-          require(ySell[i] <= 0 );
+            require(xSell[i] <= 0 );
+        }
+
+        // check all y for sell are negative
+        for( i = 0 ; i < ySell.length ; i++ ) {
+            require(ySell[i] <= 0 );
         }
 
         rateContract.setImbalanceStepFunction(token,xBuy,yBuy,xSell,ySell);

web3deployment/compileContracts.js

@@ -44,6 +44,7 @@ const input = {
     "WrapFeeBurner.sol" : fs.readFileSync(contractPath + 'wrappers/WrapFeeBurner.sol', 'utf8'),
     "KyberUniswapReserve.sol" : fs.readFileSync(contractPath + 'reserves/bridgeReserves/uniswap/KyberUniswapReserve.sol', 'utf8'),
     "WrapperBase.sol" : fs.readFileSync(contractPath + 'wrappers/WrapperBase.sol', 'utf8'),
+    "SetStepFunctionWrapper.sol" : fs.readFileSync(contractPath + 'wrappers/SetStepFunctionWrapper.sol', 'utf8')
     "WrapConversionRate.sol" : fs.readFileSync(contractPath + 'wrappers/WrapConversionRate.sol', 'utf8'),
     "WrapReadTokenData.sol" : fs.readFileSync(contractPath + 'wrappers/WrapReadTokenData.sol', 'utf8')
   };