KyberNetwork
diff --git a/‎contracts/mock/MockEnhancedStepFunctions.sol‎ renamed to ‎contracts/mock/MockConversionRateEnhancedSteps.sol‎
Lines changed: 3 additions & 3 deletions b/‎contracts/mock/MockEnhancedStepFunctions.sol‎ renamed to ‎contracts/mock/MockConversionRateEnhancedSteps.sol‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎contracts/reserves/fprConversionRate/EnhancedStepFunctions.sol‎ renamed to ‎contracts/reserves/fprConversionRate/ConversionRateEnhancedSteps.sol‎
Lines changed: 7 additions & 7 deletions b/‎contracts/reserves/fprConversionRate/EnhancedStepFunctions.sol‎ renamed to ‎contracts/reserves/fprConversionRate/ConversionRateEnhancedSteps.sol‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎contracts/wrappers/SetStepFunctionWrapper.sol‎
Lines changed: 33 additions & 18 deletions b/‎contracts/wrappers/SetStepFunctionWrapper.sol‎
Lines changed: 33 additions & 18 deletions
diff --git a/‎contractsV5/bridges/bancor/KyberBancorReserve.sol‎
Lines changed: 10 additions & 8 deletions b/‎contractsV5/bridges/bancor/KyberBancorReserve.sol‎
Lines changed: 10 additions & 8 deletions
diff --git a/‎contractsV5/bridges/bancor/mock/MockBancorNetwork.sol‎
Lines changed: 7 additions & 5 deletions b/‎contractsV5/bridges/bancor/mock/MockBancorNetwork.sol‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎test/v4/enhancedStepFunctions.js‎ renamed to ‎test/v4/conversionRateEnhancedSteps.js‎
Lines changed: 4 additions & 6 deletions b/‎test/v4/enhancedStepFunctions.js‎ renamed to ‎test/v4/conversionRateEnhancedSteps.js‎
Lines changed: 4 additions & 6 deletions
diff --git a/‎test/v5/kyberBancorReserve.js‎
Lines changed: 27 additions & 3 deletions b/‎test/v5/kyberBancorReserve.js‎
Lines changed: 27 additions & 3 deletions
@@ -1,11 +1,11 @@
 pragma solidity ^0.4.18;
 
-import "../reserves/fprConversionRate/EnhancedStepFunctions.sol";
+import "../reserves/fprConversionRate/ConversionRateEnhancedSteps.sol";
 
 
-contract MockEnhancedStepFunctions is EnhancedStepFunctions {
+contract MockConversionRateEnhancedSteps is ConversionRateEnhancedSteps {
 
-    function MockEnhancedStepFunctions(address admin) EnhancedStepFunctions(admin) public {
+    function MockConversionRateEnhancedSteps(address admin) ConversionRateEnhancedSteps(admin) public {
 
     }
 
 
@@ -2,15 +2,15 @@ pragma solidity 0.4.18;
 
 import "./ConversionRates.sol";
 
-/// @title EnhancedStepFunctions contract - new ConversionRates contract with step function enhancement
+/// @title ConversionRateEnhancedSteps contract - new ConversionRates contract with step function enhancement
 /// Removed qty step function overhead
 /// Also fixed following issues:
 /// https://github.com/KyberNetwork/smart-contracts/issues/291
 /// https://github.com/KyberNetwork/smart-contracts/issues/241
 /// 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
@@ -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);
 
@@ -3,19 +3,23 @@ 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 {
     SetStepFunctionInterface public rateContract;
     function SetStepFunctionWrapper(address admin, address operator) public {
+        require(admin != address(0));
+        require(operator != (address(0)));
+
         addOperator(operator);
         transferAdminQuickly(admin);
     }
@@ -24,23 +28,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);
 
@@ -18,13 +18,15 @@ contract KyberBancorReserve is IKyberReserve, Withdrawable, Utils {
     IBancorNetwork public bancorNetwork; // 0x0e936B11c2e7b601055e58c7E32417187aF4de4a
 
     IERC20 public bancorEth; // 0xc0829421C1d260BD3cB3E0F06cfE2D52db2cE315
+    IERC20 public bancorETHBNT; // 0xb1CD6e4153B2a390Cf00A6556b0fC1458C4A5533
     IERC20 public bancorToken; // 0x1F573D6Fb3F13d689FF844B4cE37794d79a7FF1C
 
     constructor(
         address _bancorNetwork,
         address _kyberNetwork,
         uint _feeBps,
         address _bancorEth,
+        address _bancorETHBNT,
         address _bancorToken,
         address _admin
     )
@@ -33,13 +35,15 @@ contract KyberBancorReserve is IKyberReserve, Withdrawable, Utils {
         require(_bancorNetwork != address(0), "constructor: bancorNetwork address is missing");
         require(_kyberNetwork != address(0), "constructor: kyberNetwork address is missing");
         require(_bancorEth != address(0), "constructor: bancorEth address is missing");
+        require(_bancorETHBNT != address(0), "constructor: bancorETHBNT address is missing");
         require(_bancorToken != address(0), "constructor: bancorToken address is missing");
         require(_admin != address(0), "constructor: admin address is missing");
         require(_feeBps < BPS, "constructor: fee is too big");
 
         bancorNetwork = IBancorNetwork(_bancorNetwork);
         bancorToken = IERC20(_bancorToken);
         bancorEth = IERC20(_bancorEth);
+        bancorETHBNT = IERC20(_bancorETHBNT);
 
         kyberNetwork = _kyberNetwork;
         feeBps = _feeBps;
@@ -208,21 +212,19 @@ contract KyberBancorReserve is IKyberReserve, Withdrawable, Utils {
     }
 
     function getConversionPath(IERC20 src, IERC20 dest) public view returns(IERC20[] memory path) {
-        IERC20 bntToken = bancorToken;
-
-        if (src == bntToken) {
+        if (src == bancorToken) {
             // trade from BNT to ETH
             path = new IERC20[](3);
-            path[0] = bntToken;
-            path[1] = bntToken;
+            path[0] = bancorToken;
+            path[1] = bancorETHBNT;
             path[2] = bancorEth;
             return path;
-        } else if (dest == bntToken) {
+        } else if (dest == bancorToken) {
             // trade from ETH to BNT
             path = new IERC20[](3);
             path[0] = bancorEth;
-            path[1] = bntToken;
-            path[2] = bntToken;
+            path[1] = bancorETHBNT;
+            path[2] = bancorToken;
             return path;
         }
     }
 
@@ -7,14 +7,16 @@ import "../../../UtilsV5.sol";
 contract MockBancorNetwork is IBancorNetwork, Utils {
 
     IERC20 public bancorETH;
+    IERC20 public bancorETHBNT;
     IERC20 public bancorBNT;
 
     uint public rateEthToBnt;
     uint public rateBntToETh;
 
-    constructor(address _bancorETH, address _bancorBNT) public {
+    constructor(address _bancorETH, address _bancorETHBNT, address _bancorBNT) public {
         bancorETH = IERC20(_bancorETH);
         bancorBNT = IERC20(_bancorBNT);
+        bancorETHBNT = IERC20(_bancorETHBNT);
     }
 
     function() external payable { }
@@ -27,15 +29,15 @@ contract MockBancorNetwork is IBancorNetwork, Utils {
     function getReturnByPath(IERC20[] calldata _path, uint256 _amount) external view returns (uint256, uint256) {
         require(_amount > 0);
         if (_path.length != 3) { return (0, 0); }
-        if (_path[0] == bancorBNT && _path[1] == bancorBNT && _path[2] == bancorETH) {
+        if (_path[0] == bancorBNT && _path[1] == bancorETHBNT && _path[2] == bancorETH) {
             // rate btn to eth
             uint destAmount = calcDstQty(_amount, getDecimals(bancorBNT), ETH_DECIMALS, rateBntToETh);
             if (destAmount > address(this).balance) {
                 return (0, 0);
             }
             return (destAmount, 0);
         }
-        if (_path[0] == bancorETH && _path[1] == bancorBNT && _path[2] == bancorBNT) {
+        if (_path[0] == bancorETH && _path[1] == bancorETHBNT && _path[2] == bancorBNT) {
             // rate eth to bnt
             uint destAmount = calcDstQty(_amount, ETH_DECIMALS, getDecimals(bancorBNT), rateEthToBnt);
             if (destAmount > bancorBNT.balanceOf(address(this))) {
@@ -55,7 +57,7 @@ contract MockBancorNetwork is IBancorNetwork, Utils {
     ) external payable returns (uint256) {
         require(_path.length == 3);
         // trade eth to bnt
-        require(_path[0] == bancorETH && _path[1] == bancorBNT && _path[2] == bancorBNT);
+        require(_path[0] == bancorETH && _path[1] == bancorETHBNT && _path[2] == bancorBNT);
         require(msg.value == _amount && _amount > 0);
         require(rateEthToBnt > 0);
         uint destAmount = calcDstQty(_amount, ETH_DECIMALS, getDecimals(bancorBNT), rateEthToBnt);
@@ -74,7 +76,7 @@ contract MockBancorNetwork is IBancorNetwork, Utils {
     ) external returns (uint256) {
         require(_path.length == 3);
         // trade eth to bnt
-        require(_path[0] == bancorBNT && _path[1] == bancorBNT && _path[2] == bancorETH);
+        require(_path[0] == bancorBNT && _path[1] == bancorETHBNT && _path[2] == bancorETH);
         // collect bnt
         require(_amount > 0);
         require(bancorBNT.transferFrom(msg.sender, address(this), _amount));
 
@@ -1,8 +1,6 @@
 
-//let ConversionRates = artifacts.require("./ConversionRates.sol");
-let MockEnhancedStepFunctions = artifacts.require("./mockContracts/MockEnhancedStepFunctions.sol");
+let MockConversionRateEnhancedSteps = artifacts.require("./mockContracts/MockConversionRateEnhancedSteps.sol");
 let TestToken = artifacts.require("./mockContracts/TestToken.sol");
-let Wrapper = artifacts.require("./mockContracts/Wrapper.sol");
 
 let Helper = require("./helper.js");
 const BN = web3.utils.BN;
@@ -50,17 +48,17 @@ let comID_SellRateStpImbalanceParamY = 15;
 
 let convRatesInst;
 
-contract('EnhancedStepFunctions', function(accounts) {
+contract('ConversionRateEnhancedSteps', function(accounts) {
     it("should init globals", function() {
         admin = accounts[0];
         alerter = accounts[1];
         operator = accounts[2];
         reserveAddress = accounts[3];
     })
 
-    it("should init EnhancedStepFunctions Inst and set general parameters.", async function () {
+    it("should init ConversionRateEnhancedSteps Inst and set general parameters.", async function () {
         //init contracts
-        convRatesInst = await MockEnhancedStepFunctions.new(admin);
+        convRatesInst = await MockConversionRateEnhancedSteps.new(admin);
 
         //set pricing general parameters
         convRatesInst.setValidRateDurationInBlocks(validRateDurationInBlocks);
 
@@ -42,13 +42,15 @@ contract('KyberBancorNetwork', function(accounts) {
         user = accounts[4];
 
         bancorEthToken = await TestToken.new("BancorETH", "BETH", tokenDecimal);
+        bancorETHBNTToken = await TestToken.new("BancorETHBNT", "BETHBNT", tokenDecimal);
         bancorBntToken = await TestToken.new("BancorBNT", "BBNT", tokenDecimal);
-        bancorNetwork = await MockBancorNetwork.new(bancorEthToken.address, bancorBntToken.address);
+        bancorNetwork = await MockBancorNetwork.new(bancorEthToken.address, bancorETHBNTToken.address, bancorBntToken.address);
         reserve = await KyberBancorReserve.new(
             bancorNetwork.address,
             network,
             feeBps,
             bancorEthToken.address,
+            bancorETHBNTToken.address,
             bancorBntToken.address,
             admin
         );
@@ -142,12 +144,13 @@ contract('KyberBancorNetwork', function(accounts) {
 
     it("Should test getConversionRate returns 0 when path is not correct", async function() {
         let testNewToken = await TestToken.new("Test token", "TST", tokenDecimal);
-        let testBancorNetwork = await MockBancorNetwork.new(testNewToken.address, bancorBntToken.address);
+        let testBancorNetwork = await MockBancorNetwork.new(testNewToken.address, bancorETHBNTToken.address, bancorBntToken.address);
         let testReserve = await KyberBancorReserve.new(
             testBancorNetwork.address,
             network,
             feeBps,
             bancorEthToken.address,
+            bancorETHBNTToken.address,
             bancorBntToken.address,
             admin
         );
@@ -160,12 +163,13 @@ contract('KyberBancorNetwork', function(accounts) {
         rate = await testReserve.getConversionRate(bancorBntToken.address, ethAddress, amount, 0);
         Helper.assertEqual(rate, 0, "rate should be 0 as path is incorrect");
 
-        testBancorNetwork = await MockBancorNetwork.new(bancorEthToken.address, testNewToken.address);
+        testBancorNetwork = await MockBancorNetwork.new(bancorEthToken.address, bancorETHBNTToken.address, testNewToken.address);
         testReserve = await KyberBancorReserve.new(
             testBancorNetwork.address,
             network,
             feeBps,
             bancorEthToken.address,
+            bancorETHBNTToken.address,
             bancorBntToken.address,
             admin
         );
@@ -187,6 +191,7 @@ contract('KyberBancorNetwork', function(accounts) {
                 network,
                 feeBps,
                 bancorEthToken.address,
+                bancorETHBNTToken.address,
                 bancorBntToken.address,
                 admin
             );
@@ -200,6 +205,7 @@ contract('KyberBancorNetwork', function(accounts) {
                 zeroAddress,
                 feeBps,
                 bancorEthToken.address,
+                bancorETHBNTToken.address,
                 bancorBntToken.address,
                 admin
             );
@@ -213,6 +219,7 @@ contract('KyberBancorNetwork', function(accounts) {
                 network,
                 feeBps,
                 zeroAddress,
+                bancorETHBNTToken.address,
                 bancorBntToken.address,
                 admin
             );
@@ -227,6 +234,21 @@ contract('KyberBancorNetwork', function(accounts) {
                 feeBps,
                 bancorEthToken.address,
                 zeroAddress,
+                bancorBntToken.address,
+                admin
+            );
+            assert(false, "throw was expected in line above.")
+        } catch (e) {
+            assert(Helper.isRevertErrorMessage(e), "expected throw but got: " + e);
+        }
+        try {
+            _ = await KyberBancorReserve.new(
+                bancorNetwork.address,
+                network,
+                feeBps,
+                bancorEthToken.address,
+                bancorETHBNTToken.address,
+                zeroAddress,
                 admin
             );
             assert(false, "throw was expected in line above.")
@@ -239,6 +261,7 @@ contract('KyberBancorNetwork', function(accounts) {
                 network,
                 feeBps,
                 bancorEthToken.address,
+                bancorETHBNTToken.address,
                 bancorBntToken.address,
                 zeroAddress
             );
@@ -251,6 +274,7 @@ contract('KyberBancorNetwork', function(accounts) {
             network,
             feeBps,
             bancorEthToken.address,
+            bancorETHBNTToken.address,
             bancorBntToken.address,
             admin
         );
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`pragma solidity ^0.4.18;`
`2`	`2`
`3`		`-import "../reserves/fprConversionRate/EnhancedStepFunctions.sol";`
	`3`	`+import "../reserves/fprConversionRate/ConversionRateEnhancedSteps.sol";`
`4`	`4`
`5`	`5`
`6`		`-contract MockEnhancedStepFunctions is EnhancedStepFunctions {`
	`6`	`+contract MockConversionRateEnhancedSteps is ConversionRateEnhancedSteps {`
`7`	`7`
`8`		`- function MockEnhancedStepFunctions(address admin) EnhancedStepFunctions(admin) public {`
	`8`	`+ function MockConversionRateEnhancedSteps(address admin) ConversionRateEnhancedSteps(admin) public {`
`9`	`9`
`10`	`10`	`}`
`11`	`11`