should work in theory?

.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/antes.ts

@@ -15,12 +15,8 @@ import { Answer } from './answer'
 
 export const HOUSE_LIQUIDITY_PROVIDER_ID = 'IPTOzEqrpkWmEzh6hwvAyY9PqFb2' // @ManifoldMarkets' id
 export const DEV_HOUSE_LIQUIDITY_PROVIDER_ID = '94YYTk1AFWfbWMpfYcvnnwI1veP2' // @ManifoldMarkets' id
-export const UNIQUE_BETTOR_LIQUIDITY_AMOUNT = 20
 
-type NormalizedBet<T extends Bet = Bet> = Omit<
+export const UNIQUE_BETTOR_LIQUIDITY_AMOUNT = 20
-  T,
-  'userAvatarUrl' | 'userName' | 'userUsername'
->
 
 export function getCpmmInitialLiquidity(
   providerId: string,
@@ -57,7 +53,7 @@ export function getAnteBets(
 
   const { createdTime } = contract
 
-  const yesBet: NormalizedBet = {
+  const yesBet: Bet = {
     id: yesAnteId,
     userId: creator.id,
     contractId: contract.id,
@@ -71,7 +67,7 @@ export function getAnteBets(
     fees: noFees,
   }
 
-  const noBet: NormalizedBet = {
+  const noBet: Bet = {
     id: noAnteId,
     userId: creator.id,
     contractId: contract.id,
@@ -99,7 +95,7 @@ export function getFreeAnswerAnte(
 
   const { createdTime } = contract
 
-  const anteBet: NormalizedBet = {
+  const anteBet: Bet = {
     id: anteBetId,
     userId: anteBettorId,
     contractId: contract.id,
@@ -129,7 +125,7 @@ export function getMultipleChoiceAntes(
 
   const { createdTime } = contract
 
-  const bets: NormalizedBet[] = answers.map((answer, i) => ({
+  const bets: Bet[] = answers.map((answer, i) => ({
     id: betDocIds[i],
     userId: creator.id,
     contractId: contract.id,
@@ -179,7 +175,7 @@ export function getNumericAnte(
     range(0, bucketCount).map((_, i) => [i, betAnte])
   )
 
-  const anteBet: NormalizedBet<NumericBet> = {
+  const anteBet: NumericBet = {
     id: newBetId,
     userId: anteBettorId,
     contractId: contract.id,

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/bet.ts

@@ -3,12 +3,6 @@ import { Fees } from './fees'
 export type Bet = {
   id: string
   userId: string
-
-  // denormalized for bet lists
-  userAvatarUrl?: string
-  userUsername: string
-  userName: string
-
   contractId: string
   createdTime: number
 

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[],
@@ -29,93 +21,6 @@ const computeInvestmentValue = (
   })
 }
 
-export const computeInvestmentValueCustomProb = (
-  bets: Bet[],
-  contract: Contract,
-  p: number
-) => {
-  return sumBy(bets, (bet) => {
-    if (!contract || contract.isResolved) return 0
-    if (bet.sale || bet.isSold) return 0
-    const { outcome, shares } = bet
-
-    const betP = outcome === 'YES' ? p : 1 - p
-
-    const value = betP * shares
-    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 +104,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 +126,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

@@ -1,4 +1,4 @@
-import { maxBy, partition, sortBy, sum, sumBy } from 'lodash'
+import { maxBy, sortBy, sum, sumBy } from 'lodash'
 import { Bet, LimitBet } from './bet'
 import {
   calculateCpmmSale,
@@ -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)
 }
@@ -146,20 +142,17 @@ function getCpmmInvested(yourBets: Bet[]) {
     const { outcome, shares, amount } = bet
     if (floatingEqual(shares, 0)) continue
 
-    const spent = totalSpent[outcome] ?? 0
-    const position = totalShares[outcome] ?? 0
-
     if (amount > 0) {
-      totalShares[outcome] = position + shares
+      totalShares[outcome] = (totalShares[outcome] ?? 0) + shares
-      totalSpent[outcome] = spent + amount
+      totalSpent[outcome] = (totalSpent[outcome] ?? 0) + amount
     } else if (amount < 0) {
-      const averagePrice = position === 0 ? 0 : spent / position
+      const averagePrice = totalSpent[outcome] / totalShares[outcome]
-      totalShares[outcome] = position + shares
+      totalShares[outcome] = totalShares[outcome] + shares
-      totalSpent[outcome] = spent + averagePrice * shares
+      totalSpent[outcome] = totalSpent[outcome] + averagePrice * shares
     }
   }
 
-  return sum([0, ...Object.values(totalSpent)])
+  return sum(Object.values(totalSpent))
 }
 
 function getDpmInvested(yourBets: Bet[]) {
@@ -178,8 +171,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'
@@ -216,8 +207,9 @@ export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) {
     }
   }
 
+  const netPayout = payout - loan
   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(
@@ -226,8 +218,8 @@ export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) {
 
   return {
     invested,
-    loan,
     payout,
+    netPayout,
     profit,
     profitPercent,
     totalShares,
@@ -238,8 +230,8 @@ export function getContractBetMetrics(contract: Contract, yourBets: Bet[]) {
 export function getContractBetNullMetrics() {
   return {
     invested: 0,
-    loan: 0,
     payout: 0,
+    netPayout: 0,
     profit: 0,
     profitPercent: 0,
     totalShares: {} as { [outcome: string]: number },
@@ -260,43 +252,3 @@ export function getTopAnswer(
   )
   return top?.answer
 }
-
-export function getLargestPosition(contract: Contract, userBets: Bet[]) {
-  let yesFloorShares = 0,
-    yesShares = 0,
-    noShares = 0,
-    noFloorShares = 0
-
-  if (userBets.length === 0) {
-    return null
-  }
-  if (contract.outcomeType === 'FREE_RESPONSE') {
-    const answerCounts: { [outcome: string]: number } = {}
-    for (const bet of userBets) {
-      if (bet.outcome) {
-        if (!answerCounts[bet.outcome]) {
-          answerCounts[bet.outcome] = bet.amount
-        } else {
-          answerCounts[bet.outcome] += bet.amount
-        }
-      }
-    }
-    const majorityAnswer =
-      maxBy(Object.keys(answerCounts), (outcome) => answerCounts[outcome]) ?? ''
-    return {
-      prob: undefined,
-      shares: answerCounts[majorityAnswer] || 0,
-      outcome: majorityAnswer,
-    }
-  }
-
-  const [yesBets, noBets] = partition(userBets, (bet) => bet.outcome === 'YES')
-  yesShares = sumBy(yesBets, (bet) => bet.shares)
-  noShares = sumBy(noBets, (bet) => bet.shares)
-  yesFloorShares = Math.floor(yesShares)
-  noFloorShares = Math.floor(noShares)
-
-  const shares = yesFloorShares || noFloorShares
-  const outcome = yesFloorShares > noFloorShares ? 'YES' : 'NO'
-  return { shares, outcome }
-}

common/charity.ts

@@ -589,15 +589,6 @@ CaRLA uses legal advocacy and education to ensure all cities comply with their o
 
 In addition to housing impact litigation, we provide free legal aid, education and workshops, counseling and advocacy to advocates, homeowners, small developers, and city and state government officials.`,
   },
-  {
-    name: 'Mriya',
-    website: 'https://mriya-ua.org/',
-    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:
-      'Donate supplies to soldiers in Ukraine, including tourniquets and plate carriers.',
-  },
 ].map((charity) => {
   const slug = charity.name.toLowerCase().replace(/\s/g, '-')
   return {

common/comment.ts

@@ -18,7 +18,6 @@ export type Comment<T extends AnyCommentType = AnyCommentType> = {
   userName: string
   userUsername: string
   userAvatarUrl?: string
-  bountiesAwarded?: number
 } & T
 
 export type OnContract = {
@@ -34,11 +33,6 @@ export type OnContract = {
   // denormalized from bet
   betAmount?: number
   betOutcome?: string
-
-  // denormalized based on betting history
-  commenterPositionProb?: number // binary only
-  commenterPositionShares?: number
-  commenterPositionOutcome?: string
 }
 
 export type OnGroup = {

common/contract-details.ts

@@ -30,7 +30,7 @@ export function contractTextDetails(contract: Contract) {
   const { closeTime, groupLinks } = contract
   const { createdDate, resolvedDate, volumeLabel } = contractMetrics(contract)
 
-  const groupHashtags = groupLinks?.map((g) => `#${g.name.replace(/ /g, '')}`)
+  const groupHashtags = groupLinks?.slice(0, 5).map((g) => `#${g.name}`)
 
   return (
     `${resolvedDate ? `${createdDate} - ${resolvedDate}` : createdDate}` +

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
 
@@ -59,14 +57,10 @@ export type Contract<T extends AnyContractType = AnyContractType> = {
   uniqueBettorIds?: string[]
   uniqueBettorCount?: number
   popularityScore?: number
-  dailyScore?: number
   followerCount?: number
   featuredOnHomeRank?: number
   likedByUserIds?: string[]
   likedByUserCount?: number
-  flaggedByUsernames?: string[]
-  openCommentBounties?: number
-  unlistedById?: string
 } & T
 
 export type BinaryContract = Contract & Binary
@@ -92,8 +86,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
@@ -155,7 +148,7 @@ export const OUTCOME_TYPES = [
   'NUMERIC',
 ] as const
 
-export const MAX_QUESTION_LENGTH = 240
+export const MAX_QUESTION_LENGTH = 480
 export const MAX_DESCRIPTION_LENGTH = 16000
 export const MAX_TAG_LENGTH = 60
 

common/economy.ts

@@ -7,14 +7,11 @@ export const FIXED_ANTE = econ?.FIXED_ANTE ?? 100
 export const STARTING_BALANCE = econ?.STARTING_BALANCE ?? 1000
 // for sus users, i.e. multiple sign ups for same person
 export const SUS_STARTING_BALANCE = econ?.SUS_STARTING_BALANCE ?? 10
-export const REFERRAL_AMOUNT = econ?.REFERRAL_AMOUNT ?? 250
+export const REFERRAL_AMOUNT = econ?.REFERRAL_AMOUNT ?? 500
 
 export const UNIQUE_BETTOR_BONUS_AMOUNT = econ?.UNIQUE_BETTOR_BONUS_AMOUNT ?? 10
 export const BETTING_STREAK_BONUS_AMOUNT =
-  econ?.BETTING_STREAK_BONUS_AMOUNT ?? 5
+  econ?.BETTING_STREAK_BONUS_AMOUNT ?? 10
-export const BETTING_STREAK_BONUS_MAX = econ?.BETTING_STREAK_BONUS_MAX ?? 25
+export const BETTING_STREAK_BONUS_MAX = econ?.BETTING_STREAK_BONUS_MAX ?? 50
-export const BETTING_STREAK_RESET_HOUR = econ?.BETTING_STREAK_RESET_HOUR ?? 7
+export const BETTING_STREAK_RESET_HOUR = econ?.BETTING_STREAK_RESET_HOUR ?? 0
 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/constants.ts

@@ -21,10 +21,7 @@ export function isWhitelisted(email?: string) {
 }
 
 // TODO: Before open sourcing, we should turn these into env vars
-export function isAdmin(email?: string) {
+export function isAdmin(email: string) {
-  if (!email) {
-    return false
-  }
   return ENV_CONFIG.adminEmails.includes(email)
 }
 

common/envs/dev.ts

@@ -16,6 +16,4 @@ export const DEV_CONFIG: EnvConfig = {
   cloudRunId: 'w3txbmd3ba',
   cloudRunRegion: 'uc',
   amplitudeApiKey: 'fd8cbfd964b9a205b8678a39faae71b3',
-  twitchBotEndpoint: 'https://dev-twitch-bot.manifold.markets',
-  sprigEnvironmentId: 'Tu7kRZPm7daP',
 }

common/envs/prod.ts

@@ -2,8 +2,6 @@ export type EnvConfig = {
   domain: string
   firebaseConfig: FirebaseConfig
   amplitudeApiKey?: string
-  twitchBotEndpoint?: string
-  sprigEnvironmentId?: string
 
   // IDs for v2 cloud functions -- find these by deploying a cloud function and
   // examining the URL, https://[name]-[cloudRunId]-[cloudRunRegion].a.run.app
@@ -17,9 +15,6 @@ export type EnvConfig = {
 
   // Branding
   moneyMoniker: string // e.g. 'M$'
-  bettor?: string // e.g. 'bettor' or 'predictor'
-  presentBet?: string // e.g. 'bet' or 'predict'
-  pastBet?: string // e.g. 'bet' or 'prediction'
   faviconPath?: string // Should be a file in /public
   navbarLogoPath?: string
   newQuestionPlaceholders: string[]
@@ -41,7 +36,6 @@ export type Economy = {
   BETTING_STREAK_BONUS_MAX?: number
   BETTING_STREAK_RESET_HOUR?: number
   FREE_MARKETS_PER_USER_MAX?: number
-  COMMENT_BOUNTY_AMOUNT?: number
 }
 
 type FirebaseConfig = {
@@ -58,7 +52,6 @@ type FirebaseConfig = {
 export const PROD_CONFIG: EnvConfig = {
   domain: 'manifold.markets',
   amplitudeApiKey: '2d6509fd4185ebb8be29709842752a15',
-  sprigEnvironmentId: 'sQcrq9TDqkib',
 
   firebaseConfig: {
     apiKey: 'AIzaSyDp3J57vLeAZCzxLD-vcPaGIkAmBoGOSYw',
@@ -70,7 +63,6 @@ export const PROD_CONFIG: EnvConfig = {
     appId: '1:128925704902:web:f61f86944d8ffa2a642dc7',
     measurementId: 'G-SSFK1Q138D',
   },
-  twitchBotEndpoint: 'https://twitch-bot.manifold.markets',
   cloudRunId: 'nggbo3neva',
   cloudRunRegion: 'uc',
   adminEmails: [
@@ -82,14 +74,10 @@ export const PROD_CONFIG: EnvConfig = {
     'iansphilips@gmail.com', // Ian
     'd4vidchee@gmail.com', // D4vid
     'federicoruizcassarino@gmail.com', // Fede
-    'ingawei@gmail.com', //Inga
   ],
   visibility: 'PUBLIC',
 
   moneyMoniker: 'M$',
-  bettor: 'trader',
-  pastBet: 'trade',
-  presentBet: 'trade',
   navbarLogoPath: '',
   faviconPath: '/favicon.ico',
   newQuestionPlaceholders: [

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/follow.ts

@@ -2,8 +2,3 @@ export type Follow = {
   userId: string
   timestamp: number
 }
-
-export type ContractFollow = {
-  id: string // user id
-  createdTime: number
-}

common/globalConfig.ts

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

common/group.ts

@@ -10,7 +10,6 @@ export type Group = {
   totalContracts: number
   totalMembers: number
   aboutPostId?: string
-  postIds: string[]
   chatDisabled?: boolean
   mostRecentContractAddedTime?: number
   cachedLeaderboard?: {
@@ -23,7 +22,6 @@ export type Group = {
       score: number
     }[]
   }
-  pinnedItems: { itemId: string; type: 'post' | 'contract' }[]
 }
 
 export const MAX_GROUP_NAME_LENGTH = 75
@@ -39,4 +37,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 LIKE_TIP_AMOUNT = 5
-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'
@@ -30,10 +31,7 @@ import {
   floatingLesserEqual,
 } from './util/math'
 
-export type CandidateBet<T extends Bet = Bet> = Omit<
+export type CandidateBet<T extends Bet = Bet> = Omit<T, 'id' | 'userId'>
-  T,
-  'id' | 'userId' | 'userAvatarUrl' | 'userName' | 'userUsername'
->
 export type BetInfo = {
   newBet: CandidateBet
   newPool?: { [outcome: string]: number }
@@ -143,8 +141,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 +163,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 +183,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 +193,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 +201,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 +244,6 @@ export const getBinaryCpmmBetInfo = (
     newP: cpmmState.p,
     newTotalLiquidity,
     makers,
-    ordersToCancel,
   }
 }
 
@@ -271,16 +252,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 +322,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

@@ -12,6 +12,7 @@ import {
   visibility,
 } from './contract'
 import { User } from './user'
+import { parseTags, richTextToString } from './util/parse'
 import { removeUndefinedProps } from './util/object'
 import { JSONContent } from '@tiptap/core'
 
@@ -37,6 +38,15 @@ export function getNewContract(
   answers: string[],
   visibility: visibility
 ) {
+  const tags = parseTags(
+    [
+      question,
+      richTextToString(description),
+      ...extraTags.map((tag) => `#${tag}`),
+    ].join(' ')
+  )
+  const lowercaseTags = tags.map((tag) => tag.toLowerCase())
+
   const propsByOutcomeType =
     outcomeType === 'BINARY'
       ? getBinaryCpmmProps(initialProb, ante) // getBinaryDpmProps(initialProb, ante)
@@ -60,10 +70,9 @@ export function getNewContract(
 
     question: question.trim(),
     description,
-    tags: [],
+    tags,
-    lowercaseTags: [],
+    lowercaseTags,
     visibility,
-    unlistedById: visibility === 'unlisted' ? creator.id : undefined,
     isResolved: false,
     createdTime: Date.now(),
     closeTime,
@@ -71,7 +80,6 @@ export function getNewContract(
     volume: 0,
     volume24Hours: 0,
     volume7Days: 0,
-    elasticity: propsByOutcomeType.mechanism === 'cpmm-1' ? 0.38 : 0.75,
 
     collectedFees: {
       creatorFee: 0,
@@ -112,7 +120,6 @@ const getBinaryCpmmProps = (initialProb: number, ante: number) => {
     mechanism: 'cpmm-1',
     outcomeType: 'BINARY',
     totalLiquidity: ante,
-    subsidyPool: 0,
     initialProbability: p,
     p,
     pool: pool,

common/notification.ts

@@ -1,10 +1,11 @@
-import { notification_preference } from './user-notification-preferences'
+import { notification_subscription_types, PrivateUser } from './user'
+import { DOMAIN } from './envs/constants'
 
 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
@@ -17,7 +18,7 @@ export type Notification = {
   sourceUserUsername?: string
   sourceUserAvatarUrl?: string
   sourceText?: string
-  data?: { [key: string]: any }
+  data?: string
 
   sourceContractTitle?: string
   sourceContractCreatorUsername?: string
@@ -28,7 +29,6 @@ export type Notification = {
 
   isSeenOnHref?: string
 }
-
 export type notification_source_types =
   | 'contract'
   | 'comment'
@@ -46,7 +46,6 @@ export type notification_source_types =
   | 'loan'
   | 'like'
   | 'tip_and_like'
-  | 'badge'
 
 export type notification_source_update_types =
   | 'created'
@@ -55,7 +54,7 @@ export type notification_source_update_types =
   | 'deleted'
   | 'closed'
 
-/* Optional - if possible use a notification_preference */
+/* Optional - if possible use a keyof notification_subscription_types */
 export type notification_reason_types =
   | 'tagged_user'
   | 'on_new_follow'
@@ -93,178 +92,68 @@ export type notification_reason_types =
   | 'your_contract_closed'
   | 'subsidized_your_market'
 
-type notification_descriptions = {
+// Adding a new key:value here is optional, you can just use a key of notification_subscription_types
-  [key in notification_preference]: {
+// You might want to add a key:value here if there will be multiple notification reasons that map to the same
-    simple: string
+// subscription type, i.e. 'comment_on_contract_you_follow' and 'comment_on_contract_with_users_answer' both map to
-    detailed: string
+// 'all_comments_on_watched_markets' subscription type
-    necessary?: boolean
+// TODO: perhaps better would be to map notification_subscription_types to arrays of notification_reason_types
-  }
+export const notificationReasonToSubscriptionType: Partial<
-}
+  Record<notification_reason_types, keyof notification_subscription_types>
-export const NOTIFICATION_DESCRIPTIONS: notification_descriptions = {
+> = {
-  all_answers_on_my_markets: {
+  you_referred_user: 'referral_bonuses',
-    simple: 'Answers on your markets',
+  user_joined_to_bet_on_your_market: 'referral_bonuses',
-    detailed: 'Answers on your own markets',
+  tip_received: 'tips_on_your_comments',
-  },
+  bet_fill: 'limit_order_fills',
-  all_comments_on_my_markets: {
+  user_joined_from_your_group_invite: 'referral_bonuses',
-    simple: 'Comments on your markets',
+  challenge_accepted: 'limit_order_fills',
-    detailed: 'Comments on your own markets',
+  betting_streak_incremented: 'betting_streaks',
-  },
+  liked_and_tipped_your_contract: 'tips_on_your_markets',
-  answers_by_followed_users_on_watched_markets: {
+  comment_on_your_contract: 'all_comments_on_my_markets',
-    simple: 'Only answers by users you follow',
+  answer_on_your_contract: 'all_answers_on_my_markets',
-    detailed: "Only answers by users you follow on markets you're watching",
+  comment_on_contract_you_follow: 'all_comments_on_watched_markets',
-  },
+  answer_on_contract_you_follow: 'all_answers_on_watched_markets',
-  answers_by_market_creator_on_watched_markets: {
+  update_on_contract_you_follow: 'market_updates_on_watched_markets',
-    simple: 'Only answers by market creator',
+  resolution_on_contract_you_follow: 'resolutions_on_watched_markets',
-    detailed: "Only answers by market creator on markets you're watching",
+  comment_on_contract_with_users_shares_in:
-  },
+    'all_comments_on_contracts_with_shares_in_on_watched_markets',
-  betting_streaks: {
+  answer_on_contract_with_users_shares_in:
-    simple: `For prediction streaks`,
+    'all_answers_on_contracts_with_shares_in_on_watched_markets',
-    detailed: `Bonuses for predictions made over consecutive days (Prediction streaks)})`,
+  update_on_contract_with_users_shares_in:
-  },
+    'market_updates_on_watched_markets_with_shares_in',
-  comments_by_followed_users_on_watched_markets: {
+  resolution_on_contract_with_users_shares_in:
-    simple: 'Only comments by users you follow',
+    'resolutions_on_watched_markets_with_shares_in',
-    detailed:
+  comment_on_contract_with_users_answer: 'all_comments_on_watched_markets',
-      'Only comments by users that you follow on markets that you watch',
+  update_on_contract_with_users_answer: 'market_updates_on_watched_markets',
-  },
+  resolution_on_contract_with_users_answer: 'resolutions_on_watched_markets',
-  contract_from_followed_user: {
+  answer_on_contract_with_users_answer: 'all_answers_on_watched_markets',
-    simple: 'New markets from users you follow',
+  comment_on_contract_with_users_comment: 'all_comments_on_watched_markets',
-    detailed: 'New markets from users you follow',
+  answer_on_contract_with_users_comment: 'all_answers_on_watched_markets',
-  },
+  update_on_contract_with_users_comment: 'market_updates_on_watched_markets',
-  limit_order_fills: {
+  resolution_on_contract_with_users_comment: 'resolutions_on_watched_markets',
-    simple: 'Limit order fills',
+  reply_to_users_answer: 'all_replies_to_my_answers_on_watched_markets',
-    detailed: 'When your limit order is filled by another user',
+  reply_to_users_comment: 'all_replies_to_my_comments_on_watched_markets',
-  },
-  loan_income: {
-    simple: 'Automatic loans from your predictions in unresolved markets',
-    detailed:
-      'Automatic loans from your predictions that are locked in unresolved markets',
-  },
-  market_updates_on_watched_markets: {
-    simple: 'All creator updates',
-    detailed: 'All market updates made by the creator',
-  },
-  market_updates_on_watched_markets_with_shares_in: {
-    simple: "Only creator updates on markets that you're invested in",
-    detailed:
-      "Only updates made by the creator on markets that you're invested in",
-  },
-  on_new_follow: {
-    simple: 'A user followed you',
-    detailed: 'A user followed you',
-  },
-  onboarding_flow: {
-    simple: 'Emails to help you get started using Manifold',
-    detailed: 'Emails to help you learn how to use Manifold',
-  },
-  probability_updates_on_watched_markets: {
-    simple: 'Large changes in probability on markets that you watch',
-    detailed: 'Large changes in probability on markets that you watch',
-  },
-  profit_loss_updates: {
-    simple: 'Weekly portfolio updates',
-    detailed: 'Weekly portfolio updates',
-  },
-  referral_bonuses: {
-    simple: 'For referring new users',
-    detailed: 'Bonuses you receive from referring a new user',
-  },
-  resolutions_on_watched_markets: {
-    simple: 'All market resolutions',
-    detailed: "All resolutions on markets that you're watching",
-  },
-  resolutions_on_watched_markets_with_shares_in: {
-    simple: "Only market resolutions that you're invested in",
-    detailed:
-      "Only resolutions of markets you're watching and that you're invested in",
-  },
-  subsidized_your_market: {
-    simple: 'Your market was subsidized',
-    detailed: 'When someone subsidizes your market',
-  },
-  tagged_user: {
-    simple: 'A user tagged you',
-    detailed: 'When another use tags you',
-  },
-  thank_you_for_purchases: {
-    simple: 'Thank you notes for your purchases',
-    detailed: 'Thank you notes for your purchases',
-  },
-  tipped_comments_on_watched_markets: {
-    simple: 'Only highly tipped comments on markets that you watch',
-    detailed: 'Only highly tipped comments on markets that you watch',
-  },
-  tips_on_your_comments: {
-    simple: 'Tips on your comments',
-    detailed: 'Tips on your comments',
-  },
-  tips_on_your_markets: {
-    simple: 'Tips/Likes on your markets',
-    detailed: 'Tips/Likes on your markets',
-  },
-  trending_markets: {
-    simple: 'Weekly interesting markets',
-    detailed: 'Weekly interesting markets',
-  },
-  unique_bettors_on_your_contract: {
-    simple: 'For unique predictors on your markets',
-    detailed: 'Bonuses for unique predictors on your markets',
-  },
-  your_contract_closed: {
-    simple: 'Your market has closed and you need to resolve it (necessary)',
-    detailed: 'Your market has closed and you need to resolve it (necessary)',
-    necessary: true,
-  },
-  all_comments_on_watched_markets: {
-    simple: 'All new comments',
-    detailed: 'All new comments on markets you follow',
-  },
-  all_comments_on_contracts_with_shares_in_on_watched_markets: {
-    simple: `Only on markets you're invested in`,
-    detailed: `Comments on markets that you're watching and you're invested in`,
-  },
-  all_replies_to_my_comments_on_watched_markets: {
-    simple: 'Only replies to your comments',
-    detailed: "Only replies to your comments on markets you're watching",
-  },
-  all_replies_to_my_answers_on_watched_markets: {
-    simple: 'Only replies to your answers',
-    detailed: "Only replies to your answers on markets you're watching",
-  },
-  all_answers_on_watched_markets: {
-    simple: 'All new answers',
-    detailed: "All new answers on markets you're watching",
-  },
-  all_answers_on_contracts_with_shares_in_on_watched_markets: {
-    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:
-      'Opt out of all notifications excluding your own market closure notifications',
-  },
 }
 
-export type BettingStreakData = {
+export const getDestinationsForUser = async (
-  streak: number
+  privateUser: PrivateUser,
-  bonusAmount: number
+  reason: notification_reason_types | keyof notification_subscription_types
+) => {
+  const notificationSettings = privateUser.notificationSubscriptionTypes
+  let destinations
+  let subscriptionType: keyof notification_subscription_types | undefined
+  if (Object.keys(notificationSettings).includes(reason)) {
+    subscriptionType = reason as keyof notification_subscription_types
+    destinations = notificationSettings[subscriptionType]
+  } else {
+    const key = reason as notification_reason_types
+    subscriptionType = notificationReasonToSubscriptionType[key]
+    destinations = subscriptionType
+      ? notificationSettings[subscriptionType]
+      : []
   }
-
+  return {
-export type BetFillData = {
+    sendToEmail: destinations.includes('email'),
-  betOutcome: string
+    sendToBrowser: destinations.includes('browser'),
-  creatorOutcome: string
+    urlToManageThisNotification: `${DOMAIN}/notifications?tab=settings&section=${subscriptionType}`,
-  probability: number
-  fillAmount: number
-  limitOrderTotal?: number
-  limitOrderRemaining?: number
   }
-
-export type ContractResolutionData = {
-  outcome: string
-  userPayout: number
-  userInvestment: number
 }

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-dpm.ts

@@ -168,7 +168,7 @@ export const getPayoutsMultiOutcome = (
     const winnings = (shares / sharesByOutcome[outcome]) * prob * poolTotal
     const profit = winnings - amount
 
-    const payout = amount + (1 - DPM_FEES) * profit
+    const payout = amount + (1 - DPM_FEES) * Math.max(0, profit)
     return { userId, profit, payout }
   })
 

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

@@ -3,27 +3,10 @@ import { JSONContent } from '@tiptap/core'
 export type Post = {
   id: string
   title: string
-  subtitle: string
   content: JSONContent
   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 & {
-  bounty: number
-  birthday: number
-  type: 'date-doc'
-  contractSlug: string
 }
 
 export const MAX_POST_TITLE_LENGTH = 480
-export const MAX_POST_SUBTITLE_LENGTH = 480

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

@@ -9,10 +9,7 @@ import { CPMMContract, DPMContract } from './contract'
 import { DPM_CREATOR_FEE, DPM_PLATFORM_FEE, Fees } from './fees'
 import { sumBy } from 'lodash'
 
-export type CandidateBet<T extends Bet> = Omit<
+export type CandidateBet<T extends Bet> = Omit<T, 'id' | 'userId'>
-  T,
-  'id' | 'userId' | 'userAvatarUrl' | 'userName' | 'userUsername'
->
 
 export const getSellBetInfo = (bet: Bet, contract: DPMContract) => {
   const { pool, totalShares, totalBets } = contract
@@ -84,17 +81,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 +131,5 @@ export const getCpmmSellBetInfo = (
     fees,
     makers,
     takers,
-    ordersToCancel
   }
 }

common/stats.ts

@@ -1,22 +1,20 @@
 export type Stats = {
   startDate: number
   dailyActiveUsers: number[]
-  dailyActiveUsersWeeklyAvg: number[]
   weeklyActiveUsers: number[]
   monthlyActiveUsers: number[]
-  d1: number[]
-  d1WeeklyAvg: number[]
-  nd1: number[]
-  nd1WeeklyAvg: number[]
-  nw1: number[]
   dailyBetCounts: number[]
   dailyContractCounts: number[]
   dailyCommentCounts: number[]
   dailySignups: number[]
   weekOnWeekRetention: number[]
   monthlyRetention: number[]
-  dailyActivationRate: number[]
+  weeklyActivationRate: number[]
-  dailyActivationRateWeeklyAvg: number[]
+  topTenthActions: {
+    daily: number[]
+    weekly: number[]
+    monthly: number[]
+  }
   manaBet: {
     daily: number[]
     weekly: number[]

common/txn.ts

@@ -1,14 +1,6 @@
 // A txn (pronounced "texan") respresents a payment between two ids on Manifold
 // Shortened from "transaction" to distinguish from Firebase transactions (and save chars)
-type AnyTxnType =
+type AnyTxnType = Donation | Tip | Manalink | Referral | Bonus
-  | Donation
-  | Tip
-  | Manalink
-  | Referral
-  | UniqueBettorBonus
-  | BettingStreakBonus
-  | CancelUniqueBettorBonus
-  | CommentBountyRefund
 type SourceType = 'USER' | 'CONTRACT' | 'CHARITY' | 'BANK'
 
 export type Txn<T extends AnyTxnType = AnyTxnType> = {
@@ -31,9 +23,6 @@ export type Txn<T extends AnyTxnType = AnyTxnType> = {
     | 'REFERRAL'
     | 'UNIQUE_BETTOR_BONUS'
     | 'BETTING_STREAK_BONUS'
-    | 'CANCEL_UNIQUE_BETTOR_BONUS'
-    | 'COMMENT_BOUNTY'
-    | 'REFUND_COMMENT_BOUNTY'
 
   // Any extra data
   data?: { [key: string]: any }
@@ -71,70 +60,13 @@ type Referral = {
   category: 'REFERRAL'
 }
 
-type UniqueBettorBonus = {
+type Bonus = {
   fromType: 'BANK'
   toType: 'USER'
-  category: 'UNIQUE_BETTOR_BONUS'
+  category: 'UNIQUE_BETTOR_BONUS' | 'BETTING_STREAK_BONUS'
-  data: {
-    contractId: string
-    uniqueNewBettorId?: string
-    // Old unique bettor bonus txns stored all unique bettor ids
-    uniqueBettorIds?: string[]
-  }
-}
-
-type BettingStreakBonus = {
-  fromType: 'BANK'
-  toType: 'USER'
-  category: 'BETTING_STREAK_BONUS'
-  data: {
-    currentBettingStreak?: number
-  }
-}
-
-type CancelUniqueBettorBonus = {
-  fromType: 'USER'
-  toType: 'BANK'
-  category: 'CANCEL_UNIQUE_BETTOR_BONUS'
-  data: {
-    contractId: string
-  }
-}
-
-type CommentBountyDeposit = {
-  fromType: 'USER'
-  toType: 'BANK'
-  category: 'COMMENT_BOUNTY'
-  data: {
-    contractId: string
-  }
-}
-
-type CommentBountyWithdrawal = {
-  fromType: 'BANK'
-  toType: 'USER'
-  category: 'COMMENT_BOUNTY'
-  data: {
-    contractId: string
-    commentId: string
-  }
-}
-
-type CommentBountyRefund = {
-  fromType: 'BANK'
-  toType: 'USER'
-  category: 'REFUND_COMMENT_BOUNTY'
-  data: {
-    contractId: string
-  }
 }
 
 export type DonationTxn = Txn & Donation
 export type TipTxn = Txn & Tip
 export type ManalinkTxn = Txn & Manalink
 export type ReferralTxn = Txn & Referral
-export type BettingStreakBonusTxn = Txn & BettingStreakBonus
-export type UniqueBettorBonusTxn = Txn & UniqueBettorBonus
-export type CancelUniqueBettorBonusTxn = Txn & CancelUniqueBettorBonus
-export type CommentBountyDepositTxn = Txn & CommentBountyDeposit
-export type CommentBountyWithdrawalTxn = Txn & CommentBountyWithdrawal

common/user-notification-preferences.ts

@@ -1,222 +0,0 @@
-import { filterDefined } from './util/array'
-import { notification_reason_types } from './notification'
-import { getFunctionUrl } from './api'
-import { DOMAIN } from './envs/constants'
-import { PrivateUser } from './user'
-
-export type notification_destination_types = 'email' | 'browser'
-export type notification_preference = keyof notification_preferences
-export type notification_preferences = {
-  // Watched Markets
-  all_comments_on_watched_markets: notification_destination_types[]
-  all_answers_on_watched_markets: notification_destination_types[]
-
-  // Comments
-  tipped_comments_on_watched_markets: notification_destination_types[]
-  comments_by_followed_users_on_watched_markets: notification_destination_types[]
-  all_replies_to_my_comments_on_watched_markets: notification_destination_types[]
-  all_replies_to_my_answers_on_watched_markets: notification_destination_types[]
-  all_comments_on_contracts_with_shares_in_on_watched_markets: notification_destination_types[]
-
-  // Answers
-  answers_by_followed_users_on_watched_markets: notification_destination_types[]
-  answers_by_market_creator_on_watched_markets: notification_destination_types[]
-  all_answers_on_contracts_with_shares_in_on_watched_markets: notification_destination_types[]
-
-  // On users' markets
-  your_contract_closed: notification_destination_types[]
-  all_comments_on_my_markets: notification_destination_types[]
-  all_answers_on_my_markets: notification_destination_types[]
-  subsidized_your_market: notification_destination_types[]
-
-  // Market updates
-  resolutions_on_watched_markets: notification_destination_types[]
-  resolutions_on_watched_markets_with_shares_in: notification_destination_types[]
-  market_updates_on_watched_markets: notification_destination_types[]
-  market_updates_on_watched_markets_with_shares_in: notification_destination_types[]
-  probability_updates_on_watched_markets: notification_destination_types[]
-
-  // Balance Changes
-  loan_income: notification_destination_types[]
-  betting_streaks: notification_destination_types[]
-  referral_bonuses: notification_destination_types[]
-  unique_bettors_on_your_contract: notification_destination_types[]
-  tips_on_your_comments: notification_destination_types[]
-  tips_on_your_markets: notification_destination_types[]
-  limit_order_fills: notification_destination_types[]
-
-  // General
-  tagged_user: notification_destination_types[]
-  on_new_follow: notification_destination_types[]
-  contract_from_followed_user: notification_destination_types[]
-  trending_markets: notification_destination_types[]
-  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
-}
-
-export const getDefaultNotificationPreferences = (
-  userId: string,
-  privateUser?: PrivateUser,
-  noEmails?: boolean
-) => {
-  const constructPref = (browserIf: boolean, emailIf: boolean) => {
-    const browser = browserIf ? 'browser' : undefined
-    const email = noEmails ? undefined : emailIf ? 'email' : undefined
-    return filterDefined([browser, email]) as notification_destination_types[]
-  }
-  const defaults: notification_preferences = {
-    // Watched Markets
-    all_comments_on_watched_markets: constructPref(true, false),
-    all_answers_on_watched_markets: constructPref(true, false),
-
-    // Comments
-    tips_on_your_comments: constructPref(true, true),
-    comments_by_followed_users_on_watched_markets: constructPref(true, true),
-    all_replies_to_my_comments_on_watched_markets: constructPref(true, true),
-    all_replies_to_my_answers_on_watched_markets: constructPref(true, true),
-    all_comments_on_contracts_with_shares_in_on_watched_markets: constructPref(
-      true,
-      false
-    ),
-
-    // Answers
-    answers_by_followed_users_on_watched_markets: constructPref(true, true),
-    answers_by_market_creator_on_watched_markets: constructPref(true, true),
-    all_answers_on_contracts_with_shares_in_on_watched_markets: constructPref(
-      true,
-      true
-    ),
-
-    // On users' markets
-    your_contract_closed: constructPref(true, true), // High priority
-    all_comments_on_my_markets: constructPref(true, true),
-    all_answers_on_my_markets: constructPref(true, true),
-    subsidized_your_market: constructPref(true, true),
-
-    // Market updates
-    resolutions_on_watched_markets: constructPref(true, false),
-    market_updates_on_watched_markets: constructPref(true, false),
-    market_updates_on_watched_markets_with_shares_in: constructPref(
-      true,
-      false
-    ),
-    resolutions_on_watched_markets_with_shares_in: constructPref(true, true),
-
-    //Balance Changes
-    loan_income: constructPref(true, false),
-    betting_streaks: constructPref(true, false),
-    referral_bonuses: constructPref(true, true),
-    unique_bettors_on_your_contract: constructPref(true, true),
-    tipped_comments_on_watched_markets: constructPref(true, true),
-    tips_on_your_markets: constructPref(true, true),
-    limit_order_fills: constructPref(true, false),
-
-    // General
-    tagged_user: constructPref(true, true),
-    on_new_follow: constructPref(true, true),
-    contract_from_followed_user: constructPref(true, true),
-    trending_markets: constructPref(false, true),
-    profit_loss_updates: constructPref(false, true),
-    probability_updates_on_watched_markets: constructPref(true, false),
-    thank_you_for_purchases: constructPref(false, false),
-    onboarding_flow: constructPref(false, false),
-
-    opt_out_all: [],
-    badges_awarded: constructPref(true, false),
-  }
-  return defaults
-}
-
-// Adding a new key:value here is optional, you can just use a key of notification_subscription_types
-// You might want to add a key:value here if there will be multiple notification reasons that map to the same
-// subscription type, i.e. 'comment_on_contract_you_follow' and 'comment_on_contract_with_users_answer' both map to
-// 'all_comments_on_watched_markets' subscription type
-// TODO: perhaps better would be to map notification_subscription_types to arrays of notification_reason_types
-const notificationReasonToSubscriptionType: Partial<
-  Record<notification_reason_types, notification_preference>
-> = {
-  you_referred_user: 'referral_bonuses',
-  user_joined_to_bet_on_your_market: 'referral_bonuses',
-  tip_received: 'tips_on_your_comments',
-  bet_fill: 'limit_order_fills',
-  user_joined_from_your_group_invite: 'referral_bonuses',
-  challenge_accepted: 'limit_order_fills',
-  betting_streak_incremented: 'betting_streaks',
-  liked_and_tipped_your_contract: 'tips_on_your_markets',
-  comment_on_your_contract: 'all_comments_on_my_markets',
-  answer_on_your_contract: 'all_answers_on_my_markets',
-  comment_on_contract_you_follow: 'all_comments_on_watched_markets',
-  answer_on_contract_you_follow: 'all_answers_on_watched_markets',
-  update_on_contract_you_follow: 'market_updates_on_watched_markets',
-  resolution_on_contract_you_follow: 'resolutions_on_watched_markets',
-  comment_on_contract_with_users_shares_in:
-    'all_comments_on_contracts_with_shares_in_on_watched_markets',
-  answer_on_contract_with_users_shares_in:
-    'all_answers_on_contracts_with_shares_in_on_watched_markets',
-  update_on_contract_with_users_shares_in:
-    'market_updates_on_watched_markets_with_shares_in',
-  resolution_on_contract_with_users_shares_in:
-    'resolutions_on_watched_markets_with_shares_in',
-  comment_on_contract_with_users_answer: 'all_comments_on_watched_markets',
-  update_on_contract_with_users_answer: 'market_updates_on_watched_markets',
-  resolution_on_contract_with_users_answer: 'resolutions_on_watched_markets',
-  answer_on_contract_with_users_answer: 'all_answers_on_watched_markets',
-  comment_on_contract_with_users_comment: 'all_comments_on_watched_markets',
-  answer_on_contract_with_users_comment: 'all_answers_on_watched_markets',
-  update_on_contract_with_users_comment: 'market_updates_on_watched_markets',
-  resolution_on_contract_with_users_comment: 'resolutions_on_watched_markets',
-  reply_to_users_answer: 'all_replies_to_my_answers_on_watched_markets',
-  reply_to_users_comment: 'all_replies_to_my_comments_on_watched_markets',
-}
-
-export const getNotificationDestinationsForUser = (
-  privateUser: PrivateUser,
-  // TODO: accept reasons array from most to least important and work backwards
-  reason: notification_reason_types | notification_preference
-) => {
-  const notificationSettings = privateUser.notificationPreferences
-  const unsubscribeEndpoint = getFunctionUrl('unsubscribe')
-  try {
-    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'
-    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,4 @@
-import { notification_preferences } from './user-notification-preferences'
+import { filterDefined } from './util/array'
-import { ENV_CONFIG } from './envs/constants'
-import { MarketCreatorBadge, ProvenCorrectBadge, StreakerBadge } from './badge'
 
 export type User = {
   id: string
@@ -12,6 +10,7 @@ export type User = {
 
   // For their user page
   bio?: string
+  bannerUrl?: string
   website?: string
   twitterHandle?: string
   discordHandle?: string
@@ -33,8 +32,6 @@ export type User = {
     allTime: number
   }
 
-  fractionResolvedCorrectly: number
-
   nextLoanCached: number
   followerCountCached: number
 
@@ -51,18 +48,6 @@ export type User = {
   hasSeenContractFollowModal?: boolean
   freeMarketsCreated?: number
   isBannedFromPosting?: boolean
-
-  achievements: {
-    provenCorrect?: {
-      badges: ProvenCorrectBadge[]
-    }
-    marketCreator?: {
-      badges: MarketCreatorBadge[]
-    }
-    streaker?: {
-      badges: StreakerBadge[]
-    }
-  }
 }
 
 export type PrivateUser = {
@@ -70,20 +55,71 @@ export type PrivateUser = {
   username: string // denormalized from User
 
   email?: string
+  unsubscribedFromResolutionEmails?: boolean
+  unsubscribedFromCommentEmails?: boolean
+  unsubscribedFromAnswerEmails?: boolean
+  unsubscribedFromGenericEmails?: boolean
+  unsubscribedFromWeeklyTrendingEmails?: boolean
   weeklyTrendingEmailSent?: boolean
-  weeklyPortfolioUpdateEmailSent?: boolean
   manaBonusEmailSent?: boolean
   initialDeviceToken?: string
   initialIpAddress?: string
   apiKey?: string
-  notificationPreferences: notification_preferences
+  /** @deprecated - use notificationSubscriptionTypes */
-  twitchInfo?: {
+  notificationPreferences?: notification_subscribe_types
-    twitchName: string
+  notificationSubscriptionTypes: notification_subscription_types
-    controlToken: string
-    botEnabled?: boolean
-    needsRelinking?: boolean
 }
+
+export type notification_destination_types = 'email' | 'browser'
+export type notification_subscription_types = {
+  // Watched Markets
+  all_comments_on_watched_markets: notification_destination_types[]
+  all_answers_on_watched_markets: notification_destination_types[]
+
+  // Comments
+  tipped_comments_on_watched_markets: notification_destination_types[]
+  comments_by_followed_users_on_watched_markets: notification_destination_types[]
+  all_replies_to_my_comments_on_watched_markets: notification_destination_types[]
+  all_replies_to_my_answers_on_watched_markets: notification_destination_types[]
+  all_comments_on_contracts_with_shares_in_on_watched_markets: notification_destination_types[]
+
+  // Answers
+  answers_by_followed_users_on_watched_markets: notification_destination_types[]
+  answers_by_market_creator_on_watched_markets: notification_destination_types[]
+  all_answers_on_contracts_with_shares_in_on_watched_markets: notification_destination_types[]
+
+  // On users' markets
+  your_contract_closed: notification_destination_types[]
+  all_comments_on_my_markets: notification_destination_types[]
+  all_answers_on_my_markets: notification_destination_types[]
+  subsidized_your_market: notification_destination_types[]
+
+  // Market updates
+  resolutions_on_watched_markets: notification_destination_types[]
+  resolutions_on_watched_markets_with_shares_in: notification_destination_types[]
+  market_updates_on_watched_markets: notification_destination_types[]
+  market_updates_on_watched_markets_with_shares_in: notification_destination_types[]
+  probability_updates_on_watched_markets: notification_destination_types[]
+
+  // Balance Changes
+  loan_income: notification_destination_types[]
+  betting_streaks: notification_destination_types[]
+  referral_bonuses: notification_destination_types[]
+  unique_bettors_on_your_contract: notification_destination_types[]
+  tips_on_your_comments: notification_destination_types[]
+  tips_on_your_markets: notification_destination_types[]
+  limit_order_fills: notification_destination_types[]
+
+  // General
+  tagged_user: notification_destination_types[]
+  on_new_follow: notification_destination_types[]
+  contract_from_followed_user: notification_destination_types[]
+  trending_markets: notification_destination_types[]
+  profit_loss_updates: notification_destination_types[]
+  onboarding_flow: notification_destination_types[]
+  thank_you_for_purchases: notification_destination_types[]
 }
+export type notification_subscribe_types = 'all' | 'less' | 'none'
 
 export type PortfolioMetrics = {
   investmentValue: number
@@ -93,15 +129,142 @@ 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.
+export const getDefaultNotificationSettings = (
-// Different views require different language.
+  userId: string,
-export const BETTOR = ENV_CONFIG.bettor ?? 'trader'
+  privateUser?: PrivateUser,
-export const BETTORS = ENV_CONFIG.bettor + 's' ?? 'traders'
+  noEmails?: boolean
-export const PRESENT_BET = ENV_CONFIG.presentBet ?? 'trade'
+) => {
-export const PRESENT_BETS = ENV_CONFIG.presentBet + 's' ?? 'trades'
+  const prevPref = privateUser?.notificationPreferences ?? 'all'
-export const PAST_BET = ENV_CONFIG.pastBet ?? 'trade'
+  const wantsLess = prevPref === 'less'
-export const PAST_BETS = ENV_CONFIG.pastBet + 's' ?? 'trades'
+  const wantsAll = prevPref === 'all'
+  const {
+    unsubscribedFromCommentEmails,
+    unsubscribedFromAnswerEmails,
+    unsubscribedFromResolutionEmails,
+    unsubscribedFromWeeklyTrendingEmails,
+    unsubscribedFromGenericEmails,
+  } = privateUser || {}
+
+  const constructPref = (browserIf: boolean, emailIf: boolean) => {
+    const browser = browserIf ? 'browser' : undefined
+    const email = noEmails ? undefined : emailIf ? 'email' : undefined
+    return filterDefined([browser, email]) as notification_destination_types[]
+  }
+  return {
+    // Watched Markets
+    all_comments_on_watched_markets: constructPref(
+      wantsAll,
+      !unsubscribedFromCommentEmails
+    ),
+    all_answers_on_watched_markets: constructPref(
+      wantsAll,
+      !unsubscribedFromAnswerEmails
+    ),
+
+    // Comments
+    tips_on_your_comments: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromCommentEmails
+    ),
+    comments_by_followed_users_on_watched_markets: constructPref(
+      wantsAll,
+      false
+    ),
+    all_replies_to_my_comments_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromCommentEmails
+    ),
+    all_replies_to_my_answers_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromCommentEmails
+    ),
+    all_comments_on_contracts_with_shares_in_on_watched_markets: constructPref(
+      wantsAll,
+      !unsubscribedFromCommentEmails
+    ),
+
+    // Answers
+    answers_by_followed_users_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromAnswerEmails
+    ),
+    answers_by_market_creator_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromAnswerEmails
+    ),
+    all_answers_on_contracts_with_shares_in_on_watched_markets: constructPref(
+      wantsAll,
+      !unsubscribedFromAnswerEmails
+    ),
+
+    // On users' markets
+    your_contract_closed: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromResolutionEmails
+    ), // High priority
+    all_comments_on_my_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromCommentEmails
+    ),
+    all_answers_on_my_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromAnswerEmails
+    ),
+    subsidized_your_market: constructPref(wantsAll || wantsLess, true),
+
+    // Market updates
+    resolutions_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromResolutionEmails
+    ),
+    market_updates_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      false
+    ),
+    market_updates_on_watched_markets_with_shares_in: constructPref(
+      wantsAll || wantsLess,
+      false
+    ),
+    resolutions_on_watched_markets_with_shares_in: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromResolutionEmails
+    ),
+
+    //Balance Changes
+    loan_income: constructPref(wantsAll || wantsLess, false),
+    betting_streaks: constructPref(wantsAll || wantsLess, false),
+    referral_bonuses: constructPref(wantsAll || wantsLess, true),
+    unique_bettors_on_your_contract: constructPref(
+      wantsAll || wantsLess,
+      false
+    ),
+    tipped_comments_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      !unsubscribedFromCommentEmails
+    ),
+    tips_on_your_markets: constructPref(wantsAll || wantsLess, true),
+    limit_order_fills: constructPref(wantsAll || wantsLess, false),
+
+    // General
+    tagged_user: constructPref(wantsAll || wantsLess, true),
+    on_new_follow: constructPref(wantsAll || wantsLess, true),
+    contract_from_followed_user: constructPref(wantsAll || wantsLess, true),
+    trending_markets: constructPref(
+      false,
+      !unsubscribedFromWeeklyTrendingEmails
+    ),
+    profit_loss_updates: constructPref(false, true),
+    probability_updates_on_watched_markets: constructPref(
+      wantsAll || wantsLess,
+      false
+    ),
+    thank_you_for_purchases: constructPref(
+      false,
+      !unsubscribedFromGenericEmails
+    ),
+    onboarding_flow: constructPref(false, !unsubscribedFromGenericEmails),
+  } as notification_subscription_types
+}

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

@@ -8,14 +8,7 @@ const formatter = new Intl.NumberFormat('en-US', {
 })
 
 export function formatMoney(amount: number) {
-  const newAmount =
+  const newAmount = Math.round(amount) === 0 ? 0 : Math.floor(amount) // handle -0 case
-    // handle -0 case
-    Math.round(amount) === 0
-      ? 0
-      : // Handle 499.9999999999999 case
-        (amount > 0 ? Math.floor : Math.ceil)(
-          amount + 0.00000000001 * Math.sign(amount)
-        )
   return ENV_CONFIG.moneyMoniker + formatter.format(newAmount).replace('$', '')
 }
 
@@ -60,16 +53,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,5 @@
-import { generateText, JSONContent, Node } from '@tiptap/core'
+import { MAX_TAG_LENGTH } from '../contract'
-import { generateJSON } from '@tiptap/html'
+import { generateText, JSONContent } from '@tiptap/core'
 // Tiptap starter extensions
 import { Blockquote } from '@tiptap/extension-blockquote'
 import { Bold } from '@tiptap/extension-bold'
@@ -25,7 +25,6 @@ import Iframe from './tiptap-iframe'
 import TiptapTweet from './tiptap-tweet-type'
 import { find } from 'linkifyjs'
 import { uniq } from 'lodash'
-import { TiptapSpoiler } from './tiptap-spoiler'
 
 /** get first url in text. like "notion.so " -> "http://notion.so"; "notion" -> null */
 export function getUrl(text: string) {
@@ -33,6 +32,34 @@ export function getUrl(text: string) {
   return results.length ? results[0].href : null
 }
 
+export function parseTags(text: string) {
+  const regex = /(?:^|\s)(?:[#][a-z0-9_]+)/gi
+  const matches = (text.match(regex) || []).map((match) =>
+    match.trim().substring(1).substring(0, MAX_TAG_LENGTH)
+  )
+  const tagSet = new Set()
+  const uniqueTags: string[] = []
+  // Keep casing of last tag.
+  matches.reverse()
+  for (const tag of matches) {
+    const lowercase = tag.toLowerCase()
+    if (!tagSet.has(lowercase)) {
+      tagSet.add(lowercase)
+      uniqueTags.push(tag)
+    }
+  }
+  uniqueTags.reverse()
+  return uniqueTags
+}
+
+export function parseWordsAsTags(text: string) {
+  const taggedText = text
+    .split(/\s+/)
+    .map((tag) => (tag.startsWith('#') ? tag : `#${tag}`))
+    .join(' ')
+  return parseTags(taggedText)
+}
+
 // TODO: fuzzy matching
 export const wordIn = (word: string, corpus: string) =>
   corpus.toLocaleLowerCase().includes(word.toLocaleLowerCase())
@@ -52,28 +79,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 +97,14 @@ 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({
-    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 !text ? '' : generateText(text, exhibitExts)
-  return generateText(text, stringParseExts)
-}
-
-export function htmlToRichText(html: string) {
-  return generateJSON(html, stringParseExts)
 }

common/util/random.ts

@@ -46,10 +46,3 @@ export const shuffle = (array: unknown[], rand: () => number) => {
     ;[array[i], array[swapIndex]] = [array[swapIndex], array[i]]
   }
 }
-
-export function chooseRandomSubset<T>(items: T[], count: number) {
-  const fiveMinutes = 5 * 60 * 1000
-  const seed = Math.round(Date.now() / fiveMinutes).toString()
-  shuffle(items, createRNG(seed))
-  return items.slice(0, count)
-}

common/util/time.ts

@@ -1,6 +1,3 @@
 export const MINUTE_MS = 60 * 1000
 export const HOUR_MS = 60 * MINUTE_MS
 export const DAY_MS = 24 * HOUR_MS
-
-export const sleep = (ms: number) =>
-  new Promise((resolve) => setTimeout(resolve, ms))

common/util/tiptap-spoiler.ts

@@ -1,116 +0,0 @@
-// adapted from @n8body/tiptap-spoiler
-
-import {
-  Mark,
-  markInputRule,
-  markPasteRule,
-  mergeAttributes,
-} from '@tiptap/core'
-import type { ElementType } from 'react'
-
-declare module '@tiptap/core' {
-  interface Commands<ReturnType> {
-    spoilerEditor: {
-      setSpoiler: () => ReturnType
-      toggleSpoiler: () => ReturnType
-      unsetSpoiler: () => ReturnType
-    }
-  }
-}
-
-export type SpoilerOptions = {
-  HTMLAttributes: Record<string, any>
-  spoilerOpenClass: string
-  spoilerCloseClass?: string
-  inputRegex: RegExp
-  pasteRegex: RegExp
-  as: ElementType
-}
-
-const spoilerInputRegex = /(?:^|\s)((?:\|\|)((?:[^||]+))(?:\|\|))$/
-const spoilerPasteRegex = /(?:^|\s)((?:\|\|)((?:[^||]+))(?:\|\|))/g
-
-export const TiptapSpoiler = Mark.create<SpoilerOptions>({
-  name: 'spoiler',
-
-  inline: true,
-  group: 'inline',
-  inclusive: false,
-  exitable: true,
-  content: 'inline*',
-
-  priority: 1001, // higher priority than other formatting so they go inside
-
-  addOptions() {
-    return {
-      HTMLAttributes: { 'aria-label': 'spoiler' },
-      spoilerOpenClass: '',
-      spoilerCloseClass: undefined,
-      inputRegex: spoilerInputRegex,
-      pasteRegex: spoilerPasteRegex,
-      as: 'span',
-      editing: false,
-    }
-  },
-
-  addCommands() {
-    return {
-      setSpoiler:
-        () =>
-        ({ commands }) =>
-          commands.setMark(this.name),
-      toggleSpoiler:
-        () =>
-        ({ commands }) =>
-          commands.toggleMark(this.name),
-      unsetSpoiler:
-        () =>
-        ({ commands }) =>
-          commands.unsetMark(this.name),
-    }
-  },
-
-  addInputRules() {
-    return [
-      markInputRule({
-        find: this.options.inputRegex,
-        type: this.type,
-      }),
-    ]
-  },
-
-  addPasteRules() {
-    return [
-      markPasteRule({
-        find: this.options.pasteRegex,
-        type: this.type,
-      }),
-    ]
-  },
-
-  parseHTML() {
-    return [
-      {
-        tag: 'span',
-        getAttrs: (node) =>
-          (node as HTMLElement).ariaLabel?.toLowerCase() === 'spoiler' && null,
-      },
-    ]
-  },
-
-  renderHTML({ HTMLAttributes }) {
-    const elem = document.createElement(this.options.as as string)
-
-    Object.entries(
-      mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
-        class: this.options.spoilerCloseClass ?? this.options.spoilerOpenClass,
-      })
-    ).forEach(([attr, val]) => elem.setAttribute(attr, val))
-
-    elem.addEventListener('click', () => {
-      elem.setAttribute('class', this.options.spoilerOpenClass)
-    })
-
-    return elem
-  },
-})

docs/docs/api.md

@@ -55,7 +55,6 @@ Returns the authenticated user.
 Gets all groups, in no particular order.
 
 Parameters:
-
 - `availableToUserId`: Optional. if specified, only groups that the user can
   join and groups they've already joined will be returned.
 
@@ -82,6 +81,7 @@ Gets a group's markets by its unique ID.
 Requires no authorization.  
 Note: group is singular in the URL.
 
+
 ### `GET /v0/markets`
 
 Lists all markets, ordered by creation date descending.
@@ -158,16 +158,13 @@ Requires no authorization.
     //   i.e. https://manifold.markets/Austin/test-market is the same as https://manifold.markets/foo/test-market
     url: string
 
-    outcomeType: string // BINARY, FREE_RESPONSE, MULTIPLE_CHOICE, NUMERIC, or PSEUDO_NUMERIC
+    outcomeType: string // BINARY, FREE_RESPONSE, or NUMERIC
     mechanism: string // dpm-2 or cpmm-1
 
     probability: number
     pool: { outcome: number } // For CPMM markets, the number of shares in the liquidity pool. For DPM markets, the amount of mana invested in each answer.
     p?: number // CPMM markets only, probability constant in y^p * n^(1-p) = k
     totalLiquidity?: number // CPMM markets only, the amount of mana deposited into the liquidity pool
-    min?: number // PSEUDO_NUMERIC markets only, the minimum resolvable value
-    max?: number // PSEUDO_NUMERIC markets only, the maximum resolvable value
-    isLogScale?: bool // PSEUDO_NUMERIC markets only, if true `number = (max - min + 1)^probability + minstart - 1`, otherwise `number = min + (max - min) * probability`
 
     volume: number
     volume7Days: number
@@ -411,7 +408,7 @@ Requires no authorization.
   type FullMarket = LiteMarket & {
     bets: Bet[]
     comments: Comment[]
-    answers?: Answer[] // dpm-2 markets only
+    answers?: Answer[]
     description: JSONContent // Rich text content. See https://tiptap.dev/guide/output#option-1-json
     textDescription: string // string description without formatting, images, or embeds
   }
@@ -557,7 +554,7 @@ Creates a new market on behalf of the authorized user.
 
 Parameters:
 
-- `outcomeType`: Required. One of `BINARY`, `FREE_RESPONSE`, `MULTIPLE_CHOICE`, or `PSEUDO_NUMERIC`.
+- `outcomeType`: Required. One of `BINARY`, `FREE_RESPONSE`, or `NUMERIC`.
 - `question`: Required. The headline question for the market.
 - `description`: Required. A long description describing the rules for the market.
   - Note: string descriptions do **not** turn into links, mentions, formatted text. Instead, rich text descriptions must be in [TipTap json](https://tiptap.dev/guide/output#option-1-json).
@@ -572,12 +569,6 @@ For numeric markets, you must also provide:
 
 - `min`: The minimum value that the market may resolve to.
 - `max`: The maximum value that the market may resolve to.
-- `isLogScale`: If true, your numeric market will increase exponentially from min to max.
-- `initialValue`: An initial value for the market, between min and max, exclusive.
-
-For multiple choice markets, you must also provide:
-
-- `answers`: An array of strings, each of which will be a valid answer for the market.
 
 Example request:
 
@@ -591,18 +582,6 @@ $ curl https://manifold.markets/api/v0/market -X POST -H 'Content-Type: applicat
                  "initialProb":25}'
 ```
 
-### `POST /v0/market/[marketId]/add-liquidity`
-
-Adds a specified amount of liquidity into the market.
-
-- `amount`: Required. The amount of liquidity to add, in M$.
-
-### `POST /v0/market/[marketId]/close`
-
-Closes a market on behalf of the authorized user.
-
-- `closeTime`: Optional. Milliseconds since the epoch to close the market at. If not provided, the market will be closed immediately. Cannot provide close time in past.
-
 ### `POST /v0/market/[marketId]/resolve`
 
 Resolves a market on behalf of the authorized user.
@@ -614,18 +593,15 @@ For binary markets:
 - `outcome`: Required. One of `YES`, `NO`, `MKT`, or `CANCEL`.
 - `probabilityInt`: Optional. The probability to use for `MKT` resolution.
 
-For free response or multiple choice markets:
+For free response markets:
 
 - `outcome`: Required. One of `MKT`, `CANCEL`, or a `number` indicating the answer index.
-- `resolutions`: An array of `{ answer, pct }` objects to use as the weights for resolving in favor of multiple free response options. Can only be set with `MKT` outcome. Note that the total weights must add to 100.
+- `resolutions`: An array of `{ answer, pct }` objects to use as the weights for resolving in favor of multiple free response options. Can only be set with `MKT` outcome.
 
 For numeric markets:
 
 - `outcome`: Required. One of `CANCEL`, or a `number` indicating the selected numeric bucket ID.
 - `value`: The value that the market may resolves to.
-- `probabilityInt`: Required if `value` is present. Should be equal to
-  - If log scale: `log10(value - min + 1) / log10(max - min + 1)`
-  - Otherwise: `(value - min) / (max - min)`
 
 Example request:
 
@@ -680,17 +656,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.
@@ -780,7 +745,6 @@ Requires no authorization.
 
 ## Changelog
 
-- 2022-09-24: Expand market POST docs to include new market types (`PSEUDO_NUMERIC`, `MULTIPLE_CHOICE`)
 - 2022-07-15: Add user by username and user by ID APIs
 - 2022-06-08: Add paging to markets endpoint
 - 2022-06-05: Add new authorized write endpoints

docs/docs/awesome-manifold.md

@@ -8,8 +8,9 @@ A list of community-created projects built on, or related to, Manifold Markets.
 
 ## Sites using Manifold
 
+- [CivicDashboard](https://civicdash.org/dashboard) - Uses Manifold to for tracked solutions for the SF city government
+- [Research.Bet](https://research.bet/) - Prediction market for scientific papers, using Manifold
 - [WagerWith.me](https://www.wagerwith.me/) — Bet with your friends, with full Manifold integration to bet with M$.
-- [Alignment Markets](https://alignmentmarkets.com/) - Bet on the progress of benchmarks in ML safety!
 
 ## API / Dev
 
@@ -27,7 +28,6 @@ A list of community-created projects built on, or related to, Manifold Markets.
 - [mana](https://github.com/AnnikaCodes/mana) - A Discord bot for Manifold by [@arae](https://manifold.markets/arae)
 
 ## Writeups
-
 - [Information Markets, Decision Markets, Attention Markets, Action Markets](https://astralcodexten.substack.com/p/information-markets-decision-markets) by Scott Alexander
 - [Mismatched Monetary Motivation in Manifold Markets](https://kevin.zielnicki.com/2022/02/17/manifold/) by Kevin Zielnicki
 - [Introducing the Salem/CSPI Forecasting Tournament](https://www.cspicenter.com/p/introducing-the-salemcspi-forecasting) by Richard Hanania
@@ -38,10 +38,3 @@ A list of community-created projects built on, or related to, Manifold Markets.
 
 - Folded origami and doodles by [@hamnox](https://manifold.markets/hamnox) ![](https://i.imgur.com/nVGY4pL.png) 
 - Laser-cut Foldy by [@wasabipesto](https://manifold.markets/wasabipesto) ![](https://i.imgur.com/g9S6v3P.jpg) 
-
-## Alumni
-
-_These projects are no longer active, but were really really cool!_
-
-- [Research.Bet](https://research.bet/) - Prediction market for scientific papers, using Manifold
-- [CivicDashboard](https://civicdash.org/dashboard) - Uses Manifold to for tracked solutions for the SF city government

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**

docs/docs/faq.md

@@ -4,7 +4,11 @@
 
 ### Do I have to pay real money in order to participate?
 
-Nope! Each account starts with a free 1000 mana (or M$1000 for short). If you invest it wisely, you can increase your total without ever needing to put any real money into the site.
+Nope! Each account starts with a free M$1000. If you invest it wisely, you can increase your total without ever needing to put any real money into the site.
+
+### What is the name for the currency Manifold uses, represented by M$?
+
+Manifold Dollars, or mana for short.
 
 ### Can M$ be sold for real money?
 

firestore.indexes.json

@@ -100,20 +100,6 @@
         }
       ]
     },
-    {
-      "collectionGroup": "comments",
-      "queryScope": "COLLECTION",
-      "fields": [
-        {
-          "fieldPath": "userId",
-          "order": "ASCENDING"
-        },
-        {
-          "fieldPath": "createdTime",
-          "order": "ASCENDING"
-        }
-      ]
-    },
     {
       "collectionGroup": "comments",
       "queryScope": "COLLECTION_GROUP",

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']);
       // 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;
     }
@@ -88,7 +78,7 @@ service cloud.firestore {
       allow read: if userId == request.auth.uid || isAdmin();
       allow update: if (userId == request.auth.uid || isAdmin())
                        && request.resource.data.diff(resource.data).affectedKeys()
-                         .hasOnly(['apiKey', 'notificationPreferences', 'twitchInfo']);
+                       .hasOnly(['apiKey', 'unsubscribedFromResolutionEmails', 'unsubscribedFromCommentEmails', 'unsubscribedFromAnswerEmails', 'notificationPreferences', 'unsubscribedFromWeeklyTrendingEmails','notificationSubscriptionTypes' ]);
     }
 
     match /private-users/{userId}/views/{viewId} {
@@ -110,9 +100,9 @@ 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'])
+                                                                 .hasOnly(['description', 'closeTime', 'question'])
                        && resource.data.creatorId == request.auth.uid;
       allow update: if isAdmin();
           match /comments/{commentId} {
@@ -186,7 +176,7 @@ service cloud.firestore {
           allow update: if (request.auth.uid == resource.data.creatorId || isAdmin())
                            && request.resource.data.diff(resource.data)
                            .affectedKeys()
-                        .hasOnly(['name', 'about', 'anyoneCanJoin', 'aboutPostId', 'pinnedItems' ]);
+                           .hasOnly(['name', 'about', 'anyoneCanJoin', 'aboutPostId' ]);
           allow delete: if request.auth.uid == resource.data.creatorId;
 
           match /groupContracts/{contractId} {
@@ -206,6 +196,7 @@ service cloud.firestore {
           	allow read;
             allow create: if request.auth != null && commentMatchesUser(request.auth.uid, request.resource.data) && isGroupMember();
           }
+
         }
 
       match /posts/{postId} {

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
 
@@ -65,6 +65,5 @@ Adapted from https://firebase.google.com/docs/functions/get-started
 
 Secrets are strings that shouldn't be checked into Git (eg API keys, passwords). We store these using [Google Secret Manager](https://console.cloud.google.com/security/secret-manager), which provides them as environment variables to functions that require them. Some useful workflows:
 
-- Set a secret: `$ firebase functions:secrets:set STRIPE_APIKEY`
+- Set a secret: `$ firebase functions:secrets:set stripe.test_secret="THE-API-KEY"`
-  - Then, enter the secret in the prompt.
 - Read a secret: `$ firebase functions:secrets:access STRIPE_APIKEY`

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,19 +38,15 @@
     "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",
+    "react-masonry-css": "1.0.16",
     "stripe": "8.194.0",
     "zod": "3.17.2"
   },
   "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"
-    "firebase-functions-test": "0.3.3",
-    "puppeteer": "18.0.5"
   },
   "private": true
 }

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 {
+        status: 'error',
+        message: 'Liquidity injection rejected due to overflow error.',
+      }
+    }
+
+    transaction.update(
+      contractDoc,
+      removeUndefinedProps({
+        pool: newPool,
+        p: newP,
         totalLiquidity: newTotalLiquidity,
-    } as Partial<CPMMContract>)
+      })
+    )
 
     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

@@ -14,7 +14,7 @@ import {
 export { APIError } from '../../common/api'
 
 type Output = Record<string, unknown>
-export type AuthedUser = {
+type AuthedUser = {
   uid: string
   creds: JwtCredentials | (KeyCredentials & { privateUser: PrivateUser })
 }
@@ -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/change-user-info.ts

@@ -2,7 +2,6 @@ import * as admin from 'firebase-admin'
 import { z } from 'zod'
 
 import { getUser } from './utils'
-import { Bet } from '../../common/bet'
 import { Contract } from '../../common/contract'
 import { Comment } from '../../common/comment'
 import { User } from '../../common/user'
@@ -69,21 +68,10 @@ export const changeUser = async (
     .get()
   const answerUpdate: Partial<Answer> = removeUndefinedProps(update)
 
-  const betsSnap = await firestore
-    .collectionGroup('bets')
-    .where('userId', '==', user.id)
-    .get()
-  const betsUpdate: Partial<Bet> = removeUndefinedProps({
-    userName: update.name,
-    userUsername: update.username,
-    userAvatarUrl: update.avatarUrl,
-  })
-
   const bulkWriter = firestore.bulkWriter()
   commentSnap.docs.forEach((d) => bulkWriter.update(d.ref, commentUpdate))
   answerSnap.docs.forEach((d) => bulkWriter.update(d.ref, answerUpdate))
   contracts.docs.forEach((d) => bulkWriter.update(d.ref, contractUpdate))
-  betsSnap.docs.forEach((d) => bulkWriter.update(d.ref, betsUpdate))
   await bulkWriter.flush()
   console.log('Done writing!')
 

functions/src/close-market.ts

@@ -1,58 +0,0 @@
-import * as admin from 'firebase-admin'
-import { z } from 'zod'
-
-import { Contract } from '../../common/contract'
-import { getUser } from './utils'
-
-import { isAdmin, isManifoldId } from '../../common/envs/constants'
-import { APIError, newEndpoint, validate } from './api'
-
-const bodySchema = z.object({
-  contractId: z.string(),
-  closeTime: z.number().int().nonnegative().optional(),
-})
-
-export const closemarket = newEndpoint({}, async (req, auth) => {
-  const { contractId, closeTime } = validate(bodySchema, req.body)
-  const contractDoc = firestore.doc(`contracts/${contractId}`)
-  const contractSnap = await contractDoc.get()
-  if (!contractSnap.exists)
-    throw new APIError(404, 'No contract exists with the provided ID')
-  const contract = contractSnap.data() as Contract
-  const { creatorId } = contract
-  const firebaseUser = await admin.auth().getUser(auth.uid)
-
-  if (
-    creatorId !== auth.uid &&
-    !isManifoldId(auth.uid) &&
-    !isAdmin(firebaseUser.email)
-  )
-    throw new APIError(403, 'User is not creator of contract')
-
-  const now = Date.now()
-  if (!closeTime && contract.closeTime && contract.closeTime < now)
-    throw new APIError(400, 'Contract already closed')
-
-  if (closeTime && closeTime < now)
-    throw new APIError(
-      400,
-      'Close time must be in the future. ' +
-        'Alternatively, do not provide a close time to close immediately.'
-    )
-
-  const creator = await getUser(creatorId)
-  if (!creator) throw new APIError(500, 'Creator not found')
-
-  const updatedContract = {
-    ...contract,
-    closeTime: closeTime ? closeTime : now,
-  }
-
-  await contractDoc.update(updatedContract)
-
-  console.log('contract ', contractId, 'closed')
-
-  return updatedContract
-})
-
-const firestore = admin.firestore()

functions/src/create-answer.ts

@@ -7,7 +7,6 @@ import { getNewMultiBetInfo } from '../../common/new-bet'
 import { Answer, MAX_ANSWER_LENGTH } from '../../common/answer'
 import { getValues } from './utils'
 import { APIError, newEndpoint, validate } from './api'
-import { addUserToContractFollowers } from './follow-market'
 
 const bodySchema = z.object({
   contractId: z.string().max(MAX_ANSWER_LENGTH),
@@ -97,8 +96,6 @@ export const createanswer = newEndpoint(opts, async (req, auth) => {
     return answer
   })
 
-  await addUserToContractFollowers(contractId, auth.uid)
-
   return answer
 })
 

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-group.ts

@@ -61,8 +61,6 @@ export const creategroup = newEndpoint({}, async (req, auth) => {
     anyoneCanJoin,
     totalContracts: 0,
     totalMembers: memberIds.length,
-    postIds: [],
-    pinnedItems: [],
   }
 
   await groupRef.create(group)

functions/src/create-market.ts

@@ -16,7 +16,7 @@ import { slugify } from '../../common/util/slugify'
 import { randomString } from '../../common/util/random'
 
 import { chargeUser, getContract, isProd } from './utils'
-import { APIError, AuthedUser, newEndpoint, validate, zTimestamp } from './api'
+import { APIError, newEndpoint, validate, zTimestamp } from './api'
 
 import { FIXED_ANTE, FREE_MARKETS_PER_USER_MAX } from '../../common/economy'
 import {
@@ -92,11 +92,7 @@ const multipleChoiceSchema = z.object({
   answers: z.string().trim().min(1).array().min(2),
 })
 
-export const createmarket = newEndpoint({}, (req, auth) => {
+export const createmarket = newEndpoint({}, async (req, auth) => {
-  return createMarketHelper(req.body, auth)
-})
-
-export async function createMarketHelper(body: any, auth: AuthedUser) {
   const {
     question,
     description,
@@ -105,13 +101,16 @@ export async function createMarketHelper(body: any, auth: AuthedUser) {
     outcomeType,
     groupId,
     visibility = 'public',
-  } = validate(bodySchema, body)
+  } = validate(bodySchema, req.body)
 
   let min, max, initialProb, isLogScale, answers
 
   if (outcomeType === 'PSEUDO_NUMERIC' || outcomeType === 'NUMERIC') {
     let initialValue
-    ;({ min, max, initialValue, isLogScale } = validate(numericSchema, body))
+    ;({ min, max, initialValue, isLogScale } = validate(
+      numericSchema,
+      req.body
+    ))
     if (max - min <= 0.01 || initialValue <= min || initialValue >= max)
       throw new APIError(400, 'Invalid range.')
 
@@ -127,11 +126,11 @@ export async function createMarketHelper(body: any, auth: AuthedUser) {
   }
 
   if (outcomeType === 'BINARY') {
-    ;({ initialProb } = validate(binarySchema, body))
+    ;({ initialProb } = validate(binarySchema, req.body))
   }
 
   if (outcomeType === 'MULTIPLE_CHOICE') {
-    ;({ answers } = validate(multipleChoiceSchema, body))
+    ;({ answers } = validate(multipleChoiceSchema, req.body))
   }
 
   const userDoc = await firestore.collection('users').doc(auth.uid).get()
@@ -187,17 +186,17 @@ export async function createMarketHelper(body: any, auth: AuthedUser) {
 
   // convert string descriptions into JSONContent
   const newDescription =
-    !description || typeof description === 'string'
+    typeof description === 'string'
       ? {
           type: 'doc',
           content: [
             {
               type: 'paragraph',
-              content: [{ type: 'text', text: description || ' ' }],
+              content: [{ type: 'text', text: description }],
             },
           ],
         }
-      : description
+      : description ?? {}
 
   const contract = getNewContract(
     contractRef.id,
@@ -324,7 +323,7 @@ export async function createMarketHelper(body: any, auth: AuthedUser) {
   }
 
   return contract
-}
+})
 
 const getSlug = async (question: string) => {
   const proposedSlug = slugify(question)

functions/src/create-notification.ts

@@ -1,22 +1,14 @@
 import * as admin from 'firebase-admin'
 import {
-  BetFillData,
+  getDestinationsForUser,
-  BettingStreakData,
-  ContractResolutionData,
   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'
-import { groupBy, sum, uniq } from 'lodash'
+import { groupBy, uniq } from 'lodash'
 import { Bet, LimitBet } from '../../common/bet'
 import { Answer } from '../../common/answer'
 import { getContractBetMetrics } from '../../common/calculate'
@@ -34,28 +26,27 @@ import {
   sendNewUniqueBettorsEmail,
 } from './emails'
 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,
@@ -74,7 +65,7 @@ export const createFollowOrMarketSubsidizedNotification = async (
       const { reason } = userToReasonTexts[userId]
       const privateUser = await getPrivateUser(userId)
       if (!privateUser) continue
-      const { sendToBrowser, sendToEmail } = getNotificationDestinationsForUser(
+      const { sendToBrowser, sendToEmail } = await getDestinationsForUser(
         privateUser,
         reason
       )
@@ -99,15 +90,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 +123,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',
@@ -145,7 +157,7 @@ export type replied_users_info = {
 export const createCommentOrAnswerOrUpdatedContractNotification = async (
   sourceId: string,
   sourceType: 'comment' | 'answer' | 'contract',
-  sourceUpdateType: 'created' | 'updated',
+  sourceUpdateType: 'created' | 'updated' | 'resolved',
   sourceUser: User,
   idempotencyKey: string,
   sourceText: string,
@@ -153,6 +165,17 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
   miscData?: {
     repliedUsersInfo: replied_users_info
     taggedUserIds: string[]
+  },
+  resolutionData?: {
+    bets: Bet[]
+    userInvestments: { [userId: string]: number }
+    userPayouts: { [userId: string]: number }
+    creator: User
+    creatorPayout: number
+    contract: Contract
+    outcome: string
+    resolutionProbability?: number
+    resolutions?: { [outcome: string]: number }
   }
 ) => {
   const { repliedUsersInfo, taggedUserIds } = miscData ?? {}
@@ -197,7 +220,6 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
     return await notificationRef.set(removeUndefinedProps(notification))
   }
 
-  const needNotFollowContractReasons = ['tagged_user']
   const stillFollowingContract = (userId: string) => {
     return contractFollowersIds.includes(userId)
   }
@@ -207,14 +229,13 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
     reason: notification_reason_types
   ) => {
     if (
-      (!stillFollowingContract(userId) &&
+      !stillFollowingContract(sourceContract.creatorId) ||
-        !needNotFollowContractReasons.includes(reason)) ||
       sourceUser.id == userId
     )
       return
     const privateUser = await getPrivateUser(userId)
     if (!privateUser) return
-    const { sendToBrowser, sendToEmail } = getNotificationDestinationsForUser(
+    const { sendToBrowser, sendToEmail } = await getDestinationsForUser(
       privateUser,
       reason
     )
@@ -253,6 +274,24 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
         sourceUser.avatarUrl
       )
       emailRecipientIdsList.push(userId)
+    } else if (
+      sourceType === 'contract' &&
+      sourceUpdateType === 'resolved' &&
+      resolutionData
+    ) {
+      await sendMarketResolutionEmail(
+        reason,
+        privateUser,
+        resolutionData.userInvestments[userId] ?? 0,
+        resolutionData.userPayouts[userId] ?? 0,
+        sourceUser,
+        resolutionData.creatorPayout,
+        sourceContract,
+        resolutionData.outcome,
+        resolutionData.resolutionProbability,
+        resolutionData.resolutions
+      )
+      emailRecipientIdsList.push(userId)
     }
   }
 
@@ -406,9 +445,6 @@ export const createCommentOrAnswerOrUpdatedContractNotification = async (
     )
   }
 
-  //TODO: store all possible reasons why the user might be getting the notification
-  // and choose the most lenient that they have enabled so they will unsubscribe
-  // from the least important notifications
   await notifyRepliedUser()
   await notifyTaggedUsers()
   await notifyContractCreator()
@@ -431,7 +467,7 @@ export const createTipNotification = async (
 ) => {
   const privateUser = await getPrivateUser(toUser.id)
   if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
+  const { sendToBrowser } = await getDestinationsForUser(
     privateUser,
     'tip_received'
   )
@@ -470,22 +506,20 @@ export const createBetFillNotification = async (
   fromUser: User,
   toUser: User,
   bet: Bet,
-  limitBet: LimitBet,
+  userBet: LimitBet,
   contract: Contract,
   idempotencyKey: string
 ) => {
   const privateUser = await getPrivateUser(toUser.id)
   if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
+  const { sendToBrowser } = await getDestinationsForUser(
     privateUser,
     'bet_fill'
   )
   if (!sendToBrowser) return
 
-  const fill = limitBet.fills.find((fill) => fill.matchedBetId === bet.id)
+  const fill = userBet.fills.find((fill) => fill.matchedBetId === bet.id)
   const fillAmount = fill?.amount ?? 0
-  const remainingAmount =
-    limitBet.orderAmount - sum(limitBet.fills.map((f) => f.amount))
 
   const notificationRef = firestore
     .collection(`/users/${toUser.id}/notifications`)
@@ -496,7 +530,7 @@ export const createBetFillNotification = async (
     reason: 'bet_fill',
     createdTime: Date.now(),
     isSeen: false,
-    sourceId: limitBet.id,
+    sourceId: userBet.id,
     sourceType: 'bet',
     sourceUpdateType: 'updated',
     sourceUserName: fromUser.name,
@@ -507,14 +541,6 @@ export const createBetFillNotification = async (
     sourceContractTitle: contract.question,
     sourceContractSlug: contract.slug,
     sourceContractId: contract.id,
-    data: {
-      betOutcome: bet.outcome,
-      creatorOutcome: limitBet.outcome,
-      fillAmount,
-      probability: limitBet.limitProb,
-      limitOrderTotal: limitBet.orderAmount,
-      limitOrderRemaining: remainingAmount,
-    } as BetFillData,
   }
   return await notificationRef.set(removeUndefinedProps(notification))
 
@@ -531,7 +557,7 @@ export const createReferralNotification = async (
 ) => {
   const privateUser = await getPrivateUser(toUser.id)
   if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
+  const { sendToBrowser } = await getDestinationsForUser(
     privateUser,
     'you_referred_user'
   )
@@ -585,7 +611,7 @@ export const createLoanIncomeNotification = async (
 ) => {
   const privateUser = await getPrivateUser(toUser.id)
   if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
+  const { sendToBrowser } = await getDestinationsForUser(
     privateUser,
     'loan_income'
   )
@@ -623,7 +649,7 @@ export const createChallengeAcceptedNotification = async (
 ) => {
   const privateUser = await getPrivateUser(challengeCreator.id)
   if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
+  const { sendToBrowser } = await getDestinationsForUser(
     privateUser,
     'challenge_accepted'
   )
@@ -660,12 +686,11 @@ export const createBettingStreakBonusNotification = async (
   bet: Bet,
   contract: Contract,
   amount: number,
-  streak: number,
   idempotencyKey: string
 ) => {
   const privateUser = await getPrivateUser(user.id)
   if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
+  const { sendToBrowser } = await getDestinationsForUser(
     privateUser,
     'betting_streak_incremented'
   )
@@ -694,10 +719,6 @@ export const createBettingStreakBonusNotification = async (
     sourceContractId: contract.id,
     sourceContractTitle: contract.question,
     sourceContractCreatorUsername: contract.creatorUsername,
-    data: {
-      streak: streak,
-      bonusAmount: amount,
-    } as BettingStreakData,
   }
   return await notificationRef.set(removeUndefinedProps(notification))
 }
@@ -712,7 +733,7 @@ export const createLikeNotification = async (
 ) => {
   const privateUser = await getPrivateUser(toUser.id)
   if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
+  const { sendToBrowser } = await getDestinationsForUser(
     privateUser,
     'liked_and_tipped_your_contract'
   )
@@ -759,7 +780,7 @@ export const createUniqueBettorBonusNotification = async (
 ) => {
   const privateUser = await getPrivateUser(contractCreatorId)
   if (!privateUser) return
-  const { sendToBrowser, sendToEmail } = getNotificationDestinationsForUser(
+  const { sendToBrowser, sendToEmail } = await getDestinationsForUser(
     privateUser,
     'unique_bettors_on_your_contract'
   )
@@ -849,7 +870,7 @@ export const createNewContractNotification = async (
   ) => {
     const privateUser = await getPrivateUser(userId)
     if (!privateUser) return
-    const { sendToBrowser, sendToEmail } = getNotificationDestinationsForUser(
+    const { sendToBrowser, sendToEmail } = await getDestinationsForUser(
       privateUser,
       reason
     )
@@ -909,249 +930,3 @@ export const createNewContractNotification = async (
     await sendNotificationsIfSettingsAllow(mentionedUserId, 'tagged_user')
   }
 }
-
-export const createContractResolvedNotifications = async (
-  contract: Contract,
-  creator: User,
-  outcome: string,
-  probabilityInt: number | undefined,
-  resolutionValue: number | undefined,
-  resolutionData: {
-    bets: Bet[]
-    userInvestments: { [userId: string]: number }
-    userPayouts: { [userId: string]: number }
-    creator: User
-    creatorPayout: number
-    contract: Contract
-    outcome: string
-    resolutionProbability?: number
-    resolutions?: { [outcome: string]: number }
-  }
-) => {
-  let resolutionText = outcome ?? contract.question
-  if (
-    contract.outcomeType === 'FREE_RESPONSE' ||
-    contract.outcomeType === 'MULTIPLE_CHOICE'
-  ) {
-    const answerText = contract.answers.find(
-      (answer) => answer.id === outcome
-    )?.text
-    if (answerText) resolutionText = answerText
-  } else if (contract.outcomeType === 'BINARY') {
-    if (resolutionText === 'MKT' && probabilityInt)
-      resolutionText = `${probabilityInt}%`
-    else if (resolutionText === 'MKT') resolutionText = 'PROB'
-  } else if (contract.outcomeType === 'PSEUDO_NUMERIC') {
-    if (resolutionText === 'MKT' && resolutionValue)
-      resolutionText = `${resolutionValue}`
-  }
-
-  const idempotencyKey = contract.id + '-resolved'
-  const createBrowserNotification = async (
-    userId: string,
-    reason: notification_reason_types
-  ) => {
-    const notificationRef = firestore
-      .collection(`/users/${userId}/notifications`)
-      .doc(idempotencyKey)
-    const notification: Notification = {
-      id: idempotencyKey,
-      userId,
-      reason,
-      createdTime: Date.now(),
-      isSeen: false,
-      sourceId: contract.id,
-      sourceType: 'contract',
-      sourceUpdateType: 'resolved',
-      sourceContractId: contract.id,
-      sourceUserName: creator.name,
-      sourceUserUsername: creator.username,
-      sourceUserAvatarUrl: creator.avatarUrl,
-      sourceText: resolutionText,
-      sourceContractCreatorUsername: contract.creatorUsername,
-      sourceContractTitle: contract.question,
-      sourceContractSlug: contract.slug,
-      sourceSlug: contract.slug,
-      sourceTitle: contract.question,
-      data: {
-        outcome,
-        userInvestment: resolutionData.userInvestments[userId] ?? 0,
-        userPayout: resolutionData.userPayouts[userId] ?? 0,
-      } as ContractResolutionData,
-    }
-    return await notificationRef.set(removeUndefinedProps(notification))
-  }
-
-  const sendNotificationsIfSettingsPermit = async (
-    userId: string,
-    reason: notification_reason_types
-  ) => {
-    if (!stillFollowingContract(userId) || creator.id == userId) return
-    const privateUser = await getPrivateUser(userId)
-    if (!privateUser) return
-    const { sendToBrowser, sendToEmail } = getNotificationDestinationsForUser(
-      privateUser,
-      reason
-    )
-
-    // Browser notifications
-    if (sendToBrowser) {
-      await createBrowserNotification(userId, reason)
-    }
-
-    // Emails notifications
-    if (sendToEmail)
-      await sendMarketResolutionEmail(
-        reason,
-        privateUser,
-        resolutionData.userInvestments[userId] ?? 0,
-        resolutionData.userPayouts[userId] ?? 0,
-        creator,
-        resolutionData.creatorPayout,
-        contract,
-        resolutionData.outcome,
-        resolutionData.resolutionProbability,
-        resolutionData.resolutions
-      )
-  }
-
-  const contractFollowersIds = (
-    await getValues<ContractFollow>(
-      firestore.collection(`contracts/${contract.id}/follows`)
-    )
-  ).map((follow) => follow.id)
-
-  const stillFollowingContract = (userId: string) => {
-    return contractFollowersIds.includes(userId)
-  }
-
-  await Promise.all(
-    contractFollowersIds.map((id) =>
-      sendNotificationsIfSettingsPermit(
-        id,
-        resolutionData.userInvestments[id]
-          ? 'resolution_on_contract_with_users_shares_in'
-          : 'resolution_on_contract_you_follow'
-      )
-    )
-  )
-}
-
-export const createBountyNotification = async (
-  fromUser: User,
-  toUserId: string,
-  amount: number,
-  idempotencyKey: string,
-  contract: Contract,
-  commentId?: string
-) => {
-  const privateUser = await getPrivateUser(toUserId)
-  if (!privateUser) return
-  const { sendToBrowser } = getNotificationDestinationsForUser(
-    privateUser,
-    'tip_received'
-  )
-  if (!sendToBrowser) return
-
-  const slug = commentId
-  const notificationRef = firestore
-    .collection(`/users/${toUserId}/notifications`)
-    .doc(idempotencyKey)
-  const notification: Notification = {
-    id: idempotencyKey,
-    userId: toUserId,
-    reason: 'tip_received',
-    createdTime: Date.now(),
-    isSeen: false,
-    sourceId: commentId ? commentId : contract.id,
-    sourceType: 'tip',
-    sourceUpdateType: 'created',
-    sourceUserName: fromUser.name,
-    sourceUserUsername: fromUser.username,
-    sourceUserAvatarUrl: fromUser.avatarUrl,
-    sourceText: amount.toString(),
-    sourceContractCreatorUsername: contract.creatorUsername,
-    sourceContractTitle: contract.question,
-    sourceContractSlug: contract.slug,
-    sourceSlug: slug,
-    sourceTitle: contract.question,
-  }
-  return await notificationRef.set(removeUndefinedProps(notification))
-}
-
-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

@@ -3,17 +3,10 @@ import * as admin from 'firebase-admin'
 import { getUser } from './utils'
 import { slugify } from '../../common/util/slugify'
 import { randomString } from '../../common/util/random'
-import {
+import { Post, MAX_POST_TITLE_LENGTH } from '../../common/post'
-  Post,
-  MAX_POST_TITLE_LENGTH,
-  MAX_POST_SUBTITLE_LENGTH,
-} from '../../common/post'
 import { APIError, newEndpoint, validate } from './api'
 import { JSONContent } from '@tiptap/core'
 import { z } from 'zod'
-import { removeUndefinedProps } from '../../common/util/object'
-import { createMarketHelper } from './create-market'
-import { DAY_MS } from '../../common/util/time'
 
 const contentSchema: z.ZodType<JSONContent> = z.lazy(() =>
   z.intersection(
@@ -40,21 +33,12 @@ const contentSchema: z.ZodType<JSONContent> = z.lazy(() =>
 
 const postSchema = z.object({
   title: z.string().min(1).max(MAX_POST_TITLE_LENGTH),
-  subtitle: z.string().min(1).max(MAX_POST_SUBTITLE_LENGTH),
   content: contentSchema,
-  groupId: z.string().optional(),
-
-  // Date doc fields:
-  bounty: z.number().optional(),
-  birthday: z.number().optional(),
-  type: z.string().optional(),
-  question: z.string().optional(),
 })
 
 export const createpost = newEndpoint({}, async (req, auth) => {
   const firestore = admin.firestore()
-  const { title, subtitle, content, groupId, question, ...otherProps } =
+  const { title, content } = validate(postSchema, req.body)
-    validate(postSchema, req.body)
 
   const creator = await getUser(auth.uid)
   if (!creator)
@@ -66,59 +50,16 @@ export const createpost = newEndpoint({}, async (req, auth) => {
 
   const postRef = firestore.collection('posts').doc()
 
-  // If this is a date doc, create a market for it.
+  const post: Post = {
-  let contractSlug
-  if (question) {
-    const closeTime = Date.now() + DAY_MS * 30 * 3
-
-    try {
-      const result = await createMarketHelper(
-        {
-          question,
-          closeTime,
-          outcomeType: 'BINARY',
-          visibility: 'unlisted',
-          initialProb: 50,
-          // Dating group!
-          groupId: 'j3ZE8fkeqiKmRGumy3O1',
-        },
-        auth
-      )
-      contractSlug = result.slug
-    } catch (e) {
-      console.error(e)
-    }
-  }
-
-  const post: Post = removeUndefinedProps({
-    ...otherProps,
     id: postRef.id,
     creatorId: creator.id,
     slug,
     title,
-    subtitle,
     createdTime: Date.now(),
     content: content,
-    contractSlug,
+  }
-    creatorName: creator.name,
-    creatorUsername: creator.username,
-    creatorAvatarUrl: creator.avatarUrl,
-    itemType: 'post',
-  })
 
   await postRef.create(post)
-  if (groupId) {
-    const groupRef = firestore.collection('groups').doc(groupId)
-    const group = await groupRef.get()
-    if (group.exists) {
-      const groupData = group.data()
-      if (groupData) {
-        const postIds = groupData.postIds ?? []
-        postIds.push(postRef.id)
-        await groupRef.update({ postIds })
-      }
-    }
-  }
 
   return { status: 'success', post }
 })

functions/src/create-user.ts

@@ -1,7 +1,11 @@
 import * as admin from 'firebase-admin'
 import { z } from 'zod'
 
-import { PrivateUser, User } from '../../common/user'
+import {
+  getDefaultNotificationSettings,
+  PrivateUser,
+  User,
+} from '../../common/user'
 import { getUser, getUserByUsername, getValues } from './utils'
 import { randomString } from '../../common/util/random'
 import {
@@ -18,7 +22,6 @@ import { track } from './analytics'
 import { APIError, newEndpoint, validate } from './api'
 import { Group } from '../../common/group'
 import { SUS_STARTING_BALANCE, STARTING_BALANCE } from '../../common/economy'
-import { getDefaultNotificationPreferences } from '../../common/user-notification-preferences'
 
 const bodySchema = z.object({
   deviceToken: z.string().optional(),
@@ -69,8 +72,6 @@ export const createuser = newEndpoint(opts, async (req, auth) => {
     followerCountCached: 0,
     followedCategories: DEFAULT_CATEGORIES,
     shouldShowWelcome: true,
-    fractionResolvedCorrectly: 1,
-    achievements: {},
   }
 
   await firestore.collection('users').doc(auth.uid).create(user)
@@ -82,7 +83,7 @@ export const createuser = newEndpoint(opts, async (req, auth) => {
     email,
     initialIpAddress: req.ip,
     initialDeviceToken: deviceToken,
-    notificationPreferences: getDefaultNotificationPreferences(auth.uid),
+    notificationSubscriptionTypes: getDefaultNotificationSettings(auth.uid),
   }
 
   await firestore.collection('private-users').doc(auth.uid).create(privateUser)

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/email-templates/500-mana.html

@@ -0,0 +1,321 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
+  xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+  <title>Manifold Markets 7th Day Anniversary Gift!</title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
+
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
+
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
+
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
+
+    p {
+      display: block;
+      margin: 13px 0;
+    }
+  </style>
+  <!--[if mso]>
+        <noscript>
+        <xml>
+        <o:OfficeDocumentSettings>
+          <o:AllowPNG/>
+          <o:PixelsPerInch>96</o:PixelsPerInch>
+        </o:OfficeDocumentSettings>
+        </xml>
+        </noscript>
+        <![endif]-->
+  <!--[if lte mso 11]>
+        <style type="text/css">
+          .mj-outlook-group-fix { width:100% !important; }
+        </style>
+        <![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
+  </style>
+  <style type="text/css">
+    [owa] .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
+
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
+  </style>
+</head>
+
+<body style="word-spacing:normal;background-color:#F4F4F4;">
+  <div style="background-color:#F4F4F4;">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+        style="background:#ffffff;background-color:#ffffff;width:100%;">
+        <tbody>
+          <tr>
+            <td
+              style="direction:ltr;font-size:0px;padding:0px 0px 0px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;padding-top:0px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix"
+                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
+                  width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center"
+                        style="font-size:0px;padding:0px 25px 0px 25px;padding-top:0px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                          style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:550px;"><a href="https://manifold.markets/home" target="_blank"><img
+                                    alt="" height="auto" src="https://i.imgur.com/8EP8Y8q.gif"
+                                    style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
+                                    width="550"></a></td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left"
+                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                        <div
+                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                          <p class="text-build-content"
+                            style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                            data-testid="4XoHRGw1Y"><span
+                              style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
+                              Hi {{name}},</span></p>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left"
+                        style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                        <div
+                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                          <p class="text-build-content"
+                            style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
+                            data-testid="4XoHRGw1Y"><span
+                              style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">Thanks for
+                              using Manifold Markets. Running low
+                              on mana (M$)? Click the link below to receive a one time gift of M$500!</span></p>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>
+                        <p></p>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center">
+                        <table cellspacing="0" cellpadding="0">
+                          <tr>
+                            <td>
+                              <table cellspacing="0" cellpadding="0">
+                                <tr>
+                                  <td style="border-radius: 2px;" bgcolor="#4337c9">
+                                    <a href="{{manalink}}" target="_blank"
+                                      style="padding: 12px 16px; border: 1px solid #4337c9;border-radius: 16px;font-family: Helvetica, Arial, sans-serif;font-size: 24px; color: #ffffff;text-decoration: none;font-weight:bold;display: inline-block;">
+                                      Claim M$500
+                                    </a>
+                                  </td>
+                                </tr>
+                              </table>
+                            </td>
+                          </tr>
+                        </table>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left"
+                        style="font-size:0px;padding:15px 25px 0px 25px;padding-top:15px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
+                        <div
+                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                          <p class="text-build-content" style="line-height: 23px; margin: 10px 0; margin-top: 10px;"
+                            data-testid="3Q8BP69fq"><span style="font-family:Arial, sans-serif;font-size:18px;">Did
+                              you know, besides making correct predictions, there are
+                              plenty of other ways to earn mana?</span></p>
+                          <ul>
+                            <li style="line-height:23px;"><span
+                                style="font-family:Arial, sans-serif;font-size:18px;">Receiving
+                                tips on comments</span></li>
+                            <li style="line-height:23px;"><span
+                                style="font-family:Arial, sans-serif;font-size:18px;">Unique
+                                trader bonus for each user who bets on your
+                                markets</span></li>
+                            <li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;"><a
+                                  class="link-build-content" style="color:inherit;; text-decoration: none;"
+                                  target="_blank" href="https://manifold.markets/referrals"><span
+                                    style="color:#55575d;font-family:Arial;font-size:18px;"><u>Referring
+                                      friends</u></span></a></span></li>
+                            <li style="line-height:23px;"><a class="link-build-content"
+                                style="color:inherit;; text-decoration: none;" target="_blank"
+                                href="https://manifold.markets/group/bugs?s=most-traded"><span
+                                  style="color:#55575d;font-family:Arial;font-size:18px;"><u>Reporting
+                                    bugs</u></span></a><span style="font-family:Arial, sans-serif;font-size:18px;">
+                                and </span><a class="link-build-content" style="color:inherit;; text-decoration: none;"
+                                target="_blank"
+                                href="https://manifold.markets/group/manifold-features-25bad7c7792e/chat?s=most-traded"><span
+                                  style="color:#55575d;font-family:Arial;font-size:18px;"><u>giving
+                                    feedback</u></span></a></li>
+                          </ul>
+                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;">&nbsp;</p>
+                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
+                              style="color:#000000;font-family:Arial;font-size:18px;">Cheers,</span>
+                          </p>
+                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
+                              style="color:#000000;font-family:Arial;font-size:18px;">David
+                              from Manifold</span></p>
+                          <p class="text-build-content" data-testid="3Q8BP69fq"
+                            style="margin: 10px 0; margin-bottom: 10px;">&nbsp;</p>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="left"
+                        style="font-size:0px;padding:15px 25px 0px 25px;padding-top:15px;padding-right:25px;padding-bottom:0px;padding-left:25px;word-break:break-word;">
+                        <div
+                          style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
+                          <p class="text-build-content" style="line-height: 23px; margin: 10px 0; margin-top: 10px;"
+                            data-testid="3Q8BP69fq"></a></li>
+                            </ul>
+                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;">&nbsp;</p>
+                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
+                              style="color:#000000;font-family:Arial;font-size:18px;">Cheers,</span></p>
+                          <p class="text-build-content" data-testid="3Q8BP69fq" style="margin: 10px 0;"><span
+                              style="color:#000000;font-family:Arial;font-size:18px;">David from Manifold</span></p>
+                          <p class="text-build-content" data-testid="3Q8BP69fq"
+                            style="margin: 10px 0; margin-bottom: 10px;">&nbsp;</p>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0 0 20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix"
+                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
+                  width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:0px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                          style="border-collapse:collapse;border-spacing:0px;">
+              </div>
+              <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+              <div style="margin:0px auto;max-width:600px;">
+                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+                  style="width:100%;">
+                  <tbody>
+                    <tr>
+                      <td style="direction:ltr;font-size:0px;padding:20px 0px 20px 0px;text-align:center;">
+                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+                        <div class="mj-column-per-100 mj-outlook-group-fix"
+                          style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
+                            <tbody>
+                              <tr>
+                                <td style="vertical-align:top;padding:0;">
+                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
+                                    <tbody>
+                                      <tr>
+                                        <td align="center"
+                                          style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                                          <div
+                                            style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
+                                            <p style="margin: 10px 0;">This e-mail has been sent to {{name}},
+                                              <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to manage your notifications</a>.
+                                            </p>
+                                          </div>
+                                        </td>
+                                      </tr>
+                                      <tr>
+                                        <td align="center"
+                                          style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
+                                          <div
+                                            style="font-family:Arial, sans-serif;font-size:11px;letter-spacing:normal;line-height:22px;text-align:center;color:#000000;">
+                                          </div>
+                                        </td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </td>
+                              </tr>
+                            </tbody>
+                          </table>
+                        </div>
+                        <!--[if mso | IE]></td></tr></table><![endif]-->
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+    </div>
+</body>
+
+</html>

functions/src/email-templates/creating-market.html

@@ -494,7 +494,7 @@
                                               <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                                             </p>
                                           </div>
                                         </td>

functions/src/email-templates/interesting-markets.html

@@ -443,7 +443,7 @@
                                                                                         <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                                                                                     </p>
                                                                                 </div>
                                                                             </td>

functions/src/email-templates/market-answer-comment.html

@@ -529,7 +529,7 @@
                     <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                   </td>
                 </tr>
               </table>

functions/src/email-templates/market-answer.html

@@ -369,7 +369,7 @@
                   <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/market-close.html

@@ -483,7 +483,11 @@
                         color: #999;
                         text-decoration: underline;
                         margin: 0;
-                      ">our Discord</a>!
+                      ">our Discord</a>! Or,
+                  <a href="{{unsubscribeUrl}}" style="
+                                          color: inherit;
+                                          text-decoration: none;
+                                        " target="_blank">click here to manage your notifications</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/market-comment.html

@@ -369,7 +369,7 @@
                   <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/market-resolved-no-bets.html

@@ -470,7 +470,7 @@
                   <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/market-resolved.html

@@ -502,7 +502,7 @@
                   <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/new-market-from-followed-user.html

@@ -318,7 +318,7 @@
                                                                                         <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                                                                                     </p>
                                                                                 </div>
                                                                             </td>

functions/src/email-templates/new-unique-bettor.html

@@ -9,7 +9,7 @@
 <head>
   <meta name="viewport" content="width=device-width" />
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>New unique traders on your market</title>
+  <title>New unique predictors on your market</title>
 
   <style type="text/css">
     img {
@@ -214,14 +214,14 @@
                            style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
                            data-testid="4XoHRGw1Y"><span
                           style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                          Your market <a href='{{marketUrl}}'>{{marketTitle}}</a> just got its first trade from a user!
+                          Your market <a href='{{marketUrl}}'>{{marketTitle}}</a> just got its first prediction from a user!
                           <br/>
                           <br/>
                           We sent you a <span style='color: #11b981'>{{bonusString}}</span> bonus for
-                          creating a market that appeals to others, and we'll do so for each new trader.
+                          creating a market that appeals to others, and we'll do so for each new predictor.
                           <br/>
                           <br/>
-                          Keep up the good work and check out your newest trader below!
+                          Keep up the good work and check out your newest predictor below!
                         </span></p>
                       </div>
                     </td>
@@ -376,7 +376,7 @@
                   <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/new-unique-bettors.html

@@ -9,7 +9,7 @@
 <head>
   <meta name="viewport" content="width=device-width" />
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>New unique traders on your market</title>
+  <title>New unique predictors on your market</title>
 
   <style type="text/css">
     img {
@@ -214,14 +214,14 @@
                            style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
                            data-testid="4XoHRGw1Y"><span
                           style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                          Your market <a href='{{marketUrl}}'>{{marketTitle}}</a> has attracted {{totalPredictors}} total traders!
+                          Your market <a href='{{marketUrl}}'>{{marketTitle}}</a> got predictions from a total of {{totalPredictors}} users!
                           <br/>
                           <br/>
-                          We sent you a <span style='color: #11b981'>{{bonusString}}</span> bonus for getting {{newPredictors}} new traders,
+                          We sent you a <span style='color: #11b981'>{{bonusString}}</span> bonus for getting {{newPredictors}} new predictors,
-                          and we'll continue to do so for each new trader, (although we won't send you any more emails about it for this market).
+                          and we'll continue to do so for each new predictor, (although we won't send you any more emails about it for this market).
                           <br/>
                           <br/>
-                          Keep up the good work and check out your newest traders below!
+                          Keep up the good work and check out your newest predictors below!
                         </span></p>
                       </div>
                     </td>
@@ -480,7 +480,7 @@
                   <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                 </td>
               </tr>
             </table>

functions/src/email-templates/one-week.html

@@ -192,7 +192,7 @@
                                 tips on comments and markets</span></li>
                       <li style="line-height:23px;"><span
                         style="font-family:Arial, sans-serif;font-size:18px;">Unique
-                                trader bonus for each user who trades on your
+                                predictor bonus for each user who predicts on your
                                 markets</span></li>
                       <li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;"><a
                         class="link-build-content" style="color:inherit;; text-decoration: none;"
@@ -283,7 +283,7 @@
                                     <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                                   </p>
                                 </div>
                               </td>

functions/src/email-templates/thank-you.html

@@ -218,7 +218,7 @@
                                                                         <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                                                                     </p>
                                                                 </div>
                                                             </td>

functions/src/email-templates/weekly-portfolio-update-no-movers.html

@@ -1,411 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-    xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-    <title>Weekly Portfolio Update on Manifold</title>
-    <!--[if !mso]><!-->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <!--<![endif]-->
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <style type="text/css">
-        #outlook a {
-            padding: 0;
-        }
-
-        body {
-            margin: 0;
-            padding: 0;
-            -webkit-text-size-adjust: 100%;
-            -ms-text-size-adjust: 100%;
-            font-family:"Readex Pro", Helvetica, sans-serif;
-        }
-        table { margin: 0 auto; }
-
-        table,
-        td {
-            border-collapse: collapse;
-            mso-table-lspace: 0;
-            mso-table-rspace: 0;
-        }
-        th {color:#000000; font-size:17px;}
-        th, td {padding: 10px; }
-        td{ font-size: 17px}
-        th, td { vertical-align: center; text-align: left }
-        a { vertical-align: center; text-align: left}
-        img {
-            border: 0;
-            height: auto;
-            line-height: 100%;
-            outline: none;
-            text-decoration: none;
-            -ms-interpolation-mode: bicubic;
-        }
-
-        p {
-            display: block;
-            margin: 13px 0;
-        }
-        p.change{
-            margin: 0; vertical-align: middle;font-size:16px;display: inline; padding: 2px; border-radius: 5px; width: 20px; text-align: right;
-        }
-        p.prob{
-            font-size: 22px;display: inline; vertical-align: middle; font-weight: bold; width: 50px;
-        }
-        a.question{
-            font-size: 18px;display: inline; vertical-align: middle;
-        }
-        td.question{
-           vertical-align: middle; padding-bottom: 15px; text-align: left;
-        }
-        td.probs{
-            text-align: right; padding-left: 10px; min-width: 115px
-        }
-    </style>
-    <!--[if mso]>
-      <noscript>
-        <xml>
-          <o:OfficeDocumentSettings>
-            <o:AllowPNG />
-            <o:PixelsPerInch>96</o:PixelsPerInch>
-          </o:OfficeDocumentSettings>
-        </xml>
-      </noscript>
-    <![endif]-->
-    <!--[if lte mso 11]>
-      <style type="text/css">
-        .mj-outlook-group-fix {
-          width: 100% !important;
-        }
-      </style>
-    <![endif]-->
-    <!--[if !mso]><!-->
-    <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Readex+Pro" rel="stylesheet" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Readex+Pro" rel="stylesheet" type="text/css" />
-    <style type="text/css">
-        @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
-        @import url(https://fonts.googleapis.com/css?family=Readex+Pro);
-        @import url(https://fonts.googleapis.com/css?family=Readex+Pro);
-    </style>
-    <!--<![endif]-->
-    <style type="text/css">
-        @media only screen and (min-width: 480px) {
-            .mj-column-per-100 {
-                width: 100% !important;
-                max-width: 100%;
-            }
-        }
-    </style>
-    <style media="screen and (min-width:480px)">
-        .moz-text-html .mj-column-per-100 {
-            width: 100% !important;
-            max-width: 100%;
-        }
-    </style>
-    <style type="text/css">
-        [owa] .mj-column-per-100 {
-            width: 100% !important;
-            max-width: 100%;
-        }
-    </style>
-    <style type="text/css">
-        @media only screen and (max-width: 480px) {
-            table.mj-full-width-mobile {
-                width: 100% !important;
-            }
-
-            td.mj-full-width-mobile {
-                width: auto !important;
-            }
-        }
-    </style>
-</head>
-
-<body style="word-spacing: normal; background-color: #f4f4f4">
-    <div style="margin:0px auto;max-width:600px;">
-
-        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-            <tbody>
-                <tr>
-                    <td
-                        style="direction:ltr;font-size:0px;padding:20px 0px 5px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;text-align:center;">
-                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-
-                        <div class="mj-column-per-100 mj-outlook-group-fix"
-                            style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-
-                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                style="vertical-align:top;" width="100%">
-                                <tbody>
-
-                                    <tr>
-                                        <td align="center"
-                                            style="background:#ffffff;font-size:0px;padding:10px 25px 10px 25px;padding-right:25px;padding-left:25px;word-break:break-word;">
-
-                                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                style="border-collapse:collapse;border-spacing:0px;">
-                                                <tbody>
-                                                    <tr>
-                                                        <td style="width:550px;">
-
-                                                            <a href="https://manifold.markets" target="_blank">
-
-                                                                <img alt="banner logo" height="auto"
-                                                                    src="https://manifold.markets/logo-banner.png"
-                                                                    style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
-                                                                    title="" width="550">
-
-                                                            </a>
-
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-
-                                        </td>
-                                    </tr>
-
-
-
-                                </tbody>
-                            </table>
-
-                        </div>
-
-                        <!--[if mso | IE]></td></tr></table><![endif]-->
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-
-    </div>
-    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="
-          background: #ffffff;
-          background-color: #ffffff;
-          margin: 0px auto;
-          max-width: 600px;
-        ">
-        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-            style="background: #ffffff; background-color: #ffffff; width: 100%">
-            <tbody>
-
-                <tr>
-                    <td style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 20px 0px 0px 0px;
-                  padding-bottom: 0px;
-                  padding-left: 0px;
-                  padding-right: 0px;
-                  padding-top: 20px;
-                  text-align: center;
-                ">
-                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                        <div class="mj-column-per-100 mj-outlook-group-fix" style="
-                    font-size: 0px;
-                    text-align: left;
-                    direction: ltr;
-                    display: inline-block;
-                    vertical-align: top;
-                    width: 100%;
-                  ">
-                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                style="vertical-align: top; margin-bottom: 30px" width="100%">
-                                <tbody>
-                                    <tr>
-                                        <td align="left"
-                                            style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                                            <div
-                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                                                <p class="text-build-content"
-                                                    style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
-                                                    data-testid="4XoHRGw1Y"><span
-                                                        style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                                                    </span>Hi {{name}},</p>
-                                            </div>
-                                        </td>
-                                    </tr>
-
-                                    <tr>
-                                        <td align="left"
-                                            style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:20px;word-break:break-word;">
-                                            <div
-                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                                                <p class="text-build-content"
-                                                    style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 0px;"
-                                                    data-testid="4XoHRGw1Y">
-                                                    <span style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                                                        We ran the numbers and here's how you did this past week!
-                                                    </span>
-                                                </p>
-                                            </div>
-                                        </td>
-                                    </tr>
-<!--/ show 5 columns with headers titled: Investment value, 7-day change, current balance, tips received, and markets made/-->
-                                    <tr>
-                                      <tr>
-                                        <th style='font-size: 22px; text-align: center'>
-                                          Profit
-                                        </th>
-                                      </tr>
-                                      <tr>
-                                        <td style='padding-bottom: 30px; text-align: center'>
-                                          <p class='change' style='font-size: 24px; padding:4px; {{profit_style}}'>
-                                          {{profit}}
-                                          </p>
-                                        </td>
-                                      </tr>
-                                        <td align="center"
-                                            style="font-size:0px;padding:10px 20px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                style="border-collapse:collapse;border-spacing:0px; ">
-                                                <tbody>
-                                                    <tr>
-                                                      <th style='width: 170px'>
-                                                        🔥 Prediction streak
-                                                      </th>
-                                                    <td>
-                                                        {{prediction_streak}}
-                                                    </td>
-                                                    </tr>
-                                                    <tr>
-                                                      <th>
-                                                        💸 Tips received
-                                                      </th>
-                                                    <td>
-                                                        {{tips_received}}
-                                                    </td>
-                                                    </tr>
-                                                    <tr>
-                                                      <th>
-                                                        📈 Markets traded
-                                                      </th>
-                                                      <td>
-                                                        {{markets_traded}}
-                                                      </td>
-                                                    </tr>
-                                                <tr>
-                                                  <th>
-                                                    ❓ Markets created
-                                                  </th>
-
-                                                    <td>
-                                                        {{markets_created}}
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <th style='width: 55px'>
-                                                      🥳 Traders attracted
-                                                    </th>
-                                                  <td>
-                                                    {{unique_bettors}}
-                                                  </td>
-                                                </tr>
-
-                                                </tbody>
-                                            </table>
-
-                                </tbody>
-                            </table>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-
-    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="margin: 0px auto; max-width: 600px">
-        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%">
-            <tbody>
-                <tr>
-                    <td style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 0 0 20px 0;
-                  text-align: center;
-                ">
-
-                        <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-                        <div style="margin: 0px auto; max-width: 600px">
-                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                style="width: 100%">
-                                <tbody>
-                                    <tr>
-                                        <td style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 20px 0px 20px 0px;
-                  text-align: center;
-                ">
-                                            <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                                            <div class="mj-column-per-100 mj-outlook-group-fix" style="
-                    font-size: 0px;
-                    text-align: left;
-                    direction: ltr;
-                    display: inline-block;
-                    vertical-align: top;
-                    width: 100%;
-                  ">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    width="100%">
-                                                    <tbody>
-                                                        <tr>
-                                                            <td style="vertical-align: top; padding: 0">
-                                                                <table border="0" cellpadding="0" cellspacing="0"
-                                                                    role="presentation" width="100%">
-                                                                    <tbody>
-                                                                        <tr>
-                                                                            <td align="center" style="
-                                    font-size: 0px;
-                                    padding: 10px 25px;
-                                    word-break: break-word;
-                                  ">
-                                                                                <div style="
-                                      font-family: Ubuntu, Helvetica, Arial,
-                                        sans-serif;
-                                      font-size: 11px;
-                                      line-height: 22px;
-                                      text-align: center;
-                                      color: #000000;
-                                    ">
-                                                                                    <p style="margin: 10px 0">
-                                                                                        This e-mail has been sent to
-                                                                                        {{name}},
-                                                                                        <a href="{{unsubscribeUrl}}" style="
-                                          color: inherit;
-                                          text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
-                                                                                    </p>
-                                                                                </div>
-                                                                            </td>
-                                                                        </tr>
-                                                                        <tr>
-                                                                            <td align="center" style="
-                                    font-size: 0px;
-                                    padding: 10px 25px;
-                                    word-break: break-word;
-                                  "></td>
-                                                                        </tr>
-                                                                    </tbody>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                            <!--[if mso | IE]></td></tr></table><![endif]-->
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <!--[if mso | IE]></td></tr></table><![endif]-->
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>

functions/src/email-templates/weekly-portfolio-update.html

@@ -1,510 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-    xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-    <title>Weekly Portfolio Update on Manifold</title>
-    <!--[if !mso]><!-->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <!--<![endif]-->
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <style type="text/css">
-        #outlook a {
-            padding: 0;
-        }
-
-        body {
-            margin: 0;
-            padding: 0;
-            -webkit-text-size-adjust: 100%;
-            -ms-text-size-adjust: 100%;
-            font-family:"Readex Pro", Helvetica, sans-serif;
-        }
-        table { margin: 0 auto; }
-
-        table,
-        td {
-            border-collapse: collapse;
-            mso-table-lspace: 0;
-            mso-table-rspace: 0;
-        }
-        th {color:#000000; font-size:17px;}
-        th, td {padding: 10px; }
-        td{ font-size: 17px}
-        th, td { vertical-align: center; text-align: left }
-        a { vertical-align: center; text-align: left}
-        img {
-            border: 0;
-            height: auto;
-            line-height: 100%;
-            outline: none;
-            text-decoration: none;
-            -ms-interpolation-mode: bicubic;
-        }
-
-        p {
-            display: block;
-            margin: 13px 0;
-        }
-        p.change{
-            margin: 0; vertical-align: middle;font-size:16px;display: inline; padding: 2px; border-radius: 5px; width: 20px; text-align: right;
-        }
-        p.prob{
-            font-size: 22px;display: inline; vertical-align: middle; font-weight: bold; width: 50px;
-        }
-        a.question{
-            font-size: 18px;display: inline; vertical-align: middle;
-        }
-        td.question{
-           vertical-align: middle; padding-bottom: 15px; text-align: left;
-        }
-        td.probs{
-            text-align: right; padding-left: 10px; min-width: 115px
-        }
-    </style>
-    <!--[if mso]>
-      <noscript>
-        <xml>
-          <o:OfficeDocumentSettings>
-            <o:AllowPNG />
-            <o:PixelsPerInch>96</o:PixelsPerInch>
-          </o:OfficeDocumentSettings>
-        </xml>
-      </noscript>
-    <![endif]-->
-    <!--[if lte mso 11]>
-      <style type="text/css">
-        .mj-outlook-group-fix {
-          width: 100% !important;
-        }
-      </style>
-    <![endif]-->
-    <!--[if !mso]><!-->
-    <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Readex+Pro" rel="stylesheet" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Readex+Pro" rel="stylesheet" type="text/css" />
-    <style type="text/css">
-        @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
-        @import url(https://fonts.googleapis.com/css?family=Readex+Pro);
-        @import url(https://fonts.googleapis.com/css?family=Readex+Pro);
-    </style>
-    <!--<![endif]-->
-    <style type="text/css">
-        @media only screen and (min-width: 480px) {
-            .mj-column-per-100 {
-                width: 100% !important;
-                max-width: 100%;
-            }
-        }
-    </style>
-    <style media="screen and (min-width:480px)">
-        .moz-text-html .mj-column-per-100 {
-            width: 100% !important;
-            max-width: 100%;
-        }
-    </style>
-    <style type="text/css">
-        [owa] .mj-column-per-100 {
-            width: 100% !important;
-            max-width: 100%;
-        }
-    </style>
-    <style type="text/css">
-        @media only screen and (max-width: 480px) {
-            table.mj-full-width-mobile {
-                width: 100% !important;
-            }
-
-            td.mj-full-width-mobile {
-                width: auto !important;
-            }
-        }
-    </style>
-</head>
-
-<body style="word-spacing: normal; background-color: #f4f4f4">
-    <div style="margin:0px auto;max-width:600px;">
-
-        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-            <tbody>
-                <tr>
-                    <td
-                        style="direction:ltr;font-size:0px;padding:20px 0px 5px 0px;padding-bottom:0px;padding-left:0px;padding-right:0px;text-align:center;">
-                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-
-                        <div class="mj-column-per-100 mj-outlook-group-fix"
-                            style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-
-                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                style="vertical-align:top;" width="100%">
-                                <tbody>
-
-                                    <tr>
-                                        <td align="center"
-                                            style="background:#ffffff;font-size:0px;padding:10px 25px 10px 25px;padding-right:25px;padding-left:25px;word-break:break-word;">
-
-                                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                style="border-collapse:collapse;border-spacing:0px;">
-                                                <tbody>
-                                                    <tr>
-                                                        <td style="width:550px;">
-
-                                                            <a href="https://manifold.markets" target="_blank">
-
-                                                                <img alt="banner logo" height="auto"
-                                                                    src="https://manifold.markets/logo-banner.png"
-                                                                    style="border:none;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
-                                                                    title="" width="550">
-
-                                                            </a>
-
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-
-                                        </td>
-                                    </tr>
-
-
-
-                                </tbody>
-                            </table>
-
-                        </div>
-
-                        <!--[if mso | IE]></td></tr></table><![endif]-->
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-
-    </div>
-    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#ffffff" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="
-          background: #ffffff;
-          background-color: #ffffff;
-          margin: 0px auto;
-          max-width: 600px;
-        ">
-        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-            style="background: #ffffff; background-color: #ffffff; width: 100%">
-            <tbody>
-
-                <tr>
-                    <td style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 20px 0px 0px 0px;
-                  padding-bottom: 0px;
-                  padding-left: 0px;
-                  padding-right: 0px;
-                  padding-top: 20px;
-                  text-align: center;
-                ">
-                        <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                        <div class="mj-column-per-100 mj-outlook-group-fix" style="
-                    font-size: 0px;
-                    text-align: left;
-                    direction: ltr;
-                    display: inline-block;
-                    vertical-align: top;
-                    width: 100%;
-                  ">
-                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                style="vertical-align: top" width="100%">
-                                <tbody>
-                                    <tr>
-                                        <td align="left"
-                                            style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                                            <div
-                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                                                <p class="text-build-content"
-                                                    style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 10px;"
-                                                    data-testid="4XoHRGw1Y"><span
-                                                        style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                                                    </span>Hi {{name}},</p>
-                                            </div>
-                                        </td>
-                                    </tr>
-
-                                    <tr>
-                                        <td align="left"
-                                            style="font-size:0px;padding:10px 25px;padding-top:0px;padding-bottom:20px;word-break:break-word;">
-                                            <div
-                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                                                <p class="text-build-content"
-                                                    style="line-height: 24px; margin: 10px 0; margin-top: 10px; margin-bottom: 0px;"
-                                                    data-testid="4XoHRGw1Y">
-                                                    <span style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                                                        We ran the numbers and here's how you did this past week!
-                                                    </span>
-                                                </p>
-                                            </div>
-                                        </td>
-                                    </tr>
-<!--/ show 5 columns with headers titled: Investment value, 7-day change, current balance, tips received, and markets made/-->
-                                    <tr>
-                                      <tr>
-                                        <th style='font-size: 22px; text-align: center'>
-                                          Profit
-                                        </th>
-                                      </tr>
-                                      <tr>
-                                        <td style='padding-bottom: 30px; text-align: center'>
-                                          <p class='change' style='font-size: 24px; padding:4px; {{profit_style}}'>
-                                          {{profit}}
-                                          </p>
-                                        </td>
-                                      </tr>
-                                        <td align="center"
-                                            style="font-size:0px;padding:10px 20px;padding-top:0px;padding-bottom:0px;word-break:break-word;">
-                                            <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                style="border-collapse:collapse;border-spacing:0px; ">
-                                                <tbody>
-                                                    <tr>
-                                                      <th style='width: 170px'>
-                                                        🔥 Prediction streak
-                                                      </th>
-                                                    <td>
-                                                        {{prediction_streak}}
-                                                    </td>
-                                                    </tr>
-                                                    <tr>
-                                                      <th>
-                                                        💸 Tips received
-                                                      </th>
-                                                    <td>
-                                                        {{tips_received}}
-                                                    </td>
-                                                    </tr>
-                                                    <tr>
-                                                      <th>
-                                                        📈 Markets traded
-                                                      </th>
-                                                      <td>
-                                                        {{markets_traded}}
-                                                      </td>
-                                                    </tr>
-                                                <tr>
-                                                  <th>
-                                                    ❓ Markets created
-                                                  </th>
-
-                                                    <td>
-                                                        {{markets_created}}
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <th style='width: 55px'>
-                                                      🥳 Traders attracted
-                                                    </th>
-                                                  <td>
-                                                    {{unique_bettors}}
-                                                  </td>
-                                                </tr>
-
-                                                </tbody>
-                                            </table>
-
-                                        </td>
-                                    </tr>
-
-                                    <tr>
-                                        <td align="left"
-                                            style="font-size:0px;padding:10px 25px;padding-top:20px;padding-bottom:0px;word-break:break-word;">
-                                            <div
-                                                style="font-family:Arial, sans-serif;font-size:18px;letter-spacing:normal;line-height:1;text-align:left;color:#000000;">
-                                                <p class="text-build-content"
-                                                    style="line-height: 24px; margin: 10px 0; margin-top: 20px; margin-bottom: 20px;"
-                                                    data-testid="4XoHRGw1Y">
-                                                    <span style="color:#000000;font-family:Arial, Helvetica, sans-serif;font-size:18px;">
-                                                    And here's some recent changes in your investments:
-                                                    </span>
-                                                </p>
-                                            </div>
-                                        </td>
-                                    <tr>
-                                        <td
-                                            style="font-size:0; padding-left:10px;padding-top:10px;padding-bottom:0;word-break:break-word;">
-                                            <table  role="presentation">
-                                                <tbody>
-                                                <tr>
-                                                    <td class='question'>
-                                                        <a class='question' href='{{question1Url}}'>
-                                                        {{question1Title}}
-<!--                                                            Will the US economy recover from the pandemic?-->
-                                                        </a>
-                                                    </td>
-                                                    <td class='probs'>
-                                                        <p class='prob'>
-                                                        {{question1Prob}}
-<!--                                                        9.9%-->
-                                                        <p class='change' style='{{question1ChangeStyle}}'>
-                                                        {{question1Change}}
-<!--                                                            +17%-->
-                                                        </p>
-                                                        </p>
-                                                    </td>
-                                                </tr><tr>
-                                                    <td class='question'>
-                                                        <a class='question' href='{{question2Url}}'>
-                                                        {{question2Title}}
-<!--                                                            Will the US economy recover from the pandemic? blah blah blah-->
-                                                        </a>
-                                                    </td>
-                                                    <td class='probs'>
-                                                      <p class='prob'>
-                                                        {{question2Prob}}
-<!--                                                        99.9%-->
-                                                        <p class='change' style='{{question2ChangeStyle}}'>
-                                                        {{question2Change}}
-<!--                                                            +7%-->
-                                                        </p>
-                                                        </p>
-                                                    </td>
-                                                </tr><tr>
-<!--                                                    <td style="{{investment_value_style}}">-->
-                                                    <td class='question'>
-                                                        <a class='question' href='{{question3Url}}'>
-                                                        {{question3Title}}
-<!--                                                            Will the US economy recover from the pandemic?-->
-                                                        </a>
-                                                    </td>
-                                                    <td class='probs'>
-                                                      <p class='prob'>
-                                                        {{question3Prob}}
-<!--                                                        99.9%-->
-                                                        <p class='change'  style='{{question3ChangeStyle}}'>
-                                                        {{question3Change}}
-<!--                                                            +17%-->
-                                                        </p>
-                                                        </p>
-                                                    </td>
-                                                </tr><tr>
-<!--                                                    <td style="{{investment_value_style}}">-->
-                                                    <td class='question'>
-                                                        <a class='question' href='{{question4Url}}'>
-                                                        {{question4Title}}
-<!--                                                            Will the US economy recover from the pandemic?-->
-                                                        </a>
-                                                    </td>
-                                                    <td class='probs'>
-                                                      <p class='prob'>
-                                                        {{question4Prob}}
-<!--                                                        99.9%-->
-                                                        <p class='change' style='{{question4ChangeStyle}}'>
-                                                        {{question4Change}}
-<!--                                                            +17%-->
-                                                        </p>
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                                </tbody>
-                                            </table>
-
-                                        </td>
-                                    </tr>
-
-                                </tbody>
-                            </table>
-                        </div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-
-    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="margin: 0px auto; max-width: 600px">
-        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%">
-            <tbody>
-                <tr>
-                    <td style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 0 0 20px 0;
-                  text-align: center;
-                ">
-
-                        <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-                        <div style="margin: 0px auto; max-width: 600px">
-                            <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                style="width: 100%">
-                                <tbody>
-                                    <tr>
-                                        <td style="
-                  direction: ltr;
-                  font-size: 0px;
-                  padding: 20px 0px 20px 0px;
-                  text-align: center;
-                ">
-                                            <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                                            <div class="mj-column-per-100 mj-outlook-group-fix" style="
-                    font-size: 0px;
-                    text-align: left;
-                    direction: ltr;
-                    display: inline-block;
-                    vertical-align: top;
-                    width: 100%;
-                  ">
-                                                <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                    width="100%">
-                                                    <tbody>
-                                                        <tr>
-                                                            <td style="vertical-align: top; padding: 0">
-                                                                <table border="0" cellpadding="0" cellspacing="0"
-                                                                    role="presentation" width="100%">
-                                                                    <tbody>
-                                                                        <tr>
-                                                                            <td align="center" style="
-                                    font-size: 0px;
-                                    padding: 10px 25px;
-                                    word-break: break-word;
-                                  ">
-                                                                                <div style="
-                                      font-family: Ubuntu, Helvetica, Arial,
-                                        sans-serif;
-                                      font-size: 11px;
-                                      line-height: 22px;
-                                      text-align: center;
-                                      color: #000000;
-                                    ">
-                                                                                    <p style="margin: 10px 0">
-                                                                                        This e-mail has been sent to
-                                                                                        {{name}},
-                                                                                        <a href="{{unsubscribeUrl}}" style="
-                                          color: inherit;
-                                          text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
-                                                                                    </p>
-                                                                                </div>
-                                                                            </td>
-                                                                        </tr>
-                                                                        <tr>
-                                                                            <td align="center" style="
-                                    font-size: 0px;
-                                    padding: 10px 25px;
-                                    word-break: break-word;
-                                  "></td>
-                                                                        </tr>
-                                                                    </tbody>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                            <!--[if mso | IE]></td></tr></table><![endif]-->
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                        <!--[if mso | IE]></td></tr></table><![endif]-->
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>

functions/src/email-templates/welcome.html

@@ -210,7 +210,7 @@
                                   class="link-build-content" style="color:inherit;; text-decoration: none;"
                                   target="_blank" href="https://manifold.markets/referrals"><span
                                     style="color:#55575d;font-family:Arial;font-size:18px;"><u>Refer
-                                      your friends</u></span></a> and earn M$250 for each signup!</span></li>
+                                      your friends</u></span></a> and earn M$500 for each signup!</span></li>
 
                             <li style="line-height:23px;"><span style="font-family:Arial, sans-serif;font-size:18px;"><a
                                   class="link-build-content" style="color:inherit;; text-decoration: none;"
@@ -290,7 +290,7 @@
                                               <a href="{{unsubscribeUrl}}" style="
                                           color: inherit;
                                           text-decoration: none;
-                                        " target="_blank">click here to unsubscribe from this type of notification</a>.
+                                        " target="_blank">click here to manage your notifications</a>.
                                             </p>
                                           </div>
                                         </td>

functions/src/emails.ts

@@ -2,7 +2,11 @@ import { DOMAIN } from '../../common/envs/constants'
 import { Bet } from '../../common/bet'
 import { getProbability } from '../../common/calculate'
 import { Contract } from '../../common/contract'
-import { PrivateUser, User } from '../../common/user'
+import {
+  notification_subscription_types,
+  PrivateUser,
+  User,
+} from '../../common/user'
 import {
   formatLargeNumber,
   formatMoney,
@@ -12,15 +16,13 @@ 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 { getUser } from './utils'
 import { buildCardUrl, getOpenGraphProps } from '../../common/contract-details'
-import { notification_reason_types } from '../../common/notification'
-import { Dictionary } from 'lodash'
-import { getNotificationDestinationsForUser } from '../../common/user-notification-preferences'
 import {
-  PerContractInvestmentsData,
+  notification_reason_types,
-  OverallPerformanceData,
+  getDestinationsForUser,
-} from './weekly-portfolio-emails'
+} from '../../common/notification'
+import { Dictionary } from 'lodash'
 
 export const sendMarketResolutionEmail = async (
   reason: notification_reason_types,
@@ -34,10 +36,8 @@ export const sendMarketResolutionEmail = async (
   resolutionProbability?: number,
   resolutions?: { [outcome: string]: number }
 ) => {
-  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+  const { sendToEmail, urlToManageThisNotification: unsubscribeUrl } =
-    privateUser,
+    await getDestinationsForUser(privateUser, reason)
-    reason
-  )
   if (!privateUser || !privateUser.email || !sendToEmail) return
 
   const user = await getUser(privateUser.id)
@@ -153,10 +153,9 @@ export const sendWelcomeEmail = async (
   const { name } = user
   const firstName = name.split(' ')[0]
 
-  const { unsubscribeUrl } = getNotificationDestinationsForUser(
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
-    privateUser,
+    'onboarding_flow' as keyof notification_subscription_types
-    'onboarding_flow'
+  }`
-  )
 
   return await sendTemplateEmail(
     privateUser.email,
@@ -212,17 +211,19 @@ export const sendOneWeekBonusEmail = async (
   user: User,
   privateUser: PrivateUser
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationSubscriptionTypes.onboarding_flow.includes('email')
+  )
+    return
 
   const { name } = user
   const firstName = name.split(' ')[0]
 
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
-    privateUser,
+    'onboarding_flow' as keyof notification_subscription_types
-    'onboarding_flow'
+  }`
-  )
-  if (!sendToEmail) return
-
   return await sendTemplateEmail(
     privateUser.email,
     'Manifold Markets one week anniversary gift',
@@ -243,15 +244,19 @@ export const sendCreatorGuideEmail = async (
   privateUser: PrivateUser,
   sendTime: string
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationSubscriptionTypes.onboarding_flow.includes('email')
+  )
+    return
 
   const { name } = user
   const firstName = name.split(' ')[0]
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+
-    privateUser,
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
-    'onboarding_flow'
+    'onboarding_flow' as keyof notification_subscription_types
-  )
+  }`
-  if (!sendToEmail) return
   return await sendTemplateEmail(
     privateUser.email,
     'Create your own prediction market',
@@ -271,16 +276,22 @@ export const sendThankYouEmail = async (
   user: User,
   privateUser: PrivateUser
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
+    !privateUser ||
+    !privateUser.email ||
+    !privateUser.notificationSubscriptionTypes.thank_you_for_purchases.includes(
+      'email'
+    )
+  )
+    return
 
   const { name } = user
   const firstName = name.split(' ')[0]
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
-    privateUser,
-    'thank_you_for_purchases'
-  )
 
-  if (!sendToEmail) return
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
+    'thank_you_for_purchases' as keyof notification_subscription_types
+  }`
+
   return await sendTemplateEmail(
     privateUser.email,
     'Thanks for your Manifold purchase',
@@ -301,7 +312,10 @@ export const sendMarketCloseEmail = async (
   privateUser: PrivateUser,
   contract: Contract
 ) => {
-  if (!privateUser.email) return
+  const { sendToEmail, urlToManageThisNotification: unsubscribeUrl } =
+    await getDestinationsForUser(privateUser, reason)
+
+  if (!privateUser.email || !sendToEmail) return
 
   const { username, name, id: userId } = user
   const firstName = name.split(' ')[0]
@@ -310,7 +324,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 +331,7 @@ export const sendMarketCloseEmail = async (
     {
       question,
       url,
-      unsubscribeUrl: '',
+      unsubscribeUrl,
       userId,
       name: firstName,
       volume: formatMoney(volume),
@@ -337,10 +350,8 @@ export const sendNewCommentEmail = async (
   answerText?: string,
   answerId?: string
 ) => {
-  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+  const { sendToEmail, urlToManageThisNotification: unsubscribeUrl } =
-    privateUser,
+    await getDestinationsForUser(privateUser, reason)
-    reason
-  )
   if (!privateUser || !privateUser.email || !sendToEmail) return
 
   const { question } = contract
@@ -414,10 +425,8 @@ export const sendNewAnswerEmail = async (
   // Don't send the creator's own answers.
   if (privateUser.id === creatorId) return
 
-  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+  const { sendToEmail, urlToManageThisNotification: unsubscribeUrl } =
-    privateUser,
+    await getDestinationsForUser(privateUser, reason)
-    reason
-  )
   if (!privateUser.email || !sendToEmail) return
 
   const { question, creatorUsername, slug } = contract
@@ -448,13 +457,18 @@ export const sendInterestingMarketsEmail = async (
   contractsToSend: Contract[],
   deliveryTime?: string
 ) => {
-  if (!privateUser || !privateUser.email) return
+  if (
-
+    !privateUser ||
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
+    !privateUser.email ||
-    privateUser,
+    !privateUser.notificationSubscriptionTypes.trending_markets.includes(
-    'trending_markets'
+      'email'
     )
-  if (!sendToEmail) return
+  )
+    return
+
+  const unsubscribeUrl = `${DOMAIN}/notifications?tab=settings&section=${
+    'trending_markets' as keyof notification_subscription_types
+  }`
 
   const { name } = user
   const firstName = name.split(' ')[0]
@@ -490,6 +504,10 @@ export const sendInterestingMarketsEmail = async (
   )
 }
 
+function contractUrl(contract: Contract) {
+  return `https://manifold.markets/${contract.creatorUsername}/${contract.slug}`
+}
+
 function imageSourceUrl(contract: Contract) {
   return buildCardUrl(getOpenGraphProps(contract))
 }
@@ -500,10 +518,8 @@ export const sendNewFollowedMarketEmail = async (
   privateUser: PrivateUser,
   contract: Contract
 ) => {
-  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+  const { sendToEmail, urlToManageThisNotification: unsubscribeUrl } =
-    privateUser,
+    await getDestinationsForUser(privateUser, reason)
-    reason
-  )
   if (!privateUser.email || !sendToEmail) return
   const user = await getUser(privateUser.id)
   if (!user) return
@@ -539,10 +555,8 @@ export const sendNewUniqueBettorsEmail = async (
   userBets: Dictionary<[Bet, ...Bet[]]>,
   bonusAmount: number
 ) => {
-  const { sendToEmail, unsubscribeUrl } = getNotificationDestinationsForUser(
+  const { sendToEmail, urlToManageThisNotification: unsubscribeUrl } =
-    privateUser,
+    await getDestinationsForUser(privateUser, reason)
-    reason
-  )
   if (!privateUser.email || !sendToEmail) return
   const user = await getUser(privateUser.id)
   if (!user) return
@@ -591,45 +605,3 @@ export const sendNewUniqueBettorsEmail = async (
     }
   )
 }
-
-export const sendWeeklyPortfolioUpdateEmail = async (
-  user: User,
-  privateUser: PrivateUser,
-  investments: PerContractInvestmentsData[],
-  overallPerformance: OverallPerformanceData
-) => {
-  if (!privateUser || !privateUser.email) return
-
-  const { unsubscribeUrl, sendToEmail } = getNotificationDestinationsForUser(
-    privateUser,
-    'profit_loss_updates'
-  )
-
-  if (!sendToEmail) return
-
-  const { name } = user
-  const firstName = name.split(' ')[0]
-  const templateData: Record<string, string> = {
-    name: firstName,
-    unsubscribeUrl,
-    ...overallPerformance,
-  }
-  investments.forEach((investment, i) => {
-    templateData[`question${i + 1}Title`] = investment.questionTitle
-    templateData[`question${i + 1}Url`] = investment.questionUrl
-    templateData[`question${i + 1}Prob`] = investment.questionProb
-    templateData[`question${i + 1}Change`] = formatMoney(investment.profit)
-    templateData[`question${i + 1}ChangeStyle`] = investment.profitStyle
-  })
-
-  await sendTemplateEmail(
-    privateUser.email,
-    // 'iansphilips@gmail.com',
-    `Here's your weekly portfolio update!`,
-    investments.length === 0
-      ? 'portfolio-update-no-movers'
-      : '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'
@@ -27,11 +27,9 @@ export * from './on-delete-group'
 export * from './score-contracts'
 export * from './weekly-markets-emails'
 export * from './reset-betting-streaks'
-export * from './reset-weekly-emails-flags'
+export * from './reset-weekly-emails-flag'
 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,14 +43,13 @@ 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'
 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,19 +62,15 @@ 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'
 import { unsubscribe } from './unsubscribe'
 import { stripewebhook, createcheckoutsession } from './stripe'
 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,21 +86,16 @@ 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 withdrawLiquidityFunction = toCloudFunction(withdrawliquidity)
-const createCommentFunction = toCloudFunction(createcomment)
-const awardCommentBounty = toCloudFunction(awardcommentbounty)
 const createGroupFunction = toCloudFunction(creategroup)
 const resolveMarketFunction = toCloudFunction(resolvemarket)
-const closeMarketFunction = toCloudFunction(closemarket)
 const unsubscribeFunction = toCloudFunction(unsubscribe)
 const stripeWebhookFunction = toCloudFunction(stripewebhook)
 const createCheckoutSessionFunction = toCloudFunction(createcheckoutsession)
 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,19 +109,14 @@ 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,
   unsubscribeFunction as unsubscribe,
   stripeWebhookFunction as stripewebhook,
   createCheckoutSessionFunction as createcheckoutsession,
   getCurrentUserFunction as getcurrentuser,
   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 closeContracts
+        return contract
+      })
+      .filter((x) => !!x) as Contract[]
   })
 
   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,
+      'closed' + contract.id.slice(6, contract.id.length),
-      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

@@ -3,16 +3,8 @@ import * as admin from 'firebase-admin'
 import { keyBy, uniq } from 'lodash'
 
 import { Bet, LimitBet } from '../../common/bet'
+import { getUser, getValues, isProd, log } from './utils'
 import {
-  getContractPath,
-  getUser,
-  getValues,
-  isProd,
-  log,
-  revalidateStaticProps,
-} from './utils'
-import {
-  createBadgeAwardedNotification,
   createBetFillNotification,
   createBettingStreakBonusNotification,
   createUniqueBettorBonusNotification,
@@ -25,7 +17,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,
@@ -33,19 +24,14 @@ import {
 } from '../../common/antes'
 import { APIError } from '../../common/api'
 import { User } from '../../common/user'
-import { DAY_MS } from '../../common/util/time'
+import { UNIQUE_BETTOR_LIQUIDITY_AMOUNT } from '../../common/antes'
-import { BettingStreakBonusTxn, UniqueBettorBonusTxn } from '../../common/txn'
+import { addHouseLiquidity } from './add-liquidity'
-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()
 
 export const onCreateBet = functions
-  .runWith({ secrets: ['MAILGUN_KEY', 'API_SECRET'] })
+  .runWith({ secrets: ['MAILGUN_KEY'] })
   .firestore.document('contracts/{contractId}/bets/{betId}')
   .onCreate(async (change, context) => {
     const { contractId } = context.params as {
@@ -75,17 +61,11 @@ export const onCreateBet = functions
     const bettor = await getUser(bet.userId)
     if (!bettor) return
 
-    await change.ref.update({
-      userAvatarUrl: bettor.avatarUrl,
-      userName: bettor.name,
-      userUsername: bettor.username,
-    })
-
     await updateUniqueBettorsAndGiveCreatorBonus(contract, eventId, bettor)
     await notifyFills(bet, contract, eventId, bettor)
     await updateBettingStreak(bettor, bet, contract, eventId)
 
-    await revalidateStaticProps(getContractPath(contract))
+    await firestore.collection('users').doc(bettor.id).update({ lastBetTime })
   })
 
 const updateBettingStreak = async (
@@ -94,30 +74,19 @@ const updateBettingStreak = async (
   contract: Contract,
   eventId: string
 ) => {
-  const { newBettingStreak } = await firestore.runTransaction(async (trans) => {
+  const betStreakResetTime = getTodaysBettingStreakResetTime()
-    const userDoc = firestore.collection('users').doc(user.id)
+  const lastBetTime = user?.lastBetTime ?? 0
-    const bettor = (await trans.get(userDoc)).data() as User
-    const now = Date.now()
-    const currentDateResetTime = currentDateBettingStreakResetTime()
-    // if now is before reset time, use yesterday's reset time
-    const lastDateResetTime = currentDateResetTime - DAY_MS
-    const betStreakResetTime =
-      now < currentDateResetTime ? lastDateResetTime : currentDateResetTime
-    const lastBetTime = bettor?.lastBetTime ?? 0
 
-    // If they've already bet after the reset time
+  // If they've already bet after the reset time, or if we haven't hit the reset time yet
-    if (lastBetTime > betStreakResetTime) return { newBettingStreak: undefined }
+  if (lastBetTime > betStreakResetTime || bet.createdTime < betStreakResetTime)
+    return
 
-    const newBettingStreak = (bettor?.currentBettingStreak ?? 0) + 1
+  const newBettingStreak = (user?.currentBettingStreak ?? 0) + 1
   // Otherwise, add 1 to their betting streak
-    trans.update(userDoc, {
+  await firestore.collection('users').doc(user.id).update({
     currentBettingStreak: newBettingStreak,
-      lastBetTime: bet.createdTime,
   })
-    return { newBettingStreak }
+
-  })
-  if (!newBettingStreak) return
-  const result = await firestore.runTransaction(async (trans) => {
   // Send them the bonus times their streak
   const bonusAmount = Math.min(
     BETTING_STREAK_BONUS_AMOUNT * newBettingStreak,
@@ -129,7 +98,7 @@ const updateBettingStreak = async (
   const bonusTxnDetails = {
     currentBettingStreak: newBettingStreak,
   }
-
+  const result = await firestore.runTransaction(async (trans) => {
     const bonusTxn: TxnData = {
       fromId: fromUserId,
       fromType: 'BANK',
@@ -139,50 +108,39 @@ const updateBettingStreak = async (
       token: 'M$',
       category: 'BETTING_STREAK_BONUS',
       description: JSON.stringify(bonusTxnDetails),
-      data: bonusTxnDetails,
+    }
-    } as Omit<BettingStreakBonusTxn, 'id' | 'createdTime'>
+    return await runTxn(trans, bonusTxn)
-    const { message, txn, status } = await runTxn(trans, bonusTxn)
-    return { message, txn, status, bonusAmount }
   })
-  if (result.status != 'success') {
+  if (!result.txn) {
     log("betting streak bonus txn couldn't be made")
-    log('status:', result.status)
-    log('message:', result.message)
     return
   }
-  if (result.txn) {
+
   await createBettingStreakBonusNotification(
     user,
     result.txn.id,
     bet,
     contract,
-      result.bonusAmount,
+    bonusAmount,
-      newBettingStreak,
     eventId
   )
-    await handleBettingStreakBadgeAward(user, newBettingStreak)
-  }
 }
 
 const updateUniqueBettorsAndGiveCreatorBonus = async (
-  oldContract: Contract,
+  contract: Contract,
   eventId: string,
   bettor: User
 ) => {
-  const { newUniqueBettorIds } = await firestore.runTransaction(
-    async (trans) => {
-      const contractDoc = firestore.collection(`contracts`).doc(oldContract.id)
-      const contract = (await trans.get(contractDoc)).data() as Contract
   let previousUniqueBettorIds = contract.uniqueBettorIds
 
-      const betsSnap = await trans.get(
-        firestore.collection(`contracts/${contract.id}/bets`)
-      )
   if (!previousUniqueBettorIds) {
-        const contractBets = betsSnap.docs.map((doc) => doc.data() as Bet)
+    const contractBets = (
+      await firestore.collection(`contracts/${contract.id}/bets`).get()
+    ).docs.map((doc) => doc.data() as Bet)
 
     if (contractBets.length === 0) {
-          return { newUniqueBettorIds: undefined }
+      log(`No bets for contract ${contract.id}`)
+      return
     }
 
     previousUniqueBettorIds = uniq(
@@ -200,71 +158,55 @@ const updateUniqueBettorsAndGiveCreatorBonus = async (
     log(`Got ${previousUniqueBettorIds} unique bettors`)
     isNewUniqueBettor && log(`And a new unique bettor ${bettor.id}`)
 
-        trans.update(contractDoc, {
+    await firestore.collection(`contracts`).doc(contract.id).update({
       uniqueBettorIds: newUniqueBettorIds,
       uniqueBettorCount: newUniqueBettorIds.length,
     })
   }
 
+  if (contract.mechanism === 'cpmm-1' && isNewUniqueBettor) {
+    await addHouseLiquidity(contract, UNIQUE_BETTOR_LIQUIDITY_AMOUNT)
+  }
+
   // No need to give a bonus for the creator's bet
-      if (!isNewUniqueBettor || bettor.id == contract.creatorId)
+  if (!isNewUniqueBettor || bettor.id == contract.creatorId) return
-        return { newUniqueBettorIds: undefined }
-
-      return { newUniqueBettorIds }
-    }
-  )
-
-  if (!newUniqueBettorIds) return
-
-  if (oldContract.mechanism === 'cpmm-1') {
-    await addHouseSubsidy(oldContract.id, UNIQUE_BETTOR_LIQUIDITY)
-  }
 
+  // Create combined txn for all new unique bettors
   const bonusTxnDetails = {
-    contractId: oldContract.id,
+    contractId: contract.id,
-    uniqueNewBettorId: bettor.id,
+    uniqueBettorIds: newUniqueBettorIds,
   }
   const fromUserId = isProd()
     ? HOUSE_LIQUIDITY_PROVIDER_ID
     : 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,
       fromType: 'BANK',
-      toId: oldContract.creatorId,
+      toId: contract.creatorId,
       toType: 'USER',
       amount: UNIQUE_BETTOR_BONUS_AMOUNT,
       token: 'M$',
       category: 'UNIQUE_BETTOR_BONUS',
       description: JSON.stringify(bonusTxnDetails),
-      data: bonusTxnDetails,
+    }
-    } as Omit<UniqueBettorBonusTxn, 'id' | 'createdTime'>
+    return await runTxn(trans, bonusTxn)
-
-    const { status, message, txn } = await runTxn(trans, bonusTxn)
-
-    return { status, newUniqueBettorIds, message, txn }
   })
 
   if (result.status != 'success' || !result.txn) {
-    log(`No bonus for user: ${oldContract.creatorId} - status:`, result.status)
+    log(`No bonus for user: ${contract.creatorId} - reason:`, result.status)
-    log('message:', result.message)
   } else {
-    log(
+    log(`Bonus txn for user: ${contract.creatorId} completed:`, result.txn?.id)
-      `Bonus txn for user: ${oldContract.creatorId} completed:`,
-      result.txn?.id
-    )
     await createUniqueBettorBonusNotification(
-      oldContract.creatorId,
+      contract.creatorId,
       bettor,
       result.txn.id,
-      oldContract,
+      contract,
       result.txn.amount,
-      result.newUniqueBettorIds,
+      newUniqueBettorIds,
       eventId + '-unique-bettor-bonus'
     )
   }
@@ -311,42 +253,6 @@ const notifyFills = async (
   )
 }
 
-const currentDateBettingStreakResetTime = () => {
+const getTodaysBettingStreakResetTime = () => {
   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-comment-on-contract.ts

@@ -1,18 +1,10 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
 import { compact } from 'lodash'
-import {
+import { getContract, getUser, getValues } from './utils'
-  getContract,
-  getContractPath,
-  getUser,
-  getValues,
-  revalidateStaticProps,
-} from './utils'
 import { ContractComment } from '../../common/comment'
 import { Bet } from '../../common/bet'
 import { Answer } from '../../common/answer'
-import { getLargestPosition } from '../../common/calculate'
-import { maxBy } from 'lodash'
 import {
   createCommentOrAnswerOrUpdatedContractNotification,
   replied_users_info,
@@ -22,60 +14,6 @@ import { addUserToContractFollowers } from './follow-market'
 
 const firestore = admin.firestore()
 
-function getMostRecentCommentableBet(
-  before: number,
-  betsByCurrentUser: Bet[],
-  commentsByCurrentUser: ContractComment[],
-  answerOutcome?: string
-) {
-  let sortedBetsByCurrentUser = betsByCurrentUser.sort(
-    (a, b) => b.createdTime - a.createdTime
-  )
-  if (answerOutcome) {
-    sortedBetsByCurrentUser = sortedBetsByCurrentUser.slice(0, 1)
-  }
-  return sortedBetsByCurrentUser
-    .filter((bet) => {
-      const { createdTime, isRedemption } = bet
-      // You can comment on bets posted in the last hour
-      const commentable = !isRedemption && before - createdTime < 60 * 60 * 1000
-      const alreadyCommented = commentsByCurrentUser.some(
-        (comment) => comment.createdTime > bet.createdTime
-      )
-      if (commentable && !alreadyCommented) {
-        if (!answerOutcome) return true
-        return answerOutcome === bet.outcome
-      }
-      return false
-    })
-    .pop()
-}
-
-async function getPriorUserComments(
-  contractId: string,
-  userId: string,
-  before: number
-) {
-  const priorCommentsQuery = await firestore
-    .collection('contracts')
-    .doc(contractId)
-    .collection('comments')
-    .where('createdTime', '<', before)
-    .where('userId', '==', userId)
-    .get()
-  return priorCommentsQuery.docs.map((d) => d.data() as ContractComment)
-}
-
-async function getPriorContractBets(contractId: string, before: number) {
-  const priorBetsQuery = await firestore
-    .collection('contracts')
-    .doc(contractId)
-    .collection('bets')
-    .where('createdTime', '<', before)
-    .get()
-  return priorBetsQuery.docs.map((d) => d.data() as Bet)
-}
-
 export const onCreateCommentOnContract = functions
   .runWith({ secrets: ['MAILGUN_KEY'] })
   .firestore.document('contracts/{contractId}/comments/{commentId}')
@@ -94,8 +32,6 @@ export const onCreateCommentOnContract = functions
       contractQuestion: contract.question,
     })
 
-    await revalidateStaticProps(getContractPath(contract))
-
     const comment = change.data() as ContractComment
     const lastCommentTime = comment.createdTime
 
@@ -109,48 +45,7 @@ export const onCreateCommentOnContract = functions
       .doc(contract.id)
       .update({ lastCommentTime, lastUpdatedTime: Date.now() })
 
-    const priorBets = await getPriorContractBets(
+    let bet: Bet | undefined
-      contractId,
-      comment.createdTime
-    )
-    const priorUserBets = priorBets.filter(
-      (b) => b.userId === comment.userId && !b.isAnte
-    )
-    const priorUserComments = await getPriorUserComments(
-      contractId,
-      comment.userId,
-      comment.createdTime
-    )
-    const bet = getMostRecentCommentableBet(
-      comment.createdTime,
-      priorUserBets,
-      priorUserComments,
-      comment.answerOutcome
-    )
-    if (bet) {
-      await change.ref.update({
-        betId: bet.id,
-        betOutcome: bet.outcome,
-        betAmount: bet.amount,
-      })
-    }
-
-    const position = getLargestPosition(contract, priorUserBets)
-    if (position) {
-      const fields: { [k: string]: unknown } = {
-        commenterPositionShares: position.shares,
-        commenterPositionOutcome: position.outcome,
-      }
-      const previousProb =
-        contract.outcomeType === 'BINARY'
-          ? maxBy(priorBets, (bet) => bet.createdTime)?.probAfter
-          : undefined
-      if (previousProb != null) {
-        fields.commenterPositionProb = previousProb
-      }
-      await change.ref.update(fields)
-    }
-
     let answer: Answer | undefined
     if (comment.answerOutcome) {
       answer =
@@ -159,6 +54,23 @@ export const onCreateCommentOnContract = functions
               (answer) => answer.id === comment.answerOutcome
             )
           : undefined
+    } else if (comment.betId) {
+      const betSnapshot = await firestore
+        .collection('contracts')
+        .doc(contractId)
+        .collection('bets')
+        .doc(comment.betId)
+        .get()
+      bet = betSnapshot.data() as Bet
+      answer =
+        contract.outcomeType === 'FREE_RESPONSE' && contract.answers
+          ? contract.answers.find((answer) => answer.id === bet?.outcome)
+          : undefined
+
+      await change.ref.update({
+        betOutcome: bet.outcome,
+        betAmount: bet.amount,
+      })
     }
 
     const comments = await getValues<ContractComment>(

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-create-user.ts

@@ -23,12 +23,12 @@ export const onCreateUser = functions
 
     await sendWelcomeEmail(user, privateUser)
 
+    const guideSendTime = dayjs().add(28, 'hours').toString()
+    await sendCreatorGuideEmail(user, privateUser, guideSendTime)
+
     const followupSendTime = dayjs().add(48, 'hours').toString()
     await sendPersonalFollowupEmail(user, privateUser, followupSendTime)
 
-    const guideSendTime = dayjs().add(96, 'hours').toString()
-    await sendCreatorGuideEmail(user, privateUser, guideSendTime)
-
     // skip email if weekly email is about to go out
     const day = dayjs().utc().day()
     if (day === 0 || (day === 1 && dayjs().utc().hour() <= 19)) return

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,110 +1,29 @@
 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}')
   .onUpdate(async (change, context) => {
     const contract = change.after.data() as Contract
-    const previousContract = change.before.data() as Contract
     const { eventId } = context
-    const { closeTime, question } = contract
 
-    if (!previousContract.isResolved && contract.isResolved) {
-      // No need to notify users of resolution, that's handled in resolve-market
-      return await handleResolvedContract(contract)
-    } else if (previousContract.groupSlugs !== contract.groupSlugs) {
-      await handleContractGroupUpdated(previousContract, contract)
-    } else if (
-      previousContract.closeTime !== closeTime ||
-      previousContract.question !== question
-    ) {
-      await handleUpdatedCloseTime(previousContract, contract, eventId)
-    }
-  })
-
-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,
-  eventId: string
-) {
     const contractUpdater = await getUser(contract.creatorId)
     if (!contractUpdater) throw new Error('Could not find contract updater')
+
+    const previousValue = change.before.data() as Contract
+    if (
+      previousValue.closeTime !== contract.closeTime ||
+      previousValue.question !== contract.question
+    ) {
       let sourceText = ''
-  if (previousContract.closeTime !== contract.closeTime && contract.closeTime) {
+      if (
+        previousValue.closeTime !== contract.closeTime &&
+        contract.closeTime
+      ) {
         sourceText = contract.closeTime.toString()
-  } else if (previousContract.question !== contract.question) {
+      } else if (previousValue.question !== contract.question) {
         sourceText = contract.question
       }
 
@@ -118,43 +37,4 @@ 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') &&
@@ -142,38 +139,17 @@ export const placebet = newEndpoint({}, async (req, auth) => {
     }
 
     const betDoc = contractDoc.collection('bets').doc()
-    trans.create(betDoc, {
+    trans.create(betDoc, { id: betDoc.id, userId: user.id, ...newBet })
-      id: betDoc.id,
-      userId: user.id,
-      userAvatarUrl: user.avatarUrl,
-      userUsername: user.username,
-      userName: user.name,
-      ...newBet,
-    })
     log('Created new bet document.')
 
     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 +186,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/reset-weekly-emails-flag.ts

@@ -0,0 +1,24 @@
+import * as functions from 'firebase-functions'
+import * as admin from 'firebase-admin'
+import { getAllPrivateUsers } from './utils'
+
+export const resetWeeklyEmailsFlag = functions
+  .runWith({ secrets: ['MAILGUN_KEY'] })
+  // every Monday at 12 am PT (UTC -07:00) ( 12 hours before the emails will be sent)
+  .pubsub.schedule('0 7 * * 1')
+  .timeZone('Etc/UTC')
+  .onRun(async () => {
+    const privateUsers = await getAllPrivateUsers()
+    // get all users that haven't unsubscribed from weekly emails
+    const privateUsersToSendEmailsTo = privateUsers.filter((user) => {
+      return !user.unsubscribedFromWeeklyTrendingEmails
+    })
+    const firestore = admin.firestore()
+    await Promise.all(
+      privateUsersToSendEmailsTo.map(async (user) => {
+        return firestore.collection('private-users').doc(user.id).update({
+          weeklyTrendingEmailSent: false,
+        })
+      })
+    )
+  })

functions/src/reset-weekly-emails-flags.ts

@@ -1,24 +0,0 @@
-import * as functions from 'firebase-functions'
-import * as admin from 'firebase-admin'
-import { getAllPrivateUsers } from './utils'
-
-export const resetWeeklyEmailsFlags = functions
-  .runWith({
-    timeoutSeconds: 300,
-    memory: '4GB',
-  })
-  .pubsub // every Monday at 12 am PT (UTC -07:00) ( 12 hours before the emails will be sent)
-  .schedule('0 7 * * 1')
-  .timeZone('Etc/UTC')
-  .onRun(async () => {
-    const privateUsers = await getAllPrivateUsers()
-    const firestore = admin.firestore()
-    await Promise.all(
-      privateUsers.map(async (user) => {
-        return firestore.collection('private-users').doc(user.id).update({
-          weeklyTrendingEmailSent: false,
-          weeklyPortfolioUpdateEmailSent: false,
-        })
-      })
-    )
-  })

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,34 +9,19 @@ import {
   RESOLUTIONS,
 } from '../../common/contract'
 import { Bet } from '../../common/bet'
-import {
+import { getUser, isProd, payUser } 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 { isManifoldId } from '../../common/envs/constants'
 import { removeUndefinedProps } from '../../common/util/object'
 import { LiquidityProvision } from '../../common/liquidity-provision'
 import { APIError, newEndpoint, validate } from './api'
 import { getContractBetMetrics } from '../../common/calculate'
-import { createContractResolvedNotifications } from './create-notification'
+import { createCommentOrAnswerOrUpdatedContractNotification } from './create-notification'
-import { CancelUniqueBettorBonusTxn, Txn } from '../../common/txn'
-import { runTxn, TxnData } from './transact'
-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,16 +75,14 @@ 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,
-  if (
+    req.body
-    creatorId !== auth.uid &&
-    !isManifoldId(auth.uid) &&
-    !isAdmin(firebaseUser.email)
   )
+
+  if (creatorId !== auth.uid && !isManifoldId(auth.uid))
     throw new APIError(403, 'User is not creator of contract')
 
   if (contract.resolution) throw new APIError(400, 'Contract already resolved')
@@ -107,16 +90,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,12 +112,8 @@ export const resolveMarket = async (
     (doc) => doc.data() as LiquidityProvision
   )
 
-  const {
+  const { payouts, creatorPayout, liquidityPayouts, collectedFees } =
-    payouts: traderPayouts,
+    getPayouts(
-    creatorPayout,
-    liquidityPayouts,
-    collectedFees,
-  } = getPayouts(
       outcome,
       contract,
       bets,
@@ -165,62 +134,64 @@ 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)
+  const userPayoutsWithoutLoans = groupPayoutsByUser(payouts)
-  await revalidateStaticProps(getContractPath(contract))
-
-  const userPayoutsWithoutLoans = groupPayoutsByUser(payoutsWithoutLoans)
 
   const userInvestments = mapValues(
     groupBy(bets, (bet) => bet.userId),
     (bets) => getContractBetMetrics(contract, bets).invested
   )
+  let resolutionText = outcome ?? contract.question
+  if (
+    contract.outcomeType === 'FREE_RESPONSE' ||
+    contract.outcomeType === 'MULTIPLE_CHOICE'
+  ) {
+    const answerText = contract.answers.find(
+      (answer) => answer.id === outcome
+    )?.text
+    if (answerText) resolutionText = answerText
+  } else if (contract.outcomeType === 'BINARY') {
+    if (resolutionText === 'MKT' && probabilityInt)
+      resolutionText = `${probabilityInt}%`
+    else if (resolutionText === 'MKT') resolutionText = 'PROB'
+  } else if (contract.outcomeType === 'PSEUDO_NUMERIC') {
+    if (resolutionText === 'MKT' && value) resolutionText = `${value}`
+  }
 
-  await createContractResolvedNotifications(
+  // TODO: this actually may be too slow to complete with a ton of users to notify?
-    contract,
+  await createCommentOrAnswerOrUpdatedContractNotification(
+    contract.id,
+    'contract',
+    'resolved',
     creator,
-    outcome,
+    contract.id + '-resolution',
-    probabilityInt,
+    resolutionText,
-    value,
+    contract,
+    undefined,
     {
       bets,
       userInvestments,
@@ -235,6 +206,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 +284,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
@@ -313,55 +294,4 @@ function validateAnswer(
   }
 }
 
-async function undoUniqueBettorRewardsIfCancelResolution(
-  contract: Contract,
-  outcome: string
-) {
-  if (outcome === 'CANCEL') {
-    const creatorsBonusTxns = await getValues<Txn>(
-      firestore
-        .collection('txns')
-        .where('category', '==', 'UNIQUE_BETTOR_BONUS')
-        .where('toId', '==', contract.creatorId)
-    )
-
-    const bonusTxnsOnThisContract = creatorsBonusTxns.filter(
-      (txn) => txn.data && txn.data.contractId === contract.id
-    )
-    log('total bonusTxnsOnThisContract', bonusTxnsOnThisContract.length)
-    const totalBonusAmount = sumBy(bonusTxnsOnThisContract, (txn) => txn.amount)
-    log('totalBonusAmount to be withdrawn', totalBonusAmount)
-    const result = await firestore.runTransaction(async (trans) => {
-      const bonusTxn: TxnData = {
-        fromId: contract.creatorId,
-        fromType: 'USER',
-        toId: isProd()
-          ? HOUSE_LIQUIDITY_PROVIDER_ID
-          : DEV_HOUSE_LIQUIDITY_PROVIDER_ID,
-        toType: 'BANK',
-        amount: totalBonusAmount,
-        token: 'M$',
-        category: 'CANCEL_UNIQUE_BETTOR_BONUS',
-        data: {
-          contractId: contract.id,
-        },
-      } as Omit<CancelUniqueBettorBonusTxn, 'id' | 'createdTime'>
-      return await runTxn(trans, bonusTxn)
-    })
-
-    if (result.status != 'success' || !result.txn) {
-      log(
-        `Couldn't cancel bonus for user: ${contract.creatorId} - status:`,
-        result.status
-      )
-      log('message:', result.message)
-    } else {
-      log(
-        `Cancel Bonus txn for user: ${contract.creatorId} completed:`,
-        result.txn?.id
-      )
-    }
-  }
-}
-
 const firestore = admin.firestore()

functions/src/save-twitch-credentials.ts

@@ -1,22 +0,0 @@
-import * as admin from 'firebase-admin'
-import { z } from 'zod'
-
-import { newEndpoint, validate } from './api'
-
-const bodySchema = z.object({
-  twitchInfo: z.object({
-    twitchName: z.string(),
-    controlToken: z.string(),
-  }),
-})
-
-
-export const savetwitchcredentials = newEndpoint({}, async (req, auth) => {
-  const { twitchInfo } = validate(bodySchema, req.body)
-  const userId = auth.uid
-
-  await firestore.doc(`private-users/${userId}`).update({ twitchInfo })
-  return { success: true }
-})
-
-const firestore = admin.firestore()

functions/src/score-contracts.ts

@@ -1,15 +1,12 @@
 import * as functions from 'firebase-functions'
 import * as admin from 'firebase-admin'
+import { Bet } from 'common/bet'
 import { uniq } from 'lodash'
-import { Bet } from '../../common/bet'
+import { Contract } from 'common/contract'
-import { Contract } from '../../common/contract'
 import { log } from './utils'
-import { removeUndefinedProps } from '../../common/util/object'
-import { DAY_MS, HOUR_MS } from '../../common/util/time'
 
-export const scoreContracts = functions
+export const scoreContracts = functions.pubsub
-  .runWith({ memory: '4GB', timeoutSeconds: 540 })
+  .schedule('every 1 hours')
-  .pubsub.schedule('every 1 hours')
   .onRun(async () => {
     await scoreContractsInternal()
   })
@@ -17,12 +14,11 @@ const firestore = admin.firestore()
 
 async function scoreContractsInternal() {
   const now = Date.now()
-  const hourAgo = now - HOUR_MS
+  const lastHour = now - 60 * 60 * 1000
-  const dayAgo = now - DAY_MS
+  const last3Days = now - 1000 * 60 * 60 * 24 * 3
-  const threeDaysAgo = now - DAY_MS * 3
   const activeContractsSnap = await firestore
     .collection('contracts')
-    .where('lastUpdatedTime', '>', hourAgo)
+    .where('lastUpdatedTime', '>', lastHour)
     .get()
   const activeContracts = activeContractsSnap.docs.map(
     (doc) => doc.data() as Contract
@@ -43,33 +39,16 @@ async function scoreContractsInternal() {
   for (const contract of contracts) {
     const bets = await firestore
       .collection(`contracts/${contract.id}/bets`)
-      .where('createdTime', '>', threeDaysAgo)
+      .where('createdTime', '>', last3Days)
       .get()
     const bettors = bets.docs
       .map((doc) => doc.data() as Bet)
       .map((bet) => bet.userId)
-    const popularityScore = uniq(bettors).length
+    const score = uniq(bettors).length
-
+    if (contract.popularityScore !== score)
-    const wasCreatedToday = contract.createdTime > dayAgo
-
-    let dailyScore: number | undefined
-    if (
-      contract.outcomeType === 'BINARY' &&
-      contract.mechanism === 'cpmm-1' &&
-      !wasCreatedToday
-    ) {
-      const percentChange = Math.abs(contract.probChanges.day)
-      dailyScore = popularityScore * percentChange
-    }
-
-    if (
-      contract.popularityScore !== popularityScore ||
-      contract.dailyScore !== dailyScore
-    ) {
       await firestore
         .collection('contracts')
         .doc(contract.id)
-        .update(removeUndefinedProps({ popularityScore, dailyScore }))
+        .update({ popularityScore: score })
-    }
   }
 }

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

@@ -1,30 +0,0 @@
-import * as admin from 'firebase-admin'
-
-import { initAdmin } from './script-init'
-import { getAllPrivateUsers } from 'functions/src/utils'
-initAdmin()
-
-const firestore = admin.firestore()
-
-async function main() {
-  const privateUsers = await getAllPrivateUsers()
-  await Promise.all(
-    privateUsers.map((privateUser) => {
-      if (!privateUser.id) return Promise.resolve()
-      if (privateUser.notificationPreferences.badges_awarded === undefined) {
-        return firestore
-          .collection('private-users')
-          .doc(privateUser.id)
-          .update({
-            notificationPreferences: {
-              ...privateUser.notificationPreferences,
-              badges_awarded: ['browser'],
-            },
-          })
-      }
-      return
-    })
-  )
-}
-
-if (require.main === module) main().then(() => process.exit())