From 941d66b34c9975a928634a967f82523901d98479 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Mon, 14 Mar 2022 12:14:16 -0500
Subject: [PATCH] enable fees

---
 common/calculate-cpmm.ts | 23 ++++++++---------------
 common/fees.ts           | 10 +++++-----
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/common/calculate-cpmm.ts b/common/calculate-cpmm.ts
index b477fe6a..d399596f 100644
--- a/common/calculate-cpmm.ts
+++ b/common/calculate-cpmm.ts
@@ -62,8 +62,7 @@ export function getCpmmLiquidityFee(
   bet: number,
   outcome: string
 ) {
-  const prob = getCpmmProbability(contract.pool, contract.p)
-  // const prob = getCpmmProbabilityAfterBetBeforeFees(contract, outcome, bet)
+  const prob = getCpmmProbabilityAfterBetBeforeFees(contract, outcome, bet)
   const betP = outcome === 'YES' ? 1 - prob : prob
 
   const liquidityFee = LIQUIDITY_FEE * betP * bet
@@ -83,9 +82,9 @@ export function calculateCpmmSharesAfterFee(
   outcome: string
 ) {
   const { pool, p } = contract
-  // const { remainingBet } = getCpmmLiquidityFee(contract, bet, outcome)
+  const { remainingBet } = getCpmmLiquidityFee(contract, bet, outcome)
 
-  return calculateCpmmShares(pool, p, bet, outcome)
+  return calculateCpmmShares(pool, p, remainingBet, outcome)
 }
 
 export function calculateCpmmPurchase(
@@ -94,9 +93,9 @@ export function calculateCpmmPurchase(
   outcome: string
 ) {
   const { pool, p } = contract
-  // const { remainingBet, fees } = getCpmmLiquidityFee(contract, bet, outcome)
-  const remainingBet = bet
-  const fees = noFees
+  const { remainingBet, fees } = getCpmmLiquidityFee(contract, bet, outcome)
+  // const remainingBet = bet
+  // const fees = noFees
 
   const shares = calculateCpmmShares(pool, p, remainingBet, outcome)
   const { YES: y, NO: n } = pool
@@ -110,14 +109,8 @@ export function calculateCpmmPurchase(
 
   const postBetPool = { YES: newY, NO: newN }
 
-  const { newPool, liquidity, newP } = addCpmmLiquidity(postBetPool, p, fee)
-  // const prob = getCpmmProbability(postBetPool, p)
-  // const newProb = getCpmmProbability(newPool, newP)
-  // console.log(prob, newProb)
-  // console.log(fee, liquidity, newP, newPool)
-  console.log(getCpmmLiquidity(pool, p), getCpmmLiquidity(newPool, newP))
-  console.log(pool, postBetPool, newPool)
-  // console.log(pool, postBetPool, shares)
+  const { newPool, newP } = addCpmmLiquidity(postBetPool, p, fee)
+  // console.log(fee, getCpmmLiquidity(pool, p), getCpmmLiquidity(newPool, newP))
 
   return { shares, newPool, newP, fees }
 }
diff --git a/common/fees.ts b/common/fees.ts
index 2f6436ad..bdb3b760 100644
--- a/common/fees.ts
+++ b/common/fees.ts
@@ -1,9 +1,9 @@
-export const PLATFORM_FEE = 0.005
-export const CREATOR_FEE = 0.02
-export const LIQUIDITY_FEE = 0.02
+export const PLATFORM_FEE = 0.01
+export const CREATOR_FEE = 0.04
+export const LIQUIDITY_FEE = 0.04
 
-export const DPM_PLATFORM_FEE = 2 * PLATFORM_FEE
-export const DPM_CREATOR_FEE = 2 * CREATOR_FEE
+export const DPM_PLATFORM_FEE = 0.01
+export const DPM_CREATOR_FEE = 0.04
 export const DPM_FEES = DPM_PLATFORM_FEE + DPM_CREATOR_FEE
 
 export type Fees = {