Merge branch 'add_logic' into add_user_stats

Author: jusbar23

proto/dydxprotocol/stats/stats.proto

@@ -53,13 +53,14 @@ message EpochStats {
   repeated UserWithStats stats = 2;
 }
 
-// GlobalStats stores global stats
+// GlobalStats stores global stats for the rolling window (default 30d).
 message GlobalStats {
   // Notional USDC traded in quantums
   uint64 notional_traded = 1;
 }
 
-// UserStats stores stats for a User
+// UserStats stores stats for a User. This is the sum of all stats for a user in the
+// rolling window (default 30d).
 message UserStats {
   // Taker USDC in quantums
   uint64 taker_notional = 1;

protocol/x/stats/keeper/keeper.go

@@ -282,6 +282,7 @@ func (k Keeper) ExpireOldStats(ctx sdk.Context) {
 		stats := k.GetUserStats(ctx, removedStats.User)
 		stats.TakerNotional -= removedStats.Stats.TakerNotional
 		stats.MakerNotional -= removedStats.Stats.MakerNotional
+		stats.AffiliateRevenueGeneratedQuantums -= removedStats.Stats.AffiliateRevenueGeneratedQuantums
 		k.SetUserStats(ctx, removedStats.User, stats)
 
 		// Just remove TakerNotional to avoid double counting