Merge branch 'Katalyst' into duc/add_untest_event

Author: ilanDoron

README.md

@@ -15,11 +15,11 @@ Public facing interfaces for kyber network (folder: contracts/sol6):
 2. `npm ci`
 
 ## Compilation with Buidler
-1. `./cmp.sh` to compile contracts for all solidity verseions.
+1. `./cmp.sh` to compile contracts for all solidity versions.
 2. `./cmpSol6.sh` to compile only sol6 contracts
 
 ## Testing with Buidler
-1. If contracts have not been compiled, run `./compilation.sh`. This step can be skipped subsequently.
+1. If contracts have not been compiled, run `./cmp.sh`. This step can be skipped subsequently.
 2. Run `./tst.sh`
 3. Use `-f` for running a specific test file.
 5. Use `-a` to run tests for all solidity versions. Runs only sol6 tests by default.
@@ -37,4 +37,4 @@ Public facing interfaces for kyber network (folder: contracts/sol6):
 2. Use `-f` for running a specific test file.
 
 ### Example Commands
-`./coverage.sh -f ./test/sol6/kyberNetwork.js` (Coverage for only kyberNetwork.js)
+`./coverage.sh -f ./test/sol6/kyberNetwork.js` (Coverage for only kyberNetwork.js)

contracts/sol6/Dao/KyberFeeHandler.sol

@@ -92,6 +92,7 @@ contract KyberFeeHandler is IKyberFeeHandler, Utils5, DaoOperator, ReentrancyGua
     ISanityRate[] internal sanityRateContract;
 
     event FeeDistributed(
+        IERC20 indexed token,
         address indexed platformWallet,
         uint256 platformFeeWei,
         uint256 rewardWei,
@@ -186,6 +187,7 @@ contract KyberFeeHandler is IKyberFeeHandler, Utils5, DaoOperator, ReentrancyGua
             // only platform fee paid
             totalPayoutBalance = totalPayoutBalance.add(platformFee);
             emit FeeDistributed(
+                ETH_TOKEN_ADDRESS,
                 platformWallet,
                 platformFee,
                 0,
@@ -212,6 +214,7 @@ contract KyberFeeHandler is IKyberFeeHandler, Utils5, DaoOperator, ReentrancyGua
 
         brrAmounts.burnWei = networkFee.sub(brrAmounts.rewardWei).sub(brrAmounts.rebateWei);
         emit FeeDistributed(
+            ETH_TOKEN_ADDRESS,
             platformWallet,
             platformFee,
             brrAmounts.rewardWei,
@@ -265,7 +268,7 @@ contract KyberFeeHandler is IKyberFeeHandler, Utils5, DaoOperator, ReentrancyGua
         emit RewardPaid(staker, epoch, ETH_TOKEN_ADDRESS, amountWei);
     }
 
-    /// @dev claim reabate per reserve wallet. called by any address
+    /// @dev claim rebate per reserve wallet. called by any address
     /// @param rebateWallet the wallet to claim rebates for. Total accumulated rebate sent to this wallet.
     /// @return amountWei amount of rebate claimed
     function claimReserveRebate(address rebateWallet) 

test/sol6/kyberFeeHandler.js

@@ -102,6 +102,7 @@ contract('KyberFeeHandler', function(accounts) {
             let platformWallet = accounts[1];
             let txResult = await feeHandler.handleFees(ethAddress, [], [], platformWallet, oneEth, zeroBN, {from: kyberNetwork, value: oneEth});
             expectEvent(txResult, 'FeeDistributed', {
+                token: ethAddress,
                 platformWallet: platformWallet,
                 platformFeeWei: oneEth,
                 rewardWei: zeroBN,
@@ -129,6 +130,7 @@ contract('KyberFeeHandler', function(accounts) {
             let expectedRebateWei = oneEth.mul(currentRebateBps).div(BPS);
 
             expectEvent(txResult, 'FeeDistributed', {
+                token: ethAddress,
                 platformWallet: platformWallet,
                 platformFeeWei: oneEth,
                 rewardWei: expectedRewardWei,