fix function signature for setImbalanceStepFunction (#576)

* fix function signature for setImbalanceStepFunction

* rename enhanced steps to ConversionRateEnhancedSteps

* rename enhanced steps

* review changes

Author: ilanDoron

contracts/mock/MockEnhancedStepFunctions.sol

@@ -1,11 +1,11 @@
 pragma solidity ^0.4.18;
 
-import "../reserves/fprConversionRate/EnhancedStepFunctions.sol";
+import "../reserves/fprConversionRate/ConversionRateEnhancedSteps.sol";
 
 
-contract MockEnhancedStepFunctions is EnhancedStepFunctions {
+contract MockEnhancedStepFunctions is ConversionRateEnhancedSteps {
 
-    function MockEnhancedStepFunctions(address admin) EnhancedStepFunctions(admin) public {
+    function MockEnhancedStepFunctions(address admin) ConversionRateEnhancedSteps(admin) public {
 
     }
 

contracts/reserves/fprConversionRate/EnhancedStepFunctions.sol renamed to contracts/reserves/fprConversionRate/ConversionRateEnhancedSteps.sol

@@ -10,7 +10,7 @@ import "./ConversionRates.sol";
 /// https://github.com/KyberNetwork/smart-contracts/issues/240
 
 
-contract EnhancedStepFunctions is ConversionRates {
+contract ConversionRateEnhancedSteps is ConversionRates {
 
     uint constant internal MAX_STEPS_IN_FUNCTION = 16;
     int constant internal MAX_IMBALANCE = 2 ** 255 - 1;
@@ -19,7 +19,7 @@ contract EnhancedStepFunctions is ConversionRates {
     int128 constant internal MIN_STEP_VALUE = -1 * 2 ** 127;
     int constant internal MAX_BPS_ADJUSTMENT = 100 * 100;
 
-    function EnhancedStepFunctions(address _admin) public ConversionRates(_admin)
+    function ConversionRateEnhancedSteps(address _admin) public ConversionRates(_admin)
         { } // solhint-disable-line no-empty-blocks
 
     // Blocking set qty step func as we won't use
@@ -38,10 +38,10 @@ contract EnhancedStepFunctions is ConversionRates {
 
     function setImbalanceStepFunction(
         ERC20 token,
-        int128[] xBuy,
-        int128[] yBuy,
-        int128[] xSell,
-        int128[] ySell
+        int[] xBuy,
+        int[] yBuy,
+        int[] xSell,
+        int[] ySell
     )
         public
         onlyOperator
@@ -86,14 +86,14 @@ contract EnhancedStepFunctions is ConversionRates {
 
         int[] memory buyArray = new int[](yBuy.length);
         for(i = 0; i < yBuy.length; i++) {
-            int128 xBuyVal = (i == yBuy.length - 1) ? MAX_STEP_VALUE : xBuy[i];
-            buyArray[i] = encodeStepFunctionData(xBuyVal, yBuy[i]);
+            int128 xBuyVal = (i == yBuy.length - 1) ? MAX_STEP_VALUE : int128(xBuy[i]);
+            buyArray[i] = encodeStepFunctionData(xBuyVal, int128(yBuy[i]));
         }
 
         int[] memory sellArray = new int[](ySell.length);
         for(i = 0; i < ySell.length; i++) {
-            int128 xSellVal = (i == ySell.length - 1) ? MAX_STEP_VALUE : xSell[i];
-            sellArray[i] = encodeStepFunctionData(xSellVal, ySell[i]);
+            int128 xSellVal = (i == ySell.length - 1) ? MAX_STEP_VALUE : int128(xSell[i]);
+            sellArray[i] = encodeStepFunctionData(xSellVal, int128(ySell[i]));
         }
 
         int[] memory emptyArr = new int[](0);
@@ -171,8 +171,8 @@ contract EnhancedStepFunctions is ConversionRates {
 
             // add imbalance overhead
             extraBps = executeStepFunction(
-                tokenData[token].buyRateImbalanceStepFunction, 
-                totalImbalance, 
+                tokenData[token].buyRateImbalanceStepFunction,
+                totalImbalance,
                 totalImbalance + imbalanceQty
             );
             rate = addBps(rate, extraBps);
@@ -191,8 +191,8 @@ contract EnhancedStepFunctions is ConversionRates {
 
             // add imbalance overhead
             extraBps = executeStepFunction(
-                tokenData[token].sellRateImbalanceStepFunction, 
-                totalImbalance + imbalanceQty, 
+                tokenData[token].sellRateImbalanceStepFunction,
+                totalImbalance + imbalanceQty,
                 totalImbalance
             );
             rate = addBps(rate, extraBps);

web3deployment/compileContracts.js

@@ -4,7 +4,7 @@ const solc = require('solc');
 const contractPath = path.join(__dirname, "../contracts/");
 const input = {
     "ConversionRates.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/ConversionRates.sol','utf8'),
-    "EnhancedStepFunctions.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/EnhancedStepFunctions.sol', 'utf8'),
+    "ConversionRateEnhancedSteps.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/ConversionRateEnhancedSteps.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'),