Include fee in toTokenAmount adjustment

Author: cgewecke

src/api/utils/tradeQuoter.ts

@@ -253,7 +253,8 @@ export class TradeQuoter {
     // BigNumber does not do fixed point math & FixedNumber underflows w/ numbers less than 1
     // Multiply the slippage by a factor and divide the end result by same...
     const percentMultiplier = 1000;
-    const slippageToleranceBN = Math.floor(percentMultiplier * this.outputSlippageTolerance(slippagePercentage));
+    const slippageAndFee = slippagePercentage + feePercentage;
+    const slippageToleranceBN = Math.floor(percentMultiplier * this.outputSlippageTolerance(slippageAndFee));
     const toTokenAmountMinusSlippage = toTokenAmount.mul(slippageToleranceBN).div(percentMultiplier);
     const toUnits = toTokenAmountMinusSlippage.mul(SCALE).div(setTotalSupply);
 

test/fixtures/tradeQuote.ts

@@ -181,7 +181,7 @@ export const tradeQuoteFixtures = {
     gasPrice: '61',
     slippagePercentage: '2.00%',
     fromTokenAmount: '1126868991563',
-    toTokenAmount: '91245821628',
+    toTokenAmount: '90314741816',
     display: {
        inputAmountRaw: '.5',
        inputAmount: '500000000000000000',