From db241e8f909a3681f63a46824eab2736af1c3ecc Mon Sep 17 00:00:00 2001
From: Alex Towle <jalextowle@gmail.com>
Date: Mon, 23 Sep 2019 17:32:52 -0700
Subject: [PATCH] `@0x:contracts-staking` Modified Staking events to improve
 their usability

---
 .../contracts/src/interfaces/IStakingEvents.sol  | 16 +++-------------
 .../contracts/src/interfaces/IZrxVault.sol       |  4 ----
 .../staking/contracts/src/vaults/ZrxVault.sol    |  4 ++--
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/contracts/staking/contracts/src/interfaces/IStakingEvents.sol b/contracts/staking/contracts/src/interfaces/IStakingEvents.sol
index 2e64439bfd..308df12d00 100644
--- a/contracts/staking/contracts/src/interfaces/IStakingEvents.sol
+++ b/contracts/staking/contracts/src/interfaces/IStakingEvents.sol
@@ -108,16 +108,6 @@ interface IStakingEvents {
         address zrxVaultAddress
     );
 
-     /// @dev Emitted by MixinScheduler when the timeLock period is changed.
-     /// @param timeLockPeriod The timeLock period we changed to.
-     /// @param startEpoch The epoch this period started.
-     /// @param endEpoch The epoch this period ends.
-    event TimeLockPeriodChanged(
-        uint256 timeLockPeriod,
-        uint256 startEpoch,
-        uint256 endEpoch
-    );
-
     /// @dev Emitted by MixinStakingPool when a new pool is created.
     /// @param poolId Unique id generated for pool.
     /// @param operator The operator (creator) of pool.
@@ -132,7 +122,7 @@ interface IStakingEvents {
     /// @param poolId Unique id of pool.
     /// @param makerAddress Adress of maker joining the pool.
     event PendingAddMakerToPool(
-        bytes32 poolId,
+        bytes32 indexed poolId,
         address makerAddress
     );
 
@@ -140,7 +130,7 @@ interface IStakingEvents {
     /// @param poolId Unique id of pool.
     /// @param makerAddress Adress of maker added to pool.
     event MakerAddedToStakingPool(
-        bytes32 poolId,
+        bytes32 indexed poolId,
         address makerAddress
     );
 
@@ -148,7 +138,7 @@ interface IStakingEvents {
     /// @param poolId Unique id of pool.
     /// @param makerAddress Adress of maker added to pool.
     event MakerRemovedFromStakingPool(
-        bytes32 poolId,
+        bytes32 indexed poolId,
         address makerAddress
     );
 
diff --git a/contracts/staking/contracts/src/interfaces/IZrxVault.sol b/contracts/staking/contracts/src/interfaces/IZrxVault.sol
index 7d151a5966..190ed4924f 100644
--- a/contracts/staking/contracts/src/interfaces/IZrxVault.sol
+++ b/contracts/staking/contracts/src/interfaces/IZrxVault.sol
@@ -29,21 +29,17 @@ pragma solidity ^0.5.9;
 interface IZrxVault {
 
     /// @dev Emitted when Zrx Tokens are deposited into the vault.
-    /// @param sender Address of sender (`msg.sender`).
     /// @param owner of Zrx Tokens.
     /// @param amount of Zrx Tokens deposited.
     event ZrxDepositedIntoVault(
-        address indexed sender,
         address indexed owner,
         uint256 amount
     );
 
     /// @dev Emitted when Zrx Tokens are withdrawn from the vault.
-    /// @param sender Address of sender (`msg.sender`).
     /// @param owner of Zrx Tokens.
     /// @param amount of Zrx Tokens withdrawn.
     event ZrxWithdrawnFromVault(
-        address indexed sender,
         address indexed owner,
         uint256 amount
     );
diff --git a/contracts/staking/contracts/src/vaults/ZrxVault.sol b/contracts/staking/contracts/src/vaults/ZrxVault.sol
index 0ff8ef81ab..74e2af494d 100644
--- a/contracts/staking/contracts/src/vaults/ZrxVault.sol
+++ b/contracts/staking/contracts/src/vaults/ZrxVault.sol
@@ -96,7 +96,7 @@ contract ZrxVault is
         _balances[owner] = _balances[owner].safeAdd(amount);
 
         // notify
-        emit ZrxDepositedIntoVault(msg.sender, owner, amount);
+        emit ZrxDepositedIntoVault(owner, amount);
 
         // deposit ZRX from owner
         zrxAssetProxy.transferFrom(
@@ -158,7 +158,7 @@ contract ZrxVault is
         _balances[owner] = _balances[owner].safeSub(amount);
 
         // notify
-        emit ZrxWithdrawnFromVault(msg.sender, owner, amount);
+        emit ZrxWithdrawnFromVault(owner, amount);
 
         // withdraw ZRX to owner
         _zrxToken.transfer(