.github/workflows/merge-main-into-main2.yml

@@ -1,17 +0,0 @@
-name: Merge main into main2 on every commit
-on:
-  push:
-    branches:
-      - 'main'
-jobs:
-  merge-branch:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Merge main -> main2
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          target_branch: main2
-          github_token: ${{ github.token }}

common/.eslintrc.js

@@ -26,7 +26,7 @@ module.exports = {
             caughtErrorsIgnorePattern: '^_',
           },
         ],
-        'unused-imports/no-unused-imports': 'warn',
+        'unused-imports/no-unused-imports': 'error',
       },
     },
   ],

common/add-liquidity.ts

@@ -1,4 +1,4 @@
-import { getCpmmLiquidity } from './calculate-cpmm'
+import { addCpmmLiquidity, getCpmmLiquidity } from './calculate-cpmm'
 import { CPMMContract } from './contract'
 import { LiquidityProvision } from './liquidity-provision'
 
@@ -8,23 +8,25 @@ export const getNewLiquidityProvision = (
   contract: CPMMContract,
   newLiquidityProvisionId: string
 ) => {
-  const { pool, p, totalLiquidity, subsidyPool } = contract
+  const { pool, p, totalLiquidity } = contract
 
-  const liquidity = getCpmmLiquidity(pool, p)
+  const { newPool, newP } = addCpmmLiquidity(pool, p, amount)
+
+  const liquidity =
+    getCpmmLiquidity(newPool, newP) - getCpmmLiquidity(pool, newP)
 
   const newLiquidityProvision: LiquidityProvision = {
     id: newLiquidityProvisionId,
     userId: userId,
     contractId: contract.id,
     amount,
-    pool,
+    pool: newPool,
-    p,
+    p: newP,
     liquidity,
     createdTime: Date.now(),
   }
 
   const newTotalLiquidity = (totalLiquidity ?? 0) + amount
-  const newSubsidyPool = (subsidyPool ?? 0) + amount
 
-  return { newLiquidityProvision, newTotalLiquidity, newSubsidyPool }
+  return { newLiquidityProvision, newPool, newP, newTotalLiquidity }
 }

common/badge.ts

@@ -1,123 +0,0 @@
-import { User } from './user'
-
-export type Badge = {
-  type: BadgeTypes
-  createdTime: number
-  data: { [key: string]: any }
-  name: 'Proven Correct' | 'Streaker' | 'Market Creator'
-}
-
-export type BadgeTypes = 'PROVEN_CORRECT' | 'STREAKER' | 'MARKET_CREATOR'
-
-export type ProvenCorrectBadgeData = {
-  type: 'PROVEN_CORRECT'
-  data: {
-    contractSlug: string
-    contractCreatorUsername: string
-    contractTitle: string
-    commentId: string
-    betAmount: number
-  }
-}
-
-export type MarketCreatorBadgeData = {
-  type: 'MARKET_CREATOR'
-  data: {
-    totalContractsCreated: number
-  }
-}
-
-export type StreakerBadgeData = {
-  type: 'STREAKER'
-  data: {
-    totalBettingStreak: number
-  }
-}
-
-export type ProvenCorrectBadge = Badge & ProvenCorrectBadgeData
-export type StreakerBadge = Badge & StreakerBadgeData
-export type MarketCreatorBadge = Badge & MarketCreatorBadgeData
-
-export const MINIMUM_UNIQUE_BETTORS_FOR_PROVEN_CORRECT_BADGE = 5
-export const provenCorrectRarityThresholds = [1, 1000, 10000]
-const calculateProvenCorrectBadgeRarity = (badge: ProvenCorrectBadge) => {
-  const { betAmount } = badge.data
-  const thresholdArray = provenCorrectRarityThresholds
-  let i = thresholdArray.length - 1
-  while (i >= 0) {
-    if (betAmount >= thresholdArray[i]) {
-      return i + 1
-    }
-    i--
-  }
-  return 1
-}
-
-export const streakerBadgeRarityThresholds = [1, 50, 250]
-const calculateStreakerBadgeRarity = (badge: StreakerBadge) => {
-  const { totalBettingStreak } = badge.data
-  const thresholdArray = streakerBadgeRarityThresholds
-  let i = thresholdArray.length - 1
-  while (i >= 0) {
-    if (totalBettingStreak == thresholdArray[i]) {
-      return i + 1
-    }
-    i--
-  }
-  return 1
-}
-
-export const marketCreatorBadgeRarityThresholds = [1, 75, 300]
-const calculateMarketCreatorBadgeRarity = (badge: MarketCreatorBadge) => {
-  const { totalContractsCreated } = badge.data
-  const thresholdArray = marketCreatorBadgeRarityThresholds
-  let i = thresholdArray.length - 1
-  while (i >= 0) {
-    if (totalContractsCreated == thresholdArray[i]) {
-      return i + 1
-    }
-    i--
-  }
-  return 1
-}
-
-export type rarities = 'bronze' | 'silver' | 'gold'
-
-const rarityRanks: { [key: number]: rarities } = {
-  1: 'bronze',
-  2: 'silver',
-  3: 'gold',
-}
-
-export const calculateBadgeRarity = (badge: Badge) => {
-  switch (badge.type) {
-    case 'PROVEN_CORRECT':
-      return rarityRanks[
-        calculateProvenCorrectBadgeRarity(badge as ProvenCorrectBadge)
-      ]
-    case 'MARKET_CREATOR':
-      return rarityRanks[
-        calculateMarketCreatorBadgeRarity(badge as MarketCreatorBadge)
-      ]
-    case 'STREAKER':
-      return rarityRanks[calculateStreakerBadgeRarity(badge as StreakerBadge)]
-    default:
-      return rarityRanks[0]
-  }
-}
-
-export const getBadgesByRarity = (user: User | null | undefined) => {
-  const rarities: { [key in rarities]: number } = {
-    bronze: 0,
-    silver: 0,
-    gold: 0,
-  }
-  if (!user) return rarities
-  Object.values(user.achievements).map((value) => {
-    value.badges.map((badge) => {
-      rarities[calculateBadgeRarity(badge)] =
-        (rarities[calculateBadgeRarity(badge)] ?? 0) + 1
-    })
-  })
-  return rarities
-}

common/calculate-cpmm.ts

@@ -1,10 +1,11 @@
-import { groupBy, mapValues, sumBy } from 'lodash'
+import { sum, groupBy, mapValues, sumBy } from 'lodash'
 import { LimitBet } from './bet'
 
 import { CREATOR_FEE, Fees, LIQUIDITY_FEE, PLATFORM_FEE } from './fees'
 import { LiquidityProvision } from './liquidity-provision'
 import { computeFills } from './new-bet'
 import { binarySearch } from './util/algos'
+import { addObjects } from './util/object'
 
 export type CpmmState = {
   pool: { [outcome: string]: number }
@@ -146,8 +147,7 @@ function calculateAmountToBuyShares(
   state: CpmmState,
   shares: number,
   outcome: 'YES' | 'NO',
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) {
   // Search for amount between bounds (0, shares).
   // Min share price is M$0, and max is M$1 each.
@@ -157,8 +157,7 @@ function calculateAmountToBuyShares(
       amount,
       state,
       undefined,
-      unfilledBets,
+      unfilledBets
-      balanceByUserId
     )
 
     const totalShares = sumBy(takers, (taker) => taker.shares)
@@ -170,8 +169,7 @@ export function calculateCpmmSale(
   state: CpmmState,
   shares: number,
   outcome: 'YES' | 'NO',
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) {
   if (Math.round(shares) < 0) {
     throw new Error('Cannot sell non-positive shares')
@@ -182,17 +180,15 @@ export function calculateCpmmSale(
     state,
     shares,
     oppositeOutcome,
-    unfilledBets,
+    unfilledBets
-    balanceByUserId
   )
 
-  const { cpmmState, makers, takers, totalFees, ordersToCancel } = computeFills(
+  const { cpmmState, makers, takers, totalFees } = computeFills(
     oppositeOutcome,
     buyAmount,
     state,
     undefined,
-    unfilledBets,
+    unfilledBets
-    balanceByUserId
   )
 
   // Transform buys of opposite outcome into sells.
@@ -215,7 +211,6 @@ export function calculateCpmmSale(
     fees: totalFees,
     makers,
     takers: saleTakers,
-    ordersToCancel,
   }
 }
 
@@ -223,16 +218,9 @@ export function getCpmmProbabilityAfterSale(
   state: CpmmState,
   shares: number,
   outcome: 'YES' | 'NO',
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) {
-  const { cpmmState } = calculateCpmmSale(
+  const { cpmmState } = calculateCpmmSale(state, shares, outcome, unfilledBets)
-    state,
-    shares,
-    outcome,
-    unfilledBets,
-    balanceByUserId
-  )
   return getCpmmProbability(cpmmState.pool, cpmmState.p)
 }
 
@@ -266,22 +254,48 @@ export function addCpmmLiquidity(
   return { newPool, liquidity, newP }
 }
 
-export function getCpmmLiquidityPoolWeights(liquidities: LiquidityProvision[]) {
+const calculateLiquidityDelta = (p: number) => (l: LiquidityProvision) => {
-  const userAmounts = groupBy(liquidities, (w) => w.userId)
+  const oldLiquidity = getCpmmLiquidity(l.pool, p)
-  const totalAmount = sumBy(liquidities, (w) => w.amount)
 
-  return mapValues(
+  const newPool = addObjects(l.pool, { YES: l.amount, NO: l.amount })
-    userAmounts,
+  const newLiquidity = getCpmmLiquidity(newPool, p)
-    (amounts) => sumBy(amounts, (w) => w.amount) / totalAmount
+
+  const liquidity = newLiquidity - oldLiquidity
+  return liquidity
+}
+
+export function getCpmmLiquidityPoolWeights(
+  state: CpmmState,
+  liquidities: LiquidityProvision[],
+  excludeAntes: boolean
+) {
+  const calcLiqudity = calculateLiquidityDelta(state.p)
+  const liquidityShares = liquidities.map(calcLiqudity)
+  const shareSum = sum(liquidityShares)
+
+  const weights = liquidityShares.map((shares, i) => ({
+    weight: shares / shareSum,
+    providerId: liquidities[i].userId,
+  }))
+
+  const includedWeights = excludeAntes
+    ? weights.filter((_, i) => !liquidities[i].isAnte)
+    : weights
+
+  const userWeights = groupBy(includedWeights, (w) => w.providerId)
+  const totalUserWeights = mapValues(userWeights, (userWeight) =>
+    sumBy(userWeight, (w) => w.weight)
   )
+  return totalUserWeights
 }
 
 export function getUserLiquidityShares(
   userId: string,
   state: CpmmState,
-  liquidities: LiquidityProvision[]
+  liquidities: LiquidityProvision[],
+  excludeAntes: boolean
 ) {
-  const weights = getCpmmLiquidityPoolWeights(liquidities)
+  const weights = getCpmmLiquidityPoolWeights(state, liquidities, excludeAntes)
   const userWeight = weights[userId] ?? 0
 
   return mapValues(state.pool, (shares) => userWeight * shares)

common/calculate-metrics.ts

@@ -1,17 +1,9 @@
-import { Dictionary, groupBy, last, partition, sum, sumBy, uniq } from 'lodash'
+import { last, sortBy, sum, sumBy } from 'lodash'
-import { calculatePayout, getContractBetMetrics } from './calculate'
+import { calculatePayout } from './calculate'
-import { Bet, LimitBet } from './bet'
+import { Bet } from './bet'
-import {
+import { Contract } from './contract'
-  Contract,
-  CPMMBinaryContract,
-  CPMMContract,
-  DPMContract,
-} from './contract'
 import { PortfolioMetrics, User } from './user'
 import { DAY_MS } from './util/time'
-import { getBinaryCpmmBetInfo, getNewMultiBetInfo } from './new-bet'
-import { getCpmmProbability } from './calculate-cpmm'
-import { removeUndefinedProps } from './util/object'
 
 const computeInvestmentValue = (
   bets: Bet[],
@@ -41,81 +33,13 @@ export const computeInvestmentValueCustomProb = (
 
     const betP = outcome === 'YES' ? p : 1 - p
 
-    const value = betP * shares
+    const payout = betP * shares
+    const value = payout - (bet.loanAmount ?? 0)
     if (isNaN(value)) return 0
     return value
   })
 }
 
-export const computeElasticity = (
-  bets: Bet[],
-  contract: Contract,
-  betAmount = 50
-) => {
-  const { mechanism, outcomeType } = contract
-  return mechanism === 'cpmm-1' &&
-    (outcomeType === 'BINARY' || outcomeType === 'PSEUDO_NUMERIC')
-    ? computeBinaryCpmmElasticity(bets, contract, betAmount)
-    : computeDpmElasticity(contract, betAmount)
-}
-
-export const computeBinaryCpmmElasticity = (
-  bets: Bet[],
-  contract: CPMMContract,
-  betAmount: number
-) => {
-  const limitBets = bets
-    .filter(
-      (b) =>
-        !b.isFilled &&
-        !b.isSold &&
-        !b.isRedemption &&
-        !b.sale &&
-        !b.isCancelled &&
-        b.limitProb !== undefined
-    )
-    .sort((a, b) => a.createdTime - b.createdTime) as LimitBet[]
-
-  const userIds = uniq(limitBets.map((b) => b.userId))
-  // Assume all limit orders are good.
-  const userBalances = Object.fromEntries(
-    userIds.map((id) => [id, Number.MAX_SAFE_INTEGER])
-  )
-
-  const { newPool: poolY, newP: pY } = getBinaryCpmmBetInfo(
-    'YES',
-    betAmount,
-    contract,
-    undefined,
-    limitBets,
-    userBalances
-  )
-  const resultYes = getCpmmProbability(poolY, pY)
-
-  const { newPool: poolN, newP: pN } = getBinaryCpmmBetInfo(
-    'NO',
-    betAmount,
-    contract,
-    undefined,
-    limitBets,
-    userBalances
-  )
-  const resultNo = getCpmmProbability(poolN, pN)
-
-  // handle AMM overflow
-  const safeYes = Number.isFinite(resultYes) ? resultYes : 1
-  const safeNo = Number.isFinite(resultNo) ? resultNo : 0
-
-  return safeYes - safeNo
-}
-
-export const computeDpmElasticity = (
-  contract: DPMContract,
-  betAmount: number
-) => {
-  return getNewMultiBetInfo('', 2 * betAmount, contract).newBet.probAfter
-}
-
 const computeTotalPool = (userContracts: Contract[], startTime = 0) => {
   const periodFilteredContracts = userContracts.filter(
     (contract) => contract.createdTime >= startTime
@@ -199,9 +123,14 @@ export const calculateNewPortfolioMetrics = (
 }
 
 const calculateProfitForPeriod = (
-  startingPortfolio: PortfolioMetrics | undefined,
+  startTime: number,
+  descendingPortfolio: PortfolioMetrics[],
   currentProfit: number
 ) => {
+  const startingPortfolio = descendingPortfolio.find(
+    (p) => p.timestamp < startTime
+  )
+
   if (startingPortfolio === undefined) {
     return currentProfit
   }
@@ -216,100 +145,33 @@ export const calculatePortfolioProfit = (portfolio: PortfolioMetrics) => {
 }
 
 export const calculateNewProfit = (
-  portfolioHistory: Record<
+  portfolioHistory: PortfolioMetrics[],
-    'current' | 'day' | 'week' | 'month',
-    PortfolioMetrics | undefined
-  >,
   newPortfolio: PortfolioMetrics
 ) => {
   const allTimeProfit = calculatePortfolioProfit(newPortfolio)
+  const descendingPortfolio = sortBy(
+    portfolioHistory,
+    (p) => p.timestamp
+  ).reverse()
 
   const newProfit = {
-    daily: calculateProfitForPeriod(portfolioHistory.day, allTimeProfit),
+    daily: calculateProfitForPeriod(
-    weekly: calculateProfitForPeriod(portfolioHistory.week, allTimeProfit),
+      Date.now() - 1 * DAY_MS,
-    monthly: calculateProfitForPeriod(portfolioHistory.month, allTimeProfit),
+      descendingPortfolio,
+      allTimeProfit
+    ),
+    weekly: calculateProfitForPeriod(
+      Date.now() - 7 * DAY_MS,
+      descendingPortfolio,
+      allTimeProfit
+    ),
+    monthly: calculateProfitForPeriod(
+      Date.now() - 30 * DAY_MS,
+      descendingPortfolio,
+      allTimeProfit
+    ),
     allTime: allTimeProfit,
   }
 
   return newProfit
 }
-
-export const calculateMetricsByContract = (
-  bets: Bet[],
-  contractsById: Dictionary<Contract>
-) => {
-  const betsByContract = groupBy(bets, (bet) => bet.contractId)
-  const unresolvedContracts = Object.keys(betsByContract)
-    .map((cid) => contractsById[cid])
-    .filter((c) => c && !c.isResolved)
-
-  return unresolvedContracts.map((c) => {
-    const bets = betsByContract[c.id] ?? []
-    const current = getContractBetMetrics(c, bets)
-
-    let periodMetrics
-    if (c.mechanism === 'cpmm-1' && c.outcomeType === 'BINARY') {
-      const periods = ['day', 'week', 'month'] as const
-      periodMetrics = Object.fromEntries(
-        periods.map((period) => [
-          period,
-          calculatePeriodProfit(c, bets, period),
-        ])
-      )
-    }
-
-    return removeUndefinedProps({
-      contractId: c.id,
-      ...current,
-      from: periodMetrics,
-    })
-  })
-}
-
-export type ContractMetrics = ReturnType<
-  typeof calculateMetricsByContract
->[number]
-
-const calculatePeriodProfit = (
-  contract: CPMMBinaryContract,
-  bets: Bet[],
-  period: 'day' | 'week' | 'month'
-) => {
-  const days = period === 'day' ? 1 : period === 'week' ? 7 : 30
-  const fromTime = Date.now() - days * DAY_MS
-  const [previousBets, recentBets] = partition(
-    bets,
-    (b) => b.createdTime < fromTime
-  )
-
-  const prevProb = contract.prob - contract.probChanges[period]
-  const prob = contract.resolutionProbability
-    ? contract.resolutionProbability
-    : contract.prob
-
-  const previousBetsValue = computeInvestmentValueCustomProb(
-    previousBets,
-    contract,
-    prevProb
-  )
-  const currentBetsValue = computeInvestmentValueCustomProb(
-    previousBets,
-    contract,
-    prob
-  )
-
-  const { profit: recentProfit, invested: recentInvested } =
-    getContractBetMetrics(contract, recentBets)
-
-  const profit = currentBetsValue - previousBetsValue + recentProfit
-  const invested = previousBetsValue + recentInvested
-  const profitPercent = invested === 0 ? 0 : 100 * (profit / invested)
-
-  return {
-    profit,
-    profitPercent,
-    invested,
-    prevValue: previousBetsValue,
-    value: currentBetsValue,
-  }
-}

common/calculate.ts

@@ -78,8 +78,7 @@ export function calculateShares(
 export function calculateSaleAmount(
   contract: Contract,
   bet: Bet,
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) {
   return contract.mechanism === 'cpmm-1' &&
     (contract.outcomeType === 'BINARY' ||
@@ -88,8 +87,7 @@ export function calculateSaleAmount(
         contract,
         Math.abs(bet.shares),
         bet.outcome as 'YES' | 'NO',
-        unfilledBets,
+        unfilledBets
-        balanceByUserId
       ).saleValue
     : calculateDpmSaleAmount(contract, bet)
 }
@@ -104,16 +102,14 @@ export function getProbabilityAfterSale(
   contract: Contract,
   outcome: string,
   shares: number,
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) {
   return contract.mechanism === 'cpmm-1'
     ? getCpmmProbabilityAfterSale(
         contract,
         shares,
         outcome as 'YES' | 'NO',
-        unfilledBets,
+        unfilledBets
-        balanceByUserId
       )
     : getDpmProbabilityAfterSale(contract.totalShares, outcome, shares)
 }
@@ -178,8 +174,6 @@ function getDpmInvested(yourBets: Bet[]) {
   })
 }
 
-export type ContractBetMetrics = ReturnType<typeof getContractBetMetrics>
-
 export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) {
   const { resolution } = contract
   const isCpmm = contract.mechanism === 'cpmm-1'
@@ -217,7 +211,7 @@ export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) {
   }
 
   const profit = payout + saleValue + redeemed - totalInvested
-  const profitPercent = totalInvested === 0 ? 0 : (profit / totalInvested) * 100
+  const profitPercent = (profit / totalInvested) * 100
 
   const invested = isCpmm ? getCpmmInvested(yourBets) : getDpmInvested(yourBets)
   const hasShares = Object.values(totalShares).some(

common/charity.ts

@@ -595,8 +595,7 @@ In addition to housing impact litigation, we provide free legal aid, education a
     photo:
       'https://firebasestorage.googleapis.com/v0/b/mantic-markets.appspot.com/o/user-images%2Fdefault%2Fci2h3hStFM.47?alt=media&token=0d2cdc3d-e4d8-4f5e-8f23-4a586b6ff637',
     preview: 'Donate supplies to soldiers in Ukraine',
-    description:
+    description: 'Donate supplies to soldiers in Ukraine, including tourniquets and plate carriers.',
-      'Donate supplies to soldiers in Ukraine, including tourniquets and plate carriers.',
   },
 ].map((charity) => {
   const slug = charity.name.toLowerCase().replace(/\s/g, '-')

common/contract.ts

@@ -10,7 +10,6 @@ export type AnyOutcomeType =
   | PseudoNumeric
   | FreeResponse
   | Numeric
-
 export type AnyContractType =
   | (CPMM & Binary)
   | (CPMM & PseudoNumeric)
@@ -50,7 +49,6 @@ export type Contract<T extends AnyContractType = AnyContractType> = {
   volume: number
   volume24Hours: number
   volume7Days: number
-  elasticity: number
 
   collectedFees: Fees
 
@@ -92,8 +90,7 @@ export type CPMM = {
   mechanism: 'cpmm-1'
   pool: { [outcome: string]: number }
   p: number // probability constant in y^p * n^(1-p) = k
-  totalLiquidity: number // for historical reasons, this the total subsidy amount added in M$
+  totalLiquidity: number // in M$
-  subsidyPool: number // current value of subsidy pool in M$
   prob: number
   probChanges: {
     day: number

common/economy.ts

@@ -16,5 +16,3 @@ export const BETTING_STREAK_BONUS_MAX = econ?.BETTING_STREAK_BONUS_MAX ?? 25
 export const BETTING_STREAK_RESET_HOUR = econ?.BETTING_STREAK_RESET_HOUR ?? 7
 export const FREE_MARKETS_PER_USER_MAX = econ?.FREE_MARKETS_PER_USER_MAX ?? 5
 export const COMMENT_BOUNTY_AMOUNT = econ?.COMMENT_BOUNTY_AMOUNT ?? 250
-
-export const UNIQUE_BETTOR_LIQUIDITY = 20

common/envs/dev.ts

@@ -16,6 +16,7 @@ export const DEV_CONFIG: EnvConfig = {
   cloudRunId: 'w3txbmd3ba',
   cloudRunRegion: 'uc',
   amplitudeApiKey: 'fd8cbfd964b9a205b8678a39faae71b3',
-  twitchBotEndpoint: 'https://dev-twitch-bot.manifold.markets',
+  // this is Phil's deployment
+  twitchBotEndpoint: 'https://king-prawn-app-5btyw.ondigitalocean.app',
   sprigEnvironmentId: 'Tu7kRZPm7daP',
 }

common/envs/prod.ts

@@ -70,7 +70,7 @@ export const PROD_CONFIG: EnvConfig = {
     appId: '1:128925704902:web:f61f86944d8ffa2a642dc7',
     measurementId: 'G-SSFK1Q138D',
   },
-  twitchBotEndpoint: 'https://twitch-bot.manifold.markets',
+  twitchBotEndpoint: 'https://twitch-bot-nggbo3neva-uc.a.run.app',
   cloudRunId: 'nggbo3neva',
   cloudRunRegion: 'uc',
   adminEmails: [

common/fees.ts

@@ -1,5 +1,3 @@
-export const FLAT_TRADE_FEE = 0.1 // M$0.1
-
 export const PLATFORM_FEE = 0
 export const CREATOR_FEE = 0
 export const LIQUIDITY_FEE = 0

common/globalConfig.ts

@@ -1,3 +0,0 @@
-export type GlobalConfig = {
-  pinnedItems: { itemId: string; type: 'post' | 'contract' }[]
-}

common/group.ts

@@ -39,4 +39,3 @@ export type GroupLink = {
   createdTime: number
   userId?: string
 }
-export type GroupContractDoc = { contractId: string; createdTime: number }

common/like.ts

@@ -1,9 +1,8 @@
 export type Like = {
   id: string // will be id of the object liked, i.e. contract.id
   userId: string
-  type: 'contract' | 'post'
+  type: 'contract'
   createdTime: number
   tipTxnId?: string // only holds most recent tip txn id
 }
 export const LIKE_TIP_AMOUNT = 10
-export const TIP_UNDO_DURATION = 2000

common/new-bet.ts

@@ -17,7 +17,8 @@ import {
 import {
   CPMMBinaryContract,
   DPMBinaryContract,
-  DPMContract,
+  FreeResponseContract,
+  MultipleChoiceContract,
   NumericContract,
   PseudoNumericContract,
 } from './contract'
@@ -143,8 +144,7 @@ export const computeFills = (
   betAmount: number,
   state: CpmmState,
   limitProb: number | undefined,
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) => {
   if (isNaN(betAmount)) {
     throw new Error('Invalid bet amount: ${betAmount}')
@@ -166,12 +166,10 @@ export const computeFills = (
     shares: number
     timestamp: number
   }[] = []
-  const ordersToCancel: LimitBet[] = []
 
   let amount = betAmount
   let cpmmState = { pool: state.pool, p: state.p }
   let totalFees = noFees
-  const currentBalanceByUserId = { ...balanceByUserId }
 
   let i = 0
   while (true) {
@@ -188,20 +186,9 @@ export const computeFills = (
       takers.push(taker)
     } else {
       // Matched against bet.
-      i++
-      const { userId } = maker.bet
-      const makerBalance = currentBalanceByUserId[userId]
-
-      if (floatingGreaterEqual(makerBalance, maker.amount)) {
-        currentBalanceByUserId[userId] = makerBalance - maker.amount
-      } else {
-        // Insufficient balance. Cancel maker bet.
-        ordersToCancel.push(maker.bet)
-        continue
-      }
-
       takers.push(taker)
       makers.push(maker)
+      i++
     }
 
     amount -= taker.amount
@@ -209,7 +196,7 @@ export const computeFills = (
     if (floatingEqual(amount, 0)) break
   }
 
-  return { takers, makers, totalFees, cpmmState, ordersToCancel }
+  return { takers, makers, totalFees, cpmmState }
 }
 
 export const getBinaryCpmmBetInfo = (
@@ -217,17 +204,15 @@ export const getBinaryCpmmBetInfo = (
   betAmount: number,
   contract: CPMMBinaryContract | PseudoNumericContract,
   limitProb: number | undefined,
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) => {
   const { pool, p } = contract
-  const { takers, makers, cpmmState, totalFees, ordersToCancel } = computeFills(
+  const { takers, makers, cpmmState, totalFees } = computeFills(
     outcome,
     betAmount,
     { pool, p },
     limitProb,
-    unfilledBets,
+    unfilledBets
-    balanceByUserId
   )
   const probBefore = getCpmmProbability(contract.pool, contract.p)
   const probAfter = getCpmmProbability(cpmmState.pool, cpmmState.p)
@@ -262,7 +247,6 @@ export const getBinaryCpmmBetInfo = (
     newP: cpmmState.p,
     newTotalLiquidity,
     makers,
-    ordersToCancel,
   }
 }
 
@@ -271,16 +255,14 @@ export const getBinaryBetStats = (
   betAmount: number,
   contract: CPMMBinaryContract | PseudoNumericContract,
   limitProb: number,
-  unfilledBets: LimitBet[],
+  unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 ) => {
   const { newBet } = getBinaryCpmmBetInfo(
     outcome,
     betAmount ?? 0,
     contract,
     limitProb,
-    unfilledBets,
+    unfilledBets as LimitBet[]
-    balanceByUserId
   )
   const remainingMatched =
     ((newBet.orderAmount ?? 0) - newBet.amount) /
@@ -343,7 +325,7 @@ export const getNewBinaryDpmBetInfo = (
 export const getNewMultiBetInfo = (
   outcome: string,
   amount: number,
-  contract: DPMContract
+  contract: FreeResponseContract | MultipleChoiceContract
 ) => {
   const { pool, totalShares, totalBets } = contract
 

common/new-contract.ts

@@ -63,7 +63,6 @@ export function getNewContract(
     tags: [],
     lowercaseTags: [],
     visibility,
-    unlistedById: visibility === 'unlisted' ? creator.id : undefined,
     isResolved: false,
     createdTime: Date.now(),
     closeTime,
@@ -71,7 +70,6 @@ export function getNewContract(
     volume: 0,
     volume24Hours: 0,
     volume7Days: 0,
-    elasticity: propsByOutcomeType.mechanism === 'cpmm-1' ? 0.38 : 0.75,
 
     collectedFees: {
       creatorFee: 0,
@@ -112,7 +110,6 @@ const getBinaryCpmmProps = (initialProb: number, ante: number) => {
     mechanism: 'cpmm-1',
     outcomeType: 'BINARY',
     totalLiquidity: ante,
-    subsidyPool: 0,
     initialProbability: p,
     p,
     pool: pool,

common/notification.ts

@@ -4,7 +4,7 @@ export type Notification = {
   id: string
   userId: string
   reasonText?: string
-  reason?: notification_reason_types | notification_preference
+  reason?: notification_reason_types
   createdTime: number
   viewTime?: number
   isSeen: boolean
@@ -46,7 +46,6 @@ export type notification_source_types =
   | 'loan'
   | 'like'
   | 'tip_and_like'
-  | 'badge'
 
 export type notification_source_update_types =
   | 'created'
@@ -238,10 +237,6 @@ export const NOTIFICATION_DESCRIPTIONS: notification_descriptions = {
     simple: `Only on markets you're invested in`,
     detailed: `Answers on markets that you're watching and that you're invested in`,
   },
-  badges_awarded: {
-    simple: 'New badges awarded',
-    detailed: 'New badges you have earned',
-  },
   opt_out_all: {
     simple: 'Opt out of all notifications (excludes when your markets close)',
     detailed:

common/package.json

@@ -8,13 +8,11 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@tiptap/core": "2.0.0-beta.199",
+    "@tiptap/core": "2.0.0-beta.182",
-    "@tiptap/extension-image": "2.0.0-beta.199",
+    "@tiptap/extension-image": "2.0.0-beta.30",
-    "@tiptap/extension-link": "2.0.0-beta.199",
+    "@tiptap/extension-link": "2.0.0-beta.43",
-    "@tiptap/extension-mention": "2.0.0-beta.199",
+    "@tiptap/extension-mention": "2.0.0-beta.102",
-    "@tiptap/html": "2.0.0-beta.199",
+    "@tiptap/starter-kit": "2.0.0-beta.191",
-    "@tiptap/starter-kit": "2.0.0-beta.199",
-    "@tiptap/suggestion": "2.0.0-beta.199",
     "lodash": "4.17.21"
   },
   "devDependencies": {

common/payouts-fixed.ts

@@ -1,3 +1,4 @@
+
 import { Bet } from './bet'
 import { getProbability } from './calculate'
 import { getCpmmLiquidityPoolWeights } from './calculate-cpmm'
@@ -55,11 +56,10 @@ export const getLiquidityPoolPayouts = (
   outcome: string,
   liquidities: LiquidityProvision[]
 ) => {
-  const { pool, subsidyPool } = contract
+  const { pool } = contract
-  const finalPool = pool[outcome] + (subsidyPool ?? 0)
+  const finalPool = pool[outcome]
-  if (finalPool < 1e-3) return []
 
-  const weights = getCpmmLiquidityPoolWeights(liquidities)
+  const weights = getCpmmLiquidityPoolWeights(contract, liquidities, false)
 
   return Object.entries(weights).map(([providerId, weight]) => ({
     userId: providerId,
@@ -95,11 +95,10 @@ export const getLiquidityPoolProbPayouts = (
   p: number,
   liquidities: LiquidityProvision[]
 ) => {
-  const { pool, subsidyPool } = contract
+  const { pool } = contract
-  const finalPool = p * pool.YES + (1 - p) * pool.NO + (subsidyPool ?? 0)
+  const finalPool = p * pool.YES + (1 - p) * pool.NO
-  if (finalPool < 1e-3) return []
 
-  const weights = getCpmmLiquidityPoolWeights(liquidities)
+  const weights = getCpmmLiquidityPoolWeights(contract, liquidities, false)
 
   return Object.entries(weights).map(([providerId, weight]) => ({
     userId: providerId,

common/post.ts

@@ -8,14 +8,6 @@ export type Post = {
   creatorId: string // User id
   createdTime: number
   slug: string
-
-  // denormalized user fields
-  creatorName: string
-  creatorUsername: string
-  creatorAvatarUrl?: string
-
-  likedByUserIds?: string[]
-  likedByUserCount?: number
 }
 
 export type DateDoc = Post & {

common/scoring.ts

@@ -1,9 +1,8 @@
-import { groupBy, sumBy, mapValues, keyBy, sortBy } from 'lodash'
+import { groupBy, sumBy, mapValues } from 'lodash'
 
 import { Bet } from './bet'
-import { getContractBetMetrics, resolvedPayout } from './calculate'
+import { getContractBetMetrics } from './calculate'
 import { Contract } from './contract'
-import { ContractComment } from './comment'
 
 export function scoreCreators(contracts: Contract[]) {
   const creatorScore = mapValues(
@@ -31,11 +30,8 @@ export function scoreTraders(contracts: Contract[], bets: Bet[][]) {
 }
 
 export function scoreUsersByContract(contract: Contract, bets: Bet[]) {
-  const betsByUser = groupBy(bets, (bet) => bet.userId)
+  const betsByUser = groupBy(bets, bet => bet.userId)
-  return mapValues(
+  return mapValues(betsByUser, bets => getContractBetMetrics(contract, bets).profit)
-    betsByUser,
-    (bets) => getContractBetMetrics(contract, bets).profit
-  )
 }
 
 export function addUserScores(
@@ -47,47 +43,3 @@ export function addUserScores(
     dest[userId] += score
   }
 }
-
-export function scoreCommentorsAndBettors(
-  contract: Contract,
-  bets: Bet[],
-  comments: ContractComment[]
-) {
-  const commentsById = keyBy(comments, 'id')
-  const betsById = keyBy(bets, 'id')
-
-  // If 'id2' is the sale of 'id1', both are logged with (id2 - id1) of profit
-  // Otherwise, we record the profit at resolution time
-  const profitById: Record<string, number> = {}
-  for (const bet of bets) {
-    if (bet.sale) {
-      const originalBet = betsById[bet.sale.betId]
-      const profit = bet.sale.amount - originalBet.amount
-      profitById[bet.id] = profit
-      profitById[originalBet.id] = profit
-    } else {
-      profitById[bet.id] = resolvedPayout(contract, bet) - bet.amount
-    }
-  }
-
-  // Now find the betId with the highest profit
-  const topBetId = sortBy(bets, (b) => -profitById[b.id])[0]?.id
-  const topBettor = betsById[topBetId]?.userName
-
-  // And also the commentId of the comment with the highest profit
-  const topCommentId = sortBy(
-    comments,
-    (c) => c.betId && -profitById[c.betId]
-  )[0]?.id
-  const topCommentBetId = commentsById[topCommentId]?.betId
-
-  return {
-    topCommentId,
-    topBetId,
-    topBettor,
-    profitById,
-    commentsById,
-    betsById,
-    topCommentBetId,
-  }
-}

common/sell-bet.ts

@@ -84,17 +84,15 @@ export const getCpmmSellBetInfo = (
   outcome: 'YES' | 'NO',
   contract: CPMMContract,
   unfilledBets: LimitBet[],
-  balanceByUserId: { [userId: string]: number },
   loanPaid: number
 ) => {
   const { pool, p } = contract
 
-  const { saleValue, cpmmState, fees, makers, takers, ordersToCancel } = calculateCpmmSale(
+  const { saleValue, cpmmState, fees, makers, takers } = calculateCpmmSale(
     contract,
     shares,
     outcome,
-    unfilledBets,
+    unfilledBets
-    balanceByUserId,
   )
 
   const probBefore = getCpmmProbability(pool, p)
@@ -136,6 +134,5 @@ export const getCpmmSellBetInfo = (
     fees,
     makers,
     takers,
-    ordersToCancel
   }
 }

common/user-notification-preferences.ts

@@ -53,7 +53,7 @@ export type notification_preferences = {
   profit_loss_updates: notification_destination_types[]
   onboarding_flow: notification_destination_types[]
   thank_you_for_purchases: notification_destination_types[]
-  badges_awarded: notification_destination_types[]
+
   opt_out_all: notification_destination_types[]
   // When adding a new notification preference, use add-new-notification-preference.ts to existing users
 }
@@ -126,7 +126,6 @@ export const getDefaultNotificationPreferences = (
     onboarding_flow: constructPref(false, false),
 
     opt_out_all: [],
-    badges_awarded: constructPref(true, false),
   }
   return defaults
 }
@@ -179,44 +178,31 @@ export const getNotificationDestinationsForUser = (
   reason: notification_reason_types | notification_preference
 ) => {
   const notificationSettings = privateUser.notificationPreferences
+  let destinations
+  let subscriptionType: notification_preference | undefined
+  if (Object.keys(notificationSettings).includes(reason)) {
+    subscriptionType = reason as notification_preference
+    destinations = notificationSettings[subscriptionType]
+  } else {
+    const key = reason as notification_reason_types
+    subscriptionType = notificationReasonToSubscriptionType[key]
+    destinations = subscriptionType
+      ? notificationSettings[subscriptionType]
+      : []
+  }
+  const optOutOfAllSettings = notificationSettings['opt_out_all']
+  // Your market closure notifications are high priority, opt-out doesn't affect their delivery
+  const optedOutOfEmail =
+    optOutOfAllSettings.includes('email') &&
+    subscriptionType !== 'your_contract_closed'
+  const optedOutOfBrowser =
+    optOutOfAllSettings.includes('browser') &&
+    subscriptionType !== 'your_contract_closed'
   const unsubscribeEndpoint = getFunctionUrl('unsubscribe')
-  try {
+  return {
-    let destinations
+    sendToEmail: destinations.includes('email') && !optedOutOfEmail,
-    let subscriptionType: notification_preference | undefined
+    sendToBrowser: destinations.includes('browser') && !optedOutOfBrowser,
-    if (Object.keys(notificationSettings).includes(reason)) {
+    unsubscribeUrl: `${unsubscribeEndpoint}?id=${privateUser.id}&type=${subscriptionType}`,
-      subscriptionType = reason as notification_preference
+    urlToManageThisNotification: `${DOMAIN}/notifications?tab=settings&section=${subscriptionType}`,
-      destinations = notificationSettings[subscriptionType]
-    } else {
-      const key = reason as notification_reason_types
-      subscriptionType = notificationReasonToSubscriptionType[key]
-      destinations = subscriptionType
-        ? notificationSettings[subscriptionType]
-        : []
-    }
-    const optOutOfAllSettings = notificationSettings['opt_out_all']
-    // Your market closure notifications are high priority, opt-out doesn't affect their delivery
-    const optedOutOfEmail =
-      optOutOfAllSettings.includes('email') &&
-      subscriptionType !== 'your_contract_closed'
-    const optedOutOfBrowser =
-      optOutOfAllSettings.includes('browser') &&
-      subscriptionType !== 'your_contract_closed'
-    return {
-      sendToEmail: destinations.includes('email') && !optedOutOfEmail,
-      sendToBrowser: destinations.includes('browser') && !optedOutOfBrowser,
-      unsubscribeUrl: `${unsubscribeEndpoint}?id=${privateUser.id}&type=${subscriptionType}`,
-      urlToManageThisNotification: `${DOMAIN}/notifications?tab=settings&section=${subscriptionType}`,
-    }
-  } catch (e) {
-    // Fail safely
-    console.log(
-      `couldn't get notification destinations for type ${reason} for user ${privateUser.id}`
-    )
-    return {
-      sendToEmail: false,
-      sendToBrowser: false,
-      unsubscribeUrl: '',
-      urlToManageThisNotification: '',
-    }
   }
 }

common/user.ts

@@ -1,6 +1,5 @@
 import { notification_preferences } from './user-notification-preferences'
-import { ENV_CONFIG } from './envs/constants'
+import { ENV_CONFIG } from 'common/envs/constants'
-import { MarketCreatorBadge, ProvenCorrectBadge, StreakerBadge } from './badge'
 
 export type User = {
   id: string
@@ -12,6 +11,7 @@ export type User = {
 
   // For their user page
   bio?: string
+  bannerUrl?: string
   website?: string
   twitterHandle?: string
   discordHandle?: string
@@ -51,18 +51,6 @@ export type User = {
   hasSeenContractFollowModal?: boolean
   freeMarketsCreated?: number
   isBannedFromPosting?: boolean
-
-  achievements: {
-    provenCorrect?: {
-      badges: ProvenCorrectBadge[]
-    }
-    marketCreator?: {
-      badges: MarketCreatorBadge[]
-    }
-    streaker?: {
-      badges: StreakerBadge[]
-    }
-  }
 }
 
 export type PrivateUser = {
@@ -93,8 +81,7 @@ export type PortfolioMetrics = {
   userId: string
 }
 
-export const MANIFOLD_USER_USERNAME = 'ManifoldMarkets'
+export const MANIFOLD_USERNAME = 'ManifoldMarkets'
-export const MANIFOLD_USER_NAME = 'ManifoldMarkets'
 export const MANIFOLD_AVATAR_URL = 'https://manifold.markets/logo-bg-white.png'
 
 // TODO: remove. Hardcoding the strings would be better.

common/util/color.ts

@@ -1,24 +0,0 @@
-export const interpolateColor = (color1: string, color2: string, p: number) => {
-  const rgb1 = parseInt(color1.replace('#', ''), 16)
-  const rgb2 = parseInt(color2.replace('#', ''), 16)
-
-  const [r1, g1, b1] = toArray(rgb1)
-  const [r2, g2, b2] = toArray(rgb2)
-
-  const q = 1 - p
-  const rr = Math.round(r1 * q + r2 * p)
-  const rg = Math.round(g1 * q + g2 * p)
-  const rb = Math.round(b1 * q + b2 * p)
-
-  const hexString = Number((rr << 16) + (rg << 8) + rb).toString(16)
-  const hex = `#${'0'.repeat(6 - hexString.length)}${hexString}`
-  return hex
-}
-
-function toArray(rgb: number) {
-  const r = rgb >> 16
-  const g = (rgb >> 8) % 256
-  const b = rgb % 256
-
-  return [r, g, b]
-}

common/util/format.ts

@@ -60,16 +60,6 @@ export function formatLargeNumber(num: number, sigfigs = 2): string {
   return `${numStr}${suffix[i] ?? ''}`
 }
 
-export function shortFormatNumber(num: number): string {
-  if (num < 1000) return showPrecision(num, 3)
-
-  const suffix = ['', 'K', 'M', 'B', 'T', 'Q']
-  const i = Math.floor(Math.log10(num) / 3)
-
-  const numStr = showPrecision(num / Math.pow(10, 3 * i), 2)
-  return `${numStr}${suffix[i] ?? ''}`
-}
-
 export function toCamelCase(words: string) {
   const camelCase = words
     .split(' ')

common/util/parse.ts

@@ -1,5 +1,4 @@
-import { generateText, JSONContent, Node } from '@tiptap/core'
+import { generateText, JSONContent } from '@tiptap/core'
-import { generateJSON } from '@tiptap/html'
 // Tiptap starter extensions
 import { Blockquote } from '@tiptap/extension-blockquote'
 import { Bold } from '@tiptap/extension-bold'
@@ -24,7 +23,7 @@ import { Mention } from '@tiptap/extension-mention'
 import Iframe from './tiptap-iframe'
 import TiptapTweet from './tiptap-tweet-type'
 import { find } from 'linkifyjs'
-import { uniq } from 'lodash'
+import { cloneDeep, uniq } from 'lodash'
 import { TiptapSpoiler } from './tiptap-spoiler'
 
 /** get first url in text. like "notion.so " -> "http://notion.so"; "notion" -> null */
@@ -52,28 +51,8 @@ export function parseMentions(data: JSONContent): string[] {
   return uniq(mentions)
 }
 
-// TODO: this is a hack to get around the fact that tiptap doesn't have a
+// can't just do [StarterKit, Image...] because it doesn't work with cjs imports
-// way to add a node view without bundling in tsx
+export const exhibitExts = [
-function skippableComponent(name: string): Node<any, any> {
-  return Node.create({
-    name,
-
-    group: 'block',
-
-    content: 'inline*',
-
-    parseHTML() {
-      return [
-        {
-          tag: 'grid-cards-component',
-        },
-      ]
-    },
-  })
-}
-
-const stringParseExts = [
-  // StarterKit extensions
   Blockquote,
   Bold,
   BulletList,
@@ -90,26 +69,28 @@ const stringParseExts = [
   Paragraph,
   Strike,
   Text,
-  // other extensions
+
+  Image,
   Link,
-  Image.extend({ renderText: () => '[image]' }),
+  Mention,
-  Mention, // user @mention
+  Iframe,
-  Mention.extend({ name: 'contract-mention' }), // market %mention
+  TiptapTweet,
-  Iframe.extend({
+  TiptapSpoiler,
-    renderText: ({ node }) =>
-      '[embed]' + node.attrs.src ? `(${node.attrs.src})` : '',
-  }),
-  skippableComponent('gridCardsComponent'),
-  skippableComponent('staticReactEmbedComponent'),
-  TiptapTweet.extend({ renderText: () => '[tweet]' }),
-  TiptapSpoiler.extend({ renderHTML: () => ['span', '[spoiler]', 0] }),
 ]
 
 export function richTextToString(text?: JSONContent) {
   if (!text) return ''
-  return generateText(text, stringParseExts)
+  // remove spoiler tags.
+  const newText = cloneDeep(text)
+  dfs(newText, (current) => {
+    if (current.marks?.some((m) => m.type === TiptapSpoiler.name)) {
+      current.text = '[spoiler]'
+    }
+  })
+  return generateText(newText, exhibitExts)
 }
 
-export function htmlToRichText(html: string) {
+const dfs = (data: JSONContent, f: (current: JSONContent) => any) => {
-  return generateJSON(html, stringParseExts)
+  data.content?.forEach((d) => dfs(d, f))
+  f(data)
 }

docs/docs/api.md

@@ -680,17 +680,6 @@ $ curl https://manifold.markets/api/v0/market/{marketId}/sell -X POST \
     --data-raw '{"outcome": "YES", "shares": 10}'
 ```
 
-### `POST /v0/comment`
-
-Creates a comment in the specified market. Only supports top-level comments for now.
-
-Parameters:
-
-- `contractId`: Required. The ID of the market to comment on.
-- `content`: The comment to post, formatted as [TipTap json](https://tiptap.dev/guide/output#option-1-json), OR
-- `html`: The comment to post, formatted as an HTML string, OR
-- `markdown`: The comment to post, formatted as a markdown string.
-
 ### `GET /v0/bets`
 
 Gets a list of bets, ordered by creation date descending.

docs/docs/bounties.md

@@ -15,22 +15,6 @@ Our community is the beating heart of Manifold; your individual contributions ar
 
 ## Awarded bounties
 
-💥 *Awarded on 2022-10-07*
-
-**[Pepe](https://manifold.markets/Pepe): M$10,000**
-**[Jack](https://manifold.markets/jack): M$2,000**
-**[Martin](https://manifold.markets/MartinRandall): M$2,000**
-**[Yev](https://manifold.markets/Yev): M$2,000**
-**[Michael](https://manifold.markets/MichaelWheatley): M$2,000**
-
-- For discovering an infinite mana exploit using limit orders, and informing the Manifold team of it privately.
-
-**[Matt](https://manifold.markets/MattP): M$5,000**
-**[Adrian](https://manifold.markets/ahalekelly): M$5,000**
-**[Yev](https://manifold.markets/Yev): M$5,000**
-
-- For discovering an AMM liquidity exploit and informing the Manifold team of it privately.
-
 🎈 *Awarded on 2022-06-14*
 
 **[Wasabipesto](https://manifold.markets/wasabipesto): M$20,000**

firestore.rules

@@ -23,17 +23,11 @@ service cloud.firestore {
       allow read;
     }
 
-    match /globalConfig/globalConfig {
-      allow read;
-      allow update: if isAdmin()
-      allow create: if isAdmin()
-    }
-
     match /users/{userId} {
       allow read;
       allow update: if userId == request.auth.uid
                        && request.resource.data.diff(resource.data).affectedKeys()
-                                                                    .hasOnly(['bio', 'website', 'twitterHandle', 'discordHandle', 'followedCategories', 'lastPingTime','shouldShowWelcome', 'hasSeenContractFollowModal', 'homeSections']);
+                                                                    .hasOnly(['bio', 'bannerUrl', 'website', 'twitterHandle', 'discordHandle', 'followedCategories', 'lastPingTime','shouldShowWelcome', 'hasSeenContractFollowModal', 'homeSections']);
       // User referral rules
       allow update: if userId == request.auth.uid
                          && request.resource.data.diff(resource.data).affectedKeys()
@@ -50,10 +44,6 @@ service cloud.firestore {
       allow read;
     }
 
-    match /{somePath=**}/contract-metrics/{contractId} {
-      allow read;
-    }
-
     match /{somePath=**}/challenges/{challengeId}{
       allow read;
     }
@@ -110,7 +100,7 @@ service cloud.firestore {
     match /contracts/{contractId} {
       allow read;
       allow update: if request.resource.data.diff(resource.data).affectedKeys()
-                                                                 .hasOnly(['tags', 'lowercaseTags', 'groupSlugs', 'groupLinks', 'flaggedByUsernames']);
+                                                                 .hasOnly(['tags', 'lowercaseTags', 'groupSlugs', 'groupLinks']);
       allow update: if request.resource.data.diff(resource.data).affectedKeys()
                                                                  .hasOnly(['description', 'closeTime', 'question', 'visibility', 'unlistedById'])
                        && resource.data.creatorId == request.auth.uid;

functions/.env.dev

@@ -1,3 +0,0 @@
-# This sets which EnvConfig is deployed to Firebase Cloud Functions
-
-NEXT_PUBLIC_FIREBASE_ENV=DEV

functions/.eslintrc.js

@@ -26,7 +26,7 @@ module.exports = {
             caughtErrorsIgnorePattern: '^_',
           },
         ],
-        'unused-imports/no-unused-imports': 'warn',
+        'unused-imports/no-unused-imports': 'error',
       },
     },
   ],

functions/README.md

@@ -20,7 +20,7 @@ Adapted from https://firebase.google.com/docs/functions/get-started
 3. `$ firebase login` to authenticate the CLI tools to Firebase
 4. `$ firebase use dev` to choose the dev project
 
-#### (Installing) For local development
+### For local development
 
 0. [Install](https://cloud.google.com/sdk/docs/install) gcloud CLI
 1. If you don't have java (or see the error `Error: Process java -version has exited with code 1. Please make sure Java is installed and on your system PATH.`):
@@ -35,10 +35,10 @@ Adapted from https://firebase.google.com/docs/functions/get-started
 
 ## Developing locally
 
-0. `$ ./dev.sh localdb` to start the local emulator and front end
+0. `$ firebase use dev` if you haven't already
-1. If you change db trigger code, you have to start (doesn't have to complete) the deploy of it to dev to cause a hard emulator code refresh `$ firebase deploy --only functions:dbTriggerNameHere`
+1. `$ yarn serve` to spin up the emulators 0. The Emulator UI is at http://localhost:4000; the functions are hosted on :5001.
-   - There's surely a better way to cause/react to a db trigger update but just adding this here for now as it works
+   Note: You have to kill and restart emulators when you change code; no hot reload =(
-2. If you want to test a scheduled function replace your function in `test-scheduled-function.ts` and send a GET to `http://localhost:8088/testscheduledfunction` (Best user experience is via [Postman](https://www.postman.com/downloads/)!)
+2. `$ yarn dev:emulate` in `/web` to connect to emulators with the frontend 0. Note: emulated database is cleared after every shutdown
 
 ## Firestore Commands
 

functions/package.json

@@ -5,7 +5,7 @@
     "firestore": "dev-mantic-markets.appspot.com"
   },
   "scripts": {
-    "build": "yarn compile && rm -rf dist && mkdir -p dist/functions && cp -R ../common/lib dist/common && cp -R lib/src dist/functions/src && cp ../yarn.lock dist && cp package.json dist && cp .env.prod dist && cp .env.dev dist",
+    "build": "yarn compile && rm -rf dist && mkdir -p dist/functions && cp -R ../common/lib dist/common && cp -R lib/src dist/functions/src && cp ../yarn.lock dist && cp package.json dist && cp .env dist",
     "compile": "tsc -b",
     "watch": "tsc -w",
     "shell": "yarn build && firebase functions:shell",
@@ -15,9 +15,9 @@
     "dev": "nodemon src/serve.ts",
     "localDbScript": "firebase emulators:start --only functions,firestore,pubsub --import=./firestore_export",
     "serve": "firebase use dev && yarn build && firebase emulators:start --only functions,firestore,pubsub --import=./firestore_export",
-    "db:update-local-from-remote": "yarn db:backup-remote && gsutil -m rsync -r gs://$npm_package_config_firestore/firestore_export ./firestore_export",
+    "db:update-local-from-remote": "yarn db:backup-remote && gsutil rsync -r gs://$npm_package_config_firestore/firestore_export ./firestore_export",
     "db:backup-local": "firebase emulators:export --force ./firestore_export",
-    "db:rename-remote-backup-folder": "gsutil -m mv gs://$npm_package_config_firestore/firestore_export gs://$npm_package_config_firestore/firestore_export_$(date +%d-%m-%Y-%H-%M)",
+    "db:rename-remote-backup-folder": "gsutil mv gs://$npm_package_config_firestore/firestore_export gs://$npm_package_config_firestore/firestore_export_$(date +%d-%m-%Y-%H-%M)",
     "db:backup-remote": "yarn db:rename-remote-backup-folder && gcloud firestore export gs://$npm_package_config_firestore/firestore_export/",
     "verify": "(cd .. && yarn verify)",
     "verify:dir": "npx eslint . --max-warnings 0; tsc -b -v --pretty"
@@ -26,13 +26,11 @@
   "dependencies": {
     "@amplitude/node": "1.10.0",
     "@google-cloud/functions-framework": "3.1.2",
-    "@tiptap/core": "2.0.0-beta.199",
+    "@tiptap/core": "2.0.0-beta.182",
-    "@tiptap/extension-image": "2.0.0-beta.199",
+    "@tiptap/extension-image": "2.0.0-beta.30",
-    "@tiptap/extension-link": "2.0.0-beta.199",
+    "@tiptap/extension-link": "2.0.0-beta.43",
-    "@tiptap/extension-mention": "2.0.0-beta.199",
+    "@tiptap/extension-mention": "2.0.0-beta.102",
-    "@tiptap/html": "2.0.0-beta.199",
+    "@tiptap/starter-kit": "2.0.0-beta.191",
-    "@tiptap/starter-kit": "2.0.0-beta.199",
-    "@tiptap/suggestion": "2.0.0-beta.199",
     "cors": "2.8.5",
     "dayjs": "1.11.4",
     "express": "4.18.1",
@@ -40,7 +38,6 @@
     "firebase-functions": "3.21.2",
     "lodash": "4.17.21",
     "mailgun-js": "0.22.0",
-    "marked": "4.1.1",
     "module-alias": "2.2.2",
     "node-fetch": "2",
     "stripe": "8.194.0",
@@ -48,7 +45,6 @@
   },
   "devDependencies": {
     "@types/mailgun-js": "0.22.12",
-    "@types/marked": "4.0.7",
     "@types/module-alias": "2.0.1",
     "@types/node-fetch": "2.6.2",
     "firebase-functions-test": "0.3.3",

functions/src/add-liquidity.ts

@@ -3,18 +3,24 @@ import { z } from 'zod'
 
 import { Contract, CPMMContract } from '../../common/contract'
 import { User } from '../../common/user'
+import { removeUndefinedProps } from '../../common/util/object'
 import { getNewLiquidityProvision } from '../../common/add-liquidity'
 import { APIError, newEndpoint, validate } from './api'
+import {
+  DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
+  HOUSE_LIQUIDITY_PROVIDER_ID,
+} from '../../common/antes'
+import { isProd } from './utils'
 
 const bodySchema = z.object({
   contractId: z.string(),
   amount: z.number().gt(0),
 })
 
-export const addsubsidy = newEndpoint({}, async (req, auth) => {
+export const addliquidity = newEndpoint({}, async (req, auth) => {
   const { amount, contractId } = validate(bodySchema, req.body)
 
-  if (!isFinite(amount) || amount < 1) throw new APIError(400, 'Invalid amount')
+  if (!isFinite(amount)) throw new APIError(400, 'Invalid amount')
 
   // run as transaction to prevent race conditions
   return await firestore.runTransaction(async (transaction) => {
@@ -44,7 +50,7 @@ export const addsubsidy = newEndpoint({}, async (req, auth) => {
       .collection(`contracts/${contractId}/liquidity`)
       .doc()
 
-    const { newLiquidityProvision, newTotalLiquidity, newSubsidyPool } =
+    const { newLiquidityProvision, newPool, newP, newTotalLiquidity } =
       getNewLiquidityProvision(
         user.id,
         amount,
@@ -52,10 +58,21 @@ export const addsubsidy = newEndpoint({}, async (req, auth) => {
         newLiquidityProvisionDoc.id
       )
 
-    transaction.update(contractDoc, {
+    if (newP !== undefined && !isFinite(newP)) {
-      subsidyPool: newSubsidyPool,
+      return {
-      totalLiquidity: newTotalLiquidity,
+        status: 'error',
-    } as Partial<CPMMContract>)
+        message: 'Liquidity injection rejected due to overflow error.',
+      }
+    }
+
+    transaction.update(
+      contractDoc,
+      removeUndefinedProps({
+        pool: newPool,
+        p: newP,
+        totalLiquidity: newTotalLiquidity,
+      })
+    )
 
     const newBalance = user.balance - amount
     const newTotalDeposits = user.totalDeposits - amount
@@ -76,3 +93,41 @@ export const addsubsidy = newEndpoint({}, async (req, auth) => {
 })
 
 const firestore = admin.firestore()
+
+export const addHouseLiquidity = (contract: CPMMContract, amount: number) => {
+  return firestore.runTransaction(async (transaction) => {
+    const newLiquidityProvisionDoc = firestore
+      .collection(`contracts/${contract.id}/liquidity`)
+      .doc()
+
+    const providerId = isProd()
+      ? HOUSE_LIQUIDITY_PROVIDER_ID
+      : DEV_HOUSE_LIQUIDITY_PROVIDER_ID
+
+    const { newLiquidityProvision, newPool, newP, newTotalLiquidity } =
+      getNewLiquidityProvision(
+        providerId,
+        amount,
+        contract,
+        newLiquidityProvisionDoc.id
+      )
+
+    if (newP !== undefined && !isFinite(newP)) {
+      throw new APIError(
+        500,
+        'Liquidity injection rejected due to overflow error.'
+      )
+    }
+
+    transaction.update(
+      firestore.doc(`contracts/${contract.id}`),
+      removeUndefinedProps({
+        pool: newPool,
+        p: newP,
+        totalLiquidity: newTotalLiquidity,
+      })
+    )
+
+    transaction.create(newLiquidityProvisionDoc, newLiquidityProvision)
+  })
+}

functions/src/api.ts

@@ -146,24 +146,3 @@ export const newEndpoint = (endpointOpts: EndpointOptions, fn: Handler) => {
     },
   } as EndpointDefinition
 }
-
-export const newEndpointNoAuth = (
-  endpointOpts: EndpointOptions,
-  fn: (req: Request) => Promise<Output>
-) => {
-  const opts = Object.assign({}, DEFAULT_OPTS, endpointOpts)
-  return {
-    opts,
-    handler: async (req: Request, res: Response) => {
-      log(`${req.method} ${req.url} ${JSON.stringify(req.body)}`)
-      try {
-        if (opts.method !== req.method) {
-          throw new APIError(405, `This endpoint supports only ${opts.method}.`)
-        }
-        res.status(200).json(await fn(req))
-      } catch (e) {
-        writeResponseError(e, res)
-      }
-    },
-  } as EndpointDefinition
-}

functions/src/create-comment.ts

@@ -1,105 +0,0 @@
-import * as admin from 'firebase-admin'
-
-import { getContract, getUser, log } from './utils'
-import { APIError, newEndpoint, validate } from './api'
-import { JSONContent } from '@tiptap/core'
-import { z } from 'zod'
-import { removeUndefinedProps } from '../../common/util/object'
-import { htmlToRichText } from '../../common/util/parse'
-import { marked } from 'marked'
-
-const contentSchema: z.ZodType<JSONContent> = z.lazy(() =>
-  z.intersection(
-    z.record(z.any()),
-    z.object({
-      type: z.string().optional(),
-      attrs: z.record(z.any()).optional(),
-      content: z.array(contentSchema).optional(),
-      marks: z
-        .array(
-          z.intersection(
-            z.record(z.any()),
-            z.object({
-              type: z.string(),
-              attrs: z.record(z.any()).optional(),
-            })
-          )
-        )
-        .optional(),
-      text: z.string().optional(),
-    })
-  )
-)
-
-const postSchema = z.object({
-  contractId: z.string(),
-  content: contentSchema.optional(),
-  html: z.string().optional(),
-  markdown: z.string().optional(),
-})
-
-const MAX_COMMENT_JSON_LENGTH = 20000
-
-// For now, only supports creating a new top-level comment on a contract.
-// Replies, posts, chats are not supported yet.
-export const createcomment = newEndpoint({}, async (req, auth) => {
-  const firestore = admin.firestore()
-  const { contractId, content, html, markdown } = validate(postSchema, req.body)
-
-  const creator = await getUser(auth.uid)
-  const contract = await getContract(contractId)
-
-  if (!creator) {
-    throw new APIError(400, 'No user exists with the authenticated user ID.')
-  }
-  if (!contract) {
-    throw new APIError(400, 'No contract exists with the given ID.')
-  }
-
-  let contentJson = null
-  if (content) {
-    contentJson = content
-  } else if (html) {
-    console.log('html', html)
-    contentJson = htmlToRichText(html)
-  } else if (markdown) {
-    const markedParse = marked.parse(markdown)
-    log('parsed', markedParse)
-    contentJson = htmlToRichText(markedParse)
-    log('json', contentJson)
-  }
-
-  if (!contentJson) {
-    throw new APIError(400, 'No comment content provided.')
-  }
-
-  if (JSON.stringify(contentJson).length > MAX_COMMENT_JSON_LENGTH) {
-    throw new APIError(
-      400,
-      `Comment is too long; should be less than ${MAX_COMMENT_JSON_LENGTH} as a JSON string.`
-    )
-  }
-
-  const ref = firestore.collection(`contracts/${contractId}/comments`).doc()
-
-  const comment = removeUndefinedProps({
-    id: ref.id,
-    content: contentJson,
-    createdTime: Date.now(),
-
-    userId: creator.id,
-    userName: creator.name,
-    userUsername: creator.username,
-    userAvatarUrl: creator.avatarUrl,
-
-    // OnContract fields
-    commentType: 'contract',
-    contractId: contractId,
-    contractSlug: contract.slug,
-    contractQuestion: contract.question,
-  })
-
-  await ref.set(comment)
-
-  return { status: 'success', comment }
-})

functions/src/create-notification.ts

@@ -6,13 +6,7 @@ import {
   Notification,
   notification_reason_types,
 } from '../../common/notification'
-import {
+import { User } from '../../common/user'
-  MANIFOLD_AVATAR_URL,
-  MANIFOLD_USER_NAME,
-  MANIFOLD_USER_USERNAME,
-  PrivateUser,
-  User,
-} from '../../common/user'
 import { Contract } from '../../common/contract'
 import { getPrivateUser, getValues } from './utils'
 import { Comment } from '../../common/comment'
@@ -36,26 +30,27 @@ import {
 import { filterDefined } from '../../common/util/array'
 import { getNotificationDestinationsForUser } from '../../common/user-notification-preferences'
 import { ContractFollow } from '../../common/follow'
-import { Badge } from 'common/badge'
 const firestore = admin.firestore()
 
 type recipients_to_reason_texts = {
   [userId: string]: { reason: notification_reason_types }
 }
 
-export const createFollowOrMarketSubsidizedNotification = async (
+export const createNotification = async (
   sourceId: string,
-  sourceType: 'liquidity' | 'follow',
+  sourceType: 'contract' | 'liquidity' | 'follow',
-  sourceUpdateType: 'created',
+  sourceUpdateType: 'closed' | 'created',
   sourceUser: User,
   idempotencyKey: string,
   sourceText: string,
   miscData?: {
     contract?: Contract
     recipients?: string[]
+    slug?: string
+    title?: string
   }
 ) => {
-  const { contract: sourceContract, recipients } = miscData ?? {}
+  const { contract: sourceContract, recipients, slug, title } = miscData ?? {}
 
   const shouldReceiveNotification = (
     userId: string,
@@ -99,15 +94,23 @@ export const createFollowOrMarketSubsidizedNotification = async (
           sourceContractCreatorUsername: sourceContract?.creatorUsername,
           sourceContractTitle: sourceContract?.question,
           sourceContractSlug: sourceContract?.slug,
-          sourceSlug: sourceContract?.slug,
+          sourceSlug: slug ? slug : sourceContract?.slug,
-          sourceTitle: sourceContract?.question,
+          sourceTitle: title ? title : sourceContract?.question,
         }
         await notificationRef.set(removeUndefinedProps(notification))
       }
 
       if (!sendToEmail) continue
 
-      if (reason === 'subsidized_your_market') {
+      if (reason === 'your_contract_closed' && privateUser && sourceContract) {
+        // TODO: include number and names of bettors waiting for creator to resolve their market
+        await sendMarketCloseEmail(
+          reason,
+          sourceUser,
+          privateUser,
+          sourceContract
+        )
+      } else if (reason === 'subsidized_your_market') {
         // TODO: send email to creator of market that was subsidized
       } else if (reason === 'on_new_follow') {
         // TODO: send email to user who was followed
@@ -124,7 +127,20 @@ export const createFollowOrMarketSubsidizedNotification = async (
         reason: 'on_new_follow',
       }
     return await sendNotificationsIfSettingsPermit(userToReasonTexts)
-  } else if (sourceType === 'liquidity' && sourceContract) {
+  } else if (
+    sourceType === 'contract' &&
+    sourceUpdateType === 'closed' &&
+    sourceContract
+  ) {
+    userToReasonTexts[sourceContract.creatorId] = {
+      reason: 'your_contract_closed',
+    }
+    return await sendNotificationsIfSettingsPermit(userToReasonTexts)
+  } else if (
+    sourceType === 'liquidity' &&
+    sourceUpdateType === 'created' &&
+    sourceContract
+  ) {
     if (shouldReceiveNotification(sourceContract.creatorId, userToReasonTexts))
       userToReasonTexts[sourceContract.creatorId] = {
         reason: 'subsidized_your_market',
@@ -197,7 +213,6 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
     return await notificationRef.set(removeUndefinedProps(notification))
   }
 
-  const needNotFollowContractReasons = ['tagged_user']
   const stillFollowingContract = (userId: string) => {
     return contractFollowersIds.includes(userId)
   }
@@ -206,12 +221,7 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
     userId: string,
     reason: notification_reason_types
   ) => {
-    if (
+    if (!stillFollowingContract(userId) || sourceUser.id == userId) return
-      (!stillFollowingContract(userId) &&
-        !needNotFollowContractReasons.includes(reason)) ||
-      sourceUser.id == userId
-    )
-      return
     const privateUser = await getPrivateUser(userId)
     if (!privateUser) return
     const { sendToBrowser, sendToEmail } = getNotificationDestinationsForUser(
@@ -1077,81 +1087,6 @@ export const createBountyNotification = async (
     sourceTitle: contract.question,
   }
   return await notificationRef.set(removeUndefinedProps(notification))
-}
+
-
+  // maybe TODO: send email notification to comment creator
-export const createBadgeAwardedNotification = async (
-  user: User,
-  badge: Badge
-) => {
-  const privateUser = await getPrivateUser(user.id)
-  if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
-    privateUser,
-    'badges_awarded'
-  )
-  if (!sendToBrowser) return
-
-  const notificationRef = firestore
-    .collection(`/users/${user.id}/notifications`)
-    .doc()
-  const notification: Notification = {
-    id: notificationRef.id,
-    userId: user.id,
-    reason: 'badges_awarded',
-    createdTime: Date.now(),
-    isSeen: false,
-    sourceId: badge.type,
-    sourceType: 'badge',
-    sourceUpdateType: 'created',
-    sourceUserName: MANIFOLD_USER_NAME,
-    sourceUserUsername: MANIFOLD_USER_USERNAME,
-    sourceUserAvatarUrl: MANIFOLD_AVATAR_URL,
-    sourceText: `You earned a new ${badge.name} badge!`,
-    sourceSlug: `/${user.username}?show=badges&badge=${badge.type}`,
-    sourceTitle: badge.name,
-    data: {
-      badge,
-    },
-  }
-  return await notificationRef.set(removeUndefinedProps(notification))
-
-  // TODO send email notification
-}
-
-export const createMarketClosedNotification = async (
-  contract: Contract,
-  creator: User,
-  privateUser: PrivateUser,
-  idempotencyKey: string
-) => {
-  const notificationRef = firestore
-    .collection(`/users/${creator.id}/notifications`)
-    .doc(idempotencyKey)
-  const notification: Notification = {
-    id: idempotencyKey,
-    userId: creator.id,
-    reason: 'your_contract_closed',
-    createdTime: Date.now(),
-    isSeen: false,
-    sourceId: contract.id,
-    sourceType: 'contract',
-    sourceUpdateType: 'closed',
-    sourceContractId: contract?.id,
-    sourceUserName: creator.name,
-    sourceUserUsername: creator.username,
-    sourceUserAvatarUrl: creator.avatarUrl,
-    sourceText: contract.closeTime?.toString() ?? new Date().toString(),
-    sourceContractCreatorUsername: creator.username,
-    sourceContractTitle: contract.question,
-    sourceContractSlug: contract.slug,
-    sourceSlug: contract.slug,
-    sourceTitle: contract.question,
-  }
-  await notificationRef.set(removeUndefinedProps(notification))
-  await sendMarketCloseEmail(
-    'your_contract_closed',
-    creator,
-    privateUser,
-    contract
-  )
 }

functions/src/create-post.ts

@@ -71,23 +71,19 @@ export const createpost = newEndpoint({}, async (req, auth) => {
   if (question) {
     const closeTime = Date.now() + DAY_MS * 30 * 3
 
-    try {
+    const result = await createMarketHelper(
-      const result = await createMarketHelper(
+      {
-        {
+        question,
-          question,
+        closeTime,
-          closeTime,
+        outcomeType: 'BINARY',
-          outcomeType: 'BINARY',
+        visibility: 'unlisted',
-          visibility: 'unlisted',
+        initialProb: 50,
-          initialProb: 50,
+        // Dating group!
-          // Dating group!
+        groupId: 'j3ZE8fkeqiKmRGumy3O1',
-          groupId: 'j3ZE8fkeqiKmRGumy3O1',
+      },
-        },
+      auth
-        auth
+    )
-      )
+    contractSlug = result.slug
-      contractSlug = result.slug
-    } catch (e) {
-      console.error(e)
-    }
   }
 
   const post: Post = removeUndefinedProps({
@@ -100,10 +96,6 @@ export const createpost = newEndpoint({}, async (req, auth) => {
     createdTime: Date.now(),
     content: content,
     contractSlug,
-    creatorName: creator.name,
-    creatorUsername: creator.username,
-    creatorAvatarUrl: creator.avatarUrl,
-    itemType: 'post',
   })
 
   await postRef.create(post)

functions/src/create-user.ts

@@ -70,7 +70,6 @@ export const createuser = newEndpoint(opts, async (req, auth) => {
     followedCategories: DEFAULT_CATEGORIES,
     shouldShowWelcome: true,
     fractionResolvedCorrectly: 1,
-    achievements: {},
   }
 
   await firestore.collection('users').doc(auth.uid).create(user)

functions/src/drizzle-liquidity.ts

@@ -1,69 +0,0 @@
-import * as functions from 'firebase-functions'
-import * as admin from 'firebase-admin'
-
-import { CPMMContract } from '../../common/contract'
-import { batchedWaitAll } from '../../common/util/promise'
-import { APIError } from '../../common/api'
-import { addCpmmLiquidity } from '../../common/calculate-cpmm'
-import { formatMoneyWithDecimals } from '../../common/util/format'
-
-const firestore = admin.firestore()
-
-export const drizzleLiquidity = async () => {
-  const snap = await firestore
-    .collection('contracts')
-    .where('subsidyPool', '>', 1e-7)
-    .get()
-
-  const contractIds = snap.docs.map((doc) => doc.id)
-  console.log('found', contractIds.length, 'markets to drizzle')
-  console.log()
-
-  await batchedWaitAll(
-    contractIds.map((cid) => () => drizzleMarket(cid)),
-    10
-  )
-}
-
-export const drizzleLiquidityScheduler = functions.pubsub
-  .schedule('* * * * *') // every minute
-  .onRun(drizzleLiquidity)
-
-const drizzleMarket = async (contractId: string) => {
-  await firestore.runTransaction(async (trans) => {
-    const snap = await trans.get(firestore.doc(`contracts/${contractId}`))
-    const contract = snap.data() as CPMMContract
-    const { subsidyPool, pool, p, slug, popularityScore } = contract
-    if ((subsidyPool ?? 0) < 1e-7) return
-
-    const r = Math.random()
-    const logPopularity = Math.log10((popularityScore ?? 0) + 1)
-    const v = Math.max(1, Math.min(5, logPopularity))
-    const amount = subsidyPool <= 0.5 ? subsidyPool : r * v * 0.01 * subsidyPool
-
-    const { newPool, newP } = addCpmmLiquidity(pool, p, amount)
-
-    if (!isFinite(newP)) {
-      throw new APIError(
-        500,
-        'Liquidity injection rejected due to overflow error.'
-      )
-    }
-
-    await trans.update(firestore.doc(`contracts/${contract.id}`), {
-      pool: newPool,
-      p: newP,
-      subsidyPool: subsidyPool - amount,
-    })
-
-    console.log(
-      'added subsidy',
-      formatMoneyWithDecimals(amount),
-      'of',
-      formatMoneyWithDecimals(subsidyPool),
-      'pool to',
-      slug
-    )
-    console.log()
-  })
-}

functions/src/emails.ts

@@ -12,7 +12,7 @@ import { getValueFromBucket } from '../../common/calculate-dpm'
 import { formatNumericProbability } from '../../common/pseudo-numeric'
 
 import { sendTemplateEmail, sendTextEmail } from './send-email'
-import { contractUrl, getUser, log } from './utils'
+import { contractUrl, getUser } from './utils'
 import { buildCardUrl, getOpenGraphProps } from '../../common/contract-details'
 import { notification_reason_types } from '../../common/notification'
 import { Dictionary } from 'lodash'
@@ -212,16 +212,20 @@ export const sendOneWeekBonusEmail = async (
   user: User,
   privateUser: PrivateUser
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationPreferences.onboarding_flow.includes('email')
+  )
+    return
 
   const { name } = user
   const firstName = name.split(' ')[0]
 
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+  const { unsubscribeUrl } = getNotificationDestinationsForUser(
     privateUser,
     'onboarding_flow'
   )
-  if (!sendToEmail) return
 
   return await sendTemplateEmail(
     privateUser.email,
@@ -243,15 +247,19 @@ export const sendCreatorGuideEmail = async (
   privateUser: PrivateUser,
   sendTime: string
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationPreferences.onboarding_flow.includes('email')
+  )
+    return
 
   const { name } = user
   const firstName = name.split(' ')[0]
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+  const { unsubscribeUrl } = getNotificationDestinationsForUser(
     privateUser,
     'onboarding_flow'
   )
-  if (!sendToEmail) return
   return await sendTemplateEmail(
     privateUser.email,
     'Create your own prediction market',
@@ -271,16 +279,22 @@ export const sendThankYouEmail = async (
   user: User,
   privateUser: PrivateUser
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationPreferences.thank_you_for_purchases.includes(
+      'email'
+    )
+  )
+    return
 
   const { name } = user
   const firstName = name.split(' ')[0]
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+  const { unsubscribeUrl } = getNotificationDestinationsForUser(
     privateUser,
     'thank_you_for_purchases'
   )
 
-  if (!sendToEmail) return
   return await sendTemplateEmail(
     privateUser.email,
     'Thanks for your Manifold purchase',
@@ -301,7 +315,12 @@ export const sendMarketCloseEmail = async (
   privateUser: PrivateUser,
   contract: Contract
 ) => {
-  if (!privateUser.email) return
+  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+    privateUser,
+    reason
+  )
+
+  if (!privateUser.email || !sendToEmail) return
 
   const { username, name, id: userId } = user
   const firstName = name.split(' ')[0]
@@ -310,7 +329,6 @@ export const sendMarketCloseEmail = async (
 
   const url = `https://${DOMAIN}/${username}/${slug}`
 
-  // We ignore if they were able to unsubscribe from market close emails, this is a necessary email
   return await sendTemplateEmail(
     privateUser.email,
     'Your market has closed',
@@ -318,7 +336,7 @@ export const sendMarketCloseEmail = async (
     {
       question,
       url,
-      unsubscribeUrl: '',
+      unsubscribeUrl,
       userId,
       name: firstName,
       volume: formatMoney(volume),
@@ -448,13 +466,17 @@ export const sendInterestingMarketsEmail = async (
   contractsToSend: Contract[],
   deliveryTime?: string
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationPreferences.trending_markets.includes('email')
+  )
+    return
 
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+  const { unsubscribeUrl } = getNotificationDestinationsForUser(
     privateUser,
     'trending_markets'
   )
-  if (!sendToEmail) return
 
   const { name } = user
   const firstName = name.split(' ')[0]
@@ -598,15 +620,18 @@ export const sendWeeklyPortfolioUpdateEmail = async (
   investments: PerContractInvestmentsData[],
   overallPerformance: OverallPerformanceData
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationPreferences.profit_loss_updates.includes('email')
+  )
+    return
 
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+  const { unsubscribeUrl } = getNotificationDestinationsForUser(
     privateUser,
     'profit_loss_updates'
   )
 
-  if (!sendToEmail) return
-
   const { name } = user
   const firstName = name.split(' ')[0]
   const templateData: Record<string, string> = {
@@ -631,5 +656,4 @@ export const sendWeeklyPortfolioUpdateEmail = async (
       : 'portfolio-update',
     templateData
   )
-  log('Sent portfolio update email to', privateUser.email)
 }

functions/src/helpers/add-house-subsidy.ts

@@ -1,42 +0,0 @@
-import * as admin from 'firebase-admin'
-
-import { CPMMContract } from '../../../common/contract'
-import { isProd } from '../utils'
-import {
-  DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
-  HOUSE_LIQUIDITY_PROVIDER_ID,
-} from '../../../common/antes'
-import { getNewLiquidityProvision } from '../../../common/add-liquidity'
-
-const firestore = admin.firestore()
-
-export const addHouseSubsidy = (contractId: string, amount: number) => {
-  return firestore.runTransaction(async (transaction) => {
-    const newLiquidityProvisionDoc = firestore
-      .collection(`contracts/${contractId}/liquidity`)
-      .doc()
-
-    const providerId = isProd()
-      ? HOUSE_LIQUIDITY_PROVIDER_ID
-      : DEV_HOUSE_LIQUIDITY_PROVIDER_ID
-
-    const contractDoc = firestore.doc(`contracts/${contractId}`)
-    const snap = await contractDoc.get()
-    const contract = snap.data() as CPMMContract
-
-    const { newLiquidityProvision, newTotalLiquidity, newSubsidyPool } =
-      getNewLiquidityProvision(
-        providerId,
-        amount,
-        contract,
-        newLiquidityProvisionDoc.id
-      )
-
-    transaction.update(contractDoc, {
-      subsidyPool: newSubsidyPool,
-      totalLiquidity: newTotalLiquidity,
-    } as Partial<CPMMContract>)
-
-    transaction.create(newLiquidityProvisionDoc, newLiquidityProvision)
-  })
-}

functions/src/index.ts

@@ -9,7 +9,7 @@ export * from './on-create-user'
 export * from './on-create-bet'
 export * from './on-create-comment-on-contract'
 export * from './on-view'
-export { scheduleUpdateMetrics } from './update-metrics'
+export * from './update-metrics'
 export * from './update-stats'
 export * from './update-loans'
 export * from './backup-db'
@@ -31,7 +31,6 @@ export * from './reset-weekly-emails-flags'
 export * from './on-update-contract-follow'
 export * from './on-update-like'
 export * from './weekly-portfolio-emails'
-export * from './drizzle-liquidity'
 
 // v2
 export * from './health'
@@ -45,6 +44,8 @@ export * from './sell-bet'
 export * from './sell-shares'
 export * from './claim-manalink'
 export * from './create-market'
+export * from './add-liquidity'
+export * from './withdraw-liquidity'
 export * from './create-group'
 export * from './resolve-market'
 export * from './unsubscribe'
@@ -52,7 +53,6 @@ export * from './stripe'
 export * from './mana-bonus-email'
 export * from './close-market'
 export * from './update-comment-bounty'
-export * from './add-subsidy'
 
 import { health } from './health'
 import { transact } from './transact'
@@ -65,8 +65,9 @@ import { sellbet } from './sell-bet'
 import { sellshares } from './sell-shares'
 import { claimmanalink } from './claim-manalink'
 import { createmarket } from './create-market'
-import { createcomment } from './create-comment'
+import { addliquidity } from './add-liquidity'
 import { addcommentbounty, awardcommentbounty } from './update-comment-bounty'
+import { withdrawliquidity } from './withdraw-liquidity'
 import { creategroup } from './create-group'
 import { resolvemarket } from './resolve-market'
 import { closemarket } from './close-market'
@@ -76,8 +77,6 @@ import { getcurrentuser } from './get-current-user'
 import { acceptchallenge } from './accept-challenge'
 import { createpost } from './create-post'
 import { savetwitchcredentials } from './save-twitch-credentials'
-import { updatemetrics } from './update-metrics'
-import { addsubsidy } from './add-subsidy'
 
 const toCloudFunction = ({ opts, handler }: EndpointDefinition) => {
   return onRequest(opts, handler as any)
@@ -93,10 +92,10 @@ const sellBetFunction = toCloudFunction(sellbet)
 const sellSharesFunction = toCloudFunction(sellshares)
 const claimManalinkFunction = toCloudFunction(claimmanalink)
 const createMarketFunction = toCloudFunction(createmarket)
-const addSubsidyFunction = toCloudFunction(addsubsidy)
+const addLiquidityFunction = toCloudFunction(addliquidity)
 const addCommentBounty = toCloudFunction(addcommentbounty)
-const createCommentFunction = toCloudFunction(createcomment)
 const awardCommentBounty = toCloudFunction(awardcommentbounty)
+const withdrawLiquidityFunction = toCloudFunction(withdrawliquidity)
 const createGroupFunction = toCloudFunction(creategroup)
 const resolveMarketFunction = toCloudFunction(resolvemarket)
 const closeMarketFunction = toCloudFunction(closemarket)
@@ -107,7 +106,6 @@ const getCurrentUserFunction = toCloudFunction(getcurrentuser)
 const acceptChallenge = toCloudFunction(acceptchallenge)
 const createPostFunction = toCloudFunction(createpost)
 const saveTwitchCredentials = toCloudFunction(savetwitchcredentials)
-const updateMetricsFunction = toCloudFunction(updatemetrics)
 
 export {
   healthFunction as health,
@@ -121,7 +119,8 @@ export {
   sellSharesFunction as sellshares,
   claimManalinkFunction as claimmanalink,
   createMarketFunction as createmarket,
-  addSubsidyFunction as addsubsidy,
+  addLiquidityFunction as addliquidity,
+  withdrawLiquidityFunction as withdrawliquidity,
   createGroupFunction as creategroup,
   resolveMarketFunction as resolvemarket,
   closeMarketFunction as closemarket,
@@ -132,8 +131,6 @@ export {
   acceptChallenge as acceptchallenge,
   createPostFunction as createpost,
   saveTwitchCredentials as savetwitchcredentials,
-  createCommentFunction as createcomment,
   addCommentBounty as addcommentbounty,
   awardCommentBounty as awardcommentbounty,
-  updateMetricsFunction as updatemetrics,
 }

functions/src/market-close-notifications.ts

@@ -3,10 +3,8 @@ import * as admin from 'firebase-admin'
 
 import { Contract } from '../../common/contract'
 import { getPrivateUser, getUserByUsername } from './utils'
-import { createMarketClosedNotification } from './create-notification'
+import { createNotification } from './create-notification'
-import { DAY_MS } from '../../common/util/time'
 
-const SEND_NOTIFICATIONS_EVERY_DAYS = 5
 export const marketCloseNotifications = functions
   .runWith({ secrets: ['MAILGUN_KEY'] })
   .pubsub.schedule('every 1 hours')
@@ -16,31 +14,31 @@ export const marketCloseNotifications = functions
 
 const firestore = admin.firestore()
 
-export async function sendMarketCloseEmails() {
+async function sendMarketCloseEmails() {
   const contracts = await firestore.runTransaction(async (transaction) => {
     const snap = await transaction.get(
       firestore.collection('contracts').where('isResolved', '!=', true)
     )
-    const contracts = snap.docs.map((doc) => doc.data() as Contract)
-    const now = Date.now()
-    const closeContracts = contracts.filter(
-      (contract) =>
-        contract.closeTime &&
-        contract.closeTime < now &&
-        shouldSendFirstOrFollowUpCloseNotification(contract)
-    )
 
-    await Promise.all(
+    return snap.docs
-      closeContracts.map(async (contract) => {
+      .map((doc) => {
-        await transaction.update(
+        const contract = doc.data() as Contract
-          firestore.collection('contracts').doc(contract.id),
+
-          {
+        if (
-            closeEmailsSent: admin.firestore.FieldValue.increment(1),
+          contract.resolution ||
-          }
+          (contract.closeEmailsSent ?? 0) >= 1 ||
+          contract.closeTime === undefined ||
+          (contract.closeTime ?? 0) > Date.now()
         )
+          return undefined
+
+        transaction.update(doc.ref, {
+          closeEmailsSent: (contract.closeEmailsSent ?? 0) + 1,
+        })
+
+        return contract
       })
-    )
+      .filter((x) => !!x) as Contract[]
-    return closeContracts
   })
 
   for (const contract of contracts) {
@@ -57,40 +55,14 @@ export async function sendMarketCloseEmails() {
     const privateUser = await getPrivateUser(user.id)
     if (!privateUser) continue
 
-    await createMarketClosedNotification(
+    await createNotification(
-      contract,
+      contract.id,
+      'contract',
+      'closed',
       user,
-      privateUser,
+      contract.id + '-closed-at-' + contract.closeTime,
-      contract.id + '-closed-at-' + contract.closeTime
+      contract.closeTime?.toString() ?? new Date().toString(),
+      { contract }
     )
   }
 }
-
-// The downside of this approach is if this function goes down for the entire
-// day of a multiple of the time period after the market has closed, it won't
-// keep sending them notifications bc when it comes back online the time period will have passed
-function shouldSendFirstOrFollowUpCloseNotification(contract: Contract) {
-  if (!contract.closeEmailsSent || contract.closeEmailsSent === 0) return true
-  const { closedMultipleOfNDaysAgo, fullTimePeriodsSinceClose } =
-    marketClosedMultipleOfNDaysAgo(contract)
-  return (
-    contract.closeEmailsSent > 0 &&
-    closedMultipleOfNDaysAgo &&
-    contract.closeEmailsSent === fullTimePeriodsSinceClose
-  )
-}
-
-function marketClosedMultipleOfNDaysAgo(contract: Contract) {
-  const now = Date.now()
-  const closeTime = contract.closeTime
-  if (!closeTime)
-    return { closedMultipleOfNDaysAgo: false, fullTimePeriodsSinceClose: 0 }
-  const daysSinceClose = Math.floor((now - closeTime) / DAY_MS)
-  return {
-    closedMultipleOfNDaysAgo:
-      daysSinceClose % SEND_NOTIFICATIONS_EVERY_DAYS == 0,
-    fullTimePeriodsSinceClose: Math.floor(
-      daysSinceClose / SEND_NOTIFICATIONS_EVERY_DAYS
-    ),
-  }
-}

functions/src/on-create-bet.ts

@@ -12,7 +12,6 @@ import {
   revalidateStaticProps,
 } from './utils'
 import {
-  createBadgeAwardedNotification,
   createBetFillNotification,
   createBettingStreakBonusNotification,
   createUniqueBettorBonusNotification,
@@ -25,7 +24,6 @@ import {
   BETTING_STREAK_BONUS_MAX,
   BETTING_STREAK_RESET_HOUR,
   UNIQUE_BETTOR_BONUS_AMOUNT,
-  UNIQUE_BETTOR_LIQUIDITY,
 } from '../../common/economy'
 import {
   DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
@@ -35,11 +33,6 @@ import { APIError } from '../../common/api'
 import { User } from '../../common/user'
 import { DAY_MS } from '../../common/util/time'
 import { BettingStreakBonusTxn, UniqueBettorBonusTxn } from '../../common/txn'
-import { addHouseSubsidy } from './helpers/add-house-subsidy'
-import {
-  StreakerBadge,
-  streakerBadgeRarityThresholds,
-} from '../../common/badge'
 
 const firestore = admin.firestore()
 const BONUS_START_DATE = new Date('2022-07-13T15:30:00.000Z').getTime()
@@ -110,7 +103,7 @@ const updateBettingStreak = async (
 
     const newBettingStreak = (bettor?.currentBettingStreak ?? 0) + 1
     // Otherwise, add 1 to their betting streak
-    trans.update(userDoc, {
+    await trans.update(userDoc, {
       currentBettingStreak: newBettingStreak,
       lastBetTime: bet.createdTime,
     })
@@ -150,7 +143,7 @@ const updateBettingStreak = async (
     log('message:', result.message)
     return
   }
-  if (result.txn) {
+  if (result.txn)
     await createBettingStreakBonusNotification(
       user,
       result.txn.id,
@@ -160,8 +153,6 @@ const updateBettingStreak = async (
       newBettingStreak,
       eventId
     )
-    await handleBettingStreakBadgeAward(user, newBettingStreak)
-  }
 }
 
 const updateUniqueBettorsAndGiveCreatorBonus = async (
@@ -200,7 +191,7 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
         log(`Got ${previousUniqueBettorIds} unique bettors`)
         isNewUniqueBettor && log(`And a new unique bettor ${bettor.id}`)
 
-        trans.update(contractDoc, {
+        await trans.update(contractDoc, {
           uniqueBettorIds: newUniqueBettorIds,
           uniqueBettorCount: newUniqueBettorIds.length,
         })
@@ -213,13 +204,8 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
       return { newUniqueBettorIds }
     }
   )
-
   if (!newUniqueBettorIds) return
 
-  if (oldContract.mechanism === 'cpmm-1') {
-    await addHouseSubsidy(oldContract.id, UNIQUE_BETTOR_LIQUIDITY)
-  }
-
   const bonusTxnDetails = {
     contractId: oldContract.id,
     uniqueNewBettorId: bettor.id,
@@ -229,9 +215,7 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
     : DEV_HOUSE_LIQUIDITY_PROVIDER_ID
   const fromSnap = await firestore.doc(`users/${fromUserId}`).get()
   if (!fromSnap.exists) throw new APIError(400, 'From user not found.')
-
   const fromUser = fromSnap.data() as User
-
   const result = await firestore.runTransaction(async (trans) => {
     const bonusTxn: TxnData = {
       fromId: fromUser.id,
@@ -244,9 +228,7 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
       description: JSON.stringify(bonusTxnDetails),
       data: bonusTxnDetails,
     } as Omit<UniqueBettorBonusTxn, 'id' | 'createdTime'>
-
     const { status, message, txn } = await runTxn(trans, bonusTxn)
-
     return { status, newUniqueBettorIds, message, txn }
   })
 
@@ -314,39 +296,3 @@ const notifyFills = async (
 const currentDateBettingStreakResetTime = () => {
   return new Date().setUTCHours(BETTING_STREAK_RESET_HOUR, 0, 0, 0)
 }
-
-async function handleBettingStreakBadgeAward(
-  user: User,
-  newBettingStreak: number
-) {
-  const alreadyHasBadgeForFirstStreak =
-    user.achievements?.streaker?.badges.some(
-      (badge) => badge.data.totalBettingStreak === 1
-    )
-  // TODO: check if already awarded 50th streak as well
-  if (newBettingStreak === 1 && alreadyHasBadgeForFirstStreak) return
-
-  if (streakerBadgeRarityThresholds.includes(newBettingStreak)) {
-    const badge = {
-      type: 'STREAKER',
-      name: 'Streaker',
-      data: {
-        totalBettingStreak: newBettingStreak,
-      },
-      createdTime: Date.now(),
-    } as StreakerBadge
-    // update user
-    await firestore
-      .collection('users')
-      .doc(user.id)
-      .update({
-        achievements: {
-          ...user.achievements,
-          streaker: {
-            badges: [...(user.achievements?.streaker?.badges ?? []), badge],
-          },
-        },
-      })
-    await createBadgeAwardedNotification(user, badge)
-  }
-}

functions/src/on-create-contract.ts

@@ -1,20 +1,11 @@
 import * as functions from 'firebase-functions'
 
-import { getUser, getValues } from './utils'
+import { getUser } from './utils'
-import {
+import { createNewContractNotification } from './create-notification'
-  createBadgeAwardedNotification,
-  createNewContractNotification,
-} from './create-notification'
 import { Contract } from '../../common/contract'
 import { parseMentions, richTextToString } from '../../common/util/parse'
 import { JSONContent } from '@tiptap/core'
 import { addUserToContractFollowers } from './follow-market'
-import { User } from '../../common/user'
-import * as admin from 'firebase-admin'
-import {
-  MarketCreatorBadge,
-  marketCreatorBadgeRarityThresholds,
-} from '../../common/badge'
 
 export const onCreateContract = functions
   .runWith({ secrets: ['MAILGUN_KEY'] })
@@ -37,43 +28,4 @@ export const onCreateContract = functions
       richTextToString(desc),
       mentioned
     )
-    await handleMarketCreatorBadgeAward(contractCreator)
   })
-
-const firestore = admin.firestore()
-
-async function handleMarketCreatorBadgeAward(contractCreator: User) {
-  // get all contracts by user and calculate size of array
-  const contracts = await getValues<Contract>(
-    firestore
-      .collection(`contracts`)
-      .where('creatorId', '==', contractCreator.id)
-      .where('resolution', '!=', 'CANCEL')
-  )
-  if (marketCreatorBadgeRarityThresholds.includes(contracts.length)) {
-    const badge = {
-      type: 'MARKET_CREATOR',
-      name: 'Market Creator',
-      data: {
-        totalContractsCreated: contracts.length,
-      },
-      createdTime: Date.now(),
-    } as MarketCreatorBadge
-    // update user
-    await firestore
-      .collection('users')
-      .doc(contractCreator.id)
-      .update({
-        achievements: {
-          ...contractCreator.achievements,
-          marketCreator: {
-            badges: [
-              ...(contractCreator.achievements?.marketCreator?.badges ?? []),
-              badge,
-            ],
-          },
-        },
-      })
-    await createBadgeAwardedNotification(contractCreator, badge)
-  }
-}

functions/src/on-create-liquidity-provision.ts

@@ -1,6 +1,6 @@
 import * as functions from 'firebase-functions'
 import { getContract, getUser, log } from './utils'
-import { createFollowOrMarketSubsidizedNotification } from './create-notification'
+import { createNotification } from './create-notification'
 import { LiquidityProvision } from '../../common/liquidity-provision'
 import { addUserToContractFollowers } from './follow-market'
 import { FIXED_ANTE } from '../../common/economy'
@@ -36,7 +36,7 @@ export const onCreateLiquidityProvision = functions.firestore
     if (!liquidityProvider) throw new Error('Could not find liquidity provider')
     await addUserToContractFollowers(contract.id, liquidityProvider.id)
 
-    await createFollowOrMarketSubsidizedNotification(
+    await createNotification(
       contract.id,
       'liquidity',
       'created',

functions/src/on-follow-user.ts

@@ -2,7 +2,7 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
 import { getUser } from './utils'
-import { createFollowOrMarketSubsidizedNotification } from './create-notification'
+import { createNotification } from './create-notification'
 import { FieldValue } from 'firebase-admin/firestore'
 
 export const onFollowUser = functions.firestore
@@ -23,7 +23,7 @@ export const onFollowUser = functions.firestore
       followerCountCached: FieldValue.increment(1),
     })
 
-    await createFollowOrMarketSubsidizedNotification(
+    await createNotification(
       followingUser.id,
       'follow',
       'created',

functions/src/on-update-contract.ts

@@ -1,19 +1,7 @@
 import * as functions from 'firebase-functions'
-import { getUser, getValues } from './utils'
+import { getUser } from './utils'
-import {
+import { createCommentOrAnswerOrUpdatedContractNotification } from './create-notification'
-  createBadgeAwardedNotification,
-  createCommentOrAnswerOrUpdatedContractNotification,
-} from './create-notification'
 import { Contract } from '../../common/contract'
-import { Bet } from '../../common/bet'
-import * as admin from 'firebase-admin'
-import { ContractComment } from '../../common/comment'
-import { scoreCommentorsAndBettors } from '../../common/scoring'
-import {
-  MINIMUM_UNIQUE_BETTORS_FOR_PROVEN_CORRECT_BADGE,
-  ProvenCorrectBadge,
-} from '../../common/badge'
-import { GroupContractDoc } from '../../common/group'
 
 export const onUpdateContract = functions.firestore
   .document('contracts/{contractId}')
@@ -21,14 +9,17 @@ export const onUpdateContract = functions.firestore
     const contract = change.after.data() as Contract
     const previousContract = change.before.data() as Contract
     const { eventId } = context
-    const { closeTime, question } = contract
+    const { openCommentBounties, closeTime, question } = contract
 
-    if (!previousContract.isResolved && contract.isResolved) {
+    if (
+      !previousContract.isResolved &&
+      contract.isResolved &&
+      (openCommentBounties ?? 0) > 0
+    ) {
       // No need to notify users of resolution, that's handled in resolve-market
-      return await handleResolvedContract(contract)
+      return
-    } else if (previousContract.groupSlugs !== contract.groupSlugs) {
+    }
-      await handleContractGroupUpdated(previousContract, contract)
+    if (
-    } else if (
       previousContract.closeTime !== closeTime ||
       previousContract.question !== question
     ) {
@@ -36,64 +27,6 @@ export const onUpdateContract = functions.firestore
     }
   })
 
-async function handleResolvedContract(contract: Contract) {
-  if (
-    (contract.uniqueBettorCount ?? 0) <
-      MINIMUM_UNIQUE_BETTORS_FOR_PROVEN_CORRECT_BADGE ||
-    contract.resolution === 'CANCEL'
-  )
-    return
-
-  // get all bets on this contract
-  const bets = await getValues<Bet>(
-    firestore.collection(`contracts/${contract.id}/bets`)
-  )
-
-  // get comments on this contract
-  const comments = await getValues<ContractComment>(
-    firestore.collection(`contracts/${contract.id}/comments`)
-  )
-
-  const { topCommentId, profitById, commentsById, betsById, topCommentBetId } =
-    scoreCommentorsAndBettors(contract, bets, comments)
-  if (topCommentBetId && profitById[topCommentBetId] > 0) {
-    // award proven correct badge to user
-    const comment = commentsById[topCommentId]
-    const bet = betsById[topCommentBetId]
-
-    const user = await getUser(comment.userId)
-    if (!user) return
-    const newProvenCorrectBadge = {
-      createdTime: Date.now(),
-      type: 'PROVEN_CORRECT',
-      name: 'Proven Correct',
-      data: {
-        contractSlug: contract.slug,
-        contractCreatorUsername: contract.creatorUsername,
-        commentId: comment.id,
-        betAmount: bet.amount,
-        contractTitle: contract.question,
-      },
-    } as ProvenCorrectBadge
-    // update user
-    await firestore
-      .collection('users')
-      .doc(user.id)
-      .update({
-        achievements: {
-          ...user.achievements,
-          provenCorrect: {
-            badges: [
-              ...(user.achievements?.provenCorrect?.badges ?? []),
-              newProvenCorrectBadge,
-            ],
-          },
-        },
-      })
-    await createBadgeAwardedNotification(user, newProvenCorrectBadge)
-  }
-}
-
 async function handleUpdatedCloseTime(
   previousContract: Contract,
   contract: Contract,
@@ -118,43 +51,3 @@ async function handleUpdatedCloseTime(
     contract
   )
 }
-
-async function handleContractGroupUpdated(
-  previousContract: Contract,
-  contract: Contract
-) {
-  const prevLength = previousContract.groupSlugs?.length ?? 0
-  const newLength = contract.groupSlugs?.length ?? 0
-  if (prevLength < newLength) {
-    // Contract was added to a new group
-    const groupId = contract.groupLinks?.find(
-      (link) =>
-        !previousContract.groupLinks
-          ?.map((l) => l.groupId)
-          .includes(link.groupId)
-    )?.groupId
-    if (!groupId) throw new Error('Could not find new group id')
-
-    await firestore
-      .collection(`groups/${groupId}/groupContracts`)
-      .doc(contract.id)
-      .set({
-        contractId: contract.id,
-        createdTime: Date.now(),
-      } as GroupContractDoc)
-  }
-  if (prevLength > newLength) {
-    // Contract was removed from a group
-    const groupId = previousContract.groupLinks?.find(
-      (link) =>
-        !contract.groupLinks?.map((l) => l.groupId).includes(link.groupId)
-    )?.groupId
-    if (!groupId) throw new Error('Could not find old group id')
-
-    await firestore
-      .collection(`groups/${groupId}/groupContracts`)
-      .doc(contract.id)
-      .delete()
-  }
-}
-const firestore = admin.firestore()

functions/src/on-update-user.ts

@@ -5,6 +5,8 @@ import { HOUSE_LIQUIDITY_PROVIDER_ID } from '../../common/antes'
 import { createReferralNotification } from './create-notification'
 import { ReferralTxn } from '../../common/txn'
 import { Contract } from '../../common/contract'
+import { LimitBet } from '../../common/bet'
+import { QuerySnapshot } from 'firebase-admin/firestore'
 import { Group } from '../../common/group'
 import { REFERRAL_AMOUNT } from '../../common/economy'
 const firestore = admin.firestore()
@@ -19,6 +21,10 @@ export const onUpdateUser = functions.firestore
     if (prevUser.referredByUserId !== user.referredByUserId) {
       await handleUserUpdatedReferral(user, eventId)
     }
+
+    if (user.balance <= 0) {
+      await cancelLimitOrders(user.id)
+    }
   })
 
 async function handleUserUpdatedReferral(user: User, eventId: string) {
@@ -117,3 +123,15 @@ async function handleUserUpdatedReferral(user: User, eventId: string) {
     )
   })
 }
+
+async function cancelLimitOrders(userId: string) {
+  const snapshot = (await firestore
+    .collectionGroup('bets')
+    .where('userId', '==', userId)
+    .where('isFilled', '==', false)
+    .get()) as QuerySnapshot<LimitBet>
+
+  await Promise.all(
+    snapshot.docs.map((doc) => doc.ref.update({ isCancelled: true }))
+  )
+}

functions/src/place-bet.ts

@@ -11,7 +11,6 @@ import { groupBy, mapValues, sumBy, uniq } from 'lodash'
 import { APIError, newEndpoint, validate } from './api'
 import { Contract, CPMM_MIN_POOL_QTY } from '../../common/contract'
 import { User } from '../../common/user'
-import { FLAT_TRADE_FEE } from '../../common/fees'
 import {
   BetInfo,
   getBinaryCpmmBetInfo,
@@ -24,7 +23,6 @@ import { floatingEqual } from '../../common/util/math'
 import { redeemShares } from './redeem-shares'
 import { log } from './utils'
 import { addUserToContractFollowers } from './follow-market'
-import { filterDefined } from '../../common/util/array'
 
 const bodySchema = z.object({
   contractId: z.string(),
@@ -75,11 +73,9 @@ export const placebet = newEndpoint({}, async (req, auth) => {
       newTotalLiquidity,
       newP,
       makers,
-      ordersToCancel,
     } = await (async (): Promise<
       BetInfo & {
         makers?: maker[]
-        ordersToCancel?: LimitBet[]
       }
     > => {
       if (
@@ -103,16 +99,17 @@ export const placebet = newEndpoint({}, async (req, auth) => {
           limitProb = Math.round(limitProb * 100) / 100
         }
 
-        const { unfilledBets, balanceByUserId } =
+        const unfilledBetsSnap = await trans.get(
-          await getUnfilledBetsAndUserBalances(trans, contractDoc)
+          getUnfilledBetsQuery(contractDoc)
+        )
+        const unfilledBets = unfilledBetsSnap.docs.map((doc) => doc.data())
 
         return getBinaryCpmmBetInfo(
           outcome,
           amount,
           contract,
           limitProb,
-          unfilledBets,
+          unfilledBets
-          balanceByUserId
         )
       } else if (
         (outcomeType == 'FREE_RESPONSE' || outcomeType === 'MULTIPLE_CHOICE') &&
@@ -155,25 +152,11 @@ export const placebet = newEndpoint({}, async (req, auth) => {
     if (makers) {
       updateMakers(makers, betDoc.id, contractDoc, trans)
     }
-    if (ordersToCancel) {
-      for (const bet of ordersToCancel) {
-        trans.update(contractDoc.collection('bets').doc(bet.id), {
-          isCancelled: true,
-        })
-      }
-    }
-
-    const balanceChange =
-      newBet.amount !== 0
-        ? // quick bet
-          newBet.amount + FLAT_TRADE_FEE
-        : // limit order
-          FLAT_TRADE_FEE
-
-    trans.update(userDoc, { balance: FieldValue.increment(-balanceChange) })
-    log('Updated user balance.')
 
     if (newBet.amount !== 0) {
+      trans.update(userDoc, { balance: FieldValue.increment(-newBet.amount) })
+      log('Updated user balance.')
+
       trans.update(
         contractDoc,
         removeUndefinedProps({
@@ -210,36 +193,13 @@ export const placebet = newEndpoint({}, async (req, auth) => {
 
 const firestore = admin.firestore()
 
-const getUnfilledBetsQuery = (contractDoc: DocumentReference) => {
+export const getUnfilledBetsQuery = (contractDoc: DocumentReference) => {
   return contractDoc
     .collection('bets')
     .where('isFilled', '==', false)
     .where('isCancelled', '==', false) as Query<LimitBet>
 }
 
-export const getUnfilledBetsAndUserBalances = async (
-  trans: Transaction,
-  contractDoc: DocumentReference
-) => {
-  const unfilledBetsSnap = await trans.get(getUnfilledBetsQuery(contractDoc))
-  const unfilledBets = unfilledBetsSnap.docs.map((doc) => doc.data())
-
-  // Get balance of all users with open limit orders.
-  const userIds = uniq(unfilledBets.map((bet) => bet.userId))
-  const userDocs =
-    userIds.length === 0
-      ? []
-      : await trans.getAll(
-          ...userIds.map((userId) => firestore.doc(`users/${userId}`))
-        )
-  const users = filterDefined(userDocs.map((doc) => doc.data() as User))
-  const balanceByUserId = Object.fromEntries(
-    users.map((user) => [user.id, user.balance])
-  )
-
-  return { unfilledBets, balanceByUserId }
-}
-
 type maker = {
   bet: LimitBet
   amount: number

functions/src/resolve-market.ts

@@ -1,6 +1,6 @@
 import * as admin from 'firebase-admin'
 import { z } from 'zod'
-import { mapValues, groupBy, sumBy, uniqBy } from 'lodash'
+import { mapValues, groupBy, sumBy } from 'lodash'
 
 import {
   Contract,
@@ -9,20 +9,12 @@ import {
   RESOLUTIONS,
 } from '../../common/contract'
 import { Bet } from '../../common/bet'
-import {
+import { getContractPath, getUser, getValues, isProd, log, payUser, revalidateStaticProps } from './utils'
-  getContractPath,
-  getUser,
-  getValues,
-  isProd,
-  log,
-  payUsers,
-  payUsersMultipleTransactions,
-  revalidateStaticProps,
-} from './utils'
 import {
   getLoanPayouts,
   getPayouts,
   groupPayoutsByUser,
+  Payout,
 } from '../../common/payouts'
 import { isAdmin, isManifoldId } from '../../common/envs/constants'
 import { removeUndefinedProps } from '../../common/util/object'
@@ -36,7 +28,6 @@ import {
   DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
   HOUSE_LIQUIDITY_PROVIDER_ID,
 } from '../../common/antes'
-import { User } from 'common/user'
 
 const bodySchema = z.object({
   contractId: z.string(),
@@ -90,10 +81,13 @@ export const resolvemarket = newEndpoint(opts, async (req, auth) => {
   if (!contractSnap.exists)
     throw new APIError(404, 'No contract exists with the provided ID')
   const contract = contractSnap.data() as Contract
-  const { creatorId } = contract
+  const { creatorId, closeTime } = contract
   const firebaseUser = await admin.auth().getUser(auth.uid)
 
-  const resolutionParams = getResolutionParams(contract, req.body)
+  const { value, resolutions, probabilityInt, outcome } = getResolutionParams(
+    contract,
+    req.body
+  )
 
   if (
     creatorId !== auth.uid &&
@@ -107,16 +101,6 @@ export const resolvemarket = newEndpoint(opts, async (req, auth) => {
   const creator = await getUser(creatorId)
   if (!creator) throw new APIError(500, 'Creator not found')
 
-  return await resolveMarket(contract, creator, resolutionParams)
-})
-
-export const resolveMarket = async (
-  contract: Contract,
-  creator: User,
-  { value, resolutions, probabilityInt, outcome }: ResolutionParams
-) => {
-  const { creatorId, closeTime, id: contractId } = contract
-
   const resolutionProbability =
     probabilityInt !== undefined ? probabilityInt / 100 : undefined
 
@@ -139,19 +123,15 @@ export const resolveMarket = async (
     (doc) => doc.data() as LiquidityProvision
   )
 
-  const {
+  const { payouts, creatorPayout, liquidityPayouts, collectedFees } =
-    payouts: traderPayouts,
+    getPayouts(
-    creatorPayout,
+      outcome,
-    liquidityPayouts,
+      contract,
-    collectedFees,
+      bets,
-  } = getPayouts(
+      liquidities,
-    outcome,
+      resolutions,
-    contract,
+      resolutionProbability
-    bets,
+    )
-    liquidities,
-    resolutions,
-    resolutionProbability
-  )
 
   const updatedContract = {
     ...contract,
@@ -165,50 +145,35 @@ export const resolveMarket = async (
       resolutions,
       collectedFees,
     }),
-    subsidyPool: 0,
   }
 
+  await contractDoc.update(updatedContract)
+
+  console.log('contract ', contractId, 'resolved to:', outcome)
+
   const openBets = bets.filter((b) => !b.isSold && !b.sale)
   const loanPayouts = getLoanPayouts(openBets)
 
-  const payoutsWithoutLoans = [
-    { userId: creatorId, payout: creatorPayout, deposit: creatorPayout },
-    ...liquidityPayouts.map((p) => ({ ...p, deposit: p.payout })),
-    ...traderPayouts,
-  ]
-  const payouts = [...payoutsWithoutLoans, ...loanPayouts]
-
   if (!isProd())
     console.log(
-      'trader payouts:',
+      'payouts:',
-      traderPayouts,
+      payouts,
       'creator payout:',
       creatorPayout,
-      'liquidity payout:',
+      'liquidity payout:'
-      liquidityPayouts,
-      'loan payouts:',
-      loanPayouts
     )
 
-  const userCount = uniqBy(payouts, 'userId').length
+  if (creatorPayout)
-  const contractDoc = firestore.doc(`contracts/${contractId}`)
+    await processPayouts([{ userId: creatorId, payout: creatorPayout }], true)
 
-  if (userCount <= 499) {
+  await processPayouts(liquidityPayouts, true)
-    await firestore.runTransaction(async (transaction) => {
-      payUsers(transaction, payouts)
-      transaction.update(contractDoc, updatedContract)
-    })
-  } else {
-    await payUsersMultipleTransactions(payouts)
-    await contractDoc.update(updatedContract)
-  }
-
-  console.log('contract ', contractId, 'resolved to:', outcome)
 
+  await processPayouts([...payouts, ...loanPayouts])
   await undoUniqueBettorRewardsIfCancelResolution(contract, outcome)
+
   await revalidateStaticProps(getContractPath(contract))
 
-  const userPayoutsWithoutLoans = groupPayoutsByUser(payoutsWithoutLoans)
+  const userPayoutsWithoutLoans = groupPayoutsByUser(payouts)
 
   const userInvestments = mapValues(
     groupBy(bets, (bet) => bet.userId),
@@ -235,6 +200,18 @@ export const resolveMarket = async (
   )
 
   return updatedContract
+})
+
+const processPayouts = async (payouts: Payout[], isDeposit = false) => {
+  const userPayouts = groupPayoutsByUser(payouts)
+
+  const payoutPromises = Object.entries(userPayouts).map(([userId, payout]) =>
+    payUser(userId, payout, isDeposit)
+  )
+
+  return await Promise.all(payoutPromises)
+    .catch((e) => ({ status: 'error', message: e }))
+    .then(() => ({ status: 'success' }))
 }
 
 function getResolutionParams(contract: Contract, body: string) {
@@ -301,8 +278,6 @@ function getResolutionParams(contract: Contract, body: string) {
   throw new APIError(500, `Invalid outcome type: ${outcomeType}`)
 }
 
-type ResolutionParams = ReturnType<typeof getResolutionParams>
-
 function validateAnswer(
   contract: FreeResponseContract | MultipleChoiceContract,
   answer: number

functions/src/scripts/add-new-notification-preference.ts

@@ -11,18 +11,15 @@ async function main() {
   await Promise.all(
     privateUsers.map((privateUser) => {
       if (!privateUser.id) return Promise.resolve()
-      if (privateUser.notificationPreferences.badges_awarded === undefined) {
+      return firestore
-        return firestore
+        .collection('private-users')
-          .collection('private-users')
+        .doc(privateUser.id)
-          .doc(privateUser.id)
+        .update({
-          .update({
+          notificationPreferences: {
-            notificationPreferences: {
+            ...privateUser.notificationPreferences,
-              ...privateUser.notificationPreferences,
+            opt_out_all: [],
-              badges_awarded: ['browser'],
+          },
-            },
+        })
-          })
-      }
-      return
     })
   )
 }

functions/src/scripts/backfill-badges.ts

@@ -1,136 +0,0 @@
-import * as admin from 'firebase-admin'
-
-import { initAdmin } from './script-init'
-import { getAllUsers, getValues } from '../utils'
-import { Contract } from 'common/contract'
-import {
-  MarketCreatorBadge,
-  marketCreatorBadgeRarityThresholds,
-  StreakerBadge,
-  streakerBadgeRarityThresholds,
-} from 'common/badge'
-import { User } from 'common/user'
-initAdmin()
-
-const firestore = admin.firestore()
-
-async function main() {
-  const users = await getAllUsers()
-  // const users = filterDefined([await getUser('6hHpzvRG0pMq8PNJs7RZj2qlZGn2')]) // dev ian
-  // const users = filterDefined([await getUser('uglwf3YKOZNGjjEXKc5HampOFRE2')]) // prod David
-  // const users = filterDefined([await getUser('AJwLWoo3xue32XIiAVrL5SyR1WB2')]) // prod ian
-  await Promise.all(
-    users.map(async (user) => {
-      if (!user.id) return
-      // Only backfill users without achievements
-      if (user.achievements === undefined) {
-        await firestore.collection('users').doc(user.id).update({
-          achievements: {},
-        })
-        user.achievements = {}
-        user.achievements = await awardMarketCreatorBadges(user)
-        user.achievements = await awardBettingStreakBadges(user)
-        console.log('Added achievements to user', user.id)
-        // going to ignore backfilling the proven correct badges for now
-      } else {
-        // Make corrections to existing achievements
-        await awardMarketCreatorBadges(user)
-      }
-    })
-  )
-}
-
-if (require.main === module) main().then(() => process.exit())
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-async function removeErrorBadges(user: User) {
-  if (
-    user.achievements.streaker?.badges.some(
-      (b) => b.data.totalBettingStreak > 1
-    )
-  ) {
-    console.log(
-      `User ${
-        user.id
-      } has a streaker badge with streaks ${user.achievements.streaker?.badges.map(
-        (b) => b.data.totalBettingStreak
-      )}`
-    )
-    // delete non 1,50 streaks
-    user.achievements.streaker.badges =
-      user.achievements.streaker.badges.filter((b) =>
-        streakerBadgeRarityThresholds.includes(b.data.totalBettingStreak)
-      )
-    // update user
-    await firestore.collection('users').doc(user.id).update({
-      achievements: user.achievements,
-    })
-  }
-}
-
-async function awardMarketCreatorBadges(user: User) {
-  // Award market maker badges
-  const contracts = (
-    await getValues<Contract>(
-      firestore.collection(`contracts`).where('creatorId', '==', user.id)
-    )
-  ).filter((c) => !c.resolution || c.resolution != 'CANCEL')
-
-  const achievements = {
-    ...user.achievements,
-    marketCreator: {
-      badges: [...(user.achievements.marketCreator?.badges ?? [])],
-    },
-  }
-  for (const threshold of marketCreatorBadgeRarityThresholds) {
-    const alreadyHasBadge = user.achievements.marketCreator?.badges.some(
-      (b) => b.data.totalContractsCreated === threshold
-    )
-    if (alreadyHasBadge) continue
-    if (contracts.length >= threshold) {
-      console.log(`User ${user.id} has at least ${threshold} contracts`)
-      const badge = {
-        type: 'MARKET_CREATOR',
-        name: 'Market Creator',
-        data: {
-          totalContractsCreated: threshold,
-        },
-        createdTime: Date.now(),
-      } as MarketCreatorBadge
-      achievements.marketCreator.badges.push(badge)
-    }
-  }
-  // update user
-  await firestore.collection('users').doc(user.id).update({
-    achievements,
-  })
-  return achievements
-}
-
-async function awardBettingStreakBadges(user: User) {
-  const streak = user.currentBettingStreak ?? 0
-  const achievements = {
-    ...user.achievements,
-    streaker: {
-      badges: [...(user.achievements?.streaker?.badges ?? [])],
-    },
-  }
-  for (const threshold of streakerBadgeRarityThresholds) {
-    if (streak >= threshold) {
-      const badge = {
-        type: 'STREAKER',
-        name: 'Streaker',
-        data: {
-          totalBettingStreak: threshold,
-        },
-        createdTime: Date.now(),
-      } as StreakerBadge
-      achievements.streaker.badges.push(badge)
-    }
-  }
-  // update user
-  await firestore.collection('users').doc(user.id).update({
-    achievements,
-  })
-  return achievements
-}

functions/src/scripts/backfill-subsidy-pool.ts

@@ -1,24 +0,0 @@
-import * as admin from 'firebase-admin'
-import { initAdmin } from './script-init'
-
-initAdmin()
-const firestore = admin.firestore()
-
-if (require.main === module) {
-  const contractsRef = firestore.collection('contracts')
-  contractsRef.get().then(async (contractsSnaps) => {
-
-    console.log(`Loaded ${contractsSnaps.size} contracts.`)
-
-    const needsFilling = contractsSnaps.docs.filter((ct) => {
-      return !('subsidyPool' in ct.data())
-    })
-
-    console.log(`Found ${needsFilling.length} contracts to update.`)
-    await Promise.all(
-      needsFilling.map((ct) => ct.ref.update({ subsidyPool: 0 }))
-    )
-
-    console.log(`Updated all contracts.`)
-  })
-}

functions/src/scripts/denormalize.ts

@@ -3,6 +3,7 @@
 
 import { DocumentSnapshot, Transaction } from 'firebase-admin/firestore'
 import { isEqual, zip } from 'lodash'
+import { UpdateSpec } from '../utils'
 
 export type DocumentValue = {
   doc: DocumentSnapshot
@@ -53,7 +54,7 @@ export function getDiffUpdate(diff: DocumentDiff) {
   return {
     doc: diff.dest.doc.ref,
     fields: Object.fromEntries(zip(diff.dest.fields, diff.src.vals)),
-  }
+  } as UpdateSpec
 }
 
 export function applyDiff(transaction: Transaction, diff: DocumentDiff) {

functions/src/scripts/drizzle.ts

@@ -1,8 +0,0 @@
-import { initAdmin } from './script-init'
-initAdmin()
-
-import { drizzleLiquidity } from '../drizzle-liquidity'
-
-if (require.main === module) {
-  drizzleLiquidity().then(() => process.exit())
-}

functions/src/scripts/resolve-markets-again.ts

@@ -1,59 +0,0 @@
-import { initAdmin } from './script-init'
-initAdmin()
-
-import { zip } from 'lodash'
-import { filterDefined } from 'common/util/array'
-import { resolveMarket } from '../resolve-market'
-import { getContract, getUser } from '../utils'
-
-if (require.main === module) {
-  const contractIds = process.argv.slice(2)
-  if (contractIds.length === 0) {
-    throw new Error('No contract ids provided')
-  }
-  resolveMarketsAgain(contractIds).then(() => process.exit(0))
-}
-
-async function resolveMarketsAgain(contractIds: string[]) {
-  const maybeContracts = await Promise.all(contractIds.map(getContract))
-  if (maybeContracts.some((c) => !c)) {
-    throw new Error('Invalid contract id')
-  }
-  const contracts = filterDefined(maybeContracts)
-
-  const maybeCreators = await Promise.all(
-    contracts.map((c) => getUser(c.creatorId))
-  )
-  if (maybeCreators.some((c) => !c)) {
-    throw new Error('No creator found')
-  }
-  const creators = filterDefined(maybeCreators)
-
-  if (
-    !contracts.every((c) => c.resolution === 'YES' || c.resolution === 'NO')
-  ) {
-    throw new Error('Only YES or NO resolutions supported')
-  }
-
-  const resolutionParams = contracts.map((c) => ({
-    outcome: c.resolution as string,
-    value: undefined,
-    probabilityInt: undefined,
-    resolutions: undefined,
-  }))
-
-  const params = zip(contracts, creators, resolutionParams)
-
-  for (const [contract, creator, resolutionParams] of params) {
-    if (contract && creator && resolutionParams) {
-      console.log('Resolving', contract.question)
-      try {
-        await resolveMarket(contract, creator, resolutionParams)
-      } catch (e) {
-        console.log(e)
-      }
-    }
-  }
-
-  console.log(`Resolved all contracts.`)
-}

functions/src/scripts/update-groups.ts

@@ -89,20 +89,17 @@ const getGroups = async () => {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function updateTotalContractsAndMembers() {
   const groups = await getGroups()
-  await Promise.all(
+  for (const group of groups) {
-    groups.map(async (group) => {
+    log('updating group total contracts and members', group.slug)
-      log('updating group total contracts and members', group.slug)
+    const groupRef = admin.firestore().collection('groups').doc(group.id)
-      const groupRef = admin.firestore().collection('groups').doc(group.id)
+    const totalMembers = (await groupRef.collection('groupMembers').get()).size
-      const totalMembers = (await groupRef.collection('groupMembers').get())
+    const totalContracts = (await groupRef.collection('groupContracts').get())
-        .size
+      .size
-      const totalContracts = (await groupRef.collection('groupContracts').get())
+    await groupRef.update({
-        .size
+      totalMembers,
-      await groupRef.update({
+      totalContracts,
-        totalMembers,
-        totalContracts,
-      })
     })
-  )
+  }
 }
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function removeUnusedMemberAndContractFields() {
@@ -120,6 +117,6 @@ async function removeUnusedMemberAndContractFields() {
 if (require.main === module) {
   initAdmin()
   // convertGroupFieldsToGroupDocuments()
-  updateTotalContractsAndMembers()
+  // updateTotalContractsAndMembers()
-  // removeUnusedMemberAndContractFields()
+  removeUnusedMemberAndContractFields()
 }

functions/src/sell-shares.ts

@@ -1,7 +1,6 @@
 import { mapValues, groupBy, sumBy, uniq } from 'lodash'
 import * as admin from 'firebase-admin'
 import { z } from 'zod'
-import { FieldValue } from 'firebase-admin/firestore'
 
 import { APIError, newEndpoint, validate } from './api'
 import { Contract, CPMM_MIN_POOL_QTY } from '../../common/contract'
@@ -11,7 +10,8 @@ import { addObjects, removeUndefinedProps } from '../../common/util/object'
 import { log } from './utils'
 import { Bet } from '../../common/bet'
 import { floatingEqual, floatingLesserEqual } from '../../common/util/math'
-import { getUnfilledBetsAndUserBalances, updateMakers } from './place-bet'
+import { getUnfilledBetsQuery, updateMakers } from './place-bet'
+import { FieldValue } from 'firebase-admin/firestore'
 import { redeemShares } from './redeem-shares'
 import { removeUserFromContractFollowers } from './follow-market'
 
@@ -29,18 +29,16 @@ export const sellshares = newEndpoint({}, async (req, auth) => {
     const contractDoc = firestore.doc(`contracts/${contractId}`)
     const userDoc = firestore.doc(`users/${auth.uid}`)
     const betsQ = contractDoc.collection('bets').where('userId', '==', auth.uid)
-    const [
+    const [[contractSnap, userSnap], userBetsSnap, unfilledBetsSnap] =
-      [contractSnap, userSnap],
+      await Promise.all([
-      userBetsSnap,
+        transaction.getAll(contractDoc, userDoc),
-      { unfilledBets, balanceByUserId },
+        transaction.get(betsQ),
-    ] = await Promise.all([
+        transaction.get(getUnfilledBetsQuery(contractDoc)),
-      transaction.getAll(contractDoc, userDoc),
+      ])
-      transaction.get(betsQ),
-      getUnfilledBetsAndUserBalances(transaction, contractDoc),
-    ])
     if (!contractSnap.exists) throw new APIError(400, 'Contract not found.')
     if (!userSnap.exists) throw new APIError(400, 'User not found.')
     const userBets = userBetsSnap.docs.map((doc) => doc.data() as Bet)
+    const unfilledBets = unfilledBetsSnap.docs.map((doc) => doc.data())
 
     const contract = contractSnap.data() as Contract
     const user = userSnap.data() as User
@@ -88,15 +86,13 @@ export const sellshares = newEndpoint({}, async (req, auth) => {
     let loanPaid = saleFrac * loanAmount
     if (!isFinite(loanPaid)) loanPaid = 0
 
-    const { newBet, newPool, newP, fees, makers, ordersToCancel } =
+    const { newBet, newPool, newP, fees, makers } = getCpmmSellBetInfo(
-      getCpmmSellBetInfo(
+      soldShares,
-        soldShares,
+      chosenOutcome,
-        chosenOutcome,
+      contract,
-        contract,
+      unfilledBets,
-        unfilledBets,
+      loanPaid
-        balanceByUserId,
+    )
-        loanPaid
-      )
 
     if (
       !newP ||
@@ -131,12 +127,6 @@ export const sellshares = newEndpoint({}, async (req, auth) => {
       })
     )
 
-    for (const bet of ordersToCancel) {
-      transaction.update(contractDoc.collection('bets').doc(bet.id), {
-        isCancelled: true,
-      })
-    }
-
     return { newBet, makers, maxShares, soldShares }
   })
 

functions/src/serve.ts

@@ -19,7 +19,8 @@ import { sellbet } from './sell-bet'
 import { sellshares } from './sell-shares'
 import { claimmanalink } from './claim-manalink'
 import { createmarket } from './create-market'
-import { createcomment } from './create-comment'
+import { addliquidity } from './add-liquidity'
+import { withdrawliquidity } from './withdraw-liquidity'
 import { creategroup } from './create-group'
 import { resolvemarket } from './resolve-market'
 import { unsubscribe } from './unsubscribe'
@@ -54,15 +55,16 @@ addJsonEndpointRoute('/transact', transact)
 addJsonEndpointRoute('/changeuserinfo', changeuserinfo)
 addJsonEndpointRoute('/createuser', createuser)
 addJsonEndpointRoute('/createanswer', createanswer)
-addJsonEndpointRoute('/createcomment', createcomment)
 addJsonEndpointRoute('/placebet', placebet)
 addJsonEndpointRoute('/cancelbet', cancelbet)
 addJsonEndpointRoute('/sellbet', sellbet)
 addJsonEndpointRoute('/sellshares', sellshares)
 addJsonEndpointRoute('/claimmanalink', claimmanalink)
 addJsonEndpointRoute('/createmarket', createmarket)
+addJsonEndpointRoute('/addliquidity', addliquidity)
 addJsonEndpointRoute('/addCommentBounty', addcommentbounty)
 addJsonEndpointRoute('/awardCommentBounty', awardcommentbounty)
+addJsonEndpointRoute('/withdrawliquidity', withdrawliquidity)
 addJsonEndpointRoute('/creategroup', creategroup)
 addJsonEndpointRoute('/resolvemarket', resolvemarket)
 addJsonEndpointRoute('/unsubscribe', unsubscribe)

functions/src/test-scheduled-function.ts

@@ -1,6 +1,6 @@
 import { APIError, newEndpoint } from './api'
 import { isProd } from './utils'
-import { sendMarketCloseEmails } from 'functions/src/market-close-notifications'
+import { sendTrendingMarketsEmailsToAllUsers } from 'functions/src/weekly-markets-emails'
 
 // Function for testing scheduled functions locally
 export const testscheduledfunction = newEndpoint(
@@ -10,7 +10,7 @@ export const testscheduledfunction = newEndpoint(
       throw new APIError(400, 'This function is only available in dev mode')
 
     // Replace your function here
-    await sendMarketCloseEmails()
+    await sendTrendingMarketsEmailsToAllUsers()
 
     return { success: true }
   }

functions/src/update-metrics.ts

@@ -1,11 +1,10 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
-import { groupBy, keyBy, sortBy } from 'lodash'
+import { groupBy, isEmpty, keyBy, last, sortBy } from 'lodash'
-import fetch from 'node-fetch'
-
 import { getValues, log, logMemory, writeAsync } from './utils'
 import { Bet } from '../../common/bet'
 import { Contract, CPMM } from '../../common/contract'
+
 import { PortfolioMetrics, User } from '../../common/user'
 import { DAY_MS } from '../../common/util/time'
 import { getLoanUpdates } from '../../common/loans'
@@ -15,44 +14,18 @@ import {
   calculateNewPortfolioMetrics,
   calculateNewProfit,
   calculateProbChanges,
-  calculateMetricsByContract,
-  computeElasticity,
   computeVolume,
 } from '../../common/calculate-metrics'
 import { getProbability } from '../../common/calculate'
 import { Group } from '../../common/group'
 import { batchedWaitAll } from '../../common/util/promise'
-import { newEndpointNoAuth } from './api'
-import { getFunctionUrl } from '../../common/api'
-import { filterDefined } from '../../common/util/array'
 
 const firestore = admin.firestore()
-export const scheduleUpdateMetrics = functions.pubsub
-  .schedule('every 15 minutes')
-  .onRun(async () => {
-    const url = getFunctionUrl('updatemetrics')
-    console.log('Scheduling update metrics', url)
-    const response = await fetch(url, {
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      method: 'POST',
-      body: JSON.stringify({}),
-    })
 
-    const json = await response.json()
+export const updateMetrics = functions
-
+  .runWith({ memory: '8GB', timeoutSeconds: 540 })
-    if (response.ok) console.log(json)
+  .pubsub.schedule('every 15 minutes')
-    else console.error(json)
+  .onRun(updateMetricsCore)
-  })
-
-export const updatemetrics = newEndpointNoAuth(
-  { timeoutSeconds: 2000, memory: '8GiB', minInstances: 0 },
-  async (_req) => {
-    await updateMetricsCore()
-    return { success: true }
-  }
-)
 
 export async function updateMetricsCore() {
   console.log('Loading users')
@@ -62,7 +35,11 @@ export async function updateMetricsCore() {
   const contracts = await getValues<Contract>(firestore.collection('contracts'))
 
   console.log('Loading portfolio history')
-  const userPortfolioHistory = await loadPortfolioHistory(users)
+  const allPortfolioHistories = await getValues<PortfolioMetrics>(
+    firestore
+      .collectionGroup('portfolioHistory')
+      .where('timestamp', '>', Date.now() - 31 * DAY_MS) // so it includes just over a month ago
+  )
 
   console.log('Loading groups')
   const groups = await getValues<Group>(firestore.collection('groups'))
@@ -126,7 +103,6 @@ export async function updateMetricsCore() {
         fields: {
           volume24Hours: computeVolume(contractBets, now - DAY_MS),
           volume7Days: computeVolume(contractBets, now - DAY_MS * 7),
-          elasticity: computeElasticity(contractBets, contract),
           ...cpmmFields,
         },
       }
@@ -139,10 +115,11 @@ export async function updateMetricsCore() {
   )
   const contractsByUser = groupBy(contracts, (contract) => contract.creatorId)
   const betsByUser = groupBy(bets, (bet) => bet.userId)
+  const portfolioHistoryByUser = groupBy(allPortfolioHistories, (p) => p.userId)
 
   const userMetrics = users.map((user) => {
     const currentBets = betsByUser[user.id] ?? []
-    const portfolioHistory = userPortfolioHistory[user.id] ?? []
+    const portfolioHistory = portfolioHistoryByUser[user.id] ?? []
     const userContracts = contractsByUser[user.id] ?? []
     const newCreatorVolume = calculateCreatorVolume(userContracts)
     const newPortfolio = calculateNewPortfolioMetrics(
@@ -150,20 +127,14 @@ export async function updateMetricsCore() {
       contractsById,
       currentBets
     )
-    const currPortfolio = portfolioHistory.current
+    const lastPortfolio = last(portfolioHistory)
     const didPortfolioChange =
-      currPortfolio === undefined ||
+      lastPortfolio === undefined ||
-      currPortfolio.balance !== newPortfolio.balance ||
+      lastPortfolio.balance !== newPortfolio.balance ||
-      currPortfolio.totalDeposits !== newPortfolio.totalDeposits ||
+      lastPortfolio.totalDeposits !== newPortfolio.totalDeposits ||
-      currPortfolio.investmentValue !== newPortfolio.investmentValue
+      lastPortfolio.investmentValue !== newPortfolio.investmentValue
 
     const newProfit = calculateNewProfit(portfolioHistory, newPortfolio)
-
-    const metricsByContract = calculateMetricsByContract(
-      currentBets,
-      contractsById
-    )
-
     const contractRatios = userContracts
       .map((contract) => {
         if (
@@ -173,7 +144,7 @@ export async function updateMetricsCore() {
           return 0
         }
         const contractRatio =
-          contract.flaggedByUsernames.length / (contract.uniqueBettorCount || 1)
+          contract.flaggedByUsernames.length / (contract.uniqueBettorCount ?? 1)
 
         return contractRatio
       })
@@ -181,7 +152,7 @@ export async function updateMetricsCore() {
     const badResolutions = contractRatios.filter(
       (ratio) => ratio > BAD_RESOLUTION_THRESHOLD
     )
-    let newFractionResolvedCorrectly = 1
+    let newFractionResolvedCorrectly = 0
     if (userContracts.length > 0) {
       newFractionResolvedCorrectly =
         (userContracts.length - badResolutions.length) / userContracts.length
@@ -194,7 +165,6 @@ export async function updateMetricsCore() {
       newProfit,
       didPortfolioChange,
       newFractionResolvedCorrectly,
-      metricsByContract,
     }
   })
 
@@ -210,61 +180,63 @@ export async function updateMetricsCore() {
   const nextLoanByUser = keyBy(userPayouts, (payout) => payout.user.id)
 
   const userUpdates = userMetrics.map(
-    ({ user, newCreatorVolume, newProfit, newFractionResolvedCorrectly }) => {
+    ({
+      user,
+      newCreatorVolume,
+      newPortfolio,
+      newProfit,
+      didPortfolioChange,
+      newFractionResolvedCorrectly,
+    }) => {
       const nextLoanCached = nextLoanByUser[user.id]?.payout ?? 0
       return {
-        doc: firestore.collection('users').doc(user.id),
+        fieldUpdates: {
-        fields: {
+          doc: firestore.collection('users').doc(user.id),
-          creatorVolumeCached: newCreatorVolume,
+          fields: {
-          profitCached: newProfit,
+            creatorVolumeCached: newCreatorVolume,
-          nextLoanCached,
+            profitCached: newProfit,
-          fractionResolvedCorrectly: newFractionResolvedCorrectly,
+            nextLoanCached,
+            fractionResolvedCorrectly: newFractionResolvedCorrectly,
+          },
+        },
+
+        subcollectionUpdates: {
+          doc: firestore
+            .collection('users')
+            .doc(user.id)
+            .collection('portfolioHistory')
+            .doc(),
+          fields: didPortfolioChange ? newPortfolio : {},
         },
       }
     }
   )
-  await writeAsync(firestore, userUpdates)
+  await writeAsync(
-
+    firestore,
-  const portfolioHistoryUpdates = filterDefined(
+    userUpdates.map((u) => u.fieldUpdates)
-    userMetrics.map(({ user, newPortfolio, didPortfolioChange }) => {
-      return didPortfolioChange
-        ? {
-            doc: firestore
-              .collection('users')
-              .doc(user.id)
-              .collection('portfolioHistory')
-              .doc(),
-            fields: newPortfolio,
-          }
-        : null
-    })
   )
-  await writeAsync(firestore, portfolioHistoryUpdates, 'set')
+  await writeAsync(
-
+    firestore,
-  const contractMetricsUpdates = userMetrics.flatMap(
+    userUpdates
-    ({ user, metricsByContract }) => {
+      .filter((u) => !isEmpty(u.subcollectionUpdates.fields))
-      const collection = firestore
+      .map((u) => u.subcollectionUpdates),
-        .collection('users')
+    'set'
-        .doc(user.id)
-        .collection('contract-metrics')
-      return metricsByContract.map((metrics) => ({
-        doc: collection.doc(metrics.contractId),
-        fields: metrics,
-      }))
-    }
   )
-
-  await writeAsync(firestore, contractMetricsUpdates, 'set')
-
   log(`Updated metrics for ${users.length} users.`)
 
   try {
     const groupUpdates = groups.map((group, index) => {
       const groupContractIds = contractsByGroup[index] as GroupContractDoc[]
-      const groupContracts = filterDefined(
+      const groupContracts = groupContractIds
-        groupContractIds.map((e) => contractsById[e.contractId])
+        .map((e) => contractsById[e.contractId])
-      )
+        .filter((e) => e !== undefined) as Contract[]
-      const bets = groupContracts.map((e) => betsByContract[e.id] ?? [])
+      const bets = groupContracts.map((e) => {
+        if (e != null && e.id in betsByContract) {
+          return betsByContract[e.id] ?? []
+        } else {
+          return []
+        }
+      })
 
       const creatorScores = scoreCreators(groupContracts)
       const traderScores = scoreTraders(groupContracts, bets)
@@ -298,44 +270,3 @@ const topUserScores = (scores: { [userId: string]: number }) => {
 type GroupContractDoc = { contractId: string; createdTime: number }
 
 const BAD_RESOLUTION_THRESHOLD = 0.1
-
-const loadPortfolioHistory = async (users: User[]) => {
-  const now = Date.now()
-  const userPortfolioHistory = await batchedWaitAll(
-    users.map((user) => async () => {
-      const query = firestore
-        .collection('users')
-        .doc(user.id)
-        .collection('portfolioHistory')
-        .orderBy('timestamp', 'desc')
-        .limit(1)
-
-      const portfolioMetrics = await Promise.all([
-        getValues<PortfolioMetrics>(query),
-        getValues<PortfolioMetrics>(
-          query.where('timestamp', '<', now - DAY_MS)
-        ),
-        getValues<PortfolioMetrics>(
-          query.where('timestamp', '<', now - 7 * DAY_MS)
-        ),
-        getValues<PortfolioMetrics>(
-          query.where('timestamp', '<', now - 30 * DAY_MS)
-        ),
-      ])
-      const [current, day, week, month] = portfolioMetrics.map(
-        (p) => p[0] as PortfolioMetrics | undefined
-      )
-
-      return {
-        userId: user.id,
-        current,
-        day,
-        week,
-        month,
-      }
-    }),
-    100
-  )
-
-  return keyBy(userPortfolioHistory, (p) => p.userId)
-}

functions/src/utils.ts

@@ -1,8 +1,7 @@
 import * as admin from 'firebase-admin'
 import fetch from 'node-fetch'
-import { FieldValue, Transaction } from 'firebase-admin/firestore'
-import { chunk, groupBy, mapValues, sumBy } from 'lodash'
 
+import { chunk } from 'lodash'
 import { Contract } from '../../common/contract'
 import { PrivateUser, User } from '../../common/user'
 import { Group } from '../../common/group'
@@ -48,7 +47,7 @@ export const writeAsync = async (
     const batch = db.batch()
     for (const { doc, fields } of chunks[i]) {
       if (operationType === 'update') {
-        batch.update(doc, fields as any)
+        batch.update(doc, fields)
       } else {
         batch.set(doc, fields)
       }
@@ -113,12 +112,6 @@ export const getAllPrivateUsers = async () => {
   return users.docs.map((doc) => doc.data() as PrivateUser)
 }
 
-export const getAllUsers = async () => {
-  const firestore = admin.firestore()
-  const users = await firestore.collection('users').get()
-  return users.docs.map((doc) => doc.data() as User)
-}
-
 export const getUserByUsername = async (username: string) => {
   const firestore = admin.firestore()
   const snap = await firestore
@@ -129,29 +122,38 @@ export const getUserByUsername = async (username: string) => {
   return snap.empty ? undefined : (snap.docs[0].data() as User)
 }
 
-const firestore = admin.firestore()
-
 const updateUserBalance = (
-  transaction: Transaction,
   userId: string,
-  balanceDelta: number,
+  delta: number,
-  depositDelta: number
+  isDeposit = false
 ) => {
-  const userDoc = firestore.doc(`users/${userId}`)
+  const firestore = admin.firestore()
+  return firestore.runTransaction(async (transaction) => {
+    const userDoc = firestore.doc(`users/${userId}`)
+    const userSnap = await transaction.get(userDoc)
+    if (!userSnap.exists) return
+    const user = userSnap.data() as User
 
-  // Note: Balance is allowed to go negative.
+    const newUserBalance = user.balance + delta
-  transaction.update(userDoc, {
+
-    balance: FieldValue.increment(balanceDelta),
+    // if (newUserBalance < 0)
-    totalDeposits: FieldValue.increment(depositDelta),
+    //   throw new Error(
+    //     `User (${userId}) balance cannot be negative: ${newUserBalance}`
+    //   )
+
+    if (isDeposit) {
+      const newTotalDeposits = (user.totalDeposits || 0) + delta
+      transaction.update(userDoc, { totalDeposits: newTotalDeposits })
+    }
+
+    transaction.update(userDoc, { balance: newUserBalance })
   })
 }
 
 export const payUser = (userId: string, payout: number, isDeposit = false) => {
   if (!isFinite(payout)) throw new Error('Payout is not finite: ' + payout)
 
-  return firestore.runTransaction(async (transaction) => {
+  return updateUserBalance(userId, payout, isDeposit)
-    updateUserBalance(transaction, userId, payout, isDeposit ? payout : 0)
-  })
 }
 
 export const chargeUser = (
@@ -162,67 +164,7 @@ export const chargeUser = (
   if (!isFinite(charge) || charge <= 0)
     throw new Error('User charge is not positive: ' + charge)
 
-  return payUser(userId, -charge, isAnte)
+  return updateUserBalance(userId, -charge, isAnte)
-}
-
-const checkAndMergePayouts = (
-  payouts: {
-    userId: string
-    payout: number
-    deposit?: number
-  }[]
-) => {
-  for (const { payout, deposit } of payouts) {
-    if (!isFinite(payout)) {
-      throw new Error('Payout is not finite: ' + payout)
-    }
-    if (deposit !== undefined && !isFinite(deposit)) {
-      throw new Error('Deposit is not finite: ' + deposit)
-    }
-  }
-
-  const groupedPayouts = groupBy(payouts, 'userId')
-  return Object.values(
-    mapValues(groupedPayouts, (payouts, userId) => ({
-      userId,
-      payout: sumBy(payouts, 'payout'),
-      deposit: sumBy(payouts, (p) => p.deposit ?? 0),
-    }))
-  )
-}
-
-// Max 500 users in one transaction.
-export const payUsers = (
-  transaction: Transaction,
-  payouts: {
-    userId: string
-    payout: number
-    deposit?: number
-  }[]
-) => {
-  const mergedPayouts = checkAndMergePayouts(payouts)
-  for (const { userId, payout, deposit } of mergedPayouts) {
-    updateUserBalance(transaction, userId, payout, deposit)
-  }
-}
-
-export const payUsersMultipleTransactions = async (
-  payouts: {
-    userId: string
-    payout: number
-    deposit?: number
-  }[]
-) => {
-  const mergedPayouts = checkAndMergePayouts(payouts)
-  const payoutChunks = chunk(mergedPayouts, 500)
-
-  for (const payoutChunk of payoutChunks) {
-    await firestore.runTransaction(async (transaction) => {
-      for (const { userId, payout, deposit } of payoutChunk) {
-        updateUserBalance(transaction, userId, payout, deposit)
-      }
-    })
-  }
 }
 
 export const getContractPath = (contract: Contract) => {

functions/src/weekly-markets-emails.ts

@@ -2,20 +2,12 @@ import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 
 import { Contract } from '../../common/contract'
-import {
+import { getGroup, getPrivateUser, getUser, getValues, log } from './utils'
-  getAllPrivateUsers,
-  getGroup,
-  getPrivateUser,
-  getUser,
-  getValues,
-  isProd,
-  log,
-} from './utils'
 import { createRNG, shuffle } from '../../common/util/random'
 import { DAY_MS, HOUR_MS } from '../../common/util/time'
 import { filterDefined } from '../../common/util/array'
 import { Follow } from '../../common/follow'
-import { countBy, uniq, uniqBy } from 'lodash'
+import { countBy, uniqBy } from 'lodash'
 import { sendInterestingMarketsEmail } from './emails'
 
 export const weeklyMarketsEmails = functions
@@ -45,27 +37,27 @@ export async function getTrendingContracts() {
 
 export async function sendTrendingMarketsEmailsToAllUsers() {
   const numContractsToSend = 6
-  const privateUsers = isProd()
+  // const privateUsers =
-    ? await getAllPrivateUsers()
+  //   isProd()
-    : filterDefined([
+  //   ? await getAllPrivateUsers()
-        await getPrivateUser('6hHpzvRG0pMq8PNJs7RZj2qlZGn2'), // dev Ian
+  //   filterDefined([
-      ])
+  //     await getPrivateUser('6hHpzvRG0pMq8PNJs7RZj2qlZGn2'), // dev Ian
-  const privateUsersToSendEmailsTo = privateUsers
+  //     ])
-    // Get all users that haven't unsubscribed from weekly emails
+  const privateUsersToSendEmailsTo =
-    .filter(
+    // get all users that haven't unsubscribed from weekly emails
-      (user) =>
+    // isProd()
-        user.notificationPreferences.trending_markets.includes('email') &&
+    // ? privateUsers
-        !user.weeklyTrendingEmailSent
+    //     .filter((user) => {
-    )
+    //       user.notificationPreferences.trending_markets.includes('email') &&
-    .slice(0, 90) // Send the emails out in batches
+    //         !user.weeklyTrendingEmailSent
-
+    //     })
-  // For testing different users on prod: (only send ian an email though)
+    //     .slice(125) // Send the emails out in batches
-  // const privateUsersToSendEmailsTo = filterDefined([
+    // :
-  //   await getPrivateUser('AJwLWoo3xue32XIiAVrL5SyR1WB2'), // prod Ian
+    // privateUsers
-  //   // isProd()
+    filterDefined([
-  //   await getPrivateUser('FptiiMZZ6dQivihLI8MYFQ6ypSw1'), // prod Mik
+      await getPrivateUser('AJwLWoo3xue32XIiAVrL5SyR1WB2'), // prod Ian
-  //   //   : await getPrivateUser('6hHpzvRG0pMq8PNJs7RZj2qlZGn2'), // dev Ian
+      await getPrivateUser('FptiiMZZ6dQivihLI8MYFQ6ypSw1'),
-  // ])
+    ])
 
   log(
     'Sending weekly trending emails to',
@@ -83,13 +75,11 @@ export async function sendTrendingMarketsEmailsToAllUsers() {
         !contract.groupSlugs?.includes('manifold-features') &&
         !contract.groupSlugs?.includes('manifold-6748e065087e')
     )
-    .slice(0, 50)
+    .slice(0, 20)
-
+  // log(
-  const uniqueTrendingContracts = removeSimilarQuestions(
+  //   `Found ${trendingContracts.length} trending contracts:\n`,
-    trendingContracts,
+  //   trendingContracts.map((c) => c.question).join('\n ')
-    trendingContracts,
+  // )
-    true
-  ).slice(0, 20)
 
   await Promise.all(
     privateUsersToSendEmailsTo.map(async (privateUser) => {
@@ -97,54 +87,28 @@ export async function sendTrendingMarketsEmailsToAllUsers() {
         log(`No email for ${privateUser.username}`)
         return
       }
-
-      const unbetOnFollowedMarkets = await getUserUnBetOnFollowsMarkets(
-        privateUser.id
-      )
-      const unBetOnGroupMarkets = await getUserUnBetOnGroupsMarkets(
-        privateUser.id,
-        unbetOnFollowedMarkets
-      )
-      const similarBettorsMarkets = await getSimilarBettorsMarkets(
-        privateUser.id,
-        unBetOnGroupMarkets
-      )
-
       const marketsAvailableToSend = uniqBy(
         [
-          ...chooseRandomSubset(unbetOnFollowedMarkets, 2),
+          ...(await getUserUnBetOnFollowsMarkets(
-          // // Most people will belong to groups but may not follow other users,
+            privateUser.id,
-          // so choose more from the other subsets if the followed markets is sparse
+            privateUser.id
-          ...chooseRandomSubset(
+          )),
-            unBetOnGroupMarkets,
+          ...(await getUserUnBetOnGroupsMarkets(privateUser.id)),
-            unbetOnFollowedMarkets.length < 2 ? 3 : 2
+          ...(await getSimilarBettorsMarkets(privateUser.id)),
-          ),
-          ...chooseRandomSubset(
-            similarBettorsMarkets,
-            unbetOnFollowedMarkets.length < 2 ? 3 : 2
-          ),
         ],
         (contract) => contract.id
       )
-      // // at least send them trending contracts if nothing else
+      // at least send them trending contracts if nothing else
-      if (marketsAvailableToSend.length < numContractsToSend) {
+      if (marketsAvailableToSend.length < numContractsToSend)
-        const trendingMarketsToSend =
-          numContractsToSend - marketsAvailableToSend.length
-        log(
-          `not enough personalized markets, sending ${trendingMarketsToSend} trending`
-        )
         marketsAvailableToSend.push(
-          ...removeSimilarQuestions(
+          ...trendingContracts
-            uniqueTrendingContracts,
-            marketsAvailableToSend,
-            false
-          )
             .filter(
-              (contract) => !contract.uniqueBettorIds?.includes(privateUser.id)
+              (contract) =>
+                !contract.uniqueBettorIds?.includes(privateUser.id) &&
+                !marketsAvailableToSend.map((c) => c.id).includes(contract.id)
             )
-            .slice(0, trendingMarketsToSend)
+            .slice(0, numContractsToSend - marketsAvailableToSend.length)
         )
-      }
 
       if (marketsAvailableToSend.length < numContractsToSend) {
         log(
@@ -165,12 +129,17 @@ export async function sendTrendingMarketsEmailsToAllUsers() {
       const user = await getUser(privateUser.id)
       if (!user) return
 
-      log(
+      console.log(
         'sending contracts:',
-        contractsToSend.map((c) => c.question + ' ' + c.popularityScore)
+        contractsToSend.map((c) => [c.question, c.popularityScore])
       )
       // if they don't have enough markets, find user bets and get the other bettor ids who most overlap on those markets, then do the same thing as above for them
-      await sendInterestingMarketsEmail(user, privateUser, contractsToSend)
+      // await sendInterestingMarketsEmail(user, privateUser, contractsToSend)
+      await sendInterestingMarketsEmail(
+        user,
+        privateUsersToSendEmailsTo[0],
+        contractsToSend
+      )
       await firestore.collection('private-users').doc(user.id).update({
         weeklyTrendingEmailSent: true,
       })
@@ -178,12 +147,20 @@ export async function sendTrendingMarketsEmailsToAllUsers() {
   )
 }
 
-const MINIMUM_POPULARITY_SCORE = 10
+// TODO: figure out a good minimum popularity score to filter by
+const MINIMUM_POPULARITY_SCORE = 2
 
-const getUserUnBetOnFollowsMarkets = async (userId: string) => {
+const getUserUnBetOnFollowsMarkets = async (
+  userId: string,
+  unBetOnByUserId: string
+) => {
   const follows = await getValues<Follow>(
     firestore.collection('users').doc(userId).collection('follows')
   )
+  console.log(
+    'follows',
+    follows.map((f) => f.userId)
+  )
 
   const unBetOnContractsFromFollows = await Promise.all(
     follows.map(async (follow) => {
@@ -204,40 +181,29 @@ const getUserUnBetOnFollowsMarkets = async (userId: string) => {
       )
 
       return openContracts.filter(
-        (contract) => !contract.uniqueBettorIds?.includes(userId)
+        (contract) => !contract.uniqueBettorIds?.includes(unBetOnByUserId)
       )
     })
   )
 
-  const sortedMarkets = uniqBy(
+  const sortedMarkets = unBetOnContractsFromFollows
-    unBetOnContractsFromFollows.flat(),
+    .flat()
-    (contract) => contract.id
-  )
     .filter(
       (contract) =>
         contract.popularityScore !== undefined &&
         contract.popularityScore > MINIMUM_POPULARITY_SCORE
     )
     .sort((a, b) => (b.popularityScore ?? 0) - (a.popularityScore ?? 0))
-
+  console.log(
-  const uniqueSortedMarkets = removeSimilarQuestions(
+    'sorted top 10 follow Markets',
-    sortedMarkets,
+    sortedMarkets
-    sortedMarkets,
+      .slice(0, 10)
-    true
+      .map((c) => [c.question, c.popularityScore, c.creatorId])
   )
-
+  return sortedMarkets
-  const topSortedMarkets = uniqueSortedMarkets.slice(0, 10)
-  // log(
-  //   'top 10 sorted markets by followed users',
-  //   topSortedMarkets.map((c) => c.question + ' ' + c.popularityScore)
-  // )
-  return topSortedMarkets
 }
 
-const getUserUnBetOnGroupsMarkets = async (
+const getUserUnBetOnGroupsMarkets = async (userId: string) => {
-  userId: string,
-  differentThanTheseContracts: Contract[]
-) => {
   const snap = await firestore
     .collectionGroup('groupMembers')
     .where('userId', '==', userId)
@@ -249,8 +215,10 @@ const getUserUnBetOnGroupsMarkets = async (
   const groups = filterDefined(
     await Promise.all(groupIds.map(async (groupId) => await getGroup(groupId)))
   )
-  if (groups.length === 0) return []
+  console.log(
-
+    'groups',
+    groups.map((g) => g.name)
+  )
   const unBetOnContractsFromGroups = await Promise.all(
     groups.map(async (group) => {
       const unresolvedContracts = await getValues<Contract>(
@@ -274,53 +242,37 @@ const getUserUnBetOnGroupsMarkets = async (
       )
     })
   )
-
+  const sortedMarkets = unBetOnContractsFromGroups
-  const sortedMarkets = uniqBy(
+    .flat()
-    unBetOnContractsFromGroups.flat(),
-    (contract) => contract.id
-  )
     .filter(
       (contract) =>
         contract.popularityScore !== undefined &&
         contract.popularityScore > MINIMUM_POPULARITY_SCORE
     )
     .sort((a, b) => (b.popularityScore ?? 0) - (a.popularityScore ?? 0))
-
+  console.log(
-  const uniqueSortedMarkets = removeSimilarQuestions(
+    'top 10 sorted group Markets',
-    sortedMarkets,
+    sortedMarkets
-    sortedMarkets,
+      .slice(0, 10)
-    true
+      .map((c) => [c.question, c.popularityScore, c.groupSlugs])
   )
-  const topSortedMarkets = removeSimilarQuestions(
+  return sortedMarkets
-    uniqueSortedMarkets,
-    differentThanTheseContracts,
-    false
-  ).slice(0, 10)
-
-  // log(
-  //   'top 10 sorted group markets',
-  //   topSortedMarkets.map((c) => c.question + ' ' + c.popularityScore)
-  // )
-  return topSortedMarkets
 }
 
 // Gets markets followed by similar bettors and bet on by similar bettors
-const getSimilarBettorsMarkets = async (
+const getSimilarBettorsMarkets = async (userId: string) => {
-  userId: string,
-  differentThanTheseContracts: Contract[]
-) => {
   // get contracts with unique bettor ids with this user
   const contractsUserHasBetOn = await getValues<Contract>(
     firestore
       .collection('contracts')
       .where('uniqueBettorIds', 'array-contains', userId)
   )
-  if (contractsUserHasBetOn.length === 0) return []
   // count the number of times each unique bettor id appears on those contracts
   const bettorIdsToCounts = countBy(
     contractsUserHasBetOn.map((contract) => contract.uniqueBettorIds).flat(),
     (bettorId) => bettorId
   )
+  console.log('bettorIdCounts', bettorIdsToCounts)
 
   // sort by number of times they appear with at least 2 appearances
   const sortedBettorIds = Object.entries(bettorIdsToCounts)
@@ -331,112 +283,57 @@ const getSimilarBettorsMarkets = async (
 
   // get the top 10 most similar bettors (excluding this user)
   const similarBettorIds = sortedBettorIds.slice(0, 10)
-  if (similarBettorIds.length === 0) return []
+  console.log('top sortedBettorIds', similarBettorIds)
 
   // get contracts with unique bettor ids with this user
-  const contractsSimilarBettorsHaveBetOn = uniqBy(
+  const contractsSimilarBettorsHaveBetOn = (
-    (
+    await getValues<Contract>(
-      await getValues<Contract>(
+      firestore
-        firestore
+        .collection('contracts')
-          .collection('contracts')
+        .where(
-          .where(
+          'uniqueBettorIds',
-            'uniqueBettorIds',
+          'array-contains-any',
-            'array-contains-any',
+          similarBettorIds.slice(0, 10)
-            similarBettorIds.slice(0, 10)
+        )
-          )
+        .orderBy('popularityScore', 'desc')
-          .orderBy('popularityScore', 'desc')
+        .limit(100)
-          .limit(200)
+    )
-      )
+  ).filter((contract) => !contract.uniqueBettorIds?.includes(userId))
-    ).filter(
-      (contract) =>
-        !contract.uniqueBettorIds?.includes(userId) &&
-        (contract.popularityScore ?? 0) > MINIMUM_POPULARITY_SCORE
-    ),
-    (contract) => contract.id
-  )
 
   // sort the contracts by how many times similar bettor ids are in their unique bettor ids array
-  const sortedContractsInSimilarBettorsBets = contractsSimilarBettorsHaveBetOn
+  const sortedContractsToAppearancesInSimilarBettorsBets =
-    .map((contract) => {
+    contractsSimilarBettorsHaveBetOn
-      const appearances = contract.uniqueBettorIds?.filter((bettorId) =>
+      .map((contract) => {
-        similarBettorIds.includes(bettorId)
+        const appearances = contract.uniqueBettorIds?.filter((bettorId) =>
-      ).length
+          similarBettorIds.includes(bettorId)
-      return [contract, appearances] as [Contract, number]
+        ).length
-    })
+        return [contract, appearances] as [Contract, number]
-    .sort((a, b) => b[1] - a[1])
+      })
-    .map((entry) => entry[0])
+      .sort((a, b) => b[1] - a[1])
-
+  console.log(
-  const uniqueSortedContractsInSimilarBettorsBets = removeSimilarQuestions(
+    'sortedContractsToAppearancesInSimilarBettorsBets',
-    sortedContractsInSimilarBettorsBets,
+    sortedContractsToAppearancesInSimilarBettorsBets.map((c) => [
-    sortedContractsInSimilarBettorsBets,
+      c[0].question,
-    true
+      c[1],
+    ])
   )
 
-  const topMostSimilarContracts = removeSimilarQuestions(
+  const topMostSimilarContracts =
-    uniqueSortedContractsInSimilarBettorsBets,
+    sortedContractsToAppearancesInSimilarBettorsBets.map((entry) => entry[0])
-    differentThanTheseContracts,
-    false
-  ).slice(0, 10)
 
-  // log(
+  console.log(
-  //   'top 10 sorted contracts other similar bettors have bet on',
+    'top 10 sortedContractsToAppearancesInSimilarBettorsBets',
-  //   topMostSimilarContracts.map((c) => c.question)
+    topMostSimilarContracts
-  // )
+      .map((c) => [
+        c.question,
+        c.uniqueBettorIds?.filter((bid) => similarBettorIds.includes(bid)),
+      ])
+      .slice(0, 10)
+  )
 
   return topMostSimilarContracts
 }
 
-// search contract array by question and remove contracts with 3 matching words in the question
-const removeSimilarQuestions = (
-  contractsToFilter: Contract[],
-  byContracts: Contract[],
-  allowExactSameContracts: boolean
-) => {
-  // log(
-  //   'contracts to filter by',
-  //   byContracts.map((c) => c.question + ' ' + c.popularityScore)
-  // )
-  let contractsToRemove: Contract[] = []
-  byContracts.length > 0 &&
-    byContracts.forEach((contract) => {
-      const contractQuestion = stripNonAlphaChars(
-        contract.question.toLowerCase()
-      )
-      const contractQuestionWords = uniq(contractQuestion.split(' ')).filter(
-        (w) => !IGNORE_WORDS.includes(w)
-      )
-      contractsToRemove = contractsToRemove.concat(
-        contractsToFilter.filter(
-          // Remove contracts with more than 2 matching (uncommon) words and a lower popularity score
-          (c2) => {
-            const significantOverlap =
-              // TODO: we should probably use a library for comparing strings/sentiments
-              uniq(
-                stripNonAlphaChars(c2.question.toLowerCase()).split(' ')
-              ).filter((word) => contractQuestionWords.includes(word)).length >
-              2
-            const lessPopular =
-              (c2.popularityScore ?? 0) < (contract.popularityScore ?? 0)
-            return (
-              (significantOverlap && lessPopular) ||
-              (allowExactSameContracts ? false : c2.id === contract.id)
-            )
-          }
-        )
-      )
-    })
-  // log(
-  //   'contracts to filter out',
-  //   contractsToRemove.map((c) => c.question)
-  // )
-
-  const returnContracts = contractsToFilter.filter(
-    (cf) => !contractsToRemove.map((c) => c.id).includes(cf.id)
-  )
-
-  return returnContracts
-}
-
 const fiveMinutes = 5 * 60 * 1000
 const seed = Math.round(Date.now() / fiveMinutes).toString()
 const rng = createRNG(seed)
@@ -445,40 +342,3 @@ function chooseRandomSubset(contracts: Contract[], count: number) {
   shuffle(contracts, rng)
   return contracts.slice(0, count)
 }
-
-function stripNonAlphaChars(str: string) {
-  return str.replace(/[^\w\s']|_/g, '').replace(/\s+/g, ' ')
-}
-
-const IGNORE_WORDS = [
-  'the',
-  'a',
-  'an',
-  'and',
-  'or',
-  'of',
-  'to',
-  'in',
-  'on',
-  'will',
-  'be',
-  'is',
-  'are',
-  'for',
-  'by',
-  'at',
-  'from',
-  'what',
-  'when',
-  'which',
-  'that',
-  'it',
-  'as',
-  'if',
-  'then',
-  'than',
-  'but',
-  'have',
-  'has',
-  'had',
-]

functions/src/weekly-portfolio-emails.ts

@@ -112,12 +112,13 @@ export async function sendPortfolioUpdateEmailsToAllUsers() {
       )
     )
   )
+  log('Found', contractsUsersBetOn.length, 'contracts')
+  let count = 0
   await Promise.all(
     privateUsersToSendEmailsTo.map(async (privateUser) => {
       const user = await getUser(privateUser.id)
       // Don't send to a user unless they're over 5 days old
-      if (!user || user.createdTime > Date.now() - 5 * DAY_MS)
+      if (!user || user.createdTime > Date.now() - 5 * DAY_MS) return
-        return await setEmailFlagAsSent(privateUser.id)
       const userBets = usersBets[privateUser.id] as Bet[]
       const contractsUserBetOn = contractsUsersBetOn.filter((contract) =>
         userBets.some((bet) => bet.contractId === contract.id)
@@ -218,6 +219,13 @@ export async function sendPortfolioUpdateEmailsToAllUsers() {
         (differences) => Math.abs(differences.profit)
       ).reverse()
 
+      log(
+        'Found',
+        investmentValueDifferences.length,
+        'investment differences for user',
+        privateUser.id
+      )
+
       const [winningInvestments, losingInvestments] = partition(
         investmentValueDifferences.filter(
           (diff) => diff.pastValue > 0.01 && Math.abs(diff.profit) > 1
@@ -237,28 +245,29 @@ export async function sendPortfolioUpdateEmailsToAllUsers() {
         usersToContractsCreated[privateUser.id].length === 0
       ) {
         log(
-          `No bets in last week, no market movers, no markets created. Not sending an email to ${privateUser.email} .`
+          'No bets in last week, no market movers, no markets created. Not sending an email.'
         )
-        return await setEmailFlagAsSent(privateUser.id)
+        await firestore.collection('private-users').doc(privateUser.id).update({
+          weeklyPortfolioUpdateEmailSent: true,
+        })
+        return
       }
-      // Set the flag beforehand just to be safe
-      await setEmailFlagAsSent(privateUser.id)
       await sendWeeklyPortfolioUpdateEmail(
         user,
         privateUser,
         topInvestments.concat(worstInvestments) as PerContractInvestmentsData[],
         performanceData
       )
+      await firestore.collection('private-users').doc(privateUser.id).update({
+        weeklyPortfolioUpdateEmailSent: true,
+      })
+      log('Sent weekly portfolio update email to', privateUser.email)
+      count++
+      log('sent out emails to users:', count)
     })
   )
 }
 
-async function setEmailFlagAsSent(privateUserId: string) {
-  await firestore.collection('private-users').doc(privateUserId).update({
-    weeklyPortfolioUpdateEmailSent: true,
-  })
-}
-
 export type PerContractInvestmentsData = {
   questionTitle: string
   questionUrl: string

functions/src/withdraw-liquidity.ts

@@ -0,0 +1,121 @@
+import * as admin from 'firebase-admin'
+import { z } from 'zod'
+
+import { CPMMContract } from '../../common/contract'
+import { User } from '../../common/user'
+import { subtractObjects } from '../../common/util/object'
+import { LiquidityProvision } from '../../common/liquidity-provision'
+import { getUserLiquidityShares } from '../../common/calculate-cpmm'
+import { Bet } from '../../common/bet'
+import { getProbability } from '../../common/calculate'
+import { noFees } from '../../common/fees'
+
+import { APIError, newEndpoint, validate } from './api'
+import { redeemShares } from './redeem-shares'
+
+const bodySchema = z.object({
+  contractId: z.string(),
+})
+
+export const withdrawliquidity = newEndpoint({}, async (req, auth) => {
+  const { contractId } = validate(bodySchema, req.body)
+
+  return await firestore
+    .runTransaction(async (trans) => {
+      const lpDoc = firestore.doc(`users/${auth.uid}`)
+      const lpSnap = await trans.get(lpDoc)
+      if (!lpSnap.exists) throw new APIError(400, 'User not found.')
+      const lp = lpSnap.data() as User
+
+      const contractDoc = firestore.doc(`contracts/${contractId}`)
+      const contractSnap = await trans.get(contractDoc)
+      if (!contractSnap.exists) throw new APIError(400, 'Contract not found.')
+      const contract = contractSnap.data() as CPMMContract
+
+      const liquidityCollection = firestore.collection(
+        `contracts/${contractId}/liquidity`
+      )
+
+      const liquiditiesSnap = await trans.get(liquidityCollection)
+
+      const liquidities = liquiditiesSnap.docs.map(
+        (doc) => doc.data() as LiquidityProvision
+      )
+
+      const userShares = getUserLiquidityShares(
+        auth.uid,
+        contract,
+        liquidities,
+        true
+      )
+
+      // zero all added amounts for now
+      // can add support for partial withdrawals in the future
+      liquiditiesSnap.docs
+        .filter(
+          (_, i) => !liquidities[i].isAnte && liquidities[i].userId === auth.uid
+        )
+        .forEach((doc) => trans.update(doc.ref, { amount: 0 }))
+
+      const payout = Math.min(...Object.values(userShares))
+      if (payout <= 0) return {}
+
+      const newBalance = lp.balance + payout
+      const newTotalDeposits = lp.totalDeposits + payout
+      trans.update(lpDoc, {
+        balance: newBalance,
+        totalDeposits: newTotalDeposits,
+      } as Partial<User>)
+
+      const newPool = subtractObjects(contract.pool, userShares)
+
+      const minPoolShares = Math.min(...Object.values(newPool))
+      const adjustedTotal = contract.totalLiquidity - payout
+
+      // total liquidity is a bogus number; use minPoolShares to prevent from going negative
+      const newTotalLiquidity = Math.max(adjustedTotal, minPoolShares)
+
+      trans.update(contractDoc, {
+        pool: newPool,
+        totalLiquidity: newTotalLiquidity,
+      })
+
+      const prob = getProbability(contract)
+
+      // surplus shares become user's bets
+      const bets = Object.entries(userShares)
+        .map(([outcome, shares]) =>
+          shares - payout < 1 // don't create bet if less than 1 share
+            ? undefined
+            : ({
+                userId: auth.uid,
+                contractId: contract.id,
+                amount:
+                  (outcome === 'YES' ? prob : 1 - prob) * (shares - payout),
+                shares: shares - payout,
+                outcome,
+                probBefore: prob,
+                probAfter: prob,
+                createdTime: Date.now(),
+                isLiquidityProvision: true,
+                fees: noFees,
+              } as Omit<Bet, 'id'>)
+        )
+        .filter((x) => x !== undefined)
+
+      for (const bet of bets) {
+        const doc = firestore.collection(`contracts/${contract.id}/bets`).doc()
+        trans.create(doc, { id: doc.id, ...bet })
+      }
+
+      return userShares
+    })
+    .then(async (result) => {
+      // redeem surplus bet with pre-existing bets
+      await redeemShares(auth.uid, contractId)
+      console.log('userid', auth.uid, 'withdraws', result)
+      return result
+    })
+})
+
+const firestore = admin.firestore()

web/.eslintrc.js

@@ -22,9 +22,8 @@ module.exports = {
     '@next/next/no-typos': 'off',
     'linebreak-style': ['error', 'unix'],
     'lodash/import-scope': [2, 'member'],
-    'unused-imports/no-unused-imports': 'warn',
+    'unused-imports/no-unused-imports': 'error',
   },
-  ignorePatterns: ['/public/mtg/*'],
   env: {
     browser: true,
     node: true,

web/.gitignore

@@ -3,4 +3,3 @@
 node_modules
 out
 tsconfig.tsbuildinfo
-.env*

web/components/NoSEO.tsx

@@ -1,10 +0,0 @@
-import Head from 'next/head'
-
-/** Exclude page from search results */
-export function NoSEO() {
-  return (
-    <Head>
-      <meta name="robots" content="noindex,follow" />
-    </Head>
-  )
-}

web/components/add-funds-modal.tsx

@@ -35,7 +35,7 @@ export function AddFundsModal(props: {
         <div className="text-xl">{manaToUSD(amountSelected)}</div>
       </div>
 
-      <div className="flex">
+      <div className="modal-action">
         <Button color="gray-white" onClick={() => setOpen(false)}>
           Back
         </Button>

web/components/amount-input.tsx

@@ -6,9 +6,6 @@ import { Col } from './layout/col'
 import { ENV_CONFIG } from 'common/envs/constants'
 import { Row } from './layout/row'
 import { AddFundsModal } from './add-funds-modal'
-import { Input } from './input'
-import Slider from 'rc-slider'
-import 'rc-slider/assets/index.css'
 
 export function AmountInput(props: {
   amount: number | undefined
@@ -42,13 +39,18 @@ export function AmountInput(props: {
 
   return (
     <>
-      <Col className={clsx('relative', className)}>
+      <Col className={className}>
         <label className="font-sm md:font-lg relative">
           <span className="text-greyscale-4 absolute top-1/2 my-auto ml-2 -translate-y-1/2">
             {label}
           </span>
-          <Input
+          <input
-            className={clsx('w-24 pl-9 !text-base md:w-auto', inputClassName)}
+            className={clsx(
+              'placeholder:text-greyscale-4 border-greyscale-2 rounded-md pl-9',
+              error && 'input-error',
+              'w-24 md:w-auto',
+              inputClassName
+            )}
             ref={inputRef}
             type="text"
             pattern="[0-9]*"
@@ -56,14 +58,13 @@ export function AmountInput(props: {
             placeholder="0"
             maxLength={6}
             value={amount ?? ''}
-            error={!!error}
             disabled={disabled}
             onChange={(e) => onAmountChange(e.target.value)}
           />
         </label>
 
         {error && (
-          <div className="absolute -bottom-5 whitespace-nowrap text-xs font-medium tracking-wide text-red-500">
+          <div className="absolute mt-11 whitespace-nowrap text-xs font-medium tracking-wide text-red-500">
             {error === 'Insufficient balance' ? (
               <>
                 Not enough funds.
@@ -147,7 +148,7 @@ export function BuyAmountInput(props: {
 
   return (
     <>
-      <Row className="items-center gap-4">
+      <Row className="gap-4">
         <AmountInput
           amount={amount}
           onChange={onAmountChange}
@@ -159,23 +160,14 @@ export function BuyAmountInput(props: {
           inputRef={inputRef}
         />
         {showSlider && (
-          <Slider
+          <input
-            min={0}
+            type="range"
-            max={205}
+            min="0"
+            max="205"
             value={getRaw(amount ?? 0)}
-            onChange={(value) => onAmountChange(parseRaw(value as number))}
+            onChange={(e) => onAmountChange(parseRaw(parseInt(e.target.value)))}
-            className="mx-4 !h-4 xl:hidden [&>.rc-slider-rail]:bg-gray-200 [&>.rc-slider-track]:bg-indigo-400 [&>.rc-slider-handle]:bg-indigo-400"
+            className="range range-lg only-thumb my-auto align-middle xl:hidden"
-            railStyle={{ height: 16, top: 0, left: 0 }}
+            step="5"
-            trackStyle={{ height: 16, top: 0 }}
-            handleStyle={{
-              height: 32,
-              width: 32,
-              opacity: 1,
-              border: 'none',
-              boxShadow: 'none',
-              top: -2,
-            }}
-            step={5}
           />
         )}
       </Row>

web/components/answers/answer-bet-panel.tsx

@@ -126,10 +126,7 @@ export function AnswerBetPanel(props: {
         </div>
 
         {!isModal && (
-          <button
+          <button className="btn-ghost btn-circle" onClick={closePanel}>
-            className="hover:bg-greyscale-2 rounded-full"
-            onClick={closePanel}
-          >
             <XIcon
               className="mx-auto h-8 w-8 text-gray-500"
               aria-hidden="true"

web/components/answers/answer-item.tsx

@@ -10,7 +10,6 @@ import { formatPercent } from 'common/util/format'
 import { getDpmOutcomeProbability } from 'common/calculate-dpm'
 import { tradingAllowed } from 'web/lib/firebase/contracts'
 import { Linkify } from '../linkify'
-import { Input } from '../input'
 
 export function AnswerItem(props: {
   answer: Answer
@@ -75,8 +74,8 @@ export function AnswerItem(props: {
       <Row className="items-center justify-end gap-4 self-end sm:self-start">
         {!wasResolvedTo &&
           (showChoice === 'checkbox' ? (
-            <Input
+            <input
-              className="w-24 justify-self-end !text-2xl"
+              className="input input-bordered w-24 justify-self-end text-2xl"
               type="number"
               placeholder={`${roundedProb}`}
               maxLength={9}
@@ -93,15 +92,15 @@ export function AnswerItem(props: {
             <div
               className={clsx(
                 'text-2xl',
-                tradingAllowed(contract) ? 'text-teal-500' : 'text-gray-500'
+                tradingAllowed(contract) ? 'text-green-500' : 'text-gray-500'
               )}
             >
               {probPercent}
             </div>
           ))}
         {showChoice ? (
-          <div className="flex flex-col py-1">
+          <div className="form-control py-1">
-            <label className="cursor-pointer gap-3 px-1 py-2">
+            <label className="label cursor-pointer gap-3">
               <span className="">Choose this answer</span>
               {showChoice === 'radio' && (
                 <input
@@ -144,7 +143,7 @@ export function AnswerItem(props: {
               <div
                 className={clsx(
                   'text-xl',
-                  resolution === 'MKT' ? 'text-blue-700' : 'text-teal-600'
+                  resolution === 'MKT' ? 'text-blue-700' : 'text-green-700'
                 )}
               >
                 Chosen{' '}

web/components/answers/answer-resolve-panel.tsx

@@ -10,7 +10,6 @@ import { ChooseCancelSelector } from '../yes-no-selector'
 import { ResolveConfirmationButton } from '../confirmation-button'
 import { removeUndefinedProps } from 'common/util/object'
 import { BETTOR, PAST_BETS } from 'common/user'
-import { Button } from '../button'
 
 export function AnswerResolvePanel(props: {
   isAdmin: boolean
@@ -110,14 +109,14 @@ export function AnswerResolvePanel(props: {
           )}
         >
           {resolveOption && (
-            <Button
+            <button
-              color="gray-white"
+              className="btn btn-ghost"
               onClick={() => {
                 setResolveOption(undefined)
               }}
             >
               Clear
-            </Button>
+            </button>
           )}
 
           <ResolveConfirmationButton

web/components/answers/answers-panel.tsx

@@ -23,23 +23,14 @@ import { Linkify } from 'web/components/linkify'
 import { Button } from 'web/components/button'
 import { useAdmin } from 'web/hooks/use-admin'
 import { needsAdminToResolve } from 'web/pages/[username]/[contractSlug]'
-import { CHOICE_ANSWER_COLORS } from '../charts/contract/choice'
+import { CATEGORY_COLORS } from '../charts/contract/choice'
 import { useChartAnswers } from '../charts/contract/choice'
-import { ChatIcon } from '@heroicons/react/outline'
-
-export function getAnswerColor(answer: Answer, answersArray: string[]) {
-  const colorIndex = answersArray.indexOf(answer.text)
-  return colorIndex != undefined && colorIndex < CHOICE_ANSWER_COLORS.length
-    ? CHOICE_ANSWER_COLORS[colorIndex]
-    : '#B1B1C7'
-}
 
 export function AnswersPanel(props: {
   contract: FreeResponseContract | MultipleChoiceContract
-  onAnswerCommentClick: (answer: Answer) => void
 }) {
   const isAdmin = useAdmin()
-  const { contract, onAnswerCommentClick } = props
+  const { contract } = props
   const { creatorId, resolution, resolutions, totalBets, outcomeType } =
     contract
   const [showAllAnswers, setShowAllAnswers] = useState(false)
@@ -114,8 +105,8 @@ export function AnswersPanel(props: {
     ? 'checkbox'
     : undefined
 
-  const answersArray = useChartAnswers(contract).map(
+  const colorSortedAnswer = useChartAnswers(contract).map(
-    (answer, _index) => answer.text
+    (value, _index) => value.text
   )
 
   return (
@@ -146,8 +137,7 @@ export function AnswersPanel(props: {
               key={item.id}
               answer={item}
               contract={contract}
-              onAnswerCommentClick={onAnswerCommentClick}
+              colorIndex={colorSortedAnswer.indexOf(item.text)}
-              color={getAnswerColor(item, answersArray)}
             />
           ))}
           {hasZeroBetAnswers && !showAllAnswers && (
@@ -167,9 +157,11 @@ export function AnswersPanel(props: {
         <div className="pb-4 text-gray-500">No answers yet...</div>
       )}
 
-      {outcomeType === 'FREE_RESPONSE' && tradingAllowed(contract) && (
+      {outcomeType === 'FREE_RESPONSE' &&
-        <CreateAnswerPanel contract={contract} />
+        tradingAllowed(contract) &&
-      )}
+        (!resolveOption || resolveOption === 'CANCEL') && (
+          <CreateAnswerPanel contract={contract} />
+        )}
 
       {(user?.id === creatorId || (isAdmin && needsAdminToResolve(contract))) &&
         !resolution && (
@@ -192,15 +184,15 @@ export function AnswersPanel(props: {
 function OpenAnswer(props: {
   contract: FreeResponseContract | MultipleChoiceContract
   answer: Answer
-  color: string
+  colorIndex: number | undefined
-  onAnswerCommentClick: (answer: Answer) => void
 }) {
-  const { answer, contract, onAnswerCommentClick, color } = props
+  const { answer, contract, colorIndex } = props
   const { username, avatarUrl, text } = answer
   const prob = getDpmOutcomeProbability(contract.totalShares, answer.id)
   const probPercent = formatPercent(prob)
   const [open, setOpen] = useState(false)
-  const colorWidth = 100 * Math.max(prob, 0.01)
+  const color =
+    colorIndex != undefined ? CATEGORY_COLORS[colorIndex] : '#B1B1C7'
 
   return (
     <Col className="my-1 px-2">
@@ -216,12 +208,9 @@ function OpenAnswer(props: {
 
       <Col
         className={clsx(
-          'relative w-full rounded-lg transition-all',
+          'bg-greyscale-1 relative w-full rounded-lg transition-all',
           tradingAllowed(contract) ? 'text-greyscale-7' : 'text-greyscale-5'
         )}
-        style={{
-          background: `linear-gradient(to right, ${color}90 ${colorWidth}%, #FBFBFF ${colorWidth}%)`,
-        }}
       >
         <Row className="z-20 -mb-1 justify-between gap-2 py-2 px-3">
           <Row>
@@ -230,7 +219,10 @@ function OpenAnswer(props: {
               username={username}
               avatarUrl={avatarUrl}
             />
-            <Linkify className="text-md whitespace-pre-line" text={text} />
+            <Linkify
+              className="text-md cursor-pointer whitespace-pre-line"
+              text={text}
+            />
           </Row>
           <Row className="gap-2">
             <div className="my-auto text-xl">{probPercent}</div>
@@ -244,16 +236,13 @@ function OpenAnswer(props: {
                 BUY
               </Button>
             )}
-            {
-              <button
-                className="p-1"
-                onClick={() => onAnswerCommentClick(answer)}
-              >
-                <ChatIcon className="text-greyscale-4 hover:text-greyscale-6 h-5 w-5 transition-colors" />
-              </button>
-            }
           </Row>
         </Row>
+        <hr
+          color={color}
+          className="absolute z-0 h-full w-full rounded-l-lg border-none opacity-30"
+          style={{ width: `${100 * Math.max(prob, 0.01)}%` }}
+        />
       </Col>
     </Col>
   )

web/components/answers/create-answer-panel.tsx

@@ -1,5 +1,6 @@
 import clsx from 'clsx'
 import React, { useState } from 'react'
+import Textarea from 'react-expanding-textarea'
 import { findBestMatch } from 'string-similarity'
 
 import { FreeResponseContract } from 'common/contract'
@@ -25,7 +26,6 @@ import { MAX_ANSWER_LENGTH } from 'common/answer'
 import { withTracking } from 'web/lib/service/analytics'
 import { lowerCase } from 'lodash'
 import { Button } from '../button'
-import { ExpandingInput } from '../expanding-input'
 
 export function CreateAnswerPanel(props: { contract: FreeResponseContract }) {
   const { contract } = props
@@ -122,10 +122,10 @@ export function CreateAnswerPanel(props: { contract: FreeResponseContract }) {
     <Col className="gap-4 rounded">
       <Col className="flex-1 gap-2 px-4 xl:px-0">
         <div className="mb-1">Add your answer</div>
-        <ExpandingInput
+        <Textarea
           value={text}
           onChange={(e) => changeAnswer(e.target.value)}
-          className="w-full"
+          className="textarea textarea-bordered w-full resize-none"
           placeholder="Type your answer..."
           rows={1}
           maxLength={MAX_ANSWER_LENGTH}
@@ -197,15 +197,17 @@ export function CreateAnswerPanel(props: { contract: FreeResponseContract }) {
             </>
           )}
           {user ? (
-            <Button
+            <button
-              color="green"
+              className={clsx(
-              size="lg"
+                'btn mt-2',
-              loading={isSubmitting}
+                canSubmit ? 'btn-outline' : 'btn-disabled',
+                isSubmitting && 'loading'
+              )}
               disabled={!canSubmit}
               onClick={withTracking(submitAnswer, 'submit answer')}
             >
               Submit
-            </Button>
+            </button>
           ) : (
             text && (
               <Button

web/components/answers/multiple-choice-answers.tsx

@@ -1,8 +1,8 @@
 import { MAX_ANSWER_LENGTH } from 'common/answer'
+import Textarea from 'react-expanding-textarea'
 import { XIcon } from '@heroicons/react/solid'
 import { Col } from '../layout/col'
 import { Row } from '../layout/row'
-import { ExpandingInput } from '../expanding-input'
 
 export function MultipleChoiceAnswers(props: {
   answers: string[]
@@ -27,10 +27,10 @@ export function MultipleChoiceAnswers(props: {
       {answers.map((answer, i) => (
         <Row className="mb-2 items-center gap-2 align-middle">
           {i + 1}.{' '}
-          <ExpandingInput
+          <Textarea
             value={answer}
             onChange={(e) => setAnswer(i, e.target.value)}
-            className="ml-2 w-full"
+            className="textarea textarea-bordered ml-2 w-full resize-none"
             placeholder="Type your answer..."
             rows={1}
             maxLength={MAX_ANSWER_LENGTH}

web/components/arrange-home.tsx

@@ -2,12 +2,12 @@ import clsx from 'clsx'
 import { DragDropContext, Droppable, Draggable } from '@hello-pangea/dnd'
 import { MenuIcon } from '@heroicons/react/solid'
 import { toast } from 'react-hot-toast'
-import { XCircleIcon } from '@heroicons/react/outline'
 
 import { Col } from 'web/components/layout/col'
 import { Row } from 'web/components/layout/row'
 import { Subtitle } from 'web/components/subtitle'
 import { keyBy } from 'lodash'
+import { XCircleIcon } from '@heroicons/react/outline'
 import { Button } from './button'
 import { updateUser } from 'web/lib/firebase/users'
 import { leaveGroup } from 'web/lib/firebase/groups'

web/components/auth-context.tsx

@@ -68,11 +68,11 @@ export function AuthProvider(props: {
   }, [setAuthUser, serverUser])
 
   useEffect(() => {
-    if (authUser) {
+    if (authUser != null) {
       // Persist to local storage, to reduce login blink next time.
       // Note: Cap on localStorage size is ~5mb
       localStorage.setItem(CACHED_USER_KEY, JSON.stringify(authUser))
-    } else if (authUser === null) {
+    } else {
       localStorage.removeItem(CACHED_USER_KEY)
     }
   }, [authUser])

web/components/award-bounty-button.tsx

@@ -5,6 +5,7 @@ import { awardCommentBounty } from 'web/lib/firebase/api'
 import { track } from 'web/lib/service/analytics'
 import { Row } from './layout/row'
 import { Contract } from 'common/contract'
+import { TextButton } from 'web/components/text-button'
 import { COMMENT_BOUNTY_AMOUNT } from 'common/economy'
 import { formatMoney } from 'common/util/format'
 
@@ -36,17 +37,10 @@ export function AwardBountyButton(prop: {
   const canUp = me && me.id !== comment.userId && contract.creatorId === me.id
   if (!canUp) return <div />
   return (
-    <Row
+    <Row className={clsx('-ml-2 items-center gap-0.5', !canUp ? '-ml-6' : '')}>
-      className={clsx('my-auto items-center gap-0.5', !canUp ? '-ml-6' : '')}
+      <TextButton className={'font-bold'} onClick={submit}>
-    >
-      <button
-        className={
-          'rounded-full border border-indigo-400 bg-indigo-50 py-0.5 px-2 text-xs text-indigo-400 transition-colors hover:bg-indigo-400 hover:text-white'
-        }
-        onClick={submit}
-      >
         Award {formatMoney(COMMENT_BOUNTY_AMOUNT)}
-      </button>
+      </TextButton>
     </Row>
   )
 }

web/components/badge-display.tsx

@@ -1,62 +0,0 @@
-import { User } from 'common/user'
-import { useEffect, useState } from 'react'
-import { getBadgesByRarity } from 'common/badge'
-import { Row } from 'web/components/layout/row'
-import clsx from 'clsx'
-import { BadgesModal } from 'web/components/profile/badges-modal'
-import { ParsedUrlQuery } from 'querystring'
-
-export const goldClassName = 'text-amber-400'
-export const silverClassName = 'text-gray-500'
-export const bronzeClassName = 'text-amber-900'
-
-export function BadgeDisplay(props: {
-  user: User | undefined | null
-  query: ParsedUrlQuery
-}) {
-  const { user, query } = props
-  const [showBadgesModal, setShowBadgesModal] = useState(false)
-
-  useEffect(() => {
-    const showBadgesModal = query['show'] == 'badges'
-    setShowBadgesModal(showBadgesModal)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-  // get number of badges of each rarity type
-  const badgesByRarity = getBadgesByRarity(user)
-  const badgesByRarityItems = Object.entries(badgesByRarity).map(
-    ([rarity, numBadges]) => {
-      return (
-        <Row
-          key={rarity}
-          className={clsx(
-            'items-center gap-2',
-            rarity === 'bronze'
-              ? bronzeClassName
-              : rarity === 'silver'
-              ? silverClassName
-              : goldClassName
-          )}
-        >
-          <span className={clsx('-m-0.5 text-lg')}>•</span>
-          <span className="text-xs">{numBadges}</span>
-        </Row>
-      )
-    }
-  )
-  return (
-    <Row
-      className={'cursor-pointer gap-2'}
-      onClick={() => setShowBadgesModal(true)}
-    >
-      {badgesByRarityItems}
-      {user && (
-        <BadgesModal
-          isOpen={showBadgesModal}
-          setOpen={setShowBadgesModal}
-          user={user}
-        />
-      )}
-    </Row>
-  )
-}

web/components/bet-button.tsx

@@ -16,7 +16,7 @@ import { Button } from 'web/components/button'
 import { BetSignUpPrompt } from './sign-up-prompt'
 import { User } from 'web/lib/firebase/users'
 import { SellRow } from './sell-row'
-import { useUnfilledBetsAndBalanceByUserId } from 'web/hooks/use-bets'
+import { useUnfilledBets } from 'web/hooks/use-bets'
 import { PlayMoneyDisclaimer } from './play-money-disclaimer'
 
 /** Button that opens BetPanel in a new modal */
@@ -100,9 +100,7 @@ export function SignedInBinaryMobileBetting(props: {
   user: User
 }) {
   const { contract, user } = props
-  const { unfilledBets, balanceByUserId } = useUnfilledBetsAndBalanceByUserId(
+  const unfilledBets = useUnfilledBets(contract.id) ?? []
-    contract.id
-  )
 
   return (
     <>
@@ -113,7 +111,6 @@ export function SignedInBinaryMobileBetting(props: {
             contract={contract as CPMMBinaryContract}
             user={user}
             unfilledBets={unfilledBets}
-            balanceByUserId={balanceByUserId}
             mobileView={true}
           />
         </Col>

web/components/bet-inline.tsx

@@ -10,7 +10,7 @@ import { BuyAmountInput } from './amount-input'
 import { Button } from './button'
 import { Row } from './layout/row'
 import { YesNoSelector } from './yes-no-selector'
-import { useUnfilledBetsAndBalanceByUserId } from 'web/hooks/use-bets'
+import { useUnfilledBets } from 'web/hooks/use-bets'
 import { useUser } from 'web/hooks/use-user'
 import { BetSignUpPrompt } from './sign-up-prompt'
 import { getCpmmProbability } from 'common/calculate-cpmm'
@@ -34,17 +34,14 @@ export function BetInline(props: {
   const [error, setError] = useState<string>()
 
   const isPseudoNumeric = contract.outcomeType === 'PSEUDO_NUMERIC'
-  const { unfilledBets, balanceByUserId } = useUnfilledBetsAndBalanceByUserId(
+  const unfilledBets = useUnfilledBets(contract.id) ?? []
-    contract.id
-  )
 
   const { newPool, newP } = getBinaryCpmmBetInfo(
     outcome ?? 'YES',
     amount ?? 0,
     contract,
     undefined,
-    unfilledBets,
+    unfilledBets
-    balanceByUserId
   )
   const resultProb = getCpmmProbability(newPool, newP)
   useEffect(() => setProbAfter(resultProb), [setProbAfter, resultProb])
@@ -92,7 +89,10 @@ export function BetInline(props: {
         />
         <BuyAmountInput
           className="-mb-4"
-          inputClassName="w-20 !text-base"
+          inputClassName={clsx(
+            'input-sm w-20 !text-base',
+            error && 'input-error'
+          )}
           amount={amount}
           onChange={setAmount}
           error="" // handle error ourselves

web/components/bet-panel.tsx

@@ -35,7 +35,7 @@ import { useSaveBinaryShares } from './use-save-binary-shares'
 import { BetSignUpPrompt } from './sign-up-prompt'
 import { ProbabilityOrNumericInput } from './probability-input'
 import { track } from 'web/lib/service/analytics'
-import { useUnfilledBetsAndBalanceByUserId } from 'web/hooks/use-bets'
+import { useUnfilledBets } from 'web/hooks/use-bets'
 import { LimitBets } from './limit-bets'
 import { PillButton } from './buttons/pill-button'
 import { YesNoSelector } from './yes-no-selector'
@@ -47,7 +47,6 @@ import { Modal } from './layout/modal'
 import { Title } from './title'
 import toast from 'react-hot-toast'
 import { CheckIcon } from '@heroicons/react/solid'
-import { Button } from './button'
 
 export function BetPanel(props: {
   contract: CPMMBinaryContract | PseudoNumericContract
@@ -56,9 +55,7 @@ export function BetPanel(props: {
   const { contract, className } = props
   const user = useUser()
   const userBets = useUserContractBets(user?.id, contract.id)
-  const { unfilledBets, balanceByUserId } = useUnfilledBetsAndBalanceByUserId(
+  const unfilledBets = useUnfilledBets(contract.id) ?? []
-    contract.id
-  )
   const { sharesOutcome } = useSaveBinaryShares(contract, userBets)
 
   const [isLimitOrder, setIsLimitOrder] = useState(false)
@@ -89,14 +86,12 @@ export function BetPanel(props: {
               contract={contract}
               user={user}
               unfilledBets={unfilledBets}
-              balanceByUserId={balanceByUserId}
             />
             <LimitOrderPanel
               hidden={!isLimitOrder}
               contract={contract}
               user={user}
               unfilledBets={unfilledBets}
-              balanceByUserId={balanceByUserId}
             />
           </>
         ) : (
@@ -122,9 +117,7 @@ export function SimpleBetPanel(props: {
   const user = useUser()
   const [isLimitOrder, setIsLimitOrder] = useState(false)
 
-  const { unfilledBets, balanceByUserId } = useUnfilledBetsAndBalanceByUserId(
+  const unfilledBets = useUnfilledBets(contract.id) ?? []
-    contract.id
-  )
 
   return (
     <Col className={className}>
@@ -149,7 +142,6 @@ export function SimpleBetPanel(props: {
           contract={contract}
           user={user}
           unfilledBets={unfilledBets}
-          balanceByUserId={balanceByUserId}
           onBuySuccess={onBetSuccess}
         />
         <LimitOrderPanel
@@ -157,7 +149,6 @@ export function SimpleBetPanel(props: {
           contract={contract}
           user={user}
           unfilledBets={unfilledBets}
-          balanceByUserId={balanceByUserId}
           onBuySuccess={onBetSuccess}
         />
 
@@ -176,21 +167,13 @@ export function SimpleBetPanel(props: {
 export function BuyPanel(props: {
   contract: CPMMBinaryContract | PseudoNumericContract
   user: User | null | undefined
-  unfilledBets: LimitBet[]
+  unfilledBets: Bet[]
-  balanceByUserId: { [userId: string]: number }
   hidden: boolean
   onBuySuccess?: () => void
   mobileView?: boolean
 }) {
-  const {
+  const { contract, user, unfilledBets, hidden, onBuySuccess, mobileView } =
-    contract,
+    props
-    user,
-    unfilledBets,
-    balanceByUserId,
-    hidden,
-    onBuySuccess,
-    mobileView,
-  } = props
 
   const initialProb = getProbability(contract)
   const isPseudoNumeric = contract.outcomeType === 'PSEUDO_NUMERIC'
@@ -271,15 +254,14 @@ export function BuyPanel(props: {
     })
   }
 
-  const betDisabled = isSubmitting || !betAmount || !!error
+  const betDisabled = isSubmitting || !betAmount || error
 
   const { newPool, newP, newBet } = getBinaryCpmmBetInfo(
     outcome ?? 'YES',
     betAmount ?? 0,
     contract,
     undefined,
-    unfilledBets,
+    unfilledBets as LimitBet[]
-    balanceByUserId
   )
 
   const [seeLimit, setSeeLimit] = useState(false)
@@ -434,7 +416,6 @@ export function BuyPanel(props: {
             contract={contract}
             user={user}
             unfilledBets={unfilledBets}
-            balanceByUserId={balanceByUserId}
           />
           <LimitBets
             contract={contract}
@@ -450,19 +431,11 @@ export function BuyPanel(props: {
 function LimitOrderPanel(props: {
   contract: CPMMBinaryContract | PseudoNumericContract
   user: User | null | undefined
-  unfilledBets: LimitBet[]
+  unfilledBets: Bet[]
-  balanceByUserId: { [userId: string]: number }
   hidden: boolean
   onBuySuccess?: () => void
 }) {
-  const {
+  const { contract, user, unfilledBets, hidden, onBuySuccess } = props
-    contract,
-    user,
-    unfilledBets,
-    balanceByUserId,
-    hidden,
-    onBuySuccess,
-  } = props
 
   const initialProb = getProbability(contract)
   const isPseudoNumeric = contract.outcomeType === 'PSEUDO_NUMERIC'
@@ -470,6 +443,7 @@ function LimitOrderPanel(props: {
   const [betAmount, setBetAmount] = useState<number | undefined>(undefined)
   const [lowLimitProb, setLowLimitProb] = useState<number | undefined>()
   const [highLimitProb, setHighLimitProb] = useState<number | undefined>()
+  const betChoice = 'YES'
   const [error, setError] = useState<string | undefined>()
   const [isSubmitting, setIsSubmitting] = useState(false)
 
@@ -493,7 +467,7 @@ function LimitOrderPanel(props: {
     !betAmount ||
     rangeError ||
     outOfRangeError ||
-    !!error ||
+    error ||
     (!hasYesLimitBet && !hasNoLimitBet)
 
   const yesLimitProb =
@@ -607,8 +581,7 @@ function LimitOrderPanel(props: {
     yesAmount,
     contract,
     yesLimitProb ?? initialProb,
-    unfilledBets,
+    unfilledBets as LimitBet[]
-    balanceByUserId
   )
   const yesReturnPercent = formatPercent(yesReturn)
 
@@ -622,8 +595,7 @@ function LimitOrderPanel(props: {
     noAmount,
     contract,
     noLimitProb ?? initialProb,
-    unfilledBets,
+    unfilledBets as LimitBet[]
-    balanceByUserId
   )
   const noReturnPercent = formatPercent(noReturn)
 
@@ -631,9 +603,9 @@ function LimitOrderPanel(props: {
 
   return (
     <Col className={hidden ? 'hidden' : ''}>
-      <Row className="mt-1 mb-4 items-center gap-4">
+      <Row className="mt-1 items-center gap-4">
         <Col className="gap-2">
-          <div className="text-sm text-gray-500">
+          <div className="relative ml-1 text-sm text-gray-500">
             Buy {isPseudoNumeric ? <HigherLabel /> : <YesLabel />} up to
           </div>
           <ProbabilityOrNumericInput
@@ -641,11 +613,10 @@ function LimitOrderPanel(props: {
             prob={lowLimitProb}
             setProb={setLowLimitProb}
             isSubmitting={isSubmitting}
-            placeholder="10"
           />
         </Col>
         <Col className="gap-2">
-          <div className="text-sm text-gray-500">
+          <div className="ml-1 text-sm text-gray-500">
             Buy {isPseudoNumeric ? <LowerLabel /> : <NoLabel />} down to
           </div>
           <ProbabilityOrNumericInput
@@ -653,7 +624,6 @@ function LimitOrderPanel(props: {
             prob={highLimitProb}
             setProb={setHighLimitProb}
             isSubmitting={isSubmitting}
-            placeholder="90"
           />
         </Col>
       </Row>
@@ -785,18 +755,22 @@ function LimitOrderPanel(props: {
       {(hasYesLimitBet || hasNoLimitBet) && <Spacer h={8} />}
 
       {user && (
-        <Button
+        <button
-          size="xl"
+          className={clsx(
-          disabled={betDisabled}
+            'btn flex-1',
-          color={'indigo'}
+            betDisabled
-          loading={isSubmitting}
+              ? 'btn-disabled'
-          className="flex-1"
+              : betChoice === 'YES'
-          onClick={submitBet}
+              ? 'btn-primary'
+              : 'border-none bg-red-400 hover:bg-red-500',
+            isSubmitting ? 'loading' : ''
+          )}
+          onClick={betDisabled ? undefined : submitBet}
         >
           {isSubmitting
             ? 'Submitting...'
             : `Submit order${hasTwoBets ? 's' : ''}`}
-        </Button>
+        </button>
       )}
     </Col>
   )
@@ -856,9 +830,7 @@ export function SellPanel(props: {
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [wasSubmitted, setWasSubmitted] = useState(false)
 
-  const { unfilledBets, balanceByUserId } = useUnfilledBetsAndBalanceByUserId(
+  const unfilledBets = useUnfilledBets(contract.id) ?? []
-    contract.id
-  )
 
   const betDisabled = isSubmitting || !amount || error !== undefined
 
@@ -917,8 +889,7 @@ export function SellPanel(props: {
     contract,
     sellQuantity ?? 0,
     sharesOutcome,
-    unfilledBets,
+    unfilledBets
-    balanceByUserId
   )
   const netProceeds = saleValue - loanPaid
   const profit = saleValue - costBasis
@@ -982,11 +953,11 @@ export function SellPanel(props: {
       <Col className="mt-3 w-full gap-3 text-sm">
         <Row className="items-center justify-between gap-2 text-gray-500">
           Sale amount
-          <span className="text-gray-700">{formatMoney(saleValue)}</span>
+          <span className="text-neutral">{formatMoney(saleValue)}</span>
         </Row>
         <Row className="items-center justify-between gap-2 text-gray-500">
           Profit
-          <span className="text-gray-700">{formatMoney(profit)}</span>
+          <span className="text-neutral">{formatMoney(profit)}</span>
         </Row>
         <Row className="items-center justify-between">
           <div className="text-gray-500">
@@ -1002,11 +973,11 @@ export function SellPanel(props: {
           <>
             <Row className="mt-6 items-center justify-between gap-2 text-gray-500">
               Loan payment
-              <span className="text-gray-700">{formatMoney(-loanPaid)}</span>
+              <span className="text-neutral">{formatMoney(-loanPaid)}</span>
             </Row>
             <Row className="items-center justify-between gap-2 text-gray-500">
               Net proceeds
-              <span className="text-gray-700">{formatMoney(netProceeds)}</span>
+              <span className="text-neutral">{formatMoney(netProceeds)}</span>
             </Row>
           </>
         )}

web/components/bet-summary.tsx

@@ -25,8 +25,10 @@ export function BetsSummary(props: {
   const isBinary = outcomeType === 'BINARY'
 
   const bets = props.userBets.filter((b) => !b.isAnte)
-  const { profitPercent, payout, profit, invested, hasShares } =
+  const { profitPercent, payout, profit, invested } = getContractBetMetrics(
-    getContractBetMetrics(contract, bets)
+    contract,
+    bets
+  )
 
   const excludeSales = bets.filter((b) => !b.isSold && !b.sale)
   const yesWinnings = sumBy(excludeSales, (bet) =>
@@ -37,7 +39,6 @@ export function BetsSummary(props: {
   )
 
   const position = yesWinnings - noWinnings
-  const outcome = hasShares ? (position > 0 ? 'YES' : 'NO') : undefined
 
   const prob = isBinary ? getProbability(contract) : 0
   const expectation = prob * yesWinnings + (1 - prob) * noWinnings
@@ -59,9 +60,7 @@ export function BetsSummary(props: {
           <Col>
             <div className="whitespace-nowrap text-sm text-gray-500">
               Position{' '}
-              <InfoTooltip
+              <InfoTooltip text="Number of shares you own on net. 1 YES share = M$1 if the market resolves YES." />
-                text={`Number of shares you own on net. 1 ${outcome} share = M$1 if the market resolves ${outcome}.`}
-              />
             </div>
             <div className="whitespace-nowrap">
               {position > 1e-7 ? (

web/components/bets-list.tsx

@@ -4,7 +4,7 @@ import dayjs from 'dayjs'
 import { useMemo, useState } from 'react'
 import { ChevronDownIcon, ChevronUpIcon } from '@heroicons/react/solid'
 
-import { Bet, MAX_USER_BETS_LOADED } from 'web/lib/firebase/bets'
+import { Bet } from 'web/lib/firebase/bets'
 import { User } from 'web/lib/firebase/users'
 import {
   formatMoney,
@@ -17,7 +17,6 @@ import {
   Contract,
   contractPath,
   getBinaryProbPercent,
-  MAX_USER_BET_CONTRACTS_LOADED,
 } from 'web/lib/firebase/contracts'
 import { Row } from './layout/row'
 import { sellBet } from 'web/lib/firebase/api'
@@ -38,7 +37,7 @@ import { NumericContract } from 'common/contract'
 import { formatNumericProbability } from 'common/pseudo-numeric'
 import { useUser } from 'web/hooks/use-user'
 import { useUserBets } from 'web/hooks/use-user-bets'
-import { useUnfilledBetsAndBalanceByUserId } from 'web/hooks/use-bets'
+import { useUnfilledBets } from 'web/hooks/use-bets'
 import { LimitBet } from 'common/bet'
 import { Pagination } from './pagination'
 import { LimitOrderTable } from './limit-bets'
@@ -51,9 +50,6 @@ import {
   usePersistentState,
 } from 'web/hooks/use-persistent-state'
 import { safeLocalStorage } from 'web/lib/util/local'
-import { ExclamationIcon } from '@heroicons/react/outline'
-import { Select } from './select'
-import { Table } from './table'
 
 type BetSort = 'newest' | 'profit' | 'closeTime' | 'value'
 type BetFilter = 'open' | 'limit_bet' | 'sold' | 'closed' | 'resolved' | 'all'
@@ -84,10 +80,6 @@ export function BetsList(props: { user: User }) {
     return contractList ? keyBy(contractList, 'id') : undefined
   }, [contractList])
 
-  const loadedPartialData =
-    userBets?.length === MAX_USER_BETS_LOADED ||
-    contractList?.length === MAX_USER_BET_CONTRACTS_LOADED
-
   const [sort, setSort] = usePersistentState<BetSort>('newest', {
     key: 'bets-list-sort',
     store: storageStore(safeLocalStorage()),
@@ -175,13 +167,6 @@ export function BetsList(props: { user: User }) {
 
   return (
     <Col>
-      {loadedPartialData && (
-        <Row className="my-4 items-center gap-2 self-start rounded bg-yellow-50 p-4">
-          <ExclamationIcon className="h-5 w-5" />
-          <div>Partial trade data only</div>
-        </Row>
-      )}
-
       <Col className="justify-between gap-4 sm:flex-row">
         <Row className="gap-4">
           <Col>
@@ -202,19 +187,21 @@ export function BetsList(props: { user: User }) {
         </Row>
 
         <Row className="gap-2">
-          <Select
+          <select
+            className="border-greyscale-4 self-start overflow-hidden rounded border px-2 py-2 text-sm"
             value={filter}
             onChange={(e) => setFilter(e.target.value as BetFilter)}
           >
-            <option value="open">Active</option>
+            <option value="open">Open</option>
             <option value="limit_bet">Limit orders</option>
             <option value="sold">Sold</option>
             <option value="closed">Closed</option>
             <option value="resolved">Resolved</option>
             <option value="all">All</option>
-          </Select>
+          </select>
 
-          <Select
+          <select
+            className="border-greyscale-4 self-start overflow-hidden rounded px-2 py-2 text-sm"
             value={sort}
             onChange={(e) => setSort(e.target.value as BetSort)}
           >
@@ -222,7 +209,7 @@ export function BetsList(props: { user: User }) {
             <option value="value">Value</option>
             <option value="profit">Profit</option>
             <option value="closeTime">Close date</option>
-          </Select>
+          </select>
         </Row>
       </Col>
 
@@ -425,9 +412,7 @@ export function ContractBetsTable(props: {
   const isNumeric = outcomeType === 'NUMERIC'
   const isPseudoNumeric = outcomeType === 'PSEUDO_NUMERIC'
 
-  const { unfilledBets, balanceByUserId } = useUnfilledBetsAndBalanceByUserId(
+  const unfilledBets = useUnfilledBets(contract.id) ?? []
-    contract.id
-  )
 
   return (
     <div className="overflow-x-auto">
@@ -451,7 +436,7 @@ export function ContractBetsTable(props: {
         </>
       )}
 
-      <Table>
+      <table className="table-zebra table-compact table w-full text-gray-500">
         <thead>
           <tr className="p-2">
             <th></th>
@@ -476,11 +461,10 @@ export function ContractBetsTable(props: {
               contract={contract}
               isYourBet={isYourBets}
               unfilledBets={unfilledBets}
-              balanceByUserId={balanceByUserId}
             />
           ))}
         </tbody>
-      </Table>
+      </table>
     </div>
   )
 }
@@ -491,10 +475,8 @@ function BetRow(props: {
   saleBet?: Bet
   isYourBet: boolean
   unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 }) {
-  const { bet, saleBet, contract, isYourBet, unfilledBets, balanceByUserId } =
+  const { bet, saleBet, contract, isYourBet, unfilledBets } = props
-    props
   const {
     amount,
     outcome,
@@ -522,9 +504,9 @@ function BetRow(props: {
     } else if (contract.isResolved) {
       return resolvedPayout(contract, bet)
     } else {
-      return calculateSaleAmount(contract, bet, unfilledBets, balanceByUserId)
+      return calculateSaleAmount(contract, bet, unfilledBets)
     }
-  }, [contract, bet, saleBet, unfilledBets, balanceByUserId])
+  }, [contract, bet, saleBet, unfilledBets])
 
   const saleDisplay = isAnte ? (
     'ANTE'
@@ -551,7 +533,7 @@ function BetRow(props: {
 
   return (
     <tr>
-      <td className="text-gray-700">
+      <td className="text-neutral">
         {isYourBet &&
           !isCPMM &&
           !isResolved &&
@@ -563,7 +545,6 @@ function BetRow(props: {
               contract={contract}
               bet={bet}
               unfilledBets={unfilledBets}
-              balanceByUserId={balanceByUserId}
             />
           )}
       </td>
@@ -609,9 +590,8 @@ function SellButton(props: {
   contract: Contract
   bet: Bet
   unfilledBets: LimitBet[]
-  balanceByUserId: { [userId: string]: number }
 }) {
-  const { contract, bet, unfilledBets, balanceByUserId } = props
+  const { contract, bet, unfilledBets } = props
   const { outcome, shares, loanAmount } = bet
 
   const [isSubmitting, setIsSubmitting] = useState(false)
@@ -625,16 +605,10 @@ function SellButton(props: {
     contract,
     outcome,
     shares,
-    unfilledBets,
+    unfilledBets
-    balanceByUserId
   )
 
-  const saleAmount = calculateSaleAmount(
+  const saleAmount = calculateSaleAmount(contract, bet, unfilledBets)
-    contract,
-    bet,
-    unfilledBets,
-    balanceByUserId
-  )
   const profit = saleAmount - bet.amount
 
   return (

web/components/button.tsx

@@ -13,48 +13,14 @@ export type ColorType =
   | 'gray-outline'
   | 'gradient'
   | 'gray-white'
-
+  | 'highlight-blue'
-const sizeClasses = {
-  '2xs': 'px-2 py-1 text-xs',
-  xs: 'px-2.5 py-1.5 text-sm',
-  sm: 'px-3 py-2 text-sm',
-  md: 'px-4 py-2 text-sm',
-  lg: 'px-4 py-2 text-base',
-  xl: 'px-6 py-2.5 text-base font-semibold',
-  '2xl': 'px-6 py-3 text-xl font-semibold',
-}
-
-export function buttonClass(size: SizeType, color: ColorType | 'override') {
-  return clsx(
-    'font-md inline-flex items-center justify-center rounded-md ring-inset shadow-sm transition-colors disabled:cursor-not-allowed',
-    sizeClasses[size],
-    color === 'green' &&
-      'disabled:bg-greyscale-2 bg-teal-500 text-white hover:bg-teal-600',
-    color === 'red' &&
-      'disabled:bg-greyscale-2 bg-red-400 text-white hover:bg-red-500',
-    color === 'yellow' &&
-      'disabled:bg-greyscale-2 bg-yellow-400 text-white hover:bg-yellow-500',
-    color === 'blue' &&
-      'disabled:bg-greyscale-2 bg-blue-400 text-white hover:bg-blue-500',
-    color === 'indigo' &&
-      'disabled:bg-greyscale-2 bg-indigo-500 text-white hover:bg-indigo-600',
-    color === 'gray' &&
-      'bg-greyscale-1 text-greyscale-6 hover:bg-greyscale-2 disabled:opacity-50',
-    color === 'gray-outline' &&
-      'ring-2 ring-greyscale-4 text-greyscale-4 hover:bg-greyscale-4 hover:text-white disabled:opacity-50',
-    color === 'gradient' &&
-      'disabled:bg-greyscale-2 bg-gradient-to-r from-indigo-500 to-blue-500 text-white hover:from-indigo-700 hover:to-blue-700',
-    color === 'gray-white' &&
-      'text-greyscale-6 hover:bg-greyscale-2 shadow-none disabled:opacity-50'
-  )
-}
 
 export function Button(props: {
   className?: string
   onClick?: MouseEventHandler<any> | undefined
   children?: ReactNode
   size?: SizeType
-  color?: ColorType | 'override'
+  color?: ColorType
   type?: 'button' | 'reset' | 'submit'
   disabled?: boolean
   loading?: boolean
@@ -70,10 +36,44 @@ export function Button(props: {
     loading,
   } = props
 
+  const sizeClasses = {
+    '2xs': 'px-2 py-1 text-xs',
+    xs: 'px-2.5 py-1.5 text-sm',
+    sm: 'px-3 py-2 text-sm',
+    md: 'px-4 py-2 text-sm',
+    lg: 'px-4 py-2 text-base',
+    xl: 'px-6 py-2.5 text-base font-semibold',
+    '2xl': 'px-6 py-3 text-xl font-semibold',
+  }[size]
+
   return (
     <button
       type={type}
-      className={clsx(buttonClass(size, color), className)}
+      className={clsx(
+        'font-md items-center justify-center rounded-md border border-transparent shadow-sm transition-colors disabled:cursor-not-allowed',
+        sizeClasses,
+        color === 'green' &&
+          'disabled:bg-greyscale-2 bg-teal-500 text-white hover:bg-teal-600',
+        color === 'red' &&
+          'disabled:bg-greyscale-2 bg-red-400 text-white hover:bg-red-500',
+        color === 'yellow' &&
+          'disabled:bg-greyscale-2 bg-yellow-400 text-white hover:bg-yellow-500',
+        color === 'blue' &&
+          'disabled:bg-greyscale-2 bg-blue-400 text-white hover:bg-blue-500',
+        color === 'indigo' &&
+          'disabled:bg-greyscale-2 bg-indigo-500 text-white hover:bg-indigo-600',
+        color === 'gray' &&
+          'bg-greyscale-1 text-greyscale-6 hover:bg-greyscale-2 disabled:opacity-50',
+        color === 'gray-outline' &&
+          'border-greyscale-4 text-greyscale-4 hover:bg-greyscale-4 border-2 hover:text-white disabled:opacity-50',
+        color === 'gradient' &&
+          'disabled:bg-greyscale-2 border-none bg-gradient-to-r from-indigo-500 to-blue-500 text-white hover:from-indigo-700 hover:to-blue-700',
+        color === 'gray-white' &&
+          'text-greyscale-6 hover:bg-greyscale-2 border-none shadow-none disabled:opacity-50',
+        color === 'highlight-blue' &&
+          'text-highlight-blue disabled:bg-greyscale-2 border-none shadow-none',
+        className
+      )}
       disabled={disabled || loading}
       onClick={onClick}
     >
@@ -82,39 +82,3 @@ export function Button(props: {
     </button>
   )
 }
-
-export function IconButton(props: {
-  className?: string
-  onClick?: MouseEventHandler<any> | undefined
-  children?: ReactNode
-  size?: SizeType
-  type?: 'button' | 'reset' | 'submit'
-  disabled?: boolean
-  loading?: boolean
-}) {
-  const {
-    children,
-    className,
-    onClick,
-    size = 'md',
-    type = 'button',
-    disabled = false,
-    loading,
-  } = props
-
-  return (
-    <button
-      type={type}
-      className={clsx(
-        'inline-flex items-center justify-center transition-colors disabled:cursor-not-allowed',
-        sizeClasses[size],
-        'disabled:text-greyscale-2 text-greyscale-5 hover:text-greyscale-6',
-        className
-      )}
-      disabled={disabled || loading}
-      onClick={onClick}
-    >
-      {children}
-    </button>
-  )
-}

web/components/card.tsx

@@ -1,16 +0,0 @@
-import clsx from 'clsx'
-
-export function Card(props: JSX.IntrinsicElements['div']) {
-  const { children, className, ...rest } = props
-  return (
-    <div
-      className={clsx(
-        'cursor-pointer rounded-lg border bg-white transition-shadow hover:shadow-md focus:shadow-md',
-        className
-      )}
-      {...rest}
-    >
-      {children}
-    </div>
-  )
-}

web/components/challenges/create-challenge-modal.tsx

@@ -20,10 +20,11 @@ import { getProbability } from 'common/calculate'
 import { createMarket } from 'web/lib/firebase/api'
 import { removeUndefinedProps } from 'common/util/object'
 import { FIXED_ANTE } from 'common/economy'
+import Textarea from 'react-expanding-textarea'
+import { useTextEditor } from 'web/components/editor'
 import { LoadingIndicator } from 'web/components/loading-indicator'
 import { track } from 'web/lib/service/analytics'
 import { CopyLinkButton } from '../copy-link-button'
-import { ExpandingInput } from '../expanding-input'
 
 type challengeInfo = {
   amount: number
@@ -42,6 +43,7 @@ export function CreateChallengeModal(props: {
   const { user, contract, isOpen, setOpen } = props
   const [challengeSlug, setChallengeSlug] = useState('')
   const [loading, setLoading] = useState(false)
+  const { editor } = useTextEditor({ placeholder: '' })
 
   return (
     <Modal open={isOpen} setOpen={setOpen}>
@@ -62,6 +64,7 @@ export function CreateChallengeModal(props: {
                         question: newChallenge.question,
                         outcomeType: 'BINARY',
                         initialProb: 50,
+                        description: editor?.getJSON(),
                         ante: FIXED_ANTE,
                         closeTime: dayjs().add(30, 'day').valueOf(),
                       })
@@ -150,9 +153,9 @@ function CreateChallengeForm(props: {
             {contract ? (
               <span className="underline">{contract.question}</span>
             ) : (
-              <ExpandingInput
+              <Textarea
                 placeholder="e.g. Will a Democrat be the next president?"
-                className="mt-1 w-full"
+                className="input input-bordered mt-1 w-full resize-none"
                 autoFocus={true}
                 maxLength={MAX_QUESTION_LENGTH}
                 value={challengeInfo.question}
@@ -171,7 +174,7 @@ function CreateChallengeForm(props: {
               <div>You'll bet:</div>
               <Row
                 className={
-                  'w-full max-w-xs items-center justify-between gap-4 pr-3'
+                  'form-control w-full max-w-xs items-center justify-between gap-4 pr-3'
                 }
               >
                 <AmountInput

web/components/charity/charity-card.tsx

@@ -6,8 +6,6 @@ import { Charity } from 'common/charity'
 import { useCharityTxns } from 'web/hooks/use-charity-txns'
 import { manaToUSD } from '../../../common/util/format'
 import { Row } from '../layout/row'
-import { Col } from '../layout/col'
-import { Card } from '../card'
 
 export function CharityCard(props: { charity: Charity; match?: number }) {
   const { charity } = props
@@ -17,44 +15,43 @@ export function CharityCard(props: { charity: Charity; match?: number }) {
   const raised = sumBy(txns, (txn) => txn.amount)
 
   return (
-    <Link href={`/charity/${slug}`}>
+    <Link href={`/charity/${slug}`} passHref>
-      <a className="flex-1">
+      <div className="card card-compact transition:shadow flex-1 cursor-pointer border-2 bg-white hover:shadow-md">
-        <Card className="!rounded-2xl">
+        <Row className="mt-6 mb-2">
-          <Row className="mt-6 mb-2">
+          {tags?.includes('Featured') && <FeaturedBadge />}
-            {tags?.includes('Featured') && <FeaturedBadge />}
+        </Row>
-          </Row>
+        <div className="px-8">
-          <div className="px-8">
+          <figure className="relative h-32">
-            <figure className="relative h-32">
+            {photo ? (
-              {photo ? (
+              <Image src={photo} alt="" layout="fill" objectFit="contain" />
-                <Image src={photo} alt="" layout="fill" objectFit="contain" />
+            ) : (
-              ) : (
+              <div className="h-full w-full bg-gradient-to-r from-slate-300 to-indigo-200" />
-                <div className="h-full w-full bg-gradient-to-r from-slate-300 to-indigo-200" />
+            )}
-              )}
+          </figure>
-            </figure>
+        </div>
-          </div>
+        <div className="card-body">
-          <Col className="p-8">
+          {/* <h3 className="card-title line-clamp-3">{name}</h3> */}
-            <div className="line-clamp-4 text-sm">{preview}</div>
+          <div className="line-clamp-4 text-sm">{preview}</div>
-            {raised > 0 && (
+          {raised > 0 && (
-              <>
+            <>
-                <Row className="mt-4 flex-1 items-end justify-center gap-6 text-gray-900">
+              <Row className="mt-4 flex-1 items-end justify-center gap-6 text-gray-900">
-                  <Row className="items-baseline gap-1">
+                <Row className="items-baseline gap-1">
-                    <span className="text-3xl font-semibold">
+                  <span className="text-3xl font-semibold">
-                      {formatUsd(raised)}
+                    {formatUsd(raised)}
-                    </span>
+                  </span>
-                    raised
+                  raised
-                  </Row>
+                </Row>
-                  {/* {match && (
+                {/* {match && (
                   <Col className="text-gray-500">
                     <span className="text-xl">+{formatUsd(match)}</span>
                     <span className="">match</span>
                   </Col>
                 )} */}
-                </Row>
+              </Row>
-              </>
+            </>
-            )}
+          )}
-          </Col>
+        </div>
-        </Card>
+      </div>
-      </a>
     </Link>
   )
 }

web/components/charts/contract/choice.tsx

@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import { last, range, sum, sortBy, groupBy } from 'lodash'
+import { last, sum, sortBy, groupBy } from 'lodash'
 import { scaleTime, scaleLinear } from 'd3-scale'
 import { curveStepAfter } from 'd3-shape'
 
@@ -19,36 +19,83 @@ import { MultiPoint, MultiValueHistoryChart } from '../generic-charts'
 import { Row } from 'web/components/layout/row'
 import { Avatar } from 'web/components/avatar'
 
-type ChoiceContract = FreeResponseContract | MultipleChoiceContract
+export const CATEGORY_COLORS = [
-
+  '#7eb0d5',
-export const CHOICE_ANSWER_COLORS = [
+  '#fd7f6f',
-  '#97C1EB',
+  '#b2e061',
-  '#F39F83',
+  '#bd7ebe',
-  '#F9EBA5',
+  '#ffb55a',
-  '#FFC7D2',
+  '#ffee65',
-  '#C7ECFF',
+  '#beb9db',
-  '#8CDEC7',
+  '#fdcce5',
-  '#DBE96F',
+  '#8bd3c7',
+  '#bddfb7',
+  '#e2e3f3',
+  '#fafafa',
+  '#9fcdeb',
+  '#d3d3d3',
+  '#b1a296',
+  '#e1bdb6',
+  '#f2dbc0',
+  '#fae5d3',
+  '#c5e0ec',
+  '#e0f0ff',
+  '#ffddcd',
+  '#fbd5e2',
+  '#f2e7e5',
+  '#ffe7ba',
+  '#eed9c4',
+  '#ea9999',
+  '#f9cb9c',
+  '#ffe599',
+  '#b6d7a8',
+  '#a2c4c9',
+  '#9fc5e8',
+  '#b4a7d6',
+  '#d5a6bd',
+  '#e06666',
+  '#f6b26b',
+  '#ffd966',
+  '#93c47d',
+  '#76a5af',
+  '#6fa8dc',
+  '#8e7cc3',
+  '#c27ba0',
+  '#cc0000',
+  '#e69138',
+  '#f1c232',
+  '#6aa84f',
+  '#45818e',
+  '#3d85c6',
+  '#674ea7',
+  '#a64d79',
+  '#990000',
+  '#b45f06',
+  '#bf9000',
 ]
-export const CHOICE_OTHER_COLOR = '#CCC'
-export const CHOICE_ALL_COLORS = [...CHOICE_ANSWER_COLORS, CHOICE_OTHER_COLOR]
 
 const MARGIN = { top: 20, right: 10, bottom: 20, left: 40 }
 const MARGIN_X = MARGIN.left + MARGIN.right
 const MARGIN_Y = MARGIN.top + MARGIN.bottom
 
-const getAnswers = (contract: ChoiceContract) => {
+const getTrackedAnswers = (
-  const { answers, outcomeType } = contract
+  contract: FreeResponseContract | MultipleChoiceContract,
-  const validAnswers = answers.filter(
+  topN: number
-    (answer) => answer.id !== '0' || outcomeType === 'MULTIPLE_CHOICE'
+) => {
-  )
+  const { answers, outcomeType, totalBets } = contract
+  const validAnswers = answers.filter((answer) => {
+    return (
+      (answer.id !== '0' || outcomeType === 'MULTIPLE_CHOICE') &&
+      totalBets[answer.id] > 0.000000001
+    )
+  })
   return sortBy(
     validAnswers,
     (answer) => -1 * getOutcomeProbability(contract, answer.id)
-  )
+  ).slice(0, topN)
 }
 
-const getBetPoints = (answers: Answer[], bets: Bet[], topN?: number) => {
+const getBetPoints = (answers: Answer[], bets: Bet[]) => {
   const sortedBets = sortBy(bets, (b) => b.createdTime)
   const betsByOutcome = groupBy(sortedBets, (bet) => bet.outcome)
   const sharesByOutcome = Object.fromEntries(
@@ -62,14 +109,11 @@ const getBetPoints = (answers: Answer[], bets: Bet[], topN?: number) => {
     const sharesSquared = sum(
       Object.values(sharesByOutcome).map((shares) => shares ** 2)
     )
-    const probs = answers.map((a) => sharesByOutcome[a.id] ** 2 / sharesSquared)
+    points.push({
-
+      x: new Date(bet.createdTime),
-    if (topN != null && answers.length > topN) {
+      y: answers.map((a) => sharesByOutcome[a.id] ** 2 / sharesSquared),
-      const y = [...probs.slice(0, topN), sum(probs.slice(topN))]
+      obj: bet,
-      points.push({ x: new Date(bet.createdTime), y, obj: bet })
+    })
-    } else {
-      points.push({ x: new Date(bet.createdTime), y: probs, obj: bet })
-    }
   }
   return points
 }
@@ -97,12 +141,17 @@ const Legend = (props: { className?: string; items: LegendItem[] }) => {
   )
 }
 
-export function useChartAnswers(contract: ChoiceContract) {
+export function useChartAnswers(
-  return useMemo(() => getAnswers(contract), [contract])
+  contract: FreeResponseContract | MultipleChoiceContract
+) {
+  return useMemo(
+    () => getTrackedAnswers(contract, CATEGORY_COLORS.length),
+    [contract]
+  )
 }
 
 export const ChoiceContractChart = (props: {
-  contract: ChoiceContract
+  contract: FreeResponseContract | MultipleChoiceContract
   bets: Bet[]
   width: number
   height: number
@@ -111,33 +160,18 @@ export const ChoiceContractChart = (props: {
   const { contract, bets, width, height, onMouseOver } = props
   const [start, end] = getDateRange(contract)
   const answers = useChartAnswers(contract)
-  const topN = Math.min(CHOICE_ANSWER_COLORS.length, answers.length)
+  const betPoints = useMemo(() => getBetPoints(answers, bets), [answers, bets])
-  const betPoints = useMemo(
+  const data = useMemo(
-    () => getBetPoints(answers, bets, topN),
+    () => [
-    [answers, bets, topN]
+      { x: new Date(start), y: answers.map((_) => 0) },
-  )
-  const endProbs = useMemo(
-    () => answers.map((a) => getOutcomeProbability(contract, a.id)),
-    [answers, contract]
-  )
-
-  const data = useMemo(() => {
-    const yCount = answers.length > topN ? topN + 1 : topN
-    const startY = range(0, yCount).map((_) => 0)
-    const endY =
-      answers.length > topN
-        ? [...endProbs.slice(0, topN), sum(endProbs.slice(topN))]
-        : endProbs
-    return [
-      { x: new Date(start), y: startY },
       ...betPoints,
       {
         x: new Date(end ?? Date.now() + DAY_MS),
-        y: endY,
+        y: answers.map((a) => getOutcomeProbability(contract, a.id)),
       },
-    ]
+    ],
-  }, [answers.length, topN, betPoints, endProbs, start, end])
+    [answers, contract, betPoints, start, end]
-
+  )
   const rightmostDate = getRightmostVisibleDate(
     end,
     last(betPoints)?.x?.getTime(),
@@ -154,8 +188,8 @@ export const ChoiceContractChart = (props: {
       const d = xScale.invert(x)
       const legendItems = sortBy(
         data.y.map((p, i) => ({
-          color: CHOICE_ALL_COLORS[i],
+          color: CATEGORY_COLORS[i],
-          label: i === CHOICE_ANSWER_COLORS.length ? 'Other' : answers[i].text,
+          label: answers[i].text,
           value: formatPct(p),
           p,
         })),
@@ -187,7 +221,7 @@ export const ChoiceContractChart = (props: {
       yScale={yScale}
       yKind="percent"
       data={data}
-      colors={CHOICE_ALL_COLORS}
+      colors={CATEGORY_COLORS}
       curve={curveStepAfter}
       onMouseOver={onMouseOver}
       Tooltip={ChoiceTooltip}

web/components/comment-input.tsx

@@ -1,19 +1,12 @@
-import { PaperAirplaneIcon, XCircleIcon } from '@heroicons/react/solid'
+import { PaperAirplaneIcon } from '@heroicons/react/solid'
 import { Editor } from '@tiptap/react'
 import clsx from 'clsx'
-import { Answer } from 'common/answer'
-import { AnyContractType, Contract } from 'common/contract'
 import { User } from 'common/user'
 import { useEffect, useState } from 'react'
 import { useUser } from 'web/hooks/use-user'
 import { MAX_COMMENT_LENGTH } from 'web/lib/firebase/comments'
-import Curve from 'web/public/custom-components/curve'
-import { getAnswerColor } from './answers/answers-panel'
 import { Avatar } from './avatar'
 import { TextEditor, useTextEditor } from './editor'
-import { CommentsAnswer } from './feed/feed-answer-comment-group'
-import { ContractCommentInput } from './feed/feed-comments'
-import { Col } from './layout/col'
 import { Row } from './layout/row'
 import { LoadingIndicator } from './loading-indicator'
 
@@ -24,21 +17,13 @@ export function CommentInput(props: {
   // Reply to another comment
   parentCommentId?: string
   onSubmitComment?: (editor: Editor) => void
-  // unique id for autosave
-  pageId: string
   className?: string
 }) {
-  const {
+  const { parentAnswerOutcome, parentCommentId, replyTo, onSubmitComment } =
-    parentAnswerOutcome,
+    props
-    parentCommentId,
-    replyTo,
-    onSubmitComment,
-    pageId,
-  } = props
   const user = useUser()
 
   const { editor, upload } = useTextEditor({
-    key: `comment ${pageId} ${parentCommentId ?? parentAnswerOutcome ?? ''}`,
     simple: true,
     max: MAX_COMMENT_LENGTH,
     placeholder:
@@ -79,50 +64,6 @@ export function CommentInput(props: {
     </Row>
   )
 }
-export function AnswerCommentInput(props: {
-  contract: Contract<AnyContractType>
-  answerResponse: Answer
-  onCancelAnswerResponse?: () => void
-  answersArray: string[]
-}) {
-  const { contract, answerResponse, onCancelAnswerResponse, answersArray } =
-    props
-  const replyTo = {
-    id: answerResponse.id,
-    username: answerResponse.username,
-  }
-  const color = getAnswerColor(answerResponse, answersArray)
-  return (
-    <>
-      <Col>
-        <Row className="relative">
-          <div className="absolute -bottom-1 left-1.5">
-            <Curve size={32} strokeWidth={1} color="#D8D8EB" />
-          </div>
-          <div className="ml-[38px]">
-            <CommentsAnswer
-              answer={answerResponse}
-              contract={contract}
-              color={color}
-            />
-          </div>
-        </Row>
-        <div className="relative w-full pt-1">
-          <ContractCommentInput
-            contract={contract}
-            parentAnswerOutcome={answerResponse.number.toString()}
-            replyTo={replyTo}
-            onSubmitComment={onCancelAnswerResponse}
-          />
-          <button onClick={onCancelAnswerResponse}>
-            <div className="absolute -top-1 -right-2 h-4 w-4 rounded-full bg-white" />
-            <XCircleIcon className="text-greyscale-5 hover:text-greyscale-6 absolute -top-1 -right-2 h-5 w-5" />
-          </button>
-        </div>
-      </Col>
-    </>
-  )
-}
 
 export function CommentInputTextArea(props: {
   user: User | undefined | null
@@ -139,7 +80,7 @@ export function CommentInputTextArea(props: {
 
   const submit = () => {
     submitComment()
-    editor?.commands?.clearContent(true)
+    editor?.commands?.clearContent()
   }
 
   useEffect(() => {
@@ -166,7 +107,7 @@ export function CommentInputTextArea(props: {
       },
     })
     // insert at mention and focus
-    if (replyTo && editor.isEmpty) {
+    if (replyTo) {
       editor
         .chain()
         .setContent({
@@ -174,7 +115,7 @@ export function CommentInputTextArea(props: {
           attrs: { label: replyTo.username, id: replyTo.id },
         })
         .insertContent(' ')
-        .focus(undefined, { scrollIntoView: false })
+        .focus()
         .run()
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps

web/components/comments/reply-toggle.tsx

@@ -1,29 +0,0 @@
-import clsx from 'clsx'
-import TriangleDownFillIcon from 'web/lib/icons/triangle-down-fill-icon'
-import { Row } from '../layout/row'
-
-export function ReplyToggle(props: {
-  seeReplies: boolean
-  numComments: number
-  onClick: () => void
-}) {
-  const { seeReplies, numComments, onClick } = props
-  return (
-    <button
-      className={clsx(
-        'text-left text-sm text-indigo-600',
-        numComments === 0 ? 'hidden' : ''
-      )}
-      onClick={onClick}
-    >
-      <Row className="items-center gap-1">
-        <div>
-          {numComments} {numComments === 1 ? 'Reply' : 'Replies'}
-        </div>
-        <TriangleDownFillIcon
-          className={clsx('h-2 w-2', seeReplies ? 'rotate-180' : '')}
-        />
-      </Row>
-    </button>
-  )
-}

web/components/contract-search.tsx

@@ -41,8 +41,6 @@ import { AdjustmentsIcon } from '@heroicons/react/solid'
 import { Button } from './button'
 import { Modal } from './layout/modal'
 import { Title } from './title'
-import { Input } from './input'
-import { Select } from './select'
 
 export const SORTS = [
   { label: 'Newest', value: 'newest' },
@@ -50,7 +48,6 @@ export const SORTS = [
   { label: 'Daily trending', value: 'daily-score' },
   { label: '24h volume', value: '24-hour-vol' },
   { label: 'Most popular', value: 'most-popular' },
-  { label: 'Liquidity', value: 'liquidity' },
   { label: 'Last updated', value: 'last-updated' },
   { label: 'Closing soon', value: 'close-date' },
   { label: 'Resolve date', value: 'resolve-date' },
@@ -438,18 +435,18 @@ function ContractSearchControls(props: {
   }
 
   return (
-    <Col className={clsx('bg-greyscale-1 top-0 z-20 gap-3 pb-3', className)}>
+    <Col className={clsx('bg-base-200 top-0 z-20 gap-3 pb-3', className)}>
       <Row className="gap-1 sm:gap-2">
-        <Input
+        <input
           type="text"
           value={query}
           onChange={(e) => updateQuery(e.target.value)}
           onBlur={trackCallback('search', { query: query })}
-          placeholder="Search"
+          placeholder={'Search'}
-          className="w-full"
+          className="input input-bordered w-full"
           autoFocus={autoFocus}
         />
-        {!isMobile && !query && (
+        {!isMobile && (
           <SearchFilters
             filter={filter}
             selectFilter={selectFilter}
@@ -460,7 +457,7 @@ function ContractSearchControls(props: {
             includeProbSorts={includeProbSorts}
           />
         )}
-        {isMobile && !query && (
+        {isMobile && (
           <>
             <MobileSearchBar
               children={
@@ -544,7 +541,8 @@ export function SearchFilters(props: {
 
   return (
     <div className={className}>
-      <Select
+      <select
+        className="select select-bordered"
         value={filter}
         onChange={(e) => selectFilter(e.target.value as filter)}
       >
@@ -552,9 +550,10 @@ export function SearchFilters(props: {
         <option value="closed">Closed</option>
         <option value="resolved">Resolved</option>
         <option value="all">All</option>
-      </Select>
+      </select>
       {!hideOrderSelector && (
-        <Select
+        <select
+          className="select select-bordered"
           value={sort}
           onChange={(e) => selectSort(e.target.value as Sort)}
         >
@@ -563,7 +562,7 @@ export function SearchFilters(props: {
               {option.label}
             </option>
           ))}
-        </Select>
+        </select>
       )}
     </div>
   )

web/components/contract/add-comment-bounty.tsx

@@ -4,19 +4,13 @@ import { useState } from 'react'
 import { addCommentBounty } from 'web/lib/firebase/api'
 import { track } from 'web/lib/service/analytics'
 import { Row } from 'web/components/layout/row'
+import clsx from 'clsx'
 import { formatMoney } from 'common/util/format'
 import { COMMENT_BOUNTY_AMOUNT } from 'common/economy'
 import { Button } from 'web/components/button'
-import { Title } from '../title'
-import { Col } from '../layout/col'
-import { Modal } from '../layout/modal'
 
-export function CommentBountyDialog(props: {
+export function AddCommentBountyPanel(props: { contract: Contract }) {
-  contract: Contract
+  const { contract } = props
-  open: boolean
-  setOpen: (open: boolean) => void
-}) {
-  const { contract, open, setOpen } = props
   const { id: contractId, slug } = contract
 
   const user = useUser()
@@ -51,34 +45,30 @@ export function CommentBountyDialog(props: {
   }
 
   return (
-    <Modal open={open} setOpen={setOpen}>
+    <>
-      <Col className="gap-4 rounded bg-white p-6">
+      <div className="mb-4 text-gray-500">
-        <Title className="!mt-0 !mb-0" text="Comment bounty" />
+        Add a {formatMoney(amount)} bounty for good comments that the creator
+        can award.{' '}
+        {totalAdded > 0 && `(${formatMoney(totalAdded)} currently added)`}
+      </div>
 
-        <div className="mb-4 text-gray-500">
+      <Row className={'items-center gap-2'}>
-          Add a {formatMoney(amount)} bounty for good comments that the creator
+        <Button
-          can award.{' '}
+          className={clsx('ml-2', isLoading && 'btn-disabled')}
-          {totalAdded > 0 && `(${formatMoney(totalAdded)} currently added)`}
+          onClick={submit}
-        </div>
+          disabled={isLoading}
+          color={'blue'}
+        >
+          Add {formatMoney(amount)} bounty
+        </Button>
+        <span className={'text-error'}>{error}</span>
+      </Row>
 
-        <Row className={'items-center gap-2'}>
+      {isSuccess && amount && (
-          <Button
+        <div>Success! Added {formatMoney(amount)} in bounties.</div>
-            className="ml-2"
+      )}
-            onClick={submit}
-            disabled={isLoading}
-            color={'blue'}
-          >
-            Add {formatMoney(amount)} bounty
-          </Button>
-          <span className={'text-error'}>{error}</span>
-        </Row>
 
-        {isSuccess && amount && (
+      {isLoading && <div>Processing...</div>}
-          <div>Success! Added {formatMoney(amount)} in bounties.</div>
+    </>
-        )}
-
-        {isLoading && <div>Processing...</div>}
-      </Col>
-    </Modal>
   )
 }