b2501d8145
* Answer datatype and MULTI outcome type for Contract
* Create free answer contract
* Automatically sort Tailwind classes with Prettier (#45)
* Add Prettier Tailwind plugin
* Autoformat Tailwind classes with Prettier
* Allow for non-binary contracts in contract page and related components
* logo with white inside, transparent bg
* Create answer
* Some UI for showing answers
* Answer bet panel
* Convert rest of calcuate file to generic multi contracts
* Working betting with ante'd NONE answer
* Numbered answers. Layout & calculation tweaks
* Can bet. More layout tweaks!
* Resolve answer UI
* Resolve multi market
* Resolved market UI
* Fix feed and cards for multi contracts
* Sell bets. Various fixes
* Tweaks for trades page
* Always dev mode
* Create answer bet has isAnte: true
* Fix card showing 0% for multi contracts
* Fix grouped bets feed for multi outcomes
* None option converted to none of the above label at bottom of list. Button to resolve none.
* Tweaks to no answers yet, resolve button layout
* Show ante bets on new answers in the feed
* Update placeholder text for description
* Consolidate firestore rules for subcollections
* Remove Contract and Bet type params. Use string type for outcomes.
* Increase char limit to 10k for answers. Preserve line breaks.
* Don't show resolve options after answer chosen
* Fix type error in script
* Remove NONE resolution option
* Change outcomeType to include 'MULTI' and 'FREE_RESPONSE'
* Show bet probability change and payout when creating answer
* User info change: also change answers
* Append answers to contract field 'answers'
* sort trades by resolved
* Don't include trailing !:,.; in links
* Stop flooring inputs into formatMoney
* Revert "Stop flooring inputs into formatMoney"
This reverts commit 2f7ab18429
.
* Consistently floor user.balance
* Expand create panel on focus
From Richard Hanania's feedback
* welcome email: include link to manifold
* Fix home page in dev on branches that are not free-response
* Close emails (#50)
* script init for stephen dev
* market close emails
* order of operations
* template email
* sendMarketCloseEmail: handle unsubscribe
* remove debugging
* marketCloseEmails: every hour
* sendMarketCloseEmails: check undefined
* marketCloseEmails: "every hour" => "every 1 hours"
* Set up a read API using Vercel serverless functions (#49)
* Set up read API using Vercel serverless functions
Featuring:
/api/v0/markets
/api/v0/market/[contractId]
/api/v0/slug/[contractSlug]
* Include tags in API
* Tweaks. Remove filter for only binary contract
* Fix bet probability change for NO bets
* Put back isProd calculation
Co-authored-by: Austin Chen <akrolsmir@gmail.com>
Co-authored-by: mantikoros <sgrugett@gmail.com>
Co-authored-by: mantikoros <95266179+mantikoros@users.noreply.github.com>
99 lines
2.4 KiB
TypeScript
99 lines
2.4 KiB
TypeScript
import { Bet } from './bet'
|
|
import {
|
|
calculateShares,
|
|
getProbability,
|
|
getOutcomeProbability,
|
|
} from './calculate'
|
|
import { Contract } from './contract'
|
|
import { User } from './user'
|
|
|
|
export const getNewBinaryBetInfo = (
|
|
user: User,
|
|
outcome: 'YES' | 'NO',
|
|
amount: number,
|
|
contract: Contract,
|
|
newBetId: string
|
|
) => {
|
|
const { YES: yesPool, NO: noPool } = contract.pool
|
|
|
|
const newPool =
|
|
outcome === 'YES'
|
|
? { YES: yesPool + amount, NO: noPool }
|
|
: { YES: yesPool, NO: noPool + amount }
|
|
|
|
const shares = calculateShares(contract.totalShares, amount, outcome)
|
|
|
|
const { YES: yesShares, NO: noShares } = contract.totalShares
|
|
|
|
const newTotalShares =
|
|
outcome === 'YES'
|
|
? { YES: yesShares + shares, NO: noShares }
|
|
: { YES: yesShares, NO: noShares + shares }
|
|
|
|
const { YES: yesBets, NO: noBets } = contract.totalBets
|
|
|
|
const newTotalBets =
|
|
outcome === 'YES'
|
|
? { YES: yesBets + amount, NO: noBets }
|
|
: { YES: yesBets, NO: noBets + amount }
|
|
|
|
const probBefore = getProbability(contract.totalShares)
|
|
const probAfter = getProbability(newTotalShares)
|
|
|
|
const newBet: Bet = {
|
|
id: newBetId,
|
|
userId: user.id,
|
|
contractId: contract.id,
|
|
amount,
|
|
shares,
|
|
outcome,
|
|
probBefore,
|
|
probAfter,
|
|
createdTime: Date.now(),
|
|
}
|
|
|
|
const newBalance = user.balance - amount
|
|
|
|
return { newBet, newPool, newTotalShares, newTotalBets, newBalance }
|
|
}
|
|
|
|
export const getNewMultiBetInfo = (
|
|
user: User,
|
|
outcome: string,
|
|
amount: number,
|
|
contract: Contract,
|
|
newBetId: string
|
|
) => {
|
|
const { pool, totalShares, totalBets } = contract
|
|
|
|
const prevOutcomePool = pool[outcome] ?? 0
|
|
const newPool = { ...pool, [outcome]: prevOutcomePool + amount }
|
|
|
|
const shares = calculateShares(contract.totalShares, amount, outcome)
|
|
|
|
const prevShares = totalShares[outcome] ?? 0
|
|
const newTotalShares = { ...totalShares, [outcome]: prevShares + shares }
|
|
|
|
const prevTotalBets = totalBets[outcome] ?? 0
|
|
const newTotalBets = { ...totalBets, [outcome]: prevTotalBets + amount }
|
|
|
|
const probBefore = getOutcomeProbability(totalShares, outcome)
|
|
const probAfter = getOutcomeProbability(newTotalShares, outcome)
|
|
|
|
const newBet: Bet = {
|
|
id: newBetId,
|
|
userId: user.id,
|
|
contractId: contract.id,
|
|
amount,
|
|
shares,
|
|
outcome,
|
|
probBefore,
|
|
probAfter,
|
|
createdTime: Date.now(),
|
|
}
|
|
|
|
const newBalance = user.balance - amount
|
|
|
|
return { newBet, newPool, newTotalShares, newTotalBets, newBalance }
|
|
}
|