From a4bf3395a7f80f2bbf70a51920f68805b19632fd Mon Sep 17 00:00:00 2001
From: Richard Liang <richardliang2015@u.northwestern.edu>
Date: Thu, 23 Jan 2020 10:52:45 -0800
Subject: [PATCH] Add nonindexed event to bidders

---
 contracts/helper/RebalancingSetCTokenBidder.sol          | 6 ++++--
 contracts/helper/RebalancingSetEthBidder.sol             | 6 ++++--
 package.json                                             | 2 +-
 test/contracts/helper/rebalancingSetCTokenBidder.spec.ts | 2 ++
 test/contracts/helper/rebalancingSetEthBidder.spec.ts    | 2 ++
 utils/contract_logs/rebalancingSetCTokenBidder.ts        | 3 +++
 utils/contract_logs/rebalancingSetEthBidder.ts           | 3 +++
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/contracts/helper/RebalancingSetCTokenBidder.sol b/contracts/helper/RebalancingSetCTokenBidder.sol
index 2c1d77ba9..46bf00730 100644
--- a/contracts/helper/RebalancingSetCTokenBidder.sol
+++ b/contracts/helper/RebalancingSetCTokenBidder.sol
@@ -57,7 +57,8 @@ contract RebalancingSetCTokenBidder is
 
     event BidPlacedCToken(
         address indexed rebalancingSetToken,
-        address indexed bidder
+        address indexed bidder,
+        uint256 quantity
     );
 
     /* ============ Constructor ============ */
@@ -162,7 +163,8 @@ contract RebalancingSetCTokenBidder is
         // Log bid placed with Eth event
         emit BidPlacedCToken(
             address(_rebalancingSetToken),
-            msg.sender
+            msg.sender,
+            _quantity
         );
     }
 
diff --git a/contracts/helper/RebalancingSetEthBidder.sol b/contracts/helper/RebalancingSetEthBidder.sol
index 2819af003..0592bcb69 100644
--- a/contracts/helper/RebalancingSetEthBidder.sol
+++ b/contracts/helper/RebalancingSetEthBidder.sol
@@ -53,7 +53,8 @@ contract RebalancingSetEthBidder is
 
     event BidPlacedWithEth(
         address indexed rebalancingSetToken,
-        address indexed bidder
+        address indexed bidder,
+        uint256 quantity
     );
 
     /* ============ Constructor ============ */
@@ -166,7 +167,8 @@ contract RebalancingSetEthBidder is
         // Log bid placed with Eth event
         emit BidPlacedWithEth(
             address(_rebalancingSetToken),
-            msg.sender
+            msg.sender,
+            _quantity
         );
     }
 
diff --git a/package.json b/package.json
index 3340449b1..04f5a221d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "set-protocol-contracts",
-  "version": "1.3.20-beta",
+  "version": "1.3.21-beta",
   "description": "Smart contracts for {Set} Protocol",
   "main": "dist/artifacts/index.js",
   "typings": "dist/typings/artifacts/index.d.ts",
diff --git a/test/contracts/helper/rebalancingSetCTokenBidder.spec.ts b/test/contracts/helper/rebalancingSetCTokenBidder.spec.ts
index 82e1c9dda..a06973414 100644
--- a/test/contracts/helper/rebalancingSetCTokenBidder.spec.ts
+++ b/test/contracts/helper/rebalancingSetCTokenBidder.spec.ts
@@ -564,6 +564,7 @@ contract('RebalancingSetCTokenBidder', accounts => {
         const expectedLogs = BidPlacedCToken(
           rebalancingSetToken.address,
           subjectCaller,
+          subjectQuantity,
           rebalancingSetCTokenBidder.address
         );
 
@@ -745,6 +746,7 @@ contract('RebalancingSetCTokenBidder', accounts => {
           const expectedLogs = BidPlacedCToken(
             rebalancingSetToken.address,
             subjectCaller,
+            subjectQuantity,
             rebalancingSetCTokenBidder.address
           );
 
diff --git a/test/contracts/helper/rebalancingSetEthBidder.spec.ts b/test/contracts/helper/rebalancingSetEthBidder.spec.ts
index ef2dfdbcd..3852029dc 100644
--- a/test/contracts/helper/rebalancingSetEthBidder.spec.ts
+++ b/test/contracts/helper/rebalancingSetEthBidder.spec.ts
@@ -402,6 +402,7 @@ contract('RebalancingSetEthBidder', accounts => {
         const expectedLogs = BidPlacedWithEth(
           rebalancingSetToken.address,
           subjectCaller,
+          subjectQuantity,
           rebalancingSetEthBidder.address
         );
 
@@ -552,6 +553,7 @@ contract('RebalancingSetEthBidder', accounts => {
           const expectedLogs = BidPlacedWithEth(
             rebalancingSetToken.address,
             subjectCaller,
+            subjectQuantity,
             rebalancingSetEthBidder.address
           );
 
diff --git a/utils/contract_logs/rebalancingSetCTokenBidder.ts b/utils/contract_logs/rebalancingSetCTokenBidder.ts
index dfc88472b..444d59587 100644
--- a/utils/contract_logs/rebalancingSetCTokenBidder.ts
+++ b/utils/contract_logs/rebalancingSetCTokenBidder.ts
@@ -1,8 +1,10 @@
 import { Address, Log } from 'set-protocol-utils';
+import { BigNumber } from 'bignumber.js';
 
 export function BidPlacedCToken(
   rebalancingSetToken: Address,
   bidder: Address,
+  quantity: BigNumber,
   contractAddress: Address,
 ): Log[] {
   return [{
@@ -11,6 +13,7 @@ export function BidPlacedCToken(
     args: {
       rebalancingSetToken,
       bidder,
+      quantity,
     },
   }];
 }
diff --git a/utils/contract_logs/rebalancingSetEthBidder.ts b/utils/contract_logs/rebalancingSetEthBidder.ts
index 4429ec0c8..ec47aab20 100644
--- a/utils/contract_logs/rebalancingSetEthBidder.ts
+++ b/utils/contract_logs/rebalancingSetEthBidder.ts
@@ -1,8 +1,10 @@
 import { Address, Log } from 'set-protocol-utils';
+import { BigNumber } from 'bignumber.js';
 
 export function BidPlacedWithEth(
   rebalancingSetToken: Address,
   bidder: Address,
+  quantity: BigNumber,
   contractAddress: Address,
 ): Log[] {
   return [{
@@ -11,6 +13,7 @@ export function BidPlacedWithEth(
     args: {
       rebalancingSetToken,
       bidder,
+      quantity,
     },
   }];
 }