Merge pull request #565 from KyberNetwork/ilan/deployEnhancedStepFunctionsRate

Add script to deploy enhanced step functions contract.

Author: Anyhowclick

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);
@@ -24,23 +25,34 @@ contract SetStepFunctionWrapper is Withdrawable {
         rateContract = _contract;
     }
 
-    function setImbalanceStepFunction(ERC20 token,
-                                      int[] xBuy,
-                                      int[] yBuy,
-                                      int[] xSell,
-                                      int[] ySell) public onlyOperator {
+    function setImbalanceStepFunction(
+        ERC20 token,
+        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 positive
         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

@@ -4,8 +4,11 @@ const solc = require('solc');
 const contractPath = path.join(__dirname, "../contracts/");
 const input = {
     "ConversionRates.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/ConversionRates.sol','utf8'),
-    "VolumeImbalanceRecorder.sol" : fs.readFileSync(contractPath + 'reserves/VolumeImbalanceRecorder.sol', 'utf8'),
+    "EnhancedStepFunctions.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/EnhancedStepFunctions.sol', 'utf8'),
     "ConversionRatesInterface.sol" : fs.readFileSync(contractPath + 'ConversionRatesInterface.sol', 'utf8'),
+    "reserves/fprConversionRate/ConversionRates.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/ConversionRates.sol','utf8'),
+    "reserves/VolumeImbalanceRecorder.sol" : fs.readFileSync(contractPath + 'reserves/VolumeImbalanceRecorder.sol', 'utf8'),
+    "VolumeImbalanceRecorder.sol" : fs.readFileSync(contractPath + 'reserves/VolumeImbalanceRecorder.sol', 'utf8'),
     "PermissionGroups.sol" : fs.readFileSync(contractPath + 'PermissionGroups.sol', 'utf8'),
     "ERC20Interface.sol" : fs.readFileSync(contractPath + 'ERC20Interface.sol', 'utf8'),
     "ExpectedRate.sol" : fs.readFileSync(contractPath + 'ExpectedRate.sol', 'utf8'),
@@ -36,14 +39,13 @@ const input = {
     "Utils.sol" : fs.readFileSync(contractPath + 'Utils.sol', 'utf8'),
     "Utils2.sol" : fs.readFileSync(contractPath + 'Utils2.sol', 'utf8'),
     "Utils3.sol" : fs.readFileSync(contractPath + 'Utils3.sol', 'utf8'),
-    "reserves/fprConversionRate/ConversionRates.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/ConversionRates.sol','utf8'),
-    "reserves/VolumeImbalanceRecorder.sol" : fs.readFileSync(contractPath + 'reserves/VolumeImbalanceRecorder.sol', 'utf8'),
     "Withdrawable.sol" : fs.readFileSync(contractPath + 'Withdrawable.sol', 'utf8'),
     "WhiteList.sol" : fs.readFileSync(contractPath + 'WhiteList.sol', 'utf8'),
     "WhiteListInterface.sol" : fs.readFileSync(contractPath + 'WhiteListInterface.sol', 'utf8'),
     "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')
   };