open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix free response MKT calculation to use probs from resolutions field, client-side."

Browse Source 
This reverts commit c12063799f.
This commit is contained in:
Austin Chen 2022-03-18 00:41:37 -07:00
parent c12063799f
commit 11730e48a2
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/calculate-dpm.ts
View File

@ -1,6 +1,6 @@
import * as _ from 'lodash' import * as _ from 'lodash'
import { Bet } from './bet' import { Bet } from './bet'
import { Binary, DPM, FreeResponse, FullContract } from './contract' import { Binary, DPM, FullContract } from './contract'
import { DPM_FEES } from './fees' import { DPM_FEES } from './fees'
export function getDpmProbability(totalShares: { [outcome: string]: number }) { export function getDpmProbability(totalShares: { [outcome: string]: number }) {
@ -213,27 +213,24 @@ function calculateMktDpmPayout(contract: FullContract<DPM, any>, bet: Bet) {
if (contract.outcomeType === 'BINARY') if (contract.outcomeType === 'BINARY')
return calculateBinaryMktDpmPayout(contract, bet) return calculateBinaryMktDpmPayout(contract, bet)
const { totalShares, pool, resolutions } = contract as FullContract< const { totalShares, pool } = contract
DPM,
FreeResponse
>
if (!resolutions)
throw new Error(
'resolutions required for MKT payout of free response market'
)
const totalPool = _.sum(Object.values(pool)) const totalPool = _.sum(Object.values(pool))
const probTotal = _.sum(Object.values(resolutions)) const sharesSquareSum = _.sumBy(
Object.values(totalShares) as number[],
(shares) => shares ** 2
)
const weightedShareTotal = _.sumBy(Object.keys(resolutions), (outcome) => { const weightedShareTotal = _.sumBy(Object.keys(totalShares), (outcome) => {
const prob = resolutions[outcome] / probTotal // Avoid O(n^2) by reusing sharesSquareSum for prob.
return prob * totalShares[outcome] const shares = totalShares[outcome]
const prob = shares ** 2 / sharesSquareSum
return prob * shares
}) })
const { outcome, amount, shares } = bet const { outcome, amount, shares } = bet
const betP = (resolutions[outcome] ?? 0) / probTotal const betP = getDpmOutcomeProbability(totalShares, outcome)
const winnings = ((betP * shares) / weightedShareTotal) * totalPool const winnings = ((betP * shares) / weightedShareTotal) * totalPool
return deductDpmFees(amount, winnings) return deductDpmFees(amount, winnings)