diff --git a/common/antes.ts b/common/antes.ts index 414f0c60..21dc1d4b 100644 --- a/common/antes.ts +++ b/common/antes.ts @@ -4,6 +4,7 @@ import { getCpmmLiquidity, getCpmmProbability } from './calculate-cpmm' import { Binary, CPMM, DPM, FreeResponse, FullContract } from './contract' import { User } from './user' import { LiquidityProvision } from './liquidity-provision' +import { noFees } from './fees' export const PHANTOM_ANTE = 0.001 export const MINIMUM_ANTE = 10 @@ -30,6 +31,7 @@ export function getCpmmAnteBet( probAfter: p, createdTime, isAnte: true, + fees: noFees, } return bet @@ -80,6 +82,7 @@ export function getAnteBets( probAfter: p, createdTime, isAnte: true, + fees: noFees, } const noBet: Bet = { @@ -93,6 +96,7 @@ export function getAnteBets( probAfter: p, createdTime, isAnte: true, + fees: noFees, } return { yesBet, noBet } @@ -120,6 +124,7 @@ export function getFreeAnswerAnte( probAfter: 1, createdTime, isAnte: true, + fees: noFees, } return anteBet diff --git a/common/calculate.ts b/common/calculate.ts index 5f1106b9..5baeb9a3 100644 --- a/common/calculate.ts +++ b/common/calculate.ts @@ -69,7 +69,7 @@ export function calculateShares( export function calculateSaleAmount(contract: Contract, bet: Bet) { return contract.mechanism === 'cpmm-1' && contract.outcomeType === 'BINARY' - ? calculateCpmmSale(contract, bet) + ? calculateCpmmSale(contract, bet).saleValue : calculateDpmSaleAmount(contract, bet) } diff --git a/common/scoring.ts b/common/scoring.ts index 39fce7f9..c4cd4c48 100644 --- a/common/scoring.ts +++ b/common/scoring.ts @@ -34,8 +34,9 @@ export function scoreUsersByContract( bets, (bet) => bet.isSold || bet.sale ) - const resolvePayouts = getPayouts( - resolution ?? 'MKT', + const [resolvePayouts] = getPayouts( + resolution, + {}, contract, openBets, [], diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx index 182ab631..fcf3c0bf 100644 --- a/web/components/bets-list.tsx +++ b/web/components/bets-list.tsx @@ -476,8 +476,6 @@ function BetRow(props: { bet: Bet; contract: Contract; saleBet?: Bet }) { shares, isSold, isAnte, - isLiquidityProvision, - isRedemption, loanAmount, } = bet @@ -512,9 +510,6 @@ function BetRow(props: { bet: Bet; contract: Contract; saleBet?: Bet }) { {!isCPMM && !isResolved && !isClosed && !isSold && !isAnte && ( )} - {/* {isAnte && 'ANTE'} - {isLiquidityProvision && !isAnte && 'LIQD'} - {isRedemption && 'REDEEM'} */}