From f79d69cd6924519f5fe92b67880ae677d6fc8011 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Mon, 20 Dec 2021 09:56:27 -0800
Subject: [PATCH 01/81] Increase default fetch size 25 -> 99

---
 web/lib/firebase/contracts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index f4c7de2f..4942d721 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -105,7 +105,7 @@ export async function listContracts(creatorId: string): Promise<Contract[]> {
 }
 
 export async function listAllContracts(): Promise<Contract[]> {
-  const q = query(contractCollection, orderBy('createdTime', 'desc'), limit(25))
+  const q = query(contractCollection, orderBy('createdTime', 'desc'), limit(99))
   const snapshot = await getDocs(q)
   return snapshot.docs.map((doc) => doc.data() as Contract)
 }
@@ -113,7 +113,7 @@ export async function listAllContracts(): Promise<Contract[]> {
 export function listenForContracts(
   setContracts: (contracts: Contract[]) => void
 ) {
-  const q = query(contractCollection, orderBy('createdTime', 'desc'), limit(25))
+  const q = query(contractCollection, orderBy('createdTime', 'desc'), limit(99))
   return onSnapshot(q, (snap) => {
     setContracts(snap.docs.map((doc) => doc.data() as Contract))
   })

From 05b8ce96b516466cc5626464f139dc0259c4e274 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Mon, 20 Dec 2021 18:04:19 -0600
Subject: [PATCH 02/81] Fix about page numbering

---
 web/pages/about.tsx | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index fc3244d8..36165cad 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -84,18 +84,16 @@ function Contents() {
             Anyone can create a market for any yes-or-no question.
           </strong>
         </li>
-      </ol>
-      <p>
-        You can ask questions about the future like &quot;Will Taiwan remove its
-        14-day COVID quarantine by Jun 01, 2022?&quot; Then use the information
-        to plan your trip.
-      </p>
-      <p>
-        You can also ask subjective, personal questions like &quot;Will I enjoy
-        my 2022 Taiwan trip?&quot;. Then share the market with your family and
-        friends.
-      </p>
-      <ol>
+        <p>
+          You can ask questions about the future like &quot;Will Taiwan remove
+          its 14-day COVID quarantine by Jun 01, 2022?&quot; Then use the
+          information to plan your trip.
+        </p>
+        <p>
+          You can also ask subjective, personal questions like &quot;Will I
+          enjoy my 2022 Taiwan trip?&quot;. Then share the market with your
+          family and friends.
+        </p>
         <li>
           <strong>
             Anyone can bet on a market using Mantic Dollars (M$), our platform

From 998b01cde7388e16bebeec9a887571a9dd794c4b Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Mon, 20 Dec 2021 18:06:24 -0600
Subject: [PATCH 03/81] Don't flash no markets when loading on tag page.

---
 web/pages/tag/[tag].tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/pages/tag/[tag].tsx b/web/pages/tag/[tag].tsx
index e47d344f..7f15748a 100644
--- a/web/pages/tag/[tag].tsx
+++ b/web/pages/tag/[tag].tsx
@@ -21,7 +21,11 @@ export default function TagPage() {
   return (
     <Page>
       <Title text={`#${tag}`} />
-      <SearchableGrid contracts={contracts === 'loading' ? [] : contracts} />
+      {contracts === 'loading' ? (
+        <></>
+      ) : (
+        <SearchableGrid contracts={contracts} />
+      )}
     </Page>
   )
 }

From 3841e2a98fc16c4b1cb512cf0ec58fbe8e2acb8c Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Mon, 20 Dec 2021 22:29:01 -0800
Subject: [PATCH 04/81] Change Title to use body font

---
 web/components/mantic-logo.tsx | 1 -
 web/components/title.tsx       | 5 +----
 web/tailwind.config.js         | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/web/components/mantic-logo.tsx b/web/components/mantic-logo.tsx
index afeced49..904844cb 100644
--- a/web/components/mantic-logo.tsx
+++ b/web/components/mantic-logo.tsx
@@ -17,7 +17,6 @@ export function ManticLogo(props: { darkBackground?: boolean }) {
             'font-major-mono lowercase mt-1 sm:text-2xl md:whitespace-nowrap',
             darkBackground && 'text-white'
           )}
-          style={{ fontFamily: 'Major Mono Display,monospace' }}
         >
           Mantic Markets
         </div>
diff --git a/web/components/title.tsx b/web/components/title.tsx
index 83b39562..6653a9f1 100644
--- a/web/components/title.tsx
+++ b/web/components/title.tsx
@@ -4,10 +4,7 @@ export function Title(props: { text: string; className?: string }) {
   const { text, className } = props
   return (
     <h1
-      className={clsx(
-        'text-3xl font-major-mono text-indigo-700 inline-block my-6',
-        className
-      )}
+      className={clsx('text-3xl text-indigo-700 inline-block my-6', className)}
     >
       {text}
     </h1>
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index e899ffcf..4319621d 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -8,7 +8,7 @@ module.exports = {
     fontFamily: Object.assign(
       { ...defaultTheme.fontFamily },
       {
-        'major-mono': ['Courier', 'monospace'],
+        'major-mono': ['Major Mono Display', 'monospace'],
         'readex-pro': ['Readex Pro', 'sans-serif'],
       }
     ),

From 9d438dc3568eee8baff2d42c7f7a6894972722e9 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Mon, 20 Dec 2021 22:29:32 -0800
Subject: [PATCH 05/81] Make a bunch of predictions at once (#9)

* Set up a page to make bulk predictions

* Integrate preview into the same card

* List created predictions

* Make changes per James's comments
---
 web/lib/firebase/contracts.ts  |   4 +-
 web/pages/make-predictions.tsx | 223 +++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+), 1 deletion(-)
 create mode 100644 web/pages/make-predictions.tsx

diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index 4942d721..652bec4b 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -51,11 +51,13 @@ export function compute(contract: Contract) {
   const volume = pool.YES + pool.NO - startPool.YES - startPool.NO
   const prob = pool.YES ** 2 / (pool.YES ** 2 + pool.NO ** 2)
   const probPercent = Math.round(prob * 100) + '%'
+  const startProb =
+    startPool.YES ** 2 / (startPool.YES ** 2 + startPool.NO ** 2)
   const createdDate = dayjs(createdTime).format('MMM D')
   const resolvedDate = isResolved
     ? dayjs(resolutionTime).format('MMM D')
     : undefined
-  return { volume, probPercent, createdDate, resolvedDate }
+  return { volume, probPercent, startProb, createdDate, resolvedDate }
 }
 
 const db = getFirestore(app)
diff --git a/web/pages/make-predictions.tsx b/web/pages/make-predictions.tsx
new file mode 100644
index 00000000..7b8c8405
--- /dev/null
+++ b/web/pages/make-predictions.tsx
@@ -0,0 +1,223 @@
+import clsx from 'clsx'
+import Link from 'next/link'
+import { useState } from 'react'
+import { Col } from '../components/layout/col'
+import { Row } from '../components/layout/row'
+import { Spacer } from '../components/layout/spacer'
+import { Linkify } from '../components/linkify'
+import { Page } from '../components/page'
+import { Title } from '../components/title'
+import { useUser } from '../hooks/use-user'
+import { compute, Contract, path } from '../lib/firebase/contracts'
+import { createContract } from '../lib/service/create-contract'
+
+type Prediction = {
+  question: string
+  description: string
+  initialProb: number
+  createdUrl?: string
+}
+
+function toPrediction(contract: Contract): Prediction {
+  const { startProb } = compute(contract)
+  return {
+    question: contract.question,
+    description: contract.description,
+    initialProb: startProb * 100,
+    createdUrl: path(contract),
+  }
+}
+
+function PredictionRow(props: { prediction: Prediction }) {
+  const { prediction } = props
+  return (
+    <Row className="gap-4 justify-between hover:bg-gray-300 p-4">
+      <Col className="justify-between">
+        <div className="font-medium text-indigo-700 mb-2">
+          <Linkify text={prediction.question} />
+        </div>
+        <div className="text-gray-500 text-sm">{prediction.description}</div>
+      </Col>
+      {/* Initial probability */}
+      <div className="ml-auto">
+        <div className="text-3xl">
+          <div className="text-primary">
+            {prediction.initialProb.toFixed(0)}%
+            <div className="text-lg">chance</div>
+          </div>
+        </div>
+      </div>
+      {/* Current probability; hidden for now */}
+      {/* <div>
+        <div className="text-3xl">
+          <div className="text-primary">
+            {prediction.initialProb}%<div className="text-lg">chance</div>
+          </div>
+        </div>
+      </div> */}
+    </Row>
+  )
+}
+
+function PredictionList(props: { predictions: Prediction[] }) {
+  const { predictions } = props
+  return (
+    <Col className="divide-gray-300 divide-y border-gray-300 border rounded-md">
+      {predictions.map((prediction) =>
+        prediction.createdUrl ? (
+          <Link href={prediction.createdUrl}>
+            <a>
+              <PredictionRow
+                key={prediction.question}
+                prediction={prediction}
+              />
+            </a>
+          </Link>
+        ) : (
+          <PredictionRow key={prediction.question} prediction={prediction} />
+        )
+      )}
+    </Col>
+  )
+}
+
+const TEST_VALUE = `1. Biden approval rating (as per 538) is greater than 50%: 80%
+2. Court packing is clearly going to happen (new justices don't have to be appointed by end of year): 5%
+3. Yang is New York mayor: 80%
+4. Newsom recalled as CA governor: 5%
+5. At least $250 million in damage from BLM protests this year: 30%
+6. Significant capital gains tax hike (above 30% for highest bracket): 20%`
+
+export default function MakePredictions() {
+  const user = useUser()
+  const [predictionsString, setPredictionsString] = useState('')
+  const [description, setDescription] = useState('')
+  const [isSubmitting, setIsSubmitting] = useState(false)
+  const [createdContracts, setCreatedContracts] = useState<Contract[]>([])
+
+  const bulkPlaceholder = `e.g.
+${TEST_VALUE}
+...
+`
+
+  const predictions: Prediction[] = []
+
+  // Parse bulkContracts, then run createContract for each
+  const lines = predictionsString ? predictionsString.split('\n') : []
+  for (const line of lines) {
+    // Parse line with regex
+    const matches = line.match(/^(.*):\s*(\d+)%\s*$/) || ['', '', '']
+    const [_, question, prob] = matches
+
+    if (!question || !prob) {
+      console.error('Invalid prediction: ', line)
+      continue
+    }
+
+    predictions.push({
+      question,
+      description,
+      initialProb: parseInt(prob),
+    })
+  }
+
+  async function createContracts() {
+    if (!user) {
+      // TODO: Convey error with snackbar/toast
+      console.error('You need to be signed in!')
+      return
+    }
+    setIsSubmitting(true)
+    for (const prediction of predictions) {
+      const contract = await createContract(
+        prediction.question,
+        prediction.description,
+        prediction.initialProb,
+        user
+      )
+      setCreatedContracts((prev) => [...prev, contract])
+    }
+    setPredictionsString('')
+    setIsSubmitting(false)
+  }
+
+  return (
+    <Page>
+      <Title text="Make Predictions" />
+      <div className="w-full bg-gray-100 rounded-lg shadow-xl px-6 py-4">
+        <form>
+          <div className="form-control">
+            <label className="label">
+              <span className="label-text">Prediction</span>
+              <div className="text-sm text-gray-500 ml-1">
+                One prediction per line, each formatted like "The sun will rise
+                tomorrow: 99%"
+              </div>
+            </label>
+
+            <textarea
+              className="textarea h-60 textarea-bordered"
+              placeholder={bulkPlaceholder}
+              value={predictionsString}
+              onChange={(e) => setPredictionsString(e.target.value || '')}
+            ></textarea>
+          </div>
+        </form>
+
+        <Spacer h={4} />
+
+        <div className="form-control w-full">
+          <label className="label">
+            <span className="label-text">Tags</span>
+          </label>
+
+          <input
+            type="text"
+            placeholder="e.g. #ACX2021 #World"
+            className="input"
+            value={description}
+            onChange={(e) => setDescription(e.target.value || '')}
+          />
+        </div>
+
+        {predictions.length > 0 && (
+          <div>
+            <Spacer h={4} />
+            <label className="label">
+              <span className="label-text">Preview</span>
+            </label>
+            <PredictionList predictions={predictions} />
+          </div>
+        )}
+
+        <Spacer h={4} />
+
+        <div className="flex justify-end my-4">
+          <button
+            type="submit"
+            className={clsx('btn btn-primary', {
+              loading: isSubmitting,
+            })}
+            disabled={predictions.length === 0 || isSubmitting}
+            onClick={(e) => {
+              e.preventDefault()
+              createContracts()
+            }}
+          >
+            Create all
+          </button>
+        </div>
+      </div>
+
+      {createdContracts.length > 0 && (
+        <>
+          <Spacer h={16} />
+          <Title text="Created Predictions" />
+          <div className="w-full bg-gray-100 rounded-lg shadow-xl px-6 py-4">
+            <PredictionList predictions={createdContracts.map(toPrediction)} />
+          </div>
+        </>
+      )}
+    </Page>
+  )
+}

From ff4550fe511089c5cb99a64ee582edb6259d8b27 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Tue, 21 Dec 2021 13:52:27 -0600
Subject: [PATCH 06/81] Increase the starting balance (#11)

---
 web/lib/firebase/users.ts | 2 +-
 web/pages/about.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts
index 7d98cda7..f6cd0366 100644
--- a/web/lib/firebase/users.ts
+++ b/web/lib/firebase/users.ts
@@ -19,7 +19,7 @@ import {
   signInWithPopup,
 } from 'firebase/auth'
 
-export const STARTING_BALANCE = 100
+export const STARTING_BALANCE = 1000
 
 export type User = {
   id: string
diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index 36165cad..4f2f7578 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -102,7 +102,7 @@ function Contents() {
         </li>
       </ol>
       <p>
-        You get M$ 100 just for signing up, so you can start betting
+        You get M$ 1,000 just for signing up, so you can start betting
         immediately! When a market creator decides an outcome in your favor,
         you&#39;ll win money from people who bet against you.
       </p>

From 856a2453a166ebb7a5be1718ae9a143a2c34daf0 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Tue, 21 Dec 2021 14:02:24 -0600
Subject: [PATCH 07/81] Remove references to paying for our Mantic Dollars

---
 web/pages/about.tsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index 4f2f7578..61d87516 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -104,20 +104,22 @@ function Contents() {
       <p>
         You get M$ 1,000 just for signing up, so you can start betting
         immediately! When a market creator decides an outcome in your favor,
-        you&#39;ll win money from people who bet against you.
+        you&#39;ll win Mantic Dollars from people who bet against you.
       </p>
-      <p>
+      {/* <p>
         If you run out of money, you can purchase more at a rate of $1 USD to M$
         100. (Note that Mantic Dollars are not convertible to cash and can only
         be used within our platform.)
-      </p>
+      </p> */}
       <aside>
-        💡 We&#39;re still in Open Beta; we&#39;ll tweak this model and
-        periodically reset balances before our official launch. If you purchase
-        any M$ during the beta, we promise to honor that when we launch!
+        💡 We&#39;re still in Open Beta; we&#39;ll tweak the amounts of Mantic
+        Dollars given out and periodically reset balances before our official
+        launch.
+        {/* If you purchase
+        any M$ during the beta, we promise to honor that when we launch! */}
       </aside>
 
-      <h3 id="why-do-i-want-to-bet-with-play-money-">
+      {/* <h3 id="why-do-i-want-to-bet-with-play-money-">
         Why do I want to bet with play-money?
       </h3>
       <p>
@@ -136,7 +138,7 @@ function Contents() {
         We also have some thoughts on how to reward bettors: physical swag,
         exclusive conversations with market creators, NFTs...? If you have
         ideas, let us know!
-      </p>
+      </p> */}
       <h3 id="can-prediction-markets-work-without-real-money-">
         Can prediction markets work without real money?
       </h3>
@@ -198,7 +200,7 @@ function Contents() {
       <h3 id="how-is-this-different-from-metaculus-or-hypermind-">
         How is this different from Metaculus or Hypermind?
       </h3>
-      <p>
+      {/* <p>
         We believe that in order to get the best results, you have to have skin
         in the game. We require that people use real money to buy the currency
         they use on our platform.
@@ -207,9 +209,9 @@ function Contents() {
         With Mantic Dollars being a scarce resource, people will bet more
         carefully and can&#39;t rig the outcome by creating multiple accounts.
         The result is more accurate predictions.
-      </p>
+      </p> */}
       <p>
-        Mantic Markets is also focused on accessibility and allowing anyone to
+        Mantic Markets is focused on accessibility and allowing anyone to
         quickly create and judge a prediction market. When we all have the power
         to create and share prediction markets in seconds and apply our own
         judgment on the outcome, it leads to a qualitative shift in the number,

From f48ae0170b241e1b6d13149c5d2e4228006b6258 Mon Sep 17 00:00:00 2001
From: mantikoros <95266179+mantikoros@users.noreply.github.com>
Date: Fri, 24 Dec 2021 15:06:01 -0600
Subject: [PATCH 08/81] Sell bets (#12)

* sell bet

* dev mode

* single-pot no-refund payoff; bet selling

* Increase default fetch size 25 -> 99

* Fix about page numbering

* Don't flash no markets when loading on tag page.

* Change Title to use body font

* Make a bunch of predictions at once (#9)

* Set up a page to make bulk predictions

* Integrate preview into the same card

* List created predictions

* Make changes per James's comments

* Increase the starting balance (#11)

* Remove references to paying for our Mantic Dollars

* Update simulator to use new calculations

* Change simulator random to be evenly random again

* Sell bet UI

* Migrate contracts and bets script

* Add comment to script

* bets => trades; exclude sold bets

* change sale formula

* Change current value to uncapped sell value.

* Disable sell button while selling

* Update some 'bet' to 'trade'

Co-authored-by: Austin Chen <akrolsmir@gmail.com>
Co-authored-by: jahooma <jahooma@gmail.com>
---
 .firebaserc                               |   6 +-
 functions/package.json                    |   1 +
 functions/src/index.ts                    |   3 +-
 functions/src/place-bet.ts                |  33 ++---
 functions/src/resolve-market.ts           |  23 +--
 functions/src/scripts/migrate-contract.ts |  58 ++++++++
 functions/src/sell-bet.ts                 | 162 ++++++++++++++++++++++
 functions/src/types/bet.ts                |  21 ++-
 functions/src/types/contract.ts           |   2 +-
 web/components/bet-panel.tsx              |  18 +--
 web/components/bets-list.tsx              | 117 +++++++++++++---
 web/components/contract-overview.tsx      |   4 +-
 web/components/contracts-list.tsx         |  14 +-
 web/components/profile-menu.tsx           |   6 +-
 web/lib/calculate.ts                      | 134 ++++++++++++++++++
 web/lib/calculation/contract.ts           |  72 ----------
 web/lib/firebase/api-call.ts              |   6 +
 web/lib/firebase/bets.ts                  |  17 ++-
 web/lib/firebase/contracts.ts             |   6 +-
 web/lib/firebase/init.ts                  |  40 +++---
 web/lib/service/create-contract.ts        |   7 +-
 web/lib/simulator/entries.ts              |  17 ++-
 web/lib/util/format.ts                    |   4 +-
 web/pages/[username]/[contractSlug].tsx   |   2 +-
 web/pages/about.tsx                       |   4 +-
 web/pages/simulator.tsx                   |  10 +-
 web/pages/{bets.tsx => trades.tsx}        |   6 +-
 27 files changed, 589 insertions(+), 204 deletions(-)
 create mode 100644 functions/src/scripts/migrate-contract.ts
 create mode 100644 functions/src/sell-bet.ts
 create mode 100644 web/lib/calculate.ts
 delete mode 100644 web/lib/calculation/contract.ts
 create mode 100644 web/lib/firebase/api-call.ts
 rename web/pages/{bets.tsx => trades.tsx} (68%)

diff --git a/.firebaserc b/.firebaserc
index 7594f4c6..0e191214 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,5 +1,7 @@
 {
   "projects": {
-    "default": "mantic-markets"
+    "default": "mantic-markets",
+    "prod": "mantic-markets",
+    "dev": "dev-mantic-markets"
   }
-}
+}
\ No newline at end of file
diff --git a/functions/package.json b/functions/package.json
index baaac0b4..62dd0c58 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -2,6 +2,7 @@
   "name": "functions",
   "scripts": {
     "build": "tsc",
+    "watch": "tsc -w",
     "serve": "yarn build && firebase emulators:start --only functions",
     "shell": "yarn build && firebase functions:shell",
     "start": "yarn shell",
diff --git a/functions/src/index.ts b/functions/src/index.ts
index 5f6cfc99..ee8da84b 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -2,6 +2,7 @@ import * as admin from 'firebase-admin'
 
 admin.initializeApp()
 
-export * from './keep-awake'
+// export * from './keep-awake'
 export * from './place-bet'
 export * from './resolve-market'
+export * from './sell-bet'
diff --git a/functions/src/place-bet.ts b/functions/src/place-bet.ts
index 9e773848..e6e4d25a 100644
--- a/functions/src/place-bet.ts
+++ b/functions/src/place-bet.ts
@@ -43,7 +43,7 @@ export const placeBet = functions.runWith({ minInstances: 1 }).https.onCall(
         .collection(`contracts/${contractId}/bets`)
         .doc()
 
-      const { newBet, newPool, newDpmWeights, newBalance } = getNewBetInfo(
+      const { newBet, newPool, newTotalShares, newBalance } = getNewBetInfo(
         user,
         outcome,
         amount,
@@ -54,7 +54,7 @@ export const placeBet = functions.runWith({ minInstances: 1 }).https.onCall(
       transaction.create(newBetDoc, newBet)
       transaction.update(contractDoc, {
         pool: newPool,
-        dpmWeights: newDpmWeights,
+        totalShares: newTotalShares,
       })
       transaction.update(userDoc, { balance: newBalance })
 
@@ -79,29 +79,19 @@ const getNewBetInfo = (
       ? { YES: yesPool + amount, NO: noPool }
       : { YES: yesPool, NO: noPool + amount }
 
-  const dpmWeight =
+  const shares =
     outcome === 'YES'
-      ? (amount * noPool ** 2) / (yesPool ** 2 + amount * yesPool)
-      : (amount * yesPool ** 2) / (noPool ** 2 + amount * noPool)
+      ? amount + (amount * noPool ** 2) / (yesPool ** 2 + amount * yesPool)
+      : amount + (amount * yesPool ** 2) / (noPool ** 2 + amount * noPool)
 
-  const { YES: yesWeight, NO: noWeight } = contract.dpmWeights || {
-    YES: 0,
-    NO: 0,
-  } // only nesc for old contracts
+  const { YES: yesShares, NO: noShares } = contract.totalShares
 
-  const newDpmWeights =
+  const newTotalShares =
     outcome === 'YES'
-      ? { YES: yesWeight + dpmWeight, NO: noWeight }
-      : { YES: yesWeight, NO: noWeight + dpmWeight }
+      ? { YES: yesShares + shares, NO: noShares }
+      : { YES: yesShares, NO: noShares + shares }
 
   const probBefore = yesPool ** 2 / (yesPool ** 2 + noPool ** 2)
-
-  const probAverage =
-    (amount +
-      noPool * Math.atan(yesPool / noPool) -
-      noPool * Math.atan((amount + yesPool) / noPool)) /
-    amount
-
   const probAfter = newPool.YES ** 2 / (newPool.YES ** 2 + newPool.NO ** 2)
 
   const newBet: Bet = {
@@ -109,15 +99,14 @@ const getNewBetInfo = (
     userId: user.id,
     contractId: contract.id,
     amount,
-    dpmWeight,
+    shares,
     outcome,
     probBefore,
-    probAverage,
     probAfter,
     createdTime: Date.now(),
   }
 
   const newBalance = user.balance - amount
 
-  return { newBet, newPool, newDpmWeights, newBalance }
+  return { newBet, newPool, newTotalShares, newBalance }
 }
diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index e20ca354..280af022 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -78,22 +78,27 @@ export const resolveMarket = functions
 const firestore = admin.firestore()
 
 const getPayouts = (outcome: string, contract: Contract, bets: Bet[]) => {
-  const [yesBets, noBets] = _.partition(bets, (bet) => bet.outcome === 'YES')
+  const openBets = bets.filter((b) => !b.isSold && !b.sale)
+  const [yesBets, noBets] = _.partition(
+    openBets,
+    (bet) => bet.outcome === 'YES'
+  )
 
-  const [pool, winningBets] =
+  const startPool = contract.startPool.YES + contract.startPool.NO
+  const truePool = contract.pool.YES + contract.pool.NO - startPool
+
+  const [totalShares, winningBets] =
     outcome === 'YES'
-      ? [contract.pool.NO - contract.startPool.NO, yesBets]
-      : [contract.pool.YES - contract.startPool.YES, noBets]
+      ? [contract.totalShares.YES, yesBets]
+      : [contract.totalShares.NO, noBets]
 
-  const finalPool = (1 - PLATFORM_FEE - CREATOR_FEE) * pool
-  const creatorPayout = CREATOR_FEE * pool
+  const finalPool = (1 - PLATFORM_FEE - CREATOR_FEE) * truePool
+  const creatorPayout = CREATOR_FEE * truePool
   console.log('final pool:', finalPool, 'creator fee:', creatorPayout)
 
-  const sumWeights = _.sumBy(winningBets, (bet) => bet.dpmWeight)
-
   const winnerPayouts = winningBets.map((bet) => ({
     userId: bet.userId,
-    payout: bet.amount + (bet.dpmWeight / sumWeights) * finalPool,
+    payout: (bet.shares / totalShares) * finalPool,
   }))
 
   return winnerPayouts.concat([
diff --git a/functions/src/scripts/migrate-contract.ts b/functions/src/scripts/migrate-contract.ts
new file mode 100644
index 00000000..eb55783e
--- /dev/null
+++ b/functions/src/scripts/migrate-contract.ts
@@ -0,0 +1,58 @@
+import * as admin from 'firebase-admin'
+import * as _ from 'lodash'
+import { Bet } from '../types/bet'
+import { Contract } from '../types/contract'
+
+type DocRef = admin.firestore.DocumentReference
+
+// Generate your own private key, and set the path below:
+// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
+const serviceAccount = require('../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json')
+
+admin.initializeApp({
+  credential: admin.credential.cert(serviceAccount),
+})
+const firestore = admin.firestore()
+
+async function migrateBet(contractRef: DocRef, bet: Bet) {
+  const { dpmWeight, amount, id } = bet as Bet & { dpmWeight: number }
+  const shares = dpmWeight + amount
+
+  await contractRef.collection('bets').doc(id).update({ shares })
+}
+
+async function migrateContract(contractRef: DocRef, contract: Contract) {
+  const bets = await contractRef
+    .collection('bets')
+    .get()
+    .then((snap) => snap.docs.map((bet) => bet.data() as Bet))
+
+  const totalShares = {
+    YES: _.sumBy(bets, (bet) => (bet.outcome === 'YES' ? bet.shares : 0)),
+    NO: _.sumBy(bets, (bet) => (bet.outcome === 'NO' ? bet.shares : 0)),
+  }
+
+  await contractRef.update({ totalShares })
+}
+
+async function migrateContracts() {
+  console.log('Migrating contracts')
+
+  const snapshot = await firestore.collection('contracts').get()
+  const contracts = snapshot.docs.map((doc) => doc.data() as Contract)
+
+  console.log('Loaded contracts', contracts.length)
+
+  for (const contract of contracts) {
+    const contractRef = firestore.doc(`contracts/${contract.id}`)
+    const betsSnapshot = await contractRef.collection('bets').get()
+    const bets = betsSnapshot.docs.map((bet) => bet.data() as Bet)
+
+    console.log('contract', contract.question, 'bets', bets.length)
+
+    for (const bet of bets) await migrateBet(contractRef, bet)
+    await migrateContract(contractRef, contract)
+  }
+}
+
+if (require.main === module) migrateContracts().then(() => process.exit())
diff --git a/functions/src/sell-bet.ts b/functions/src/sell-bet.ts
new file mode 100644
index 00000000..ba60a5e3
--- /dev/null
+++ b/functions/src/sell-bet.ts
@@ -0,0 +1,162 @@
+import * as admin from 'firebase-admin'
+import * as functions from 'firebase-functions'
+
+import { CREATOR_FEE, PLATFORM_FEE } from './resolve-market'
+import { Bet } from './types/bet'
+import { Contract } from './types/contract'
+import { User } from './types/user'
+
+export const sellBet = functions.runWith({ minInstances: 1 }).https.onCall(
+  async (
+    data: {
+      contractId: string
+      betId: string
+    },
+    context
+  ) => {
+    const userId = context?.auth?.uid
+    if (!userId) return { status: 'error', message: 'Not authorized' }
+
+    const { contractId, betId } = data
+
+    // run as transaction to prevent race conditions
+    return await firestore.runTransaction(async (transaction) => {
+      const userDoc = firestore.doc(`users/${userId}`)
+      const userSnap = await transaction.get(userDoc)
+      if (!userSnap.exists)
+        return { status: 'error', message: 'User not found' }
+      const user = userSnap.data() as User
+
+      const contractDoc = firestore.doc(`contracts/${contractId}`)
+      const contractSnap = await transaction.get(contractDoc)
+      if (!contractSnap.exists)
+        return { status: 'error', message: 'Invalid contract' }
+      const contract = contractSnap.data() as Contract
+
+      const betDoc = firestore.doc(`contracts/${contractId}/bets/${betId}`)
+      const betSnap = await transaction.get(betDoc)
+      if (!betSnap.exists) return { status: 'error', message: 'Invalid bet' }
+      const bet = betSnap.data() as Bet
+
+      if (bet.isSold) return { status: 'error', message: 'Bet already sold' }
+
+      const newBetDoc = firestore
+        .collection(`contracts/${contractId}/bets`)
+        .doc()
+
+      const { newBet, newPool, newTotalShares, newBalance, creatorFee } =
+        getSellBetInfo(user, bet, contract, newBetDoc.id)
+
+      const creatorDoc = firestore.doc(`users/${contract.creatorId}`)
+      const creatorSnap = await transaction.get(creatorDoc)
+      if (creatorSnap.exists) {
+        const creator = creatorSnap.data() as User
+        const creatorNewBalance = creator.balance + creatorFee
+        transaction.update(creatorDoc, { balance: creatorNewBalance })
+      }
+
+      transaction.update(betDoc, { isSold: true })
+      transaction.create(newBetDoc, newBet)
+      transaction.update(contractDoc, {
+        pool: newPool,
+        totalShares: newTotalShares,
+      })
+      transaction.update(userDoc, { balance: newBalance })
+
+      return { status: 'success' }
+    })
+  }
+)
+
+const firestore = admin.firestore()
+
+const getSellBetInfo = (
+  user: User,
+  bet: Bet,
+  contract: Contract,
+  newBetId: string
+) => {
+  const { id: betId, amount, shares, outcome } = bet
+
+  const { YES: yesPool, NO: noPool } = contract.pool
+  const { YES: yesStart, NO: noStart } = contract.startPool
+  const { YES: yesShares, NO: noShares } = contract.totalShares
+
+  const [y, n, s] = [yesPool, noPool, shares]
+
+  const shareValue =
+    outcome === 'YES'
+      ? // https://www.wolframalpha.com/input/?i=b+%2B+%28b+n%5E2%29%2F%28y+%28-b+%2B+y%29%29+%3D+c+solve+b
+        (n ** 2 +
+          s * y +
+          y ** 2 -
+          Math.sqrt(
+            n ** 4 + (s - y) ** 2 * y ** 2 + 2 * n ** 2 * y * (s + y)
+          )) /
+        (2 * y)
+      : (y ** 2 +
+          s * n +
+          n ** 2 -
+          Math.sqrt(
+            y ** 4 + (s - n) ** 2 * n ** 2 + 2 * y ** 2 * n * (s + n)
+          )) /
+        (2 * n)
+
+  const startPool = yesStart + noStart
+  const pool = yesPool + noPool - startPool
+
+  const probBefore = yesPool ** 2 / (yesPool ** 2 + noPool ** 2)
+
+  const f = pool / (probBefore * yesShares + (1 - probBefore) * noShares)
+
+  const myPool = outcome === 'YES' ? yesPool - yesStart : noPool - noStart
+
+  const adjShareValue = Math.min(Math.min(1, f) * shareValue, myPool)
+
+  const newPool =
+    outcome === 'YES'
+      ? { YES: yesPool - adjShareValue, NO: noPool }
+      : { YES: yesPool, NO: noPool - adjShareValue }
+
+  const newTotalShares =
+    outcome === 'YES'
+      ? { YES: yesShares - shares, NO: noShares }
+      : { YES: yesShares, NO: noShares - shares }
+
+  const probAfter = newPool.YES ** 2 / (newPool.YES ** 2 + newPool.NO ** 2)
+
+  const creatorFee = CREATOR_FEE * adjShareValue
+  const saleAmount = (1 - CREATOR_FEE - PLATFORM_FEE) * adjShareValue
+
+  console.log(
+    'SELL M$',
+    amount,
+    outcome,
+    'for M$',
+    saleAmount,
+    'M$/share:',
+    f,
+    'creator fee: M$',
+    creatorFee
+  )
+
+  const newBet: Bet = {
+    id: newBetId,
+    userId: user.id,
+    contractId: contract.id,
+    amount: -adjShareValue,
+    shares: -shares,
+    outcome,
+    probBefore,
+    probAfter,
+    createdTime: Date.now(),
+    sale: {
+      amount: saleAmount,
+      betId,
+    },
+  }
+
+  const newBalance = user.balance + saleAmount
+
+  return { newBet, newPool, newTotalShares, newBalance, creatorFee }
+}
diff --git a/functions/src/types/bet.ts b/functions/src/types/bet.ts
index 2113f812..8b540165 100644
--- a/functions/src/types/bet.ts
+++ b/functions/src/types/bet.ts
@@ -2,11 +2,20 @@ export type Bet = {
   id: string
   userId: string
   contractId: string
-  amount: number // Amount of bet
-  outcome: 'YES' | 'NO' // Chosen outcome
-  createdTime: number
+
+  amount: number // bet size; negative if SELL bet
+  outcome: 'YES' | 'NO'
+  shares: number // dynamic parimutuel pool weight; negative if SELL bet
+
   probBefore: number
-  probAverage: number
   probAfter: number
-  dpmWeight: number // Dynamic Parimutuel weight
-}
\ No newline at end of file
+
+  sale?: {
+    amount: number // amount user makes from sale
+    betId: string // id of bet being sold
+  }
+
+  isSold?: boolean // true if this BUY bet has been sold
+
+  createdTime: number
+}
diff --git a/functions/src/types/contract.ts b/functions/src/types/contract.ts
index 8278206b..5f354654 100644
--- a/functions/src/types/contract.ts
+++ b/functions/src/types/contract.ts
@@ -12,7 +12,7 @@ export type Contract = {
 
   startPool: { YES: number; NO: number }
   pool: { YES: number; NO: number }
-  dpmWeights: { YES: number; NO: number }
+  totalShares: { YES: number; NO: number }
 
   createdTime: number // Milliseconds since epoch
   lastUpdatedTime: number // If the question or description was changed
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index f0f34410..42f3abae 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -12,9 +12,9 @@ import { formatMoney, formatPercent } from '../lib/util/format'
 import { Title } from './title'
 import {
   getProbability,
-  getDpmWeight,
+  calculateShares,
   getProbabilityAfterBet,
-} from '../lib/calculation/contract'
+} from '../lib/calculate'
 import { firebaseLogin } from '../lib/firebase/users'
 
 export function BetPanel(props: { contract: Contract; className?: string }) {
@@ -84,9 +84,9 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
     betChoice,
     betAmount ?? 0
   )
-  const dpmWeight = getDpmWeight(contract.pool, betAmount ?? 0, betChoice)
+  const shares = calculateShares(contract.pool, betAmount ?? 0, betChoice)
 
-  const estimatedWinnings = Math.floor((betAmount ?? 0) + dpmWeight)
+  const estimatedWinnings = Math.floor(shares)
   const estimatedReturn = betAmount
     ? (estimatedWinnings - betAmount) / betAmount
     : 0
@@ -98,7 +98,7 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
     <Col
       className={clsx('bg-gray-100 shadow-xl px-8 py-6 rounded-md', className)}
     >
-      <Title className="!mt-0 whitespace-nowrap" text="Place a bet" />
+      <Title className="!mt-0 whitespace-nowrap" text="Place a trade" />
 
       <div className="mt-2 mb-1 text-sm text-gray-400">Outcome</div>
       <YesNoSelector
@@ -107,7 +107,7 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
         onSelect={(choice) => onBetChoice(choice)}
       />
 
-      <div className="mt-3 mb-1 text-sm text-gray-400">Bet amount</div>
+      <div className="mt-3 mb-1 text-sm text-gray-400">Amount</div>
       <Col className="my-2">
         <label className="input-group">
           <span className="text-sm bg-gray-200">M$</span>
@@ -168,18 +168,18 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
           )}
           onClick={betDisabled ? undefined : submitBet}
         >
-          {isSubmitting ? 'Submitting...' : 'Place bet'}
+          {isSubmitting ? 'Submitting...' : 'Submit trade'}
         </button>
       ) : (
         <button
           className="btn mt-4 border-none normal-case text-lg font-medium px-10 bg-gradient-to-r from-teal-500 to-green-500 hover:from-teal-600 hover:to-green-600"
           onClick={firebaseLogin}
         >
-          Sign in to bet!
+          Sign in to trade!
         </button>
       )}
 
-      {wasSubmitted && <div className="mt-4">Bet submitted!</div>}
+      {wasSubmitted && <div className="mt-4">Trade submitted!</div>}
     </Col>
   )
 }
diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 5e51f141..52de070b 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -13,10 +13,13 @@ import { Row } from './layout/row'
 import { UserLink } from './user-page'
 import {
   calculatePayout,
+  calculateSaleAmount,
   currentValue,
   resolvedPayout,
-} from '../lib/calculation/contract'
+} from '../lib/calculate'
 import clsx from 'clsx'
+import { cloudFunction } from '../lib/firebase/api-call'
+import { ConfirmationButton } from './confirmation-button'
 
 export function BetsList(props: { user: User }) {
   const { user } = props
@@ -65,19 +68,26 @@ export function BetsList(props: { user: User }) {
     contracts,
     (contract) => contract.isResolved
   )
+
   const currentBets = _.sumBy(unresolved, (contract) =>
-    _.sumBy(contractBets[contract.id], (bet) => bet.amount)
+    _.sumBy(contractBets[contract.id], (bet) => {
+      if (bet.isSold || bet.sale) return 0
+      return bet.amount
+    })
   )
 
   const currentBetsValue = _.sumBy(unresolved, (contract) =>
-    _.sumBy(contractBets[contract.id], (bet) => currentValue(contract, bet))
+    _.sumBy(contractBets[contract.id], (bet) => {
+      if (bet.isSold || bet.sale) return 0
+      return currentValue(contract, bet)
+    })
   )
 
   return (
     <Col className="mt-6 gap-6">
       <Row className="gap-8">
         <Col>
-          <div className="text-sm text-gray-500">Active bets</div>
+          <div className="text-sm text-gray-500">Currently invested</div>
           <div>{formatMoney(currentBets)}</div>
         </Col>
         <Col>
@@ -173,16 +183,17 @@ export function MyBetsSummary(props: {
   const { bets, contract, className } = props
   const { resolution } = contract
 
-  const betsTotal = _.sumBy(bets, (bet) => bet.amount)
+  const excludeSales = bets.filter((b) => !b.isSold && !b.sale)
+  const betsTotal = _.sumBy(excludeSales, (bet) => bet.amount)
 
   const betsPayout = resolution
     ? _.sumBy(bets, (bet) => resolvedPayout(contract, bet))
     : 0
 
-  const yesWinnings = _.sumBy(bets, (bet) =>
+  const yesWinnings = _.sumBy(excludeSales, (bet) =>
     calculatePayout(contract, bet, 'YES')
   )
-  const noWinnings = _.sumBy(bets, (bet) =>
+  const noWinnings = _.sumBy(excludeSales, (bet) =>
     calculatePayout(contract, bet, 'NO')
   )
 
@@ -190,7 +201,7 @@ export function MyBetsSummary(props: {
     <Row className={clsx('gap-4 sm:gap-6', className)}>
       <Col>
         <div className="text-sm text-gray-500 whitespace-nowrap">
-          Total bets
+          Amount invested
         </div>
         <div className="whitespace-nowrap">{formatMoney(betsTotal)}</div>
       </Col>
@@ -228,6 +239,11 @@ export function ContractBetsTable(props: {
 }) {
   const { contract, bets, className } = props
 
+  const [sales, buys] = _.partition(bets, (bet) => bet.sale)
+  const salesDict = _.fromPairs(
+    sales.map((sale) => [sale.sale?.betId ?? '', sale])
+  )
+
   const { isResolved } = contract
 
   return (
@@ -237,15 +253,21 @@ export function ContractBetsTable(props: {
           <tr className="p-2">
             <th>Date</th>
             <th>Outcome</th>
-            <th>Bet</th>
+            <th>Amount</th>
             <th>Probability</th>
             {!isResolved && <th>Est. max payout</th>}
             <th>{isResolved ? <>Payout</> : <>Current value</>}</th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
-          {bets.map((bet) => (
-            <BetRow key={bet.id} bet={bet} contract={contract} />
+          {buys.map((bet) => (
+            <BetRow
+              key={bet.id}
+              bet={bet}
+              sale={salesDict[bet.id]}
+              contract={contract}
+            />
           ))}
         </tbody>
       </table>
@@ -253,14 +275,22 @@ export function ContractBetsTable(props: {
   )
 }
 
-function BetRow(props: { bet: Bet; contract: Contract }) {
-  const { bet, contract } = props
-  const { amount, outcome, createdTime, probBefore, probAfter, dpmWeight } = bet
+function BetRow(props: { bet: Bet; contract: Contract; sale?: Bet }) {
+  const { bet, sale, contract } = props
+  const {
+    amount,
+    outcome,
+    createdTime,
+    probBefore,
+    probAfter,
+    shares,
+    isSold,
+  } = bet
   const { isResolved } = contract
 
   return (
     <tr>
-      <td>{dayjs(createdTime).format('MMM D, H:mma')}</td>
+      <td>{dayjs(createdTime).format('MMM D, h:mma')}</td>
       <td>
         <OutcomeLabel outcome={outcome} />
       </td>
@@ -268,18 +298,63 @@ function BetRow(props: { bet: Bet; contract: Contract }) {
       <td>
         {formatPercent(probBefore)} → {formatPercent(probAfter)}
       </td>
-      {!isResolved && <td>{formatMoney(amount + dpmWeight)}</td>}
+      {!isResolved && <td>{formatMoney(shares)}</td>}
       <td>
-        {formatMoney(
-          isResolved
-            ? resolvedPayout(contract, bet)
-            : currentValue(contract, bet)
-        )}
+        {bet.isSold
+          ? 'N/A'
+          : formatMoney(
+              isResolved
+                ? resolvedPayout(contract, bet)
+                : bet.sale
+                ? bet.sale.amount ?? 0
+                : currentValue(contract, bet)
+            )}
       </td>
+
+      {sale ? (
+        <td>SOLD for {formatMoney(Math.abs(sale.amount))}</td>
+      ) : (
+        !isResolved &&
+        !isSold && (
+          <td className="text-neutral">
+            <SellButton contract={contract} bet={bet} />
+          </td>
+        )
+      )}
     </tr>
   )
 }
 
+const sellBet = cloudFunction('sellBet')
+
+function SellButton(props: { contract: Contract; bet: Bet }) {
+  const { contract, bet } = props
+  const [isSubmitting, setIsSubmitting] = useState(false)
+
+  return (
+    <ConfirmationButton
+      id={`sell-${bet.id}`}
+      openModelBtn={{
+        className: clsx('btn-sm', isSubmitting && 'btn-disabled loading'),
+        label: 'Sell',
+      }}
+      submitBtn={{ className: 'btn-primary' }}
+      onSubmit={async () => {
+        setIsSubmitting(true)
+        await sellBet({ contractId: contract.id, betId: bet.id })
+        setIsSubmitting(false)
+      }}
+    >
+      <div className="text-2xl mb-4">Sell</div>
+      <div>
+        Do you want to sell your {formatMoney(bet.amount)} position on{' '}
+        <OutcomeLabel outcome={bet.outcome} /> for{' '}
+        {formatMoney(calculateSaleAmount(contract, bet))}?
+      </div>
+    </ConfirmationButton>
+  )
+}
+
 function OutcomeLabel(props: { outcome: 'YES' | 'NO' | 'CANCEL' }) {
   const { outcome } = props
 
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index ad105c9d..aa8dfe6c 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -90,7 +90,7 @@ export const ContractOverview = (props: {
 }) => {
   const { contract, className } = props
   const { resolution, creatorId } = contract
-  const { probPercent, volume } = compute(contract)
+  const { probPercent, truePool } = compute(contract)
 
   const user = useUser()
   const isCreator = user?.id === creatorId
@@ -140,7 +140,7 @@ export const ContractOverview = (props: {
       <ContractDescription contract={contract} isCreator={isCreator} />
 
       {/* Show a delete button for contracts without any trading */}
-      {isCreator && volume === 0 && (
+      {isCreator && truePool === 0 && (
         <>
           <Spacer h={8} />
           <button
diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index f0d15b7b..74c94ad5 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -17,7 +17,7 @@ import { Linkify } from './linkify'
 
 export function ContractDetails(props: { contract: Contract }) {
   const { contract } = props
-  const { volume, createdDate, resolvedDate } = compute(contract)
+  const { truePool, createdDate, resolvedDate } = compute(contract)
 
   return (
     <Row className="flex-wrap text-sm text-gray-500">
@@ -29,7 +29,7 @@ export function ContractDetails(props: { contract: Contract }) {
         {resolvedDate ? `${createdDate} - ${resolvedDate}` : createdDate}
       </div>
       <div className="mx-2">•</div>
-      <div className="whitespace-nowrap">{formatMoney(volume)} volume</div>
+      <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
     </Row>
   )
 }
@@ -110,14 +110,14 @@ function ContractsGrid(props: { contracts: Contract[] }) {
   )
 }
 
-type Sort = 'createdTime' | 'volume' | 'resolved' | 'all'
+type Sort = 'createdTime' | 'pool' | 'resolved' | 'all'
 export function SearchableGrid(props: {
   contracts: Contract[]
   defaultSort?: Sort
 }) {
   const { contracts, defaultSort } = props
   const [query, setQuery] = useState('')
-  const [sort, setSort] = useState(defaultSort || 'volume')
+  const [sort, setSort] = useState(defaultSort || 'pool')
 
   function check(corpus: String) {
     return corpus.toLowerCase().includes(query.toLowerCase())
@@ -132,8 +132,8 @@ export function SearchableGrid(props: {
 
   if (sort === 'createdTime' || sort === 'resolved' || sort === 'all') {
     matches.sort((a, b) => b.createdTime - a.createdTime)
-  } else if (sort === 'volume') {
-    matches.sort((a, b) => compute(b).volume - compute(a).volume)
+  } else if (sort === 'pool') {
+    matches.sort((a, b) => compute(b).truePool - compute(a).truePool)
   }
 
   if (sort !== 'all') {
@@ -159,7 +159,7 @@ export function SearchableGrid(props: {
           value={sort}
           onChange={(e) => setSort(e.target.value as Sort)}
         >
-          <option value="volume">Most traded</option>
+          <option value="pool">Most traded</option>
           <option value="createdTime">Newest first</option>
           <option value="resolved">Resolved</option>
           <option value="all">All markets</option>
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index 21a603da..43022a9e 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -41,8 +41,8 @@ function getNavigationOptions(user: User, options: { mobile: boolean }) {
         ]
       : []),
     {
-      name: 'Your bets',
-      href: '/bets',
+      name: 'Your trades',
+      href: '/trades',
     },
     {
       name: 'Your markets',
@@ -64,7 +64,7 @@ function ProfileSummary(props: { user: User }) {
       <div className="rounded-full w-10 h-10 mr-4">
         <Image src={user.avatarUrl} width={40} height={40} />
       </div>
-      <div className="truncate" style={{ maxWidth: 175 }}>
+      <div className="truncate text-left" style={{ maxWidth: 175 }}>
         {user.name}
         <div className="text-gray-700 text-sm">{formatMoney(user.balance)}</div>
       </div>
diff --git a/web/lib/calculate.ts b/web/lib/calculate.ts
new file mode 100644
index 00000000..13649c06
--- /dev/null
+++ b/web/lib/calculate.ts
@@ -0,0 +1,134 @@
+import { Bet } from './firebase/bets'
+import { Contract } from './firebase/contracts'
+
+const fees = 0.02
+
+export function getProbability(pool: { YES: number; NO: number }) {
+  const [yesPool, noPool] = [pool.YES, pool.NO]
+  const numerator = Math.pow(yesPool, 2)
+  const denominator = Math.pow(yesPool, 2) + Math.pow(noPool, 2)
+  return numerator / denominator
+}
+
+export function getProbabilityAfterBet(
+  pool: { YES: number; NO: number },
+  outcome: 'YES' | 'NO',
+  bet: number
+) {
+  const [YES, NO] = [
+    pool.YES + (outcome === 'YES' ? bet : 0),
+    pool.NO + (outcome === 'NO' ? bet : 0),
+  ]
+  return getProbability({ YES, NO })
+}
+
+export function calculateShares(
+  pool: { YES: number; NO: number },
+  bet: number,
+  betChoice: 'YES' | 'NO'
+) {
+  const [yesPool, noPool] = [pool.YES, pool.NO]
+
+  return betChoice === 'YES'
+    ? bet + (bet * noPool ** 2) / (yesPool ** 2 + bet * yesPool)
+    : bet + (bet * yesPool ** 2) / (noPool ** 2 + bet * noPool)
+}
+
+export function calculatePayout(
+  contract: Contract,
+  bet: Bet,
+  outcome: 'YES' | 'NO' | 'CANCEL'
+) {
+  const { amount, outcome: betOutcome, shares } = bet
+
+  if (outcome === 'CANCEL') return amount
+  if (betOutcome !== outcome) return 0
+
+  const { totalShares } = contract
+
+  if (totalShares[outcome] === 0) return 0
+
+  const startPool = contract.startPool.YES + contract.startPool.NO
+  const pool = contract.pool.YES + contract.pool.NO - startPool
+
+  return (1 - fees) * (shares / totalShares[outcome]) * pool
+}
+
+export function resolvedPayout(contract: Contract, bet: Bet) {
+  if (contract.resolution)
+    return calculatePayout(contract, bet, contract.resolution)
+  throw new Error('Contract was not resolved')
+}
+
+export function currentValue(contract: Contract, bet: Bet) {
+  // const prob = getProbability(contract.pool)
+  // const yesPayout = calculatePayout(contract, bet, 'YES')
+  // const noPayout = calculatePayout(contract, bet, 'NO')
+
+  // return prob * yesPayout + (1 - prob) * noPayout
+
+  const { shares, outcome } = bet
+
+  const { YES: yesPool, NO: noPool } = contract.pool
+  const [y, n, s] = [yesPool, noPool, shares]
+
+  const shareValue =
+    outcome === 'YES'
+      ? // https://www.wolframalpha.com/input/?i=b+%2B+%28b+n%5E2%29%2F%28y+%28-b+%2B+y%29%29+%3D+c+solve+b
+        (n ** 2 +
+          s * y +
+          y ** 2 -
+          Math.sqrt(
+            n ** 4 + (s - y) ** 2 * y ** 2 + 2 * n ** 2 * y * (s + y)
+          )) /
+        (2 * y)
+      : (y ** 2 +
+          s * n +
+          n ** 2 -
+          Math.sqrt(
+            y ** 4 + (s - n) ** 2 * n ** 2 + 2 * y ** 2 * n * (s + n)
+          )) /
+        (2 * n)
+
+  return (1 - fees) * shareValue
+}
+export function calculateSaleAmount(contract: Contract, bet: Bet) {
+  const { shares, outcome } = bet
+
+  const { YES: yesPool, NO: noPool } = contract.pool
+  const { YES: yesStart, NO: noStart } = contract.startPool
+  const { YES: yesShares, NO: noShares } = contract.totalShares
+
+  const [y, n, s] = [yesPool, noPool, shares]
+
+  const shareValue =
+    outcome === 'YES'
+      ? // https://www.wolframalpha.com/input/?i=b+%2B+%28b+n%5E2%29%2F%28y+%28-b+%2B+y%29%29+%3D+c+solve+b
+        (n ** 2 +
+          s * y +
+          y ** 2 -
+          Math.sqrt(
+            n ** 4 + (s - y) ** 2 * y ** 2 + 2 * n ** 2 * y * (s + y)
+          )) /
+        (2 * y)
+      : (y ** 2 +
+          s * n +
+          n ** 2 -
+          Math.sqrt(
+            y ** 4 + (s - n) ** 2 * n ** 2 + 2 * y ** 2 * n * (s + n)
+          )) /
+        (2 * n)
+
+  const startPool = yesStart + noStart
+  const pool = yesPool + noPool - startPool
+
+  const probBefore = yesPool ** 2 / (yesPool ** 2 + noPool ** 2)
+  const f = pool / (probBefore * yesShares + (1 - probBefore) * noShares)
+
+  const myPool = outcome === 'YES' ? yesPool - yesStart : noPool - noStart
+
+  const adjShareValue = Math.min(Math.min(1, f) * shareValue, myPool)
+
+  const saleAmount = (1 - fees) * adjShareValue
+  return saleAmount
+}
diff --git a/web/lib/calculation/contract.ts b/web/lib/calculation/contract.ts
deleted file mode 100644
index 69464beb..00000000
--- a/web/lib/calculation/contract.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Bet } from '../firebase/bets'
-import { Contract } from '../firebase/contracts'
-
-const fees = 0.02
-
-export function getProbability(pool: { YES: number; NO: number }) {
-  const [yesPool, noPool] = [pool.YES, pool.NO]
-  const numerator = Math.pow(yesPool, 2)
-  const denominator = Math.pow(yesPool, 2) + Math.pow(noPool, 2)
-  return numerator / denominator
-}
-
-export function getProbabilityAfterBet(
-  pool: { YES: number; NO: number },
-  outcome: 'YES' | 'NO',
-  bet: number
-) {
-  const [YES, NO] = [
-    pool.YES + (outcome === 'YES' ? bet : 0),
-    pool.NO + (outcome === 'NO' ? bet : 0),
-  ]
-  return getProbability({ YES, NO })
-}
-
-export function getDpmWeight(
-  pool: { YES: number; NO: number },
-  bet: number,
-  betChoice: 'YES' | 'NO'
-) {
-  const [yesPool, noPool] = [pool.YES, pool.NO]
-
-  return betChoice === 'YES'
-    ? (bet * Math.pow(noPool, 2)) / (Math.pow(yesPool, 2) + bet * yesPool)
-    : (bet * Math.pow(yesPool, 2)) / (Math.pow(noPool, 2) + bet * noPool)
-}
-
-export function calculatePayout(
-  contract: Contract,
-  bet: Bet,
-  outcome: 'YES' | 'NO' | 'CANCEL'
-) {
-  const { amount, outcome: betOutcome, dpmWeight } = bet
-
-  if (outcome === 'CANCEL') return amount
-  if (betOutcome !== outcome) return 0
-
-  let { dpmWeights, pool, startPool } = contract
-
-  // Fake data if not set.
-  if (!dpmWeights) dpmWeights = { YES: 100, NO: 100 }
-
-  // Fake data if not set.
-  if (!pool) pool = { YES: 100, NO: 100 }
-
-  const otherOutcome = outcome === 'YES' ? 'NO' : 'YES'
-  const poolSize = pool[otherOutcome] - startPool[otherOutcome]
-
-  return (1 - fees) * (dpmWeight / dpmWeights[outcome]) * poolSize + amount
-}
-export function resolvedPayout(contract: Contract, bet: Bet) {
-  if (contract.resolution)
-    return calculatePayout(contract, bet, contract.resolution)
-  throw new Error('Contract was not resolved')
-}
-
-export function currentValue(contract: Contract, bet: Bet) {
-  const prob = getProbability(contract.pool)
-  const yesPayout = calculatePayout(contract, bet, 'YES')
-  const noPayout = calculatePayout(contract, bet, 'NO')
-
-  return prob * yesPayout + (1 - prob) * noPayout
-}
diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts
new file mode 100644
index 00000000..fc054386
--- /dev/null
+++ b/web/lib/firebase/api-call.ts
@@ -0,0 +1,6 @@
+import { getFunctions, httpsCallable } from 'firebase/functions'
+
+const functions = getFunctions()
+
+export const cloudFunction = (name: string) => httpsCallable(functions, name)
+
diff --git a/web/lib/firebase/bets.ts b/web/lib/firebase/bets.ts
index 92b33010..b09d8f8b 100644
--- a/web/lib/firebase/bets.ts
+++ b/web/lib/firebase/bets.ts
@@ -11,12 +11,21 @@ export type Bet = {
   id: string
   userId: string
   contractId: string
-  amount: number // Amount of bet
-  outcome: 'YES' | 'NO' // Chosen outcome
-  dpmWeight: number // Dynamic Parimutuel weight
+
+  amount: number // bet size; negative if SELL bet
+  outcome: 'YES' | 'NO'
+  shares: number // dynamic parimutuel pool weight; negative if SELL bet
+
   probBefore: number
-  probAverage: number
   probAfter: number
+
+  sale?: {
+    amount: number // amount user makes from sale
+    betId: string // id of bet being sold
+  }
+
+  isSold?: boolean // true if this BUY bet has been sold
+
   createdTime: number
 }
 
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index 652bec4b..f97e111c 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -30,7 +30,7 @@ export type Contract = {
 
   startPool: { YES: number; NO: number }
   pool: { YES: number; NO: number }
-  dpmWeights: { YES: number; NO: number }
+  totalShares: { YES: number; NO: number }
 
   createdTime: number // Milliseconds since epoch
   lastUpdatedTime: number // If the question or description was changed
@@ -48,7 +48,7 @@ export function path(contract: Contract) {
 
 export function compute(contract: Contract) {
   const { pool, startPool, createdTime, resolutionTime, isResolved } = contract
-  const volume = pool.YES + pool.NO - startPool.YES - startPool.NO
+  const truePool = pool.YES + pool.NO - startPool.YES - startPool.NO
   const prob = pool.YES ** 2 / (pool.YES ** 2 + pool.NO ** 2)
   const probPercent = Math.round(prob * 100) + '%'
   const startProb =
@@ -57,7 +57,7 @@ export function compute(contract: Contract) {
   const resolvedDate = isResolved
     ? dayjs(resolutionTime).format('MMM D')
     : undefined
-  return { volume, probPercent, startProb, createdDate, resolvedDate }
+  return { truePool, probPercent, startProb, createdDate, resolvedDate }
 }
 
 const db = getFirestore(app)
diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts
index c807de98..c9561861 100644
--- a/web/lib/firebase/init.ts
+++ b/web/lib/firebase/init.ts
@@ -1,24 +1,28 @@
 import { getFirestore } from '@firebase/firestore'
 import { initializeApp } from 'firebase/app'
-const firebaseConfig = {
-  apiKey: 'AIzaSyDp3J57vLeAZCzxLD-vcPaGIkAmBoGOSYw',
-  authDomain: 'mantic-markets.firebaseapp.com',
-  projectId: 'mantic-markets',
-  storageBucket: 'mantic-markets.appspot.com',
-  messagingSenderId: '128925704902',
-  appId: '1:128925704902:web:f61f86944d8ffa2a642dc7',
-  measurementId: 'G-SSFK1Q138D',
-}
+
+export const isProd = process.env.NODE_ENV === 'production'
+
+const firebaseConfig = isProd
+  ? {
+      apiKey: 'AIzaSyDp3J57vLeAZCzxLD-vcPaGIkAmBoGOSYw',
+      authDomain: 'mantic-markets.firebaseapp.com',
+      projectId: 'mantic-markets',
+      storageBucket: 'mantic-markets.appspot.com',
+      messagingSenderId: '128925704902',
+      appId: '1:128925704902:web:f61f86944d8ffa2a642dc7',
+      measurementId: 'G-SSFK1Q138D',
+    }
+  : {
+      apiKey: 'AIzaSyBoq3rzUa8Ekyo3ZaTnlycQYPRCA26VpOw',
+      authDomain: 'dev-mantic-markets.firebaseapp.com',
+      projectId: 'dev-mantic-markets',
+      storageBucket: 'dev-mantic-markets.appspot.com',
+      messagingSenderId: '134303100058',
+      appId: '1:134303100058:web:27f9ea8b83347251f80323',
+      measurementId: 'G-YJC9E37P37',
+    }
 
 // Initialize Firebase
 export const app = initializeApp(firebaseConfig)
 export const db = getFirestore(app)
-
-// try {
-//   // Note: this is still throwing a console error atm...
-//   import('firebase/analytics').then((analytics) => {
-//     analytics.getAnalytics(app)
-//   })
-// } catch (e) {
-//   console.warn('Analytics were blocked')
-// }
diff --git a/web/lib/service/create-contract.ts b/web/lib/service/create-contract.ts
index b10cddbf..eba7b0ff 100644
--- a/web/lib/service/create-contract.ts
+++ b/web/lib/service/create-contract.ts
@@ -2,7 +2,6 @@ import {
   Contract,
   getContractFromSlug,
   pushNewContract,
-  setContract,
 } from '../firebase/contracts'
 import { User } from '../firebase/users'
 import { randomString } from '../util/random-string'
@@ -38,7 +37,7 @@ export async function createContract(
 
     startPool: { YES: startYes, NO: startNo },
     pool: { YES: startYes, NO: startNo },
-    dpmWeights: { YES: 0, NO: 0 },
+    totalShares: { YES: 0, NO: 0 },
     isResolved: false,
 
     // TODO: Set create time to Firestore timestamp
@@ -49,8 +48,8 @@ export async function createContract(
   return await pushNewContract(contract)
 }
 
-export function calcStartPool(initialProb: number, initialCapital = 200) {
-  const p = initialProb / 100.0
+export function calcStartPool(initialProbInt: number, initialCapital = 200) {
+  const p = initialProbInt / 100.0
 
   const startYes =
     p === 0.5
diff --git a/web/lib/simulator/entries.ts b/web/lib/simulator/entries.ts
index df80543b..535a59ad 100644
--- a/web/lib/simulator/entries.ts
+++ b/web/lib/simulator/entries.ts
@@ -21,10 +21,13 @@ function makeWeights(bids: Bid[]) {
   // First pass: calculate all the weights
   for (const { yesBid, noBid } of bids) {
     const yesWeight =
-      (yesBid * Math.pow(noPot, 2)) / (Math.pow(yesPot, 2) + yesBid * yesPot) ||
-      0
+      yesBid +
+        (yesBid * Math.pow(noPot, 2)) /
+          (Math.pow(yesPot, 2) + yesBid * yesPot) || 0
     const noWeight =
-      (noBid * Math.pow(yesPot, 2)) / (Math.pow(noPot, 2) + noBid * noPot) || 0
+      noBid +
+        (noBid * Math.pow(yesPot, 2)) / (Math.pow(noPot, 2) + noBid * noPot) ||
+      0
 
     // Note: Need to calculate weights BEFORE updating pot
     yesPot += yesBid
@@ -53,15 +56,15 @@ export function makeEntries(bids: Bid[]): Entry[] {
   const yesWeightsSum = weights.reduce((sum, entry) => sum + entry.yesWeight, 0)
   const noWeightsSum = weights.reduce((sum, entry) => sum + entry.noWeight, 0)
 
+  const potSize = yesPot + noPot - YES_SEED - NO_SEED
+
   // Second pass: calculate all the payouts
   const entries: Entry[] = []
 
   for (const weight of weights) {
     const { yesBid, noBid, yesWeight, noWeight } = weight
-    // Payout: You get your initial bid back, as well as your share of the
-    // (noPot - seed) according to your yesWeight
-    const yesPayout = yesBid + (yesWeight / yesWeightsSum) * (noPot - NO_SEED)
-    const noPayout = noBid + (noWeight / noWeightsSum) * (yesPot - YES_SEED)
+    const yesPayout = (yesWeight / yesWeightsSum) * potSize
+    const noPayout = (noWeight / noWeightsSum) * potSize
     const yesReturn = (yesPayout - yesBid) / yesBid
     const noReturn = (noPayout - noBid) / noBid
     entries.push({ ...weight, yesPayout, noPayout, yesReturn, noReturn })
diff --git a/web/lib/util/format.ts b/web/lib/util/format.ts
index 5a9e3020..9d0496b2 100644
--- a/web/lib/util/format.ts
+++ b/web/lib/util/format.ts
@@ -6,11 +6,11 @@ const formatter = new Intl.NumberFormat('en-US', {
 })
 
 export function formatMoney(amount: number) {
-  return 'M$ ' + formatter.format(amount).substring(1)
+  return 'M$ ' + formatter.format(amount).replace('$', '')
 }
 
 export function formatWithCommas(amount: number) {
-  return formatter.format(amount).substring(1)
+  return formatter.format(amount).replace('$', '')
 }
 
 export function formatPercent(zeroToOne: number) {
diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 3bb7b5ad..60a1a5fb 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -97,7 +97,7 @@ function BetsSection(props: { contract: Contract; user: User | null }) {
 
   return (
     <div>
-      <Title text="Your bets" />
+      <Title text="Your trades" />
       <MyBetsSummary contract={contract} bets={userBets} />
       <Spacer h={6} />
       <ContractBetsTable contract={contract} bets={userBets} />
diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index 61d87516..54aa9453 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -162,8 +162,8 @@ function Contents() {
       </p>
       <h3 id="how-are-markets-resolved-">How are markets resolved?</h3>
       <p>
-        The creator of the prediction market decides the outcome and earns 0.5%
-        of the trade volume for their effort.
+        The creator of the prediction market decides the outcome and earns 1% of
+        the betting pool for their effort.
       </p>
       <p>
         This simple resolution mechanism has surprising benefits in allowing a
diff --git a/web/pages/simulator.tsx b/web/pages/simulator.tsx
index 3294f503..3df8a83d 100644
--- a/web/pages/simulator.tsx
+++ b/web/pages/simulator.tsx
@@ -86,7 +86,7 @@ function TableRowEnd(props: { entry: Entry | null; isNew?: boolean }) {
     return (
       <>
         <td>{(entry.prob * 100).toFixed(1)}%</td>
-        <td>${(entry.yesBid + entry.yesWeight).toFixed(0)}</td>
+        <td>${entry.yesWeight.toFixed(0)}</td>
         {!props.isNew && (
           <>
             <td>${entry.yesPayout.toFixed(0)}</td>
@@ -99,7 +99,7 @@ function TableRowEnd(props: { entry: Entry | null; isNew?: boolean }) {
     return (
       <>
         <td>{(entry.prob * 100).toFixed(1)}%</td>
-        <td>${(entry.noBid + entry.noWeight).toFixed(0)}</td>
+        <td>${entry.noWeight.toFixed(0)}</td>
         {!props.isNew && (
           <>
             <td>${entry.noPayout.toFixed(0)}</td>
@@ -149,9 +149,9 @@ function NewBidTable(props: {
 
   function randomBid() {
     const bidType = Math.random() < 0.5 ? 'YES' : 'NO'
-    const p = bidType === 'YES' ? nextEntry.prob : 1 - nextEntry.prob
+    // const p = bidType === 'YES' ? nextEntry.prob : 1 - nextEntry.prob
 
-    const amount = Math.round(p * Math.random() * 300) + 1
+    const amount = Math.floor(Math.random() * 300) + 1
     const bid = makeBid(bidType, amount)
 
     bids.splice(steps, 0, bid)
@@ -238,7 +238,7 @@ function NewBidTable(props: {
 // Show a hello world React page
 export default function Simulator() {
   const [steps, setSteps] = useState(1)
-  const [bids, setBids] = useState([{ yesBid: 550, noBid: 450 }])
+  const [bids, setBids] = useState([{ yesBid: 100, noBid: 100 }])
 
   const entries = useMemo(
     () => makeEntries(bids.slice(0, steps)),
diff --git a/web/pages/bets.tsx b/web/pages/trades.tsx
similarity index 68%
rename from web/pages/bets.tsx
rename to web/pages/trades.tsx
index bebd044e..6e66d001 100644
--- a/web/pages/bets.tsx
+++ b/web/pages/trades.tsx
@@ -4,13 +4,13 @@ import { SEO } from '../components/SEO'
 import { Title } from '../components/title'
 import { useUser } from '../hooks/use-user'
 
-export default function BetsPage() {
+export default function TradesPage() {
   const user = useUser()
 
   return (
     <Page>
-      <SEO title="Your bets" description="Your bets" url="/bets" />
-      <Title text="Your bets" />
+      <SEO title="Your trades" description="Your trades" url="/trades" />
+      <Title text="Your trades" />
       {user && <BetsList user={user} />}
     </Page>
   )

From b2945c24b1f5f1fcce31d7c2d42a171ec63c69f5 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Fri, 24 Dec 2021 16:14:02 -0500
Subject: [PATCH 09/81] turn keep awake on

---
 functions/src/index.ts      | 2 +-
 functions/src/keep-awake.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/functions/src/index.ts b/functions/src/index.ts
index ee8da84b..dfb09c89 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -2,7 +2,7 @@ import * as admin from 'firebase-admin'
 
 admin.initializeApp()
 
-// export * from './keep-awake'
+export * from './keep-awake'
 export * from './place-bet'
 export * from './resolve-market'
 export * from './sell-bet'
diff --git a/functions/src/keep-awake.ts b/functions/src/keep-awake.ts
index 85aa3475..00799e65 100644
--- a/functions/src/keep-awake.ts
+++ b/functions/src/keep-awake.ts
@@ -8,6 +8,7 @@ export const keepAwake = functions.pubsub
     await Promise.all([
       callCloudFunction('placeBet'),
       callCloudFunction('resolveMarket'),
+      callCloudFunction('sellBet'),
     ])
 
     await sleep(30)
@@ -15,6 +16,7 @@ export const keepAwake = functions.pubsub
     await Promise.all([
       callCloudFunction('placeBet'),
       callCloudFunction('resolveMarket'),
+      callCloudFunction('sellBet'),
     ])
   })
 

From a902dfebcaf972f68bcf6bc2ae4216f94674701b Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Fri, 24 Dec 2021 16:29:15 -0500
Subject: [PATCH 10/81] Fit long names on mobile

---
 web/components/bets-list.tsx    | 4 +---
 web/components/profile-menu.tsx | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 52de070b..6b05c689 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -200,9 +200,7 @@ export function MyBetsSummary(props: {
   return (
     <Row className={clsx('gap-4 sm:gap-6', className)}>
       <Col>
-        <div className="text-sm text-gray-500 whitespace-nowrap">
-          Amount invested
-        </div>
+        <div className="text-sm text-gray-500 whitespace-nowrap">Invested</div>
         <div className="whitespace-nowrap">{formatMoney(betsTotal)}</div>
       </Col>
       {resolution ? (
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index 43022a9e..8f50fbfb 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -64,7 +64,7 @@ function ProfileSummary(props: { user: User }) {
       <div className="rounded-full w-10 h-10 mr-4">
         <Image src={user.avatarUrl} width={40} height={40} />
       </div>
-      <div className="truncate text-left" style={{ maxWidth: 175 }}>
+      <div className="truncate text-left" style={{ maxWidth: 140 }}>
         {user.name}
         <div className="text-gray-700 text-sm">{formatMoney(user.balance)}</div>
       </div>

From b06d41e31a39fef3b33775021fd23815a0d7d757 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 29 Dec 2021 00:49:10 -0500
Subject: [PATCH 11/81] resolve market cancel uses only pool to pay out

---
 functions/src/resolve-market.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index 280af022..ec6cd3bf 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -54,10 +54,7 @@ export const resolveMarket = functions
 
       const payouts =
         outcome === 'CANCEL'
-          ? bets.map((bet) => ({
-              userId: bet.userId,
-              payout: bet.amount,
-            }))
+          ? getCancelPayouts(contract, bets)
           : getPayouts(outcome, contract, bets)
 
       console.log('payouts:', payouts)
@@ -77,6 +74,20 @@ export const resolveMarket = functions
 
 const firestore = admin.firestore()
 
+const getCancelPayouts = (contract: Contract, bets: Bet[]) => {
+  const startPool = contract.startPool.YES + contract.startPool.NO
+  const truePool = contract.pool.YES + contract.pool.NO - startPool
+
+  const openBets = bets.filter((b) => !b.isSold && !b.sale)
+
+  const betSum = _.sumBy(openBets, (b) => b.amount)
+
+  return openBets.map((bet) => ({
+    userId: bet.userId,
+    payout: (bet.amount / betSum) * truePool,
+  }))
+}
+
 const getPayouts = (outcome: string, contract: Contract, bets: Bet[]) => {
   const openBets = bets.filter((b) => !b.isSold && !b.sale)
   const [yesBets, noBets] = _.partition(

From a9e1cbc0beca912bc15d0e612e58bb2c6938a286 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 29 Dec 2021 23:31:26 -0800
Subject: [PATCH 12/81] Point local server to prod Firebase for now (#13)

---
 web/lib/firebase/init.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts
index c9561861..98734946 100644
--- a/web/lib/firebase/init.ts
+++ b/web/lib/firebase/init.ts
@@ -1,7 +1,9 @@
 import { getFirestore } from '@firebase/firestore'
 import { initializeApp } from 'firebase/app'
 
-export const isProd = process.env.NODE_ENV === 'production'
+// TODO: Reenable this when we have a way to set the Firebase db in dev
+// export const isProd = process.env.NODE_ENV === 'production'
+export const isProd = true
 
 const firebaseConfig = isProd
   ? {

From a5e4411075563e897545759b05020d054c2beffc Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 30 Dec 2021 13:35:29 -0500
Subject: [PATCH 13/81] Load all contracts, and filter to 99 client-side.

---
 web/components/contracts-list.tsx | 5 +++++
 web/lib/firebase/contracts.ts     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index 74c94ad5..b80ade7c 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -110,6 +110,8 @@ function ContractsGrid(props: { contracts: Contract[] }) {
   )
 }
 
+const MAX_CONTRACTS_DISPLAYED = 99
+
 type Sort = 'createdTime' | 'pool' | 'resolved' | 'all'
 export function SearchableGrid(props: {
   contracts: Contract[]
@@ -143,6 +145,9 @@ export function SearchableGrid(props: {
     )
   }
 
+  if (matches.length > MAX_CONTRACTS_DISPLAYED)
+    matches = _.slice(matches, 0, MAX_CONTRACTS_DISPLAYED)
+
   return (
     <div>
       {/* Show a search input next to a sort dropdown */}
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index f97e111c..b8ea93e3 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -107,7 +107,7 @@ export async function listContracts(creatorId: string): Promise<Contract[]> {
 }
 
 export async function listAllContracts(): Promise<Contract[]> {
-  const q = query(contractCollection, orderBy('createdTime', 'desc'), limit(99))
+  const q = query(contractCollection, orderBy('createdTime', 'desc'))
   const snapshot = await getDocs(q)
   return snapshot.docs.map((doc) => doc.data() as Contract)
 }
@@ -115,7 +115,7 @@ export async function listAllContracts(): Promise<Contract[]> {
 export function listenForContracts(
   setContracts: (contracts: Contract[]) => void
 ) {
-  const q = query(contractCollection, orderBy('createdTime', 'desc'), limit(99))
+  const q = query(contractCollection, orderBy('createdTime', 'desc'))
   return onSnapshot(q, (snap) => {
     setContracts(snap.docs.map((doc) => doc.data() as Contract))
   })

From 527a8a8b099faaa70617cccd1318b5424e134a7b Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 30 Dec 2021 13:52:05 -0500
Subject: [PATCH 14/81] White panels, medium shadows

---
 web/components/bet-panel.tsx        | 4 +---
 web/components/contracts-list.tsx   | 2 +-
 web/components/resolution-panel.tsx | 4 +---
 web/pages/create.tsx                | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index 42f3abae..55467527 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -95,9 +95,7 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
   const remainingBalance = (user?.balance || 0) - (betAmount || 0)
 
   return (
-    <Col
-      className={clsx('bg-gray-100 shadow-xl px-8 py-6 rounded-md', className)}
-    >
+    <Col className={clsx('bg-white shadow-md px-8 py-6 rounded-md', className)}>
       <Title className="!mt-0 whitespace-nowrap" text="Place a trade" />
 
       <div className="mt-2 mb-1 text-sm text-gray-400">Outcome</div>
diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index b80ade7c..2902cccd 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -55,7 +55,7 @@ function ContractCard(props: { contract: Contract }) {
   return (
     <Link href={path(contract)}>
       <a>
-        <li className="col-span-1 bg-white hover:bg-gray-100 shadow-xl rounded-lg divide-y divide-gray-200">
+        <li className="col-span-1 bg-white hover:bg-gray-100 shadow-md rounded-lg divide-y divide-gray-200">
           <div className="card">
             <div className="card-body p-6">
               <Row className="justify-between gap-4 mb-2">
diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx
index 4e98a713..626480a7 100644
--- a/web/components/resolution-panel.tsx
+++ b/web/components/resolution-panel.tsx
@@ -51,9 +51,7 @@ export function ResolutionPanel(props: {
       : 'btn-disabled'
 
   return (
-    <Col
-      className={clsx('bg-gray-100 shadow-xl px-8 py-6 rounded-md', className)}
-    >
+    <Col className={clsx('bg-white shadow-md px-8 py-6 rounded-md', className)}>
       <Title className="mt-0" text="Your market" />
 
       <div className="pt-2 pb-1 text-sm text-gray-400">Resolve outcome</div>
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index d7ad6cae..0a66d14d 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -45,7 +45,7 @@ export default function NewContract() {
     <Page>
       <Title text="Create a new prediction market" />
 
-      <div className="w-full bg-gray-100 rounded-lg shadow-xl px-6 py-4">
+      <div className="w-full bg-white rounded-lg shadow-md px-6 py-4">
         {/* Create a Tailwind form that takes in all the fields needed for a new contract */}
         {/* When the form is submitted, create a new contract in the database */}
         <form>
@@ -57,7 +57,7 @@ export default function NewContract() {
             <input
               type="text"
               placeholder="e.g. Will the FDA approve Paxlovid before Jun 2nd, 2022?"
-              className="input"
+              className="input input-bordered"
               value={question}
               onChange={(e) => setQuestion(e.target.value || '')}
             />

From f78920c9122f0fb8e568e0a90d129e7b7bfa6fc6 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Thu, 30 Dec 2021 14:03:32 -0600
Subject: [PATCH 15/81] Organize markets by creator!! (#14)

---
 web/components/contracts-list.tsx | 73 +++++++++++++++++++++++++++----
 web/components/link.tsx           | 24 ++++++++++
 web/components/user-page.tsx      | 21 +++------
 web/pages/create.tsx              |  4 +-
 4 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 web/components/link.tsx

diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index 2902cccd..f098173f 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -14,6 +14,8 @@ import { formatMoney } from '../lib/util/format'
 import { User } from '../lib/firebase/users'
 import { UserLink } from './user-page'
 import { Linkify } from './linkify'
+import { Col } from './layout/col'
+import { SiteLink } from './link'
 
 export function ContractDetails(props: { contract: Contract }) {
   const { contract } = props
@@ -110,16 +112,63 @@ function ContractsGrid(props: { contracts: Contract[] }) {
   )
 }
 
+export function CreatorContractsGrid(props: { contracts: Contract[] }) {
+  const { contracts } = props
+
+  const byCreator = _.groupBy(contracts, (contract) => contract.creatorId)
+  const creatorIds = _.sortBy(Object.keys(byCreator), (creatorId) =>
+    _.sumBy(byCreator[creatorId], (contract) => -1 * compute(contract).truePool)
+  )
+
+  return (
+    <Col className="gap-6">
+      {creatorIds.map((creatorId) => {
+        const { creatorUsername, creatorName } = byCreator[creatorId][0]
+
+        return (
+          <Col className="gap-6">
+            <SiteLink href={`/${creatorUsername}`}>{creatorName}</SiteLink>
+
+            <ul role="list" className="grid grid-cols-1 gap-6 lg:grid-cols-2">
+              {byCreator[creatorId].slice(0, 6).map((contract) => (
+                <ContractCard contract={contract} key={contract.id} />
+              ))}
+            </ul>
+
+            {byCreator[creatorId].length > 6 ? (
+              <Link href={`/${creatorUsername}`}>
+                <a
+                  className={clsx(
+                    'self-end hover:underline hover:decoration-indigo-400 hover:decoration-2'
+                  )}
+                  onClick={(e) => e.stopPropagation()}
+                >
+                  See all
+                </a>
+              </Link>
+            ) : (
+              <div />
+            )}
+          </Col>
+        )
+      })}
+    </Col>
+  )
+}
+
 const MAX_CONTRACTS_DISPLAYED = 99
 
-type Sort = 'createdTime' | 'pool' | 'resolved' | 'all'
+type Sort = 'creator' | 'createdTime' | 'pool' | 'resolved' | 'all'
 export function SearchableGrid(props: {
   contracts: Contract[]
   defaultSort?: Sort
+  byOneCreator?: boolean
 }) {
-  const { contracts, defaultSort } = props
+  const { contracts, defaultSort, byOneCreator } = props
   const [query, setQuery] = useState('')
-  const [sort, setSort] = useState(defaultSort || 'pool')
+  const [sort, setSort] = useState(
+    defaultSort || (byOneCreator ? 'pool' : 'creator')
+  )
 
   function check(corpus: String) {
     return corpus.toLowerCase().includes(query.toLowerCase())
@@ -134,7 +183,7 @@ export function SearchableGrid(props: {
 
   if (sort === 'createdTime' || sort === 'resolved' || sort === 'all') {
     matches.sort((a, b) => b.createdTime - a.createdTime)
-  } else if (sort === 'pool') {
+  } else if (sort === 'pool' || sort === 'creator') {
     matches.sort((a, b) => compute(b).truePool - compute(a).truePool)
   }
 
@@ -164,19 +213,27 @@ export function SearchableGrid(props: {
           value={sort}
           onChange={(e) => setSort(e.target.value as Sort)}
         >
+          {byOneCreator ? (
+            <option value="all">All markets</option>
+          ) : (
+            <option value="creator">By creator</option>
+          )}
           <option value="pool">Most traded</option>
           <option value="createdTime">Newest first</option>
           <option value="resolved">Resolved</option>
-          <option value="all">All markets</option>
         </select>
       </div>
 
-      <ContractsGrid contracts={matches} />
+      {!byOneCreator && (sort === 'creator' || sort === 'resolved') ? (
+        <CreatorContractsGrid contracts={matches} />
+      ) : (
+        <ContractsGrid contracts={matches} />
+      )}
     </div>
   )
 }
 
-export function ContractsList(props: { creator: User }) {
+export function CreatorContractsList(props: { creator: User }) {
   const { creator } = props
   const [contracts, setContracts] = useState<Contract[] | 'loading'>('loading')
 
@@ -189,5 +246,5 @@ export function ContractsList(props: { creator: User }) {
 
   if (contracts === 'loading') return <></>
 
-  return <SearchableGrid contracts={contracts} defaultSort="all" />
+  return <SearchableGrid contracts={contracts} byOneCreator defaultSort="all" />
 }
diff --git a/web/components/link.tsx b/web/components/link.tsx
new file mode 100644
index 00000000..c462d611
--- /dev/null
+++ b/web/components/link.tsx
@@ -0,0 +1,24 @@
+import clsx from 'clsx'
+import Link from 'next/link'
+
+export const SiteLink = (props: {
+  href: string
+  children: any
+  className?: string
+}) => {
+  const { href, children, className } = props
+
+  return (
+    <Link href={href}>
+      <a
+        className={clsx(
+          'hover:underline hover:decoration-indigo-400 hover:decoration-2',
+          className
+        )}
+        onClick={(e) => e.stopPropagation()}
+      >
+        {children}
+      </a>
+    </Link>
+  )
+}
diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index b3a6d058..bc531737 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -1,28 +1,19 @@
 import { firebaseLogout, User } from '../lib/firebase/users'
-import { ContractsList } from './contracts-list'
+import { CreatorContractsList } from './contracts-list'
 import { Title } from './title'
 import { Row } from './layout/row'
 import { formatMoney } from '../lib/util/format'
-import Link from 'next/link'
-import clsx from 'clsx'
 import { SEO } from './SEO'
 import { Page } from './page'
+import { SiteLink } from './link'
 
 export function UserLink(props: { username: string; className?: string }) {
   const { username, className } = props
 
   return (
-    <Link href={`/${username}`}>
-      <a
-        className={clsx(
-          'hover:underline hover:decoration-indigo-400 hover:decoration-2',
-          className
-        )}
-        onClick={(e) => e.stopPropagation()}
-      >
-        @{username}
-      </a>
-    </Link>
+    <SiteLink href={`/${username}`} className={className}>
+      @{username}
+    </SiteLink>
   )
 }
 
@@ -81,7 +72,7 @@ export function UserPage(props: { user: User; currentUser?: User }) {
 
       <Title text={possesive + 'markets'} />
 
-      <ContractsList creator={user} />
+      <CreatorContractsList creator={user} />
     </Page>
   )
 }
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 0a66d14d..5806f9ec 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -1,7 +1,7 @@
 import router from 'next/router'
 import { useEffect, useState } from 'react'
 
-import { ContractsList } from '../components/contracts-list'
+import { CreatorContractsList } from '../components/contracts-list'
 import { Spacer } from '../components/layout/spacer'
 import { Title } from '../components/title'
 import { useUser } from '../hooks/use-user'
@@ -119,7 +119,7 @@ export default function NewContract() {
 
       <Title text="Your markets" />
 
-      {creator && <ContractsList creator={creator} />}
+      {creator && <CreatorContractsList creator={creator} />}
     </Page>
   )
 }

From 6a851fe86a30cf51640dea6fc2c8a882593d00d5 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 30 Dec 2021 15:55:50 -0600
Subject: [PATCH 16/81] Update resolve descriptions

---
 web/components/resolution-panel.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx
index 626480a7..7f9f74c6 100644
--- a/web/components/resolution-panel.tsx
+++ b/web/components/resolution-panel.tsx
@@ -68,18 +68,14 @@ export function ResolutionPanel(props: {
       <div>
         {outcome === 'YES' ? (
           <>
-            Winnings will be paid out to YES bettors. You earn 1% of the NO
-            bets.
+            Winnings will be paid out to YES bettors. You earn 1% of the pool.
           </>
         ) : outcome === 'NO' ? (
-          <>
-            Winnings will be paid out to NO bettors. You earn 1% of the YES
-            bets.
-          </>
+          <>Winnings will be paid out to NO bettors. You earn 1% of the pool.</>
         ) : outcome === 'CANCEL' ? (
-          <>All bets will be returned with no fees.</>
+          <>The pool will be returned to traders with no fees.</>
         ) : (
-          <>Resolving this market will immediately pay out bettors.</>
+          <>Resolving this market will immediately pay out traders.</>
         )}
       </div>
 

From 41a011a9bb37af55dad86bbf1a53771208e2e15f Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 30 Dec 2021 16:31:04 -0600
Subject: [PATCH 17/81] Increase size of creator name. Decrease spacing

---
 web/components/contracts-list.tsx | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index f098173f..aed8e3f4 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -112,6 +112,8 @@ function ContractsGrid(props: { contracts: Contract[] }) {
   )
 }
 
+const MAX_GROUPED_CONTRACTS_DISPLAYED = 6
+
 export function CreatorContractsGrid(props: { contracts: Contract[] }) {
   const { contracts } = props
 
@@ -126,16 +128,20 @@ export function CreatorContractsGrid(props: { contracts: Contract[] }) {
         const { creatorUsername, creatorName } = byCreator[creatorId][0]
 
         return (
-          <Col className="gap-6">
-            <SiteLink href={`/${creatorUsername}`}>{creatorName}</SiteLink>
+          <Col className="gap-4">
+            <SiteLink className="text-lg" href={`/${creatorUsername}`}>
+              {creatorName}
+            </SiteLink>
 
-            <ul role="list" className="grid grid-cols-1 gap-6 lg:grid-cols-2">
-              {byCreator[creatorId].slice(0, 6).map((contract) => (
-                <ContractCard contract={contract} key={contract.id} />
-              ))}
+            <ul role="list" className="grid grid-cols-1 gap-4 lg:grid-cols-2">
+              {byCreator[creatorId]
+                .slice(0, MAX_GROUPED_CONTRACTS_DISPLAYED)
+                .map((contract) => (
+                  <ContractCard contract={contract} key={contract.id} />
+                ))}
             </ul>
 
-            {byCreator[creatorId].length > 6 ? (
+            {byCreator[creatorId].length > MAX_GROUPED_CONTRACTS_DISPLAYED ? (
               <Link href={`/${creatorUsername}`}>
                 <a
                   className={clsx(

From 6eda71286c38c5e05746aea862e89909442d09be Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Fri, 31 Dec 2021 13:31:41 -0600
Subject: [PATCH 18/81] nav bar: dark background, no shadow

---
 web/components/nav-bar.tsx | 9 +--------
 web/components/page.tsx    | 1 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/web/components/nav-bar.tsx b/web/components/nav-bar.tsx
index 0798b29a..01093e46 100644
--- a/web/components/nav-bar.tsx
+++ b/web/components/nav-bar.tsx
@@ -22,14 +22,7 @@ export function NavBar(props: {
   const themeClasses = clsx(darkBackground && 'text-white', hoverClasses)
 
   return (
-    <nav
-      className={clsx(
-        'w-full p-4 mb-4 shadow-sm',
-        !darkBackground && 'bg-white',
-        className
-      )}
-      aria-label="Global"
-    >
+    <nav className={clsx('w-full p-4 mb-4', className)} aria-label="Global">
       <Row
         className={clsx(
           'justify-between items-center mx-auto sm:px-4',
diff --git a/web/components/page.tsx b/web/components/page.tsx
index 1bc62289..66e9a272 100644
--- a/web/components/page.tsx
+++ b/web/components/page.tsx
@@ -7,6 +7,7 @@ export function Page(props: { wide?: boolean; children?: any }) {
   return (
     <div>
       <NavBar wide={wide} />
+
       <div
         className={clsx(
           'w-full px-4 pb-8 mx-auto',

From f1977f26ead5dc0e7f0290292e9cf7b5ce2c9a12 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Fri, 31 Dec 2021 13:17:32 -0600
Subject: [PATCH 19/81] Don't wrap external link with next/link

---
 web/components/contracts-list.tsx          |  2 +-
 web/components/linkify.tsx                 | 12 +++++-------
 web/components/{link.tsx => site-link.tsx} | 13 ++++++++++++-
 web/components/user-page.tsx               |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)
 rename web/components/{link.tsx => site-link.tsx} (63%)

diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index aed8e3f4..b40c926a 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -15,7 +15,7 @@ import { User } from '../lib/firebase/users'
 import { UserLink } from './user-page'
 import { Linkify } from './linkify'
 import { Col } from './layout/col'
-import { SiteLink } from './link'
+import { SiteLink } from './site-link'
 
 export function ContractDetails(props: { contract: Contract }) {
   const { contract } = props
diff --git a/web/components/linkify.tsx b/web/components/linkify.tsx
index fd1be879..df6bb98d 100644
--- a/web/components/linkify.tsx
+++ b/web/components/linkify.tsx
@@ -1,5 +1,5 @@
-import Link from 'next/link'
 import { Fragment } from 'react'
+import { SiteLink } from './site-link'
 
 // Return a JSX span, linkifying @username, #hashtags, and https://...
 export function Linkify(props: { text: string }) {
@@ -20,12 +20,10 @@ export function Linkify(props: { text: string }) {
     return (
       <>
         {whitespace}
-        <Link href={href}>
-          <a className="text-indigo-700 hover:underline hover:decoration-2">
-            {symbol}
-            {tag}
-          </a>
-        </Link>
+        <SiteLink className="text-indigo-700" href={href}>
+          {symbol}
+          {tag}
+        </SiteLink>
       </>
     )
   })
diff --git a/web/components/link.tsx b/web/components/site-link.tsx
similarity index 63%
rename from web/components/link.tsx
rename to web/components/site-link.tsx
index c462d611..a3a5a01b 100644
--- a/web/components/link.tsx
+++ b/web/components/site-link.tsx
@@ -8,7 +8,18 @@ export const SiteLink = (props: {
 }) => {
   const { href, children, className } = props
 
-  return (
+  return href.startsWith('http') ? (
+    <a
+      href={href}
+      className={clsx(
+        'hover:underline hover:decoration-indigo-400 hover:decoration-2',
+        className
+      )}
+      onClick={(e) => e.stopPropagation()}
+    >
+      {children}
+    </a>
+  ) : (
     <Link href={href}>
       <a
         className={clsx(
diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index bc531737..6a93ba88 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -5,7 +5,7 @@ import { Row } from './layout/row'
 import { formatMoney } from '../lib/util/format'
 import { SEO } from './SEO'
 import { Page } from './page'
-import { SiteLink } from './link'
+import { SiteLink } from './site-link'
 
 export function UserLink(props: { username: string; className?: string }) {
   const { username, className } = props

From 96d5ea043766a0045bbb06f64cbb8f4c8362131b Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Fri, 31 Dec 2021 13:41:37 -0600
Subject: [PATCH 20/81] Add sort by tag

---
 web/components/contracts-list.tsx | 65 +++++++++++++++++++++++++++++--
 web/lib/util/parse.ts             |  8 ++++
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 web/lib/util/parse.ts

diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index b40c926a..07c052b0 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -16,6 +16,7 @@ import { UserLink } from './user-page'
 import { Linkify } from './linkify'
 import { Col } from './layout/col'
 import { SiteLink } from './site-link'
+import { parseTags } from '../lib/util/parse'
 
 export function ContractDetails(props: { contract: Contract }) {
   const { contract } = props
@@ -162,9 +163,64 @@ export function CreatorContractsGrid(props: { contracts: Contract[] }) {
   )
 }
 
+export function TagContractsGrid(props: { contracts: Contract[] }) {
+  const { contracts } = props
+
+  const contractTags = _.flatMap(contracts, (contract) =>
+    parseTags(contract.question + ' ' + contract.description).map((tag) => ({
+      tag,
+      contract,
+    }))
+  )
+  const groupedByTag = _.groupBy(contractTags, ({ tag }) => tag)
+  const byTag = _.mapValues(groupedByTag, (contractTags) =>
+    contractTags.map(({ contract }) => contract)
+  )
+  const tags = _.sortBy(Object.keys(byTag), (tag) =>
+    _.sumBy(byTag[tag], (contract) => -1 * compute(contract).truePool)
+  )
+
+  return (
+    <Col className="gap-6">
+      {tags.map((tag) => {
+        return (
+          <Col className="gap-4">
+            <SiteLink className="text-lg" href={`/tag/${tag}`}>
+              #{tag}
+            </SiteLink>
+
+            <ul role="list" className="grid grid-cols-1 gap-4 lg:grid-cols-2">
+              {byTag[tag]
+                .slice(0, MAX_GROUPED_CONTRACTS_DISPLAYED)
+                .map((contract) => (
+                  <ContractCard contract={contract} key={contract.id} />
+                ))}
+            </ul>
+
+            {byTag[tag].length > MAX_GROUPED_CONTRACTS_DISPLAYED ? (
+              <Link href={`/tag/${tag}`}>
+                <a
+                  className={clsx(
+                    'self-end hover:underline hover:decoration-indigo-400 hover:decoration-2'
+                  )}
+                  onClick={(e) => e.stopPropagation()}
+                >
+                  See all
+                </a>
+              </Link>
+            ) : (
+              <div />
+            )}
+          </Col>
+        )
+      })}
+    </Col>
+  )
+}
+
 const MAX_CONTRACTS_DISPLAYED = 99
 
-type Sort = 'creator' | 'createdTime' | 'pool' | 'resolved' | 'all'
+type Sort = 'creator' | 'tag' | 'createdTime' | 'pool' | 'resolved' | 'all'
 export function SearchableGrid(props: {
   contracts: Contract[]
   defaultSort?: Sort
@@ -189,7 +245,7 @@ export function SearchableGrid(props: {
 
   if (sort === 'createdTime' || sort === 'resolved' || sort === 'all') {
     matches.sort((a, b) => b.createdTime - a.createdTime)
-  } else if (sort === 'pool' || sort === 'creator') {
+  } else if (sort === 'pool' || sort === 'creator' || sort === 'tag') {
     matches.sort((a, b) => compute(b).truePool - compute(a).truePool)
   }
 
@@ -224,13 +280,16 @@ export function SearchableGrid(props: {
           ) : (
             <option value="creator">By creator</option>
           )}
+          <option value="tag">By tag</option>
           <option value="pool">Most traded</option>
           <option value="createdTime">Newest first</option>
           <option value="resolved">Resolved</option>
         </select>
       </div>
 
-      {!byOneCreator && (sort === 'creator' || sort === 'resolved') ? (
+      {sort === 'tag' ? (
+        <TagContractsGrid contracts={matches} />
+      ) : !byOneCreator && (sort === 'creator' || sort === 'resolved') ? (
         <CreatorContractsGrid contracts={matches} />
       ) : (
         <ContractsGrid contracts={matches} />
diff --git a/web/lib/util/parse.ts b/web/lib/util/parse.ts
new file mode 100644
index 00000000..2857b7a1
--- /dev/null
+++ b/web/lib/util/parse.ts
@@ -0,0 +1,8 @@
+export function parseTags(text: string) {
+  const regex = /(?:^|\s)(?:[#][a-z0-9_]+)/gi
+  const matches = text.match(regex) || []
+  return matches.map((match) => {
+    const tag = match.trim().substring(1)
+    return tag
+  })
+}

From 0b9b2396f17055984b3fe6c0b57db1f4fcd85fb9 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Fri, 31 Dec 2021 14:13:06 -0600
Subject: [PATCH 21/81] Est. Max Payout => Shares in bet table

---
 web/components/bets-list.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 6b05c689..18c74563 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -5,7 +5,11 @@ import { useEffect, useState } from 'react'
 import { useUserBets } from '../hooks/use-user-bets'
 import { Bet } from '../lib/firebase/bets'
 import { User } from '../lib/firebase/users'
-import { formatMoney, formatPercent } from '../lib/util/format'
+import {
+  formatMoney,
+  formatPercent,
+  formatWithCommas,
+} from '../lib/util/format'
 import { Col } from './layout/col'
 import { Spacer } from './layout/spacer'
 import { Contract, getContractFromId, path } from '../lib/firebase/contracts'
@@ -253,7 +257,7 @@ export function ContractBetsTable(props: {
             <th>Outcome</th>
             <th>Amount</th>
             <th>Probability</th>
-            {!isResolved && <th>Est. max payout</th>}
+            <th>Shares</th>
             <th>{isResolved ? <>Payout</> : <>Current value</>}</th>
             <th></th>
           </tr>
@@ -296,7 +300,7 @@ function BetRow(props: { bet: Bet; contract: Contract; sale?: Bet }) {
       <td>
         {formatPercent(probBefore)} → {formatPercent(probAfter)}
       </td>
-      {!isResolved && <td>{formatMoney(shares)}</td>}
+      <td>{formatWithCommas(shares)}</td>
       <td>
         {bet.isSold
           ? 'N/A'

From 7d5e02a69c551fa5d85430c48b6fc64f14a8998a Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Fri, 31 Dec 2021 14:25:01 -0600
Subject: [PATCH 22/81] username => name on user page

---
 web/components/user-page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index 6a93ba88..3bf207b2 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -58,7 +58,7 @@ export function UserPage(props: { user: User; currentUser?: User }) {
 
   const isCurrentUser = user.id === currentUser?.id
 
-  const possesive = isCurrentUser ? 'Your ' : `${user.username}'s `
+  const possesive = isCurrentUser ? 'Your ' : `${user.name}'s `
 
   return (
     <Page>

From 50e3dc5cd05ab9a6132e0d87c2a53393dcac2998 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Fri, 31 Dec 2021 14:33:05 -0600
Subject: [PATCH 23/81] Add Discord link as menu option!

---
 web/components/menu.tsx         | 1 +
 web/components/profile-menu.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/components/menu.tsx b/web/components/menu.tsx
index 5c3794ef..5b8ffd86 100644
--- a/web/components/menu.tsx
+++ b/web/components/menu.tsx
@@ -34,6 +34,7 @@ export function MenuButton(props: {
               {({ active }) => (
                 <a
                   href={item.href}
+                  target={item.href.startsWith('http') ? '_blank' : undefined}
                   onClick={item.onClick}
                   className={clsx(
                     active ? 'bg-gray-100' : '',
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index 8f50fbfb..b5e88d43 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -48,7 +48,10 @@ function getNavigationOptions(user: User, options: { mobile: boolean }) {
       name: 'Your markets',
       href: `/${user.username}`,
     },
-
+    {
+      name: 'Discord',
+      href: 'https://discord.gg/eHQBNBqXuh',
+    },
     {
       name: 'Sign out',
       href: '#',

From 4db7e03b921eb3a1a05e94184cc66918e963b42d Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Fri, 31 Dec 2021 17:22:15 -0600
Subject: [PATCH 24/81] Switch to old current value calculation

---
 web/lib/calculate.ts | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/web/lib/calculate.ts b/web/lib/calculate.ts
index 13649c06..b195a65a 100644
--- a/web/lib/calculate.ts
+++ b/web/lib/calculate.ts
@@ -61,37 +61,13 @@ export function resolvedPayout(contract: Contract, bet: Bet) {
 }
 
 export function currentValue(contract: Contract, bet: Bet) {
-  // const prob = getProbability(contract.pool)
-  // const yesPayout = calculatePayout(contract, bet, 'YES')
-  // const noPayout = calculatePayout(contract, bet, 'NO')
+  const prob = getProbability(contract.pool)
+  const yesPayout = calculatePayout(contract, bet, 'YES')
+  const noPayout = calculatePayout(contract, bet, 'NO')
 
-  // return prob * yesPayout + (1 - prob) * noPayout
-
-  const { shares, outcome } = bet
-
-  const { YES: yesPool, NO: noPool } = contract.pool
-  const [y, n, s] = [yesPool, noPool, shares]
-
-  const shareValue =
-    outcome === 'YES'
-      ? // https://www.wolframalpha.com/input/?i=b+%2B+%28b+n%5E2%29%2F%28y+%28-b+%2B+y%29%29+%3D+c+solve+b
-        (n ** 2 +
-          s * y +
-          y ** 2 -
-          Math.sqrt(
-            n ** 4 + (s - y) ** 2 * y ** 2 + 2 * n ** 2 * y * (s + y)
-          )) /
-        (2 * y)
-      : (y ** 2 +
-          s * n +
-          n ** 2 -
-          Math.sqrt(
-            y ** 4 + (s - n) ** 2 * n ** 2 + 2 * y ** 2 * n * (s + n)
-          )) /
-        (2 * n)
-
-  return (1 - fees) * shareValue
+  return prob * yesPayout + (1 - prob) * noPayout
 }
+
 export function calculateSaleAmount(contract: Contract, bet: Bet) {
   const { shares, outcome } = bet
 

From afc6f28a49249fdc46d40d8906a4abb9ea36cf97 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sat, 1 Jan 2022 18:08:52 -0600
Subject: [PATCH 25/81] Send email on market resolution with your payout

---
 functions/package.json          |   4 +-
 functions/src/emails.ts         |  35 +++
 functions/src/resolve-market.ts |  26 +-
 functions/src/send-email.ts     |  18 ++
 functions/yarn.lock             | 459 +++++++++++++++++++++++++++++++-
 5 files changed, 531 insertions(+), 11 deletions(-)
 create mode 100644 functions/src/emails.ts
 create mode 100644 functions/src/send-email.ts

diff --git a/functions/package.json b/functions/package.json
index 62dd0c58..79de1b65 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -17,9 +17,11 @@
     "fetch": "1.1.0",
     "firebase-admin": "10.0.0",
     "firebase-functions": "3.16.0",
-    "lodash": "4.17.21"
+    "lodash": "4.17.21",
+    "mailgun-js": "0.22.0"
   },
   "devDependencies": {
+    "@types/mailgun-js": "0.22.12",
     "firebase-functions-test": "0.3.3",
     "typescript": "4.5.3"
   },
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
new file mode 100644
index 00000000..14c030f3
--- /dev/null
+++ b/functions/src/emails.ts
@@ -0,0 +1,35 @@
+import { sendEmail } from './send-email'
+import { Contract } from './types/contract'
+import { User } from './types/user'
+import { getUser } from './utils'
+
+export const sendMarketResolutionEmail = async (
+  userId: string,
+  payout: number,
+  creator: User,
+  contract: Contract,
+  resolution: 'YES' | 'NO' | 'CANCEL'
+) => {
+  const user = await getUser(userId)
+  if (!user) return
+
+  const subject = `Resolved ${toDisplayResolution[resolution]}: ${contract.question}`
+
+  const body = `Dear ${user.name},
+
+A market you bet in has been resolved!
+
+Creator: ${contract.creatorName}
+Question: ${contract.question}
+
+Resolution: ${toDisplayResolution[resolution]}
+
+Your payout is M$ ${Math.round(payout)}
+
+View the market here:
+https://mantic.markets/${creator.username}/${contract.slug}
+`
+  await sendEmail(user.email, subject, body)
+}
+
+const toDisplayResolution = { YES: 'YES', NO: 'NO', CANCEL: 'N/A' }
diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index ec6cd3bf..0ab9f4cb 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -5,6 +5,8 @@ import * as _ from 'lodash'
 import { Contract } from './types/contract'
 import { User } from './types/user'
 import { Bet } from './types/bet'
+import { getUser } from './utils'
+import { sendMarketResolutionEmail } from './emails'
 
 export const PLATFORM_FEE = 0.01 // 1%
 export const CREATOR_FEE = 0.01 // 1%
@@ -14,7 +16,7 @@ export const resolveMarket = functions
   .https.onCall(
     async (
       data: {
-        outcome: string
+        outcome: 'YES' | 'NO' | 'CANCEL'
         contractId: string
       },
       context
@@ -39,6 +41,9 @@ export const resolveMarket = functions
       if (contract.resolution)
         return { status: 'error', message: 'Contract already resolved' }
 
+      const creator = await getUser(contract.creatorId)
+      if (!creator) return { status: 'error', message: 'Creator not found' }
+
       await contractDoc.update({
         isResolved: true,
         resolution: outcome,
@@ -66,9 +71,26 @@ export const resolveMarket = functions
 
       const payoutPromises = Object.entries(userPayouts).map(payUser)
 
-      return await Promise.all(payoutPromises)
+      const result = await Promise.all(payoutPromises)
         .catch((e) => ({ status: 'error', message: e }))
         .then(() => ({ status: 'success' }))
+
+      const activeBets = bets.filter((bet) => !bet.isSold && !bet.sale)
+      const nonWinners = _.difference(
+        _.uniq(activeBets.map(({ userId }) => userId)),
+        Object.keys(userPayouts)
+      )
+      const emailPayouts = [
+        ...Object.entries(userPayouts),
+        ...nonWinners.map((userId) => [userId, 0] as const),
+      ]
+      await Promise.all(
+        emailPayouts.map(([userId, payout]) =>
+          sendMarketResolutionEmail(userId, payout, creator, contract, outcome)
+        )
+      )
+
+      return result
     }
   )
 
diff --git a/functions/src/send-email.ts b/functions/src/send-email.ts
new file mode 100644
index 00000000..98948fcf
--- /dev/null
+++ b/functions/src/send-email.ts
@@ -0,0 +1,18 @@
+import * as mailgun from 'mailgun-js'
+import * as functions from 'firebase-functions'
+
+const DOMAIN = 'mg.mantic.markets'
+const mg = mailgun({ apiKey: functions.config().mailgun.key, domain: DOMAIN })
+
+export const sendEmail = (to: string, subject: string, text: string) => {
+  const data = {
+    from: 'Mantic Markets <no-reply@mantic.markets>',
+    to,
+    subject,
+    text,
+  }
+
+  return mg.messages().send(data, (error, body) => {
+    console.log('Sent email', error, body)
+  })
+}
diff --git a/functions/yarn.lock b/functions/yarn.lock
index 87ccb0ad..6cec7f41 100644
--- a/functions/yarn.lock
+++ b/functions/yarn.lock
@@ -301,6 +301,14 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
   integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
 
+"@types/mailgun-js@0.22.12":
+  version "0.22.12"
+  resolved "https://registry.yarnpkg.com/@types/mailgun-js/-/mailgun-js-0.22.12.tgz#b0dcb590b56ef3e599ab1f262882493d318e5510"
+  integrity sha512-fTjuh2mOPoJF2BN0QAhE5iPOBls333KIJrmrrJHObMDuBCgEfaENLX2LH1FjKqhfuWfGotKOfPFZMuSok5Ow7g==
+  dependencies:
+    "@types/node" "*"
+    form-data "^2.5.0"
+
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -344,6 +352,13 @@ accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
+agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -351,6 +366,13 @@ agent-base@6:
   dependencies:
     debug "4"
 
+agent-base@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -373,6 +395,13 @@ arrify@^2.0.0, arrify@^2.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
+ast-types@0.x.x:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
+  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
+  dependencies:
+    tslib "^2.0.1"
+
 async-retry@^1.3.1, async-retry@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
@@ -380,6 +409,18 @@ async-retry@^1.3.1, async-retry@^1.3.3:
   dependencies:
     retry "0.13.1"
 
+async@^2.6.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
 base64-js@^1.3.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -432,6 +473,11 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
+
 color-convert@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
@@ -444,6 +490,13 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+combined-stream@^1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
 compressible@^2.0.12:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -485,6 +538,11 @@ cookie@0.4.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
 
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
 cors@^2.8.5:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
@@ -498,25 +556,63 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
+data-uri-to-buffer@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+  integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
+
 date-and-time@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-2.0.1.tgz#bc8b72704980e8a0979bb186118d30d02059ef04"
   integrity sha512-O7Xe5dLaqvY/aF/MFWArsAM1J4j7w1CSZlPCX9uHgmb+6SbkPd8Q4YOvfvH/cZGvFlJFfHOZKxQtmMUOoZhc/w==
 
-debug@2.6.9:
+debug@2, debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.1, debug@^4.3.2:
+debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
   dependencies:
     ms "2.1.2"
 
+debug@^3.1.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+deep-is@~0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+degenerator@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
+  dependencies:
+    ast-types "0.x.x"
+    escodegen "1.x.x"
+    esprima "3.x.x"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -592,6 +688,18 @@ ent@^2.2.0:
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
   integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
+es6-promise@^4.0.3:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  dependencies:
+    es6-promise "^4.0.3"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -602,6 +710,38 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
+escodegen@1.x.x:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+esprima@3.x.x:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
+esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+estraverse@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
@@ -648,7 +788,7 @@ express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend@^3.0.2:
+extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -658,6 +798,11 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
 fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz#ec02ac8e01ab8a319af182dae2681213cfe9ce53"
@@ -678,6 +823,11 @@ fetch@1.1.0:
     biskviit "1.0.1"
     encoding "0.1.12"
 
+file-uri-to-path@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 finalhandler@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -726,6 +876,15 @@ firebase-functions@3.16.0:
     express "^4.17.1"
     lodash "^4.17.14"
 
+form-data@^2.3.3, form-data@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -736,6 +895,14 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
+ftp@~0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -784,6 +951,18 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-uri@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.4.tgz#d4937ab819e218d4cb5ae18e4f5962bef169cc6a"
+  integrity sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q==
+  dependencies:
+    data-uri-to-buffer "1"
+    debug "2"
+    extend "~3.0.2"
+    file-uri-to-path "1"
+    ftp "~0.3.10"
+    readable-stream "2"
+
 google-auth-library@^7.0.0, google-auth-library@^7.6.1, google-auth-library@^7.9.2:
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.11.0.tgz#b63699c65037310a424128a854ba7e736704cbdb"
@@ -860,6 +1039,14 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
   integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
@@ -869,6 +1056,14 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81"
+  integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==
+  dependencies:
+    agent-base "^4.3.0"
+    debug "^3.1.0"
+
 https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -889,11 +1084,26 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-inherits@2.0.4, inherits@^2.0.3:
+inflection@~1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+
+inflection@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
+  integrity sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=
+
+inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ip@1.1.5, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -914,6 +1124,11 @@ is-stream-ended@^0.1.4:
   resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda"
   integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==
 
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -924,6 +1139,16 @@ is-typedarray@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
 jose@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/jose/-/jose-2.0.5.tgz#29746a18d9fff7dcf9d5d2a6f62cb0c7cd27abd3"
@@ -999,6 +1224,14 @@ jws@^4.0.0:
     jwa "^2.0.0"
     safe-buffer "^5.0.1"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 limiter@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
@@ -1059,6 +1292,13 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -1082,6 +1322,21 @@ lru-memoizer@^2.1.4:
     lodash.clonedeep "^4.5.0"
     lru-cache "~4.0.0"
 
+mailgun-js@0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.22.0.tgz#128942b5e47a364a470791608852bf68c96b3a05"
+  integrity sha512-a2alg5nuTZA9Psa1pSEIEsbxr1Zrmqx4VkgGCQ30xVh0kIH7Bu57AYILo+0v8QLSdXtCyLaS+KVmdCrQo0uWFA==
+  dependencies:
+    async "^2.6.1"
+    debug "^4.1.0"
+    form-data "^2.3.3"
+    inflection "~1.12.0"
+    is-stream "^1.1.0"
+    path-proxy "~1.0.0"
+    promisify-call "^2.0.2"
+    proxy-agent "^3.0.3"
+    tsscmp "^1.0.6"
+
 make-dir@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -1109,7 +1364,7 @@ mime-db@1.51.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-types@^2.0.8, mime-types@~2.1.24:
+mime-types@^2.0.8, mime-types@^2.1.12, mime-types@~2.1.24:
   version "2.1.34"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
   integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
@@ -1146,6 +1401,11 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
+netmask@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
+
 node-fetch@^2.6.1:
   version "2.6.6"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
@@ -1182,6 +1442,18 @@ once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 p-limit@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
@@ -1189,16 +1461,65 @@ p-limit@^3.0.1:
   dependencies:
     yocto-queue "^0.1.0"
 
+pac-proxy-agent@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.1.tgz#115b1e58f92576cac2eba718593ca7b0e37de2ad"
+  integrity sha512-44DUg21G/liUZ48dJpUSjZnFfZro/0K5JTyFYLBcmh9+T6Ooi4/i4efwUiEy0+4oQusCBqWdhv16XohIj1GqnQ==
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^4.1.1"
+    get-uri "^2.0.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^3.0.0"
+    pac-resolver "^3.0.0"
+    raw-body "^2.2.0"
+    socks-proxy-agent "^4.0.1"
+
+pac-resolver@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
+  dependencies:
+    co "^4.6.0"
+    degenerator "^1.0.4"
+    ip "^1.1.5"
+    netmask "^1.0.6"
+    thunkify "^2.1.2"
+
 parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+path-proxy@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
+  integrity sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=
+  dependencies:
+    inflection "~1.3.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+promisify-call@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
+  integrity sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=
+  dependencies:
+    with-callback "^1.0.2"
+
 proto3-json-serializer@^0.1.5:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.6.tgz#67cf3b8d5f4c8bebfc410698ad3b1ed64da39c7b"
@@ -1233,6 +1554,25 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-agent@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.1.tgz#7e04e06bf36afa624a1540be247b47c970bd3014"
+  integrity sha512-WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==
+  dependencies:
+    agent-base "^4.2.0"
+    debug "4"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^3.0.0"
+    lru-cache "^5.1.1"
+    pac-proxy-agent "^3.0.1"
+    proxy-from-env "^1.0.0"
+    socks-proxy-agent "^4.0.1"
+
+proxy-from-env@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 pseudomap@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -1270,7 +1610,7 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.2:
+raw-body@2.4.2, raw-body@^2.2.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
   integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
@@ -1280,6 +1620,29 @@ raw-body@2.4.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+readable-stream@1.1.x:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@2:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readable-stream@^3.1.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -1312,6 +1675,11 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -1366,11 +1734,37 @@ signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
   integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
 
+smart-buffer@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
 snakeize@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/snakeize/-/snakeize-0.1.0.tgz#10c088d8b58eb076b3229bb5a04e232ce126422d"
   integrity sha1-EMCI2LWOsHazIpu1oE4jLOEmQi0=
 
+socks-proxy-agent@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
+  dependencies:
+    agent-base "~4.2.1"
+    socks "~2.3.2"
+
+socks@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
+  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
+  dependencies:
+    ip "1.1.5"
+    smart-buffer "^4.1.0"
+
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -1409,6 +1803,18 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -1432,6 +1838,11 @@ teeny-request@^7.0.0:
     stream-events "^1.0.5"
     uuid "^8.0.0"
 
+thunkify@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
+
 toidentifier@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
@@ -1442,11 +1853,23 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-tslib@^2.1.0:
+tslib@^2.0.1, tslib@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
+tsscmp@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
+  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -1479,7 +1902,7 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
-util-deprecate@^1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -1526,6 +1949,16 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
+with-callback@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/with-callback/-/with-callback-1.0.2.tgz#a09629b9a920028d721404fb435bdcff5c91bc21"
+  integrity sha1-oJYpuakgAo1yFAT7Q1vc/1yRvCE=
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -1555,6 +1988,11 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -1565,6 +2003,11 @@ yallist@^2.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

From 5890b74225ca405fc7d01361170f82666dd8484b Mon Sep 17 00:00:00 2001
From: mantikoros <95266179+mantikoros@users.noreply.github.com>
Date: Sat, 1 Jan 2022 19:03:18 -0600
Subject: [PATCH 26/81] Mkt resolution: new standard resolution (pay back bets
 first) (#15)

* new standard resolution; contract.totalBets; MKT resolution

* recalculate script

* Fix one bug and change script name

Co-authored-by: jahooma <jahooma@gmail.com>
---
 functions/src/place-bet.ts                    | 19 +++--
 functions/src/resolve-market.ts               | 77 +++++++++++++------
 .../scripts/recalculate-contract-totals.ts    | 62 +++++++++++++++
 functions/src/sell-bet.ts                     | 26 ++++++-
 functions/src/types/contract.ts               |  1 +
 web/lib/calculate.ts                          | 12 ++-
 web/lib/firebase/contracts.ts                 |  1 +
 web/lib/service/create-contract.ts            |  1 +
 8 files changed, 160 insertions(+), 39 deletions(-)
 create mode 100644 functions/src/scripts/recalculate-contract-totals.ts

diff --git a/functions/src/place-bet.ts b/functions/src/place-bet.ts
index e6e4d25a..d26c07de 100644
--- a/functions/src/place-bet.ts
+++ b/functions/src/place-bet.ts
@@ -43,18 +43,14 @@ export const placeBet = functions.runWith({ minInstances: 1 }).https.onCall(
         .collection(`contracts/${contractId}/bets`)
         .doc()
 
-      const { newBet, newPool, newTotalShares, newBalance } = getNewBetInfo(
-        user,
-        outcome,
-        amount,
-        contract,
-        newBetDoc.id
-      )
+      const { newBet, newPool, newTotalShares, newTotalBets, newBalance } =
+        getNewBetInfo(user, outcome, amount, contract, newBetDoc.id)
 
       transaction.create(newBetDoc, newBet)
       transaction.update(contractDoc, {
         pool: newPool,
         totalShares: newTotalShares,
+        totalBets: newTotalBets,
       })
       transaction.update(userDoc, { balance: newBalance })
 
@@ -91,6 +87,13 @@ const getNewBetInfo = (
       ? { YES: yesShares + shares, NO: noShares }
       : { YES: yesShares, NO: noShares + shares }
 
+  const { YES: yesBets, NO: noBets } = contract.totalBets
+
+  const newTotalBets =
+    outcome === 'YES'
+      ? { YES: yesBets + amount, NO: noBets }
+      : { YES: yesBets, NO: noBets + amount }
+
   const probBefore = yesPool ** 2 / (yesPool ** 2 + noPool ** 2)
   const probAfter = newPool.YES ** 2 / (newPool.YES ** 2 + newPool.NO ** 2)
 
@@ -108,5 +111,5 @@ const getNewBetInfo = (
 
   const newBalance = user.balance - amount
 
-  return { newBet, newPool, newTotalShares, newBalance }
+  return { newBet, newPool, newTotalShares, newTotalBets, newBalance }
 }
diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index 0ab9f4cb..656c73b5 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -55,12 +55,19 @@ export const resolveMarket = functions
       const betsSnap = await firestore
         .collection(`contracts/${contractId}/bets`)
         .get()
+
       const bets = betsSnap.docs.map((doc) => doc.data() as Bet)
+      const openBets = bets.filter((b) => !b.isSold && !b.sale)
+
+      const startPool = contract.startPool.YES + contract.startPool.NO
+      const truePool = contract.pool.YES + contract.pool.NO - startPool
 
       const payouts =
         outcome === 'CANCEL'
-          ? getCancelPayouts(contract, bets)
-          : getPayouts(outcome, contract, bets)
+          ? getCancelPayouts(truePool, openBets)
+          : outcome === 'MKT'
+          ? getMktPayouts(truePool, contract, openBets)
+          : getStandardPayouts(outcome, truePool, contract, openBets)
 
       console.log('payouts:', payouts)
 
@@ -96,42 +103,51 @@ export const resolveMarket = functions
 
 const firestore = admin.firestore()
 
-const getCancelPayouts = (contract: Contract, bets: Bet[]) => {
-  const startPool = contract.startPool.YES + contract.startPool.NO
-  const truePool = contract.pool.YES + contract.pool.NO - startPool
+const getCancelPayouts = (truePool: number, bets: Bet[]) => {
+  console.log('resolved N/A, pool M$', truePool)
 
-  const openBets = bets.filter((b) => !b.isSold && !b.sale)
+  const betSum = _.sumBy(bets, (b) => b.amount)
 
-  const betSum = _.sumBy(openBets, (b) => b.amount)
-
-  return openBets.map((bet) => ({
+  return bets.map((bet) => ({
     userId: bet.userId,
     payout: (bet.amount / betSum) * truePool,
   }))
 }
 
-const getPayouts = (outcome: string, contract: Contract, bets: Bet[]) => {
-  const openBets = bets.filter((b) => !b.isSold && !b.sale)
-  const [yesBets, noBets] = _.partition(
-    openBets,
-    (bet) => bet.outcome === 'YES'
+const getStandardPayouts = (
+  outcome: string,
+  truePool: number,
+  contract: Contract,
+  bets: Bet[]
+) => {
+  const [yesBets, noBets] = _.partition(bets, (bet) => bet.outcome === 'YES')
+  const winningBets = outcome === 'YES' ? yesBets : noBets
+
+  const betSum = _.sumBy(winningBets, (b) => b.amount)
+
+  if (betSum >= truePool) return getCancelPayouts(truePool, winningBets)
+
+  const creatorPayout = CREATOR_FEE * truePool
+  console.log(
+    'resolved',
+    outcome,
+    'pool: M$',
+    truePool,
+    'creator fee: M$',
+    creatorPayout
   )
 
-  const startPool = contract.startPool.YES + contract.startPool.NO
-  const truePool = contract.pool.YES + contract.pool.NO - startPool
+  const shareDifferenceSum = _.sumBy(winningBets, (b) => b.shares - b.amount)
 
-  const [totalShares, winningBets] =
-    outcome === 'YES'
-      ? [contract.totalShares.YES, yesBets]
-      : [contract.totalShares.NO, noBets]
-
-  const finalPool = (1 - PLATFORM_FEE - CREATOR_FEE) * truePool
-  const creatorPayout = CREATOR_FEE * truePool
-  console.log('final pool:', finalPool, 'creator fee:', creatorPayout)
+  const winningsPool = truePool - betSum
+  const fees = PLATFORM_FEE + CREATOR_FEE
 
   const winnerPayouts = winningBets.map((bet) => ({
     userId: bet.userId,
-    payout: (bet.shares / totalShares) * finalPool,
+    payout:
+      (1 - fees) *
+      (bet.amount +
+        ((bet.shares - bet.amount) / shareDifferenceSum) * winningsPool),
   }))
 
   return winnerPayouts.concat([
@@ -139,6 +155,17 @@ const getPayouts = (outcome: string, contract: Contract, bets: Bet[]) => {
   ]) // add creator fee
 }
 
+const getMktPayouts = (truePool: number, contract: Contract, bets: Bet[]) => {
+  const p =
+    contract.pool.YES ** 2 / (contract.pool.YES ** 2 + contract.pool.NO ** 2)
+  console.log('Resolved MKT at p=', p)
+
+  return [
+    ...getStandardPayouts('YES', p * truePool, contract, bets),
+    ...getStandardPayouts('NO', (1 - p) * truePool, contract, bets),
+  ]
+}
+
 const payUser = ([userId, payout]: [string, number]) => {
   return firestore.runTransaction(async (transaction) => {
     const userDoc = firestore.doc(`users/${userId}`)
diff --git a/functions/src/scripts/recalculate-contract-totals.ts b/functions/src/scripts/recalculate-contract-totals.ts
new file mode 100644
index 00000000..d1b33bb4
--- /dev/null
+++ b/functions/src/scripts/recalculate-contract-totals.ts
@@ -0,0 +1,62 @@
+import * as admin from 'firebase-admin'
+import * as _ from 'lodash'
+import { Bet } from '../types/bet'
+import { Contract } from '../types/contract'
+
+type DocRef = admin.firestore.DocumentReference
+
+// Generate your own private key, and set the path below:
+// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
+const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
+
+admin.initializeApp({
+  credential: admin.credential.cert(serviceAccount),
+})
+const firestore = admin.firestore()
+
+async function recalculateContract(contractRef: DocRef, contract: Contract) {
+  const bets = await contractRef
+    .collection('bets')
+    .get()
+    .then((snap) => snap.docs.map((bet) => bet.data() as Bet))
+
+  const openBets = bets.filter((b) => !b.isSold && !b.sale)
+
+  const totalShares = {
+    YES: _.sumBy(openBets, (bet) => (bet.outcome === 'YES' ? bet.shares : 0)),
+    NO: _.sumBy(openBets, (bet) => (bet.outcome === 'NO' ? bet.shares : 0)),
+  }
+
+  const totalBets = {
+    YES: _.sumBy(openBets, (bet) => (bet.outcome === 'YES' ? bet.amount : 0)),
+    NO: _.sumBy(openBets, (bet) => (bet.outcome === 'NO' ? bet.amount : 0)),
+  }
+
+  await contractRef.update({ totalShares, totalBets })
+
+  console.log(
+    'calculating totals for "',
+    contract.question,
+    '" total bets:',
+    totalBets
+  )
+  console.log()
+}
+
+async function recalculateContractTotals() {
+  console.log('Recalculating contract info')
+
+  const snapshot = await firestore.collection('contracts').get()
+  const contracts = snapshot.docs.map((doc) => doc.data() as Contract)
+
+  console.log('Loaded', contracts.length, 'contracts')
+
+  for (const contract of contracts) {
+    const contractRef = firestore.doc(`contracts/${contract.id}`)
+
+    await recalculateContract(contractRef, contract)
+  }
+}
+
+if (require.main === module)
+  recalculateContractTotals().then(() => process.exit())
diff --git a/functions/src/sell-bet.ts b/functions/src/sell-bet.ts
index ba60a5e3..3d37d3c3 100644
--- a/functions/src/sell-bet.ts
+++ b/functions/src/sell-bet.ts
@@ -44,8 +44,14 @@ export const sellBet = functions.runWith({ minInstances: 1 }).https.onCall(
         .collection(`contracts/${contractId}/bets`)
         .doc()
 
-      const { newBet, newPool, newTotalShares, newBalance, creatorFee } =
-        getSellBetInfo(user, bet, contract, newBetDoc.id)
+      const {
+        newBet,
+        newPool,
+        newTotalShares,
+        newTotalBets,
+        newBalance,
+        creatorFee,
+      } = getSellBetInfo(user, bet, contract, newBetDoc.id)
 
       const creatorDoc = firestore.doc(`users/${contract.creatorId}`)
       const creatorSnap = await transaction.get(creatorDoc)
@@ -60,6 +66,7 @@ export const sellBet = functions.runWith({ minInstances: 1 }).https.onCall(
       transaction.update(contractDoc, {
         pool: newPool,
         totalShares: newTotalShares,
+        totalBets: newTotalBets,
       })
       transaction.update(userDoc, { balance: newBalance })
 
@@ -81,6 +88,7 @@ const getSellBetInfo = (
   const { YES: yesPool, NO: noPool } = contract.pool
   const { YES: yesStart, NO: noStart } = contract.startPool
   const { YES: yesShares, NO: noShares } = contract.totalShares
+  const { YES: yesBets, NO: noBets } = contract.totalBets
 
   const [y, n, s] = [yesPool, noPool, shares]
 
@@ -123,6 +131,11 @@ const getSellBetInfo = (
       ? { YES: yesShares - shares, NO: noShares }
       : { YES: yesShares, NO: noShares - shares }
 
+  const newTotalBets =
+    outcome === 'YES'
+      ? { YES: yesBets - amount, NO: noBets }
+      : { YES: yesBets, NO: noBets - amount }
+
   const probAfter = newPool.YES ** 2 / (newPool.YES ** 2 + newPool.NO ** 2)
 
   const creatorFee = CREATOR_FEE * adjShareValue
@@ -158,5 +171,12 @@ const getSellBetInfo = (
 
   const newBalance = user.balance + saleAmount
 
-  return { newBet, newPool, newTotalShares, newBalance, creatorFee }
+  return {
+    newBet,
+    newPool,
+    newTotalShares,
+    newTotalBets,
+    newBalance,
+    creatorFee,
+  }
 }
diff --git a/functions/src/types/contract.ts b/functions/src/types/contract.ts
index 5f354654..2cb86ac2 100644
--- a/functions/src/types/contract.ts
+++ b/functions/src/types/contract.ts
@@ -13,6 +13,7 @@ export type Contract = {
   startPool: { YES: number; NO: number }
   pool: { YES: number; NO: number }
   totalShares: { YES: number; NO: number }
+  totalBets: { YES: number; NO: number }
 
   createdTime: number // Milliseconds since epoch
   lastUpdatedTime: number // If the question or description was changed
diff --git a/web/lib/calculate.ts b/web/lib/calculate.ts
index b195a65a..642473df 100644
--- a/web/lib/calculate.ts
+++ b/web/lib/calculate.ts
@@ -44,14 +44,20 @@ export function calculatePayout(
   if (outcome === 'CANCEL') return amount
   if (betOutcome !== outcome) return 0
 
-  const { totalShares } = contract
+  const { totalShares, totalBets } = contract
 
   if (totalShares[outcome] === 0) return 0
 
   const startPool = contract.startPool.YES + contract.startPool.NO
-  const pool = contract.pool.YES + contract.pool.NO - startPool
+  const truePool = contract.pool.YES + contract.pool.NO - startPool
 
-  return (1 - fees) * (shares / totalShares[outcome]) * pool
+  if (totalBets[outcome] >= truePool)
+    return (amount / totalBets[outcome]) * truePool
+
+  const total = totalShares[outcome] - totalBets[outcome]
+  const winningsPool = truePool - totalBets[outcome]
+
+  return (1 - fees) * (amount + ((shares - amount) / total) * winningsPool)
 }
 
 export function resolvedPayout(contract: Contract, bet: Bet) {
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index b8ea93e3..1db5d00e 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -31,6 +31,7 @@ export type Contract = {
   startPool: { YES: number; NO: number }
   pool: { YES: number; NO: number }
   totalShares: { YES: number; NO: number }
+  totalBets: { YES: number; NO: number }
 
   createdTime: number // Milliseconds since epoch
   lastUpdatedTime: number // If the question or description was changed
diff --git a/web/lib/service/create-contract.ts b/web/lib/service/create-contract.ts
index eba7b0ff..966115b0 100644
--- a/web/lib/service/create-contract.ts
+++ b/web/lib/service/create-contract.ts
@@ -38,6 +38,7 @@ export async function createContract(
     startPool: { YES: startYes, NO: startNo },
     pool: { YES: startYes, NO: startNo },
     totalShares: { YES: 0, NO: 0 },
+    totalBets: { YES: 0, NO: 0 },
     isResolved: false,
 
     // TODO: Set create time to Firestore timestamp

From 0950a281f221ccd4812f0a5acfbe501765f77fd2 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sat, 1 Jan 2022 19:13:30 -0600
Subject: [PATCH 27/81] Fix build error from merge. Extract resolution emails
 to function

---
 functions/src/emails.ts         |  4 +--
 functions/src/resolve-market.ts | 43 ++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index 14c030f3..adf65235 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -8,7 +8,7 @@ export const sendMarketResolutionEmail = async (
   payout: number,
   creator: User,
   contract: Contract,
-  resolution: 'YES' | 'NO' | 'CANCEL'
+  resolution: 'YES' | 'NO' | 'CANCEL' | 'MKT'
 ) => {
   const user = await getUser(userId)
   if (!user) return
@@ -32,4 +32,4 @@ https://mantic.markets/${creator.username}/${contract.slug}
   await sendEmail(user.email, subject, body)
 }
 
-const toDisplayResolution = { YES: 'YES', NO: 'NO', CANCEL: 'N/A' }
+const toDisplayResolution = { YES: 'YES', NO: 'NO', CANCEL: 'N/A', MKT: 'MKT' }
diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index 656c73b5..164551bd 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -16,7 +16,7 @@ export const resolveMarket = functions
   .https.onCall(
     async (
       data: {
-        outcome: 'YES' | 'NO' | 'CANCEL'
+        outcome: 'YES' | 'NO' | 'CANCEL' | 'MKT'
         contractId: string
       },
       context
@@ -82,25 +82,40 @@ export const resolveMarket = functions
         .catch((e) => ({ status: 'error', message: e }))
         .then(() => ({ status: 'success' }))
 
-      const activeBets = bets.filter((bet) => !bet.isSold && !bet.sale)
-      const nonWinners = _.difference(
-        _.uniq(activeBets.map(({ userId }) => userId)),
-        Object.keys(userPayouts)
-      )
-      const emailPayouts = [
-        ...Object.entries(userPayouts),
-        ...nonWinners.map((userId) => [userId, 0] as const),
-      ]
-      await Promise.all(
-        emailPayouts.map(([userId, payout]) =>
-          sendMarketResolutionEmail(userId, payout, creator, contract, outcome)
-        )
+      await sendResolutionEmails(
+        openBets,
+        userPayouts,
+        creator,
+        contract,
+        outcome
       )
 
       return result
     }
   )
 
+const sendResolutionEmails = async (
+  openBets: Bet[],
+  userPayouts: { [userId: string]: number },
+  creator: User,
+  contract: Contract,
+  outcome: 'YES' | 'NO' | 'CANCEL' | 'MKT'
+) => {
+  const nonWinners = _.difference(
+    _.uniq(openBets.map(({ userId }) => userId)),
+    Object.keys(userPayouts)
+  )
+  const emailPayouts = [
+    ...Object.entries(userPayouts),
+    ...nonWinners.map((userId) => [userId, 0] as const),
+  ]
+  await Promise.all(
+    emailPayouts.map(([userId, payout]) =>
+      sendMarketResolutionEmail(userId, payout, creator, contract, outcome)
+    )
+  )
+}
+
 const firestore = admin.firestore()
 
 const getCancelPayouts = (truePool: number, bets: Bet[]) => {

From b74a0c02c551034ce0ac0d415de80382f3d7a254 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sat, 1 Jan 2022 19:20:25 -0600
Subject: [PATCH 28/81] Remove a new line in email

---
 functions/src/emails.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index adf65235..ba4874d3 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -21,7 +21,6 @@ A market you bet in has been resolved!
 
 Creator: ${contract.creatorName}
 Question: ${contract.question}
-
 Resolution: ${toDisplayResolution[resolution]}
 
 Your payout is M$ ${Math.round(payout)}

From 8c644da10db07dc868994357137de8ae856acf1c Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sat, 1 Jan 2022 22:52:55 -0600
Subject: [PATCH 29/81] Update contract title with resolution or percent chance

---
 web/pages/[username]/[contractSlug].tsx | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 60a1a5fb..4fe92741 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -11,7 +11,11 @@ import { useBets } from '../../hooks/use-bets'
 import { Title } from '../../components/title'
 import { Spacer } from '../../components/layout/spacer'
 import { User } from '../../lib/firebase/users'
-import { Contract, getContractFromSlug } from '../../lib/firebase/contracts'
+import {
+  compute,
+  Contract,
+  getContractFromSlug,
+} from '../../lib/firebase/contracts'
 import { SEO } from '../../components/SEO'
 import { Page } from '../../components/page'
 
@@ -47,13 +51,18 @@ export default function ContractPage(props: {
     return <div>Contract not found...</div>
   }
 
-  const { creatorId, isResolved } = contract
+  const { creatorId, isResolved, resolution, question } = contract
   const isCreator = user?.id === creatorId
 
+  const { probPercent } = compute(contract)
+  const title = resolution
+    ? `Resolved ${resolution}: ${question}`
+    : `${probPercent} chance: ${question}`
+
   return (
     <Page wide={!isResolved}>
       <SEO
-        title={contract.question}
+        title={title}
         description={contract.description}
         url={`/${props.username}/${props.slug}`}
       />

From a9e8b4c1e72d91bcf7330d507e1463b7c488b103 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sat, 1 Jan 2022 23:52:32 -0600
Subject: [PATCH 30/81] Attempt to fix external link in description

---
 web/components/linkify.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/components/linkify.tsx b/web/components/linkify.tsx
index df6bb98d..3ee4650f 100644
--- a/web/components/linkify.tsx
+++ b/web/components/linkify.tsx
@@ -15,7 +15,7 @@ export function Linkify(props: { text: string }) {
       {
         '@': `/${tag}`,
         '#': `/tag/${tag}`,
-      }[symbol] ?? match
+      }[symbol] ?? match.trim()
 
     return (
       <>

From 907acec601b58fd12b7e3c82489e69645b413d2a Mon Sep 17 00:00:00 2001
From: mantikoros <95266179+mantikoros@users.noreply.github.com>
Date: Sun, 2 Jan 2022 00:27:58 -0600
Subject: [PATCH 31/81] Mkt resolution 2: Enable MKT resolution (#16)

* new standard resolution; contract.totalBets; MKT resolution

* recalculate script

* enable resolve MKT

* different approach to resolve MKT

* comment out init

* Count payouts for bets with exluded sales

Co-authored-by: jahooma <jahooma@gmail.com>
---
 functions/src/resolve-market.ts      | 53 ++++++++++++++++++++--
 functions/src/scripts/recalculate.ts | 61 +++++++++++++++++++++++++
 web/components/bets-list.tsx         |  9 +++-
 web/components/contract-overview.tsx |  1 +
 web/components/contracts-list.tsx    |  2 +
 web/components/resolution-panel.tsx  | 11 ++++-
 web/components/yes-no-selector.tsx   | 68 +++++++++++++++++-----------
 web/lib/calculate.ts                 | 32 ++++++++++++-
 8 files changed, 201 insertions(+), 36 deletions(-)
 create mode 100644 functions/src/scripts/recalculate.ts

diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index 164551bd..4862703f 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -26,7 +26,7 @@ export const resolveMarket = functions
 
       const { outcome, contractId } = data
 
-      if (!['YES', 'NO', 'CANCEL'].includes(outcome))
+      if (!['YES', 'NO', 'MKT', 'CANCEL'].includes(outcome))
         return { status: 'error', message: 'Invalid outcome' }
 
       const contractDoc = firestore.doc(`contracts/${contractId}`)
@@ -155,7 +155,6 @@ const getStandardPayouts = (
   const shareDifferenceSum = _.sumBy(winningBets, (b) => b.shares - b.amount)
 
   const winningsPool = truePool - betSum
-  const fees = PLATFORM_FEE + CREATOR_FEE
 
   const winnerPayouts = winningBets.map((bet) => ({
     userId: bet.userId,
@@ -173,11 +172,53 @@ const getStandardPayouts = (
 const getMktPayouts = (truePool: number, contract: Contract, bets: Bet[]) => {
   const p =
     contract.pool.YES ** 2 / (contract.pool.YES ** 2 + contract.pool.NO ** 2)
-  console.log('Resolved MKT at p=', p)
+  console.log('Resolved MKT at p=', p, 'pool: $M', truePool)
+
+  const [yesBets, noBets] = _.partition(bets, (bet) => bet.outcome === 'YES')
+
+  const weightedBetTotal =
+    p * _.sumBy(yesBets, (b) => b.amount) +
+    (1 - p) * _.sumBy(noBets, (b) => b.amount)
+
+  if (weightedBetTotal >= truePool) {
+    return bets.map((bet) => ({
+      userId: bet.userId,
+      payout:
+        (((bet.outcome === 'YES' ? p : 1 - p) * bet.amount) /
+          weightedBetTotal) *
+        truePool,
+    }))
+  }
+
+  const winningsPool = truePool - weightedBetTotal
+
+  const weightedShareTotal =
+    p * _.sumBy(yesBets, (b) => b.shares - b.amount) +
+    (1 - p) * _.sumBy(noBets, (b) => b.shares - b.amount)
+
+  const yesPayouts = yesBets.map((bet) => ({
+    userId: bet.userId,
+    payout:
+      (1 - fees) *
+      (p * bet.amount +
+        ((p * (bet.shares - bet.amount)) / weightedShareTotal) * winningsPool),
+  }))
+
+  const noPayouts = noBets.map((bet) => ({
+    userId: bet.userId,
+    payout:
+      (1 - fees) *
+      ((1 - p) * bet.amount +
+        (((1 - p) * (bet.shares - bet.amount)) / weightedShareTotal) *
+          winningsPool),
+  }))
+
+  const creatorPayout = CREATOR_FEE * truePool
 
   return [
-    ...getStandardPayouts('YES', p * truePool, contract, bets),
-    ...getStandardPayouts('NO', (1 - p) * truePool, contract, bets),
+    ...yesPayouts,
+    ...noPayouts,
+    { userId: contract.creatorId, payout: creatorPayout },
   ]
 }
 
@@ -192,3 +233,5 @@ const payUser = ([userId, payout]: [string, number]) => {
     transaction.update(userDoc, { balance: newUserBalance })
   })
 }
+
+const fees = PLATFORM_FEE + CREATOR_FEE
diff --git a/functions/src/scripts/recalculate.ts b/functions/src/scripts/recalculate.ts
new file mode 100644
index 00000000..103152c9
--- /dev/null
+++ b/functions/src/scripts/recalculate.ts
@@ -0,0 +1,61 @@
+import * as admin from 'firebase-admin'
+import * as _ from 'lodash'
+import { Bet } from '../types/bet'
+import { Contract } from '../types/contract'
+
+type DocRef = admin.firestore.DocumentReference
+
+// Generate your own private key, and set the path below:
+// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
+const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
+
+admin.initializeApp({
+  credential: admin.credential.cert(serviceAccount),
+})
+const firestore = admin.firestore()
+
+async function recalculateContract(contractRef: DocRef, contract: Contract) {
+  const bets = await contractRef
+    .collection('bets')
+    .get()
+    .then((snap) => snap.docs.map((bet) => bet.data() as Bet))
+
+  const openBets = bets.filter((b) => !b.isSold && !b.sale)
+
+  const totalShares = {
+    YES: _.sumBy(openBets, (bet) => (bet.outcome === 'YES' ? bet.shares : 0)),
+    NO: _.sumBy(openBets, (bet) => (bet.outcome === 'NO' ? bet.shares : 0)),
+  }
+
+  const totalBets = {
+    YES: _.sumBy(openBets, (bet) => (bet.outcome === 'YES' ? bet.amount : 0)),
+    NO: _.sumBy(openBets, (bet) => (bet.outcome === 'NO' ? bet.amount : 0)),
+  }
+
+  await contractRef.update({ totalShares, totalBets })
+
+  console.log(
+    'calculating totals for "',
+    contract.question,
+    '" total bets:',
+    totalBets
+  )
+  console.log()
+}
+
+async function migrateContracts() {
+  console.log('Recalculating contract info')
+
+  const snapshot = await firestore.collection('contracts').get()
+  const contracts = snapshot.docs.map((doc) => doc.data() as Contract)
+
+  console.log('Loaded', contracts.length, 'contracts')
+
+  for (const contract of contracts) {
+    const contractRef = firestore.doc(`contracts/${contract.id}`)
+
+    await recalculateContract(contractRef, contract)
+  }
+}
+
+if (require.main === module) migrateContracts().then(() => process.exit())
diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 18c74563..29d51346 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -191,7 +191,7 @@ export function MyBetsSummary(props: {
   const betsTotal = _.sumBy(excludeSales, (bet) => bet.amount)
 
   const betsPayout = resolution
-    ? _.sumBy(bets, (bet) => resolvedPayout(contract, bet))
+    ? _.sumBy(excludeSales, (bet) => resolvedPayout(contract, bet))
     : 0
 
   const yesWinnings = _.sumBy(excludeSales, (bet) =>
@@ -357,11 +357,12 @@ function SellButton(props: { contract: Contract; bet: Bet }) {
   )
 }
 
-function OutcomeLabel(props: { outcome: 'YES' | 'NO' | 'CANCEL' }) {
+function OutcomeLabel(props: { outcome: 'YES' | 'NO' | 'CANCEL' | 'MKT' }) {
   const { outcome } = props
 
   if (outcome === 'YES') return <YesLabel />
   if (outcome === 'NO') return <NoLabel />
+  if (outcome === 'MKT') return <MarketLabel />
   return <CancelLabel />
 }
 
@@ -376,3 +377,7 @@ function NoLabel() {
 function CancelLabel() {
   return <span className="text-yellow-400">N/A</span>
 }
+
+function MarketLabel() {
+  return <span className="text-blue-400">MKT</span>
+}
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index aa8dfe6c..ec2fc4cb 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -98,6 +98,7 @@ export const ContractOverview = (props: {
   const resolutionColor = {
     YES: 'text-primary',
     NO: 'text-red-400',
+    MKT: 'text-blue-400',
     CANCEL: 'text-yellow-400',
     '': '', // Empty if unresolved
   }[contract.resolution || '']
diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index 07c052b0..dc83bafb 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -44,6 +44,7 @@ function ContractCard(props: { contract: Contract }) {
   const resolutionColor = {
     YES: 'text-primary',
     NO: 'text-red-400',
+    MKT: 'text-blue-400',
     CANCEL: 'text-yellow-400',
     '': '', // Empty if unresolved
   }[contract.resolution || '']
@@ -51,6 +52,7 @@ function ContractCard(props: { contract: Contract }) {
   const resolutionText = {
     YES: 'YES',
     NO: 'NO',
+    MKT: 'MKT',
     CANCEL: 'N/A',
     '': '',
   }[contract.resolution || '']
diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx
index 7f9f74c6..d5ccbfd5 100644
--- a/web/components/resolution-panel.tsx
+++ b/web/components/resolution-panel.tsx
@@ -20,7 +20,9 @@ export function ResolutionPanel(props: {
 }) {
   const { contract, className } = props
 
-  const [outcome, setOutcome] = useState<'YES' | 'NO' | 'CANCEL' | undefined>()
+  const [outcome, setOutcome] = useState<
+    'YES' | 'NO' | 'MKT' | 'CANCEL' | undefined
+  >()
 
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [error, setError] = useState<string | undefined>(undefined)
@@ -48,6 +50,8 @@ export function ResolutionPanel(props: {
       ? 'bg-red-400 hover:bg-red-500'
       : outcome === 'CANCEL'
       ? 'bg-yellow-400 hover:bg-yellow-500'
+      : outcome === 'MKT'
+      ? 'bg-blue-400 hover:bg-blue-500'
       : 'btn-disabled'
 
   return (
@@ -74,6 +78,11 @@ export function ResolutionPanel(props: {
           <>Winnings will be paid out to NO bettors. You earn 1% of the pool.</>
         ) : outcome === 'CANCEL' ? (
           <>The pool will be returned to traders with no fees.</>
+        ) : outcome === 'MKT' ? (
+          <>
+            Traders will be paid out at the current implied probability. You
+            earn 1% of the pool.
+          </>
         ) : (
           <>Resolving this market will immediately pay out traders.</>
         )}
diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx
index 391db469..528b199d 100644
--- a/web/components/yes-no-selector.tsx
+++ b/web/components/yes-no-selector.tsx
@@ -1,5 +1,6 @@
 import clsx from 'clsx'
 import React from 'react'
+import { Col } from './layout/col'
 import { Row } from './layout/row'
 
 export function YesNoSelector(props: {
@@ -29,48 +30,60 @@ export function YesNoSelector(props: {
 }
 
 export function YesNoCancelSelector(props: {
-  selected: 'YES' | 'NO' | 'CANCEL' | undefined
-  onSelect: (selected: 'YES' | 'NO' | 'CANCEL') => void
+  selected: 'YES' | 'NO' | 'MKT' | 'CANCEL' | undefined
+  onSelect: (selected: 'YES' | 'NO' | 'MKT' | 'CANCEL') => void
   className?: string
   btnClassName?: string
 }) {
   const { selected, onSelect, className } = props
 
-  const btnClassName = clsx('px-6', props.btnClassName)
+  const btnClassName = clsx('px-6 flex-1', props.btnClassName)
 
   return (
-    <Row className={clsx('space-x-3', className)}>
-      <Button
-        color={selected === 'YES' ? 'green' : 'gray'}
-        onClick={() => onSelect('YES')}
-        className={btnClassName}
-      >
-        YES
-      </Button>
+    <Col>
+      <Row className={clsx('space-x-3 w-full', className)}>
+        <Button
+          color={selected === 'YES' ? 'green' : 'gray'}
+          onClick={() => onSelect('YES')}
+          className={btnClassName}
+        >
+          YES
+        </Button>
 
-      <Button
-        color={selected === 'NO' ? 'red' : 'gray'}
-        onClick={() => onSelect('NO')}
-        className={btnClassName}
-      >
-        NO
-      </Button>
+        <Button
+          color={selected === 'NO' ? 'red' : 'gray'}
+          onClick={() => onSelect('NO')}
+          className={btnClassName}
+        >
+          NO
+        </Button>
+      </Row>
 
-      <Button
-        color={selected === 'CANCEL' ? 'yellow' : 'gray'}
-        onClick={() => onSelect('CANCEL')}
-        className={btnClassName}
-      >
-        N/A
-      </Button>
-    </Row>
+      <Row className={clsx('space-x-3 w-full', className)}>
+        <Button
+          color={selected === 'MKT' ? 'blue' : 'gray'}
+          onClick={() => onSelect('MKT')}
+          className={clsx(btnClassName, 'btn-sm')}
+        >
+          MKT
+        </Button>
+
+        <Button
+          color={selected === 'CANCEL' ? 'yellow' : 'gray'}
+          onClick={() => onSelect('CANCEL')}
+          className={clsx(btnClassName, 'btn-sm')}
+        >
+          N/A
+        </Button>
+      </Row>
+    </Col>
   )
 }
 
 function Button(props: {
   className?: string
   onClick?: () => void
-  color: 'green' | 'red' | 'yellow' | 'gray'
+  color: 'green' | 'red' | 'blue' | 'yellow' | 'gray'
   children?: any
 }) {
   const { className, onClick, children, color } = props
@@ -83,6 +96,7 @@ function Button(props: {
         color === 'green' && 'btn-primary',
         color === 'red' && 'bg-red-400 hover:bg-red-500',
         color === 'yellow' && 'bg-yellow-400 hover:bg-yellow-500',
+        color === 'blue' && 'bg-blue-400 hover:bg-blue-500',
         color === 'gray' && 'text-gray-700 bg-gray-300 hover:bg-gray-400',
         className
       )}
diff --git a/web/lib/calculate.ts b/web/lib/calculate.ts
index 642473df..b265f228 100644
--- a/web/lib/calculate.ts
+++ b/web/lib/calculate.ts
@@ -37,11 +37,13 @@ export function calculateShares(
 export function calculatePayout(
   contract: Contract,
   bet: Bet,
-  outcome: 'YES' | 'NO' | 'CANCEL'
+  outcome: 'YES' | 'NO' | 'CANCEL' | 'MKT'
 ) {
   const { amount, outcome: betOutcome, shares } = bet
 
   if (outcome === 'CANCEL') return amount
+  if (outcome === 'MKT') return calculateMktPayout(contract, bet)
+
   if (betOutcome !== outcome) return 0
 
   const { totalShares, totalBets } = contract
@@ -60,6 +62,34 @@ export function calculatePayout(
   return (1 - fees) * (amount + ((shares - amount) / total) * winningsPool)
 }
 
+function calculateMktPayout(contract: Contract, bet: Bet) {
+  const p =
+    contract.pool.YES ** 2 / (contract.pool.YES ** 2 + contract.pool.NO ** 2)
+  const weightedTotal =
+    p * contract.totalBets.YES + (1 - p) * contract.totalBets.NO
+
+  const startPool = contract.startPool.YES + contract.startPool.NO
+  const truePool = contract.pool.YES + contract.pool.NO - startPool
+
+  const betP = bet.outcome === 'YES' ? p : 1 - p
+
+  if (weightedTotal >= truePool) {
+    return ((betP * bet.amount) / weightedTotal) * truePool
+  }
+
+  const winningsPool = truePool - weightedTotal
+
+  const weightedShareTotal =
+    p * (contract.totalShares.YES - contract.totalBets.YES) +
+    (1 - p) * (contract.totalShares.NO - contract.totalBets.NO)
+
+  return (
+    (1 - fees) *
+    (betP * bet.amount +
+      ((betP * (bet.shares - bet.amount)) / weightedShareTotal) * winningsPool)
+  )
+}
+
 export function resolvedPayout(contract: Contract, bet: Bet) {
   if (contract.resolution)
     return calculatePayout(contract, bet, contract.resolution)

From cdf25ba65971042a5c065d98da37d07da41fbf6f Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Sun, 2 Jan 2022 12:57:52 -0600
Subject: [PATCH 32/81] contract page seo tags

---
 web/pages/[username]/[contractSlug].tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 4fe92741..fa9bbac6 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -55,15 +55,16 @@ export default function ContractPage(props: {
   const isCreator = user?.id === creatorId
 
   const { probPercent } = compute(contract)
-  const title = resolution
-    ? `Resolved ${resolution}: ${question}`
-    : `${probPercent} chance: ${question}`
+
+  const description = resolution
+    ? `Resolved ${resolution}. ${contract.description}`
+    : `${probPercent} chance. ${contract.description}`
 
   return (
     <Page wide={!isResolved}>
       <SEO
-        title={title}
-        description={contract.description}
+        title={question}
+        description={description}
         url={`/${props.username}/${props.slug}`}
       />
 

From 657b6b2763282134a4a76bd08b1e69ca6476cf9a Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sun, 2 Jan 2022 13:09:01 -0600
Subject: [PATCH 33/81] Improve positioning of x% chance on mobile, break words
 in description.

---
 web/components/contract-card.tsx     | 74 ++++++++++++++++++++++++++
 web/components/contract-overview.tsx | 78 ++++++++++++++++++----------
 web/components/contracts-list.tsx    | 76 ++-------------------------
 3 files changed, 128 insertions(+), 100 deletions(-)
 create mode 100644 web/components/contract-card.tsx

diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx
new file mode 100644
index 00000000..bcfd0935
--- /dev/null
+++ b/web/components/contract-card.tsx
@@ -0,0 +1,74 @@
+import clsx from 'clsx'
+import Link from 'next/link'
+import { Row } from '../components/layout/row'
+import { formatMoney } from '../lib/util/format'
+import { UserLink } from './user-page'
+import { Linkify } from './linkify'
+import { Contract, compute, path } from '../lib/firebase/contracts'
+
+export function ContractCard(props: { contract: Contract }) {
+  const { contract } = props
+  const { probPercent } = compute(contract)
+
+  const resolutionColor = {
+    YES: 'text-primary',
+    NO: 'text-red-400',
+    MKT: 'text-blue-400',
+    CANCEL: 'text-yellow-400',
+    '': '', // Empty if unresolved
+  }[contract.resolution || '']
+
+  const resolutionText = {
+    YES: 'YES',
+    NO: 'NO',
+    MKT: 'MKT',
+    CANCEL: 'N/A',
+    '': '',
+  }[contract.resolution || '']
+
+  return (
+    <Link href={path(contract)}>
+      <a>
+        <li className="col-span-1 bg-white hover:bg-gray-100 shadow-md rounded-lg divide-y divide-gray-200">
+          <div className="card">
+            <div className="card-body p-6">
+              <Row className="justify-between gap-4 mb-2">
+                <p className="font-medium text-indigo-700">
+                  <Linkify text={contract.question} />
+                </p>
+                <div className={clsx('text-4xl', resolutionColor)}>
+                  {resolutionText || (
+                    <div className="text-primary">
+                      {probPercent}
+                      <div className="text-lg">chance</div>
+                    </div>
+                  )}
+                </div>
+              </Row>
+              <ContractDetails contract={contract} />
+            </div>
+          </div>
+        </li>
+      </a>
+    </Link>
+  )
+}
+
+export function ContractDetails(props: { contract: Contract }) {
+  const { contract } = props
+  const { truePool, createdDate, resolvedDate } = compute(contract)
+
+  return (
+    <Row className="flex-wrap text-sm text-gray-500">
+      <div className="whitespace-nowrap">
+        <UserLink username={contract.creatorUsername} />
+      </div>
+      <div className="mx-2">•</div>
+      <div className="whitespace-nowrap">
+        {resolvedDate ? `${createdDate} - ${resolvedDate}` : createdDate}
+      </div>
+      <div className="mx-2">•</div>
+      <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
+    </Row>
+  )
+}
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index ec2fc4cb..3dc5230c 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -8,13 +8,13 @@ import {
 import { Col } from './layout/col'
 import { Spacer } from './layout/spacer'
 import { ContractProbGraph } from './contract-prob-graph'
-import { ContractDetails } from './contracts-list'
 import router from 'next/router'
 import { useUser } from '../hooks/use-user'
 import { Row } from './layout/row'
 import dayjs from 'dayjs'
 import { Linkify } from './linkify'
 import clsx from 'clsx'
+import { ContractDetails } from './contract-card'
 
 function ContractDescription(props: {
   contract: Contract
@@ -35,7 +35,7 @@ function ContractDescription(props: {
   }
 
   return (
-    <div className="whitespace-pre-line">
+    <div className="whitespace-pre-line break-words">
       <Linkify text={contract.description} />
       <br />
       {isCreator &&
@@ -84,6 +84,40 @@ function ContractDescription(props: {
   )
 }
 
+function ResolutionOrChance(props: {
+  resolution?: 'YES' | 'NO' | 'MKT' | 'CANCEL'
+  probPercent: string
+  className?: string
+}) {
+  const { resolution, probPercent, className } = props
+
+  const resolutionColor = {
+    YES: 'text-primary',
+    NO: 'text-red-400',
+    MKT: 'text-blue-400',
+    CANCEL: 'text-yellow-400',
+    '': '', // Empty if unresolved
+  }[resolution || '']
+
+  return (
+    <Col className={clsx('text-3xl md:text-4xl', className)}>
+      {resolution ? (
+        <>
+          <div className="text-lg md:text-xl text-gray-500">Resolved</div>
+          <div className={resolutionColor}>
+            {resolution === 'CANCEL' ? 'N/A' : resolution}
+          </div>
+        </>
+      ) : (
+        <>
+          <div className="text-primary">{probPercent}</div>
+          <div className="text-lg md:text-xl text-primary">chance</div>
+        </>
+      )}
+    </Col>
+  )
+}
+
 export const ContractOverview = (props: {
   contract: Contract
   className?: string
@@ -95,39 +129,29 @@ export const ContractOverview = (props: {
   const user = useUser()
   const isCreator = user?.id === creatorId
 
-  const resolutionColor = {
-    YES: 'text-primary',
-    NO: 'text-red-400',
-    MKT: 'text-blue-400',
-    CANCEL: 'text-yellow-400',
-    '': '', // Empty if unresolved
-  }[contract.resolution || '']
-
   return (
     <Col className={clsx('mb-6', className)}>
-      <Col className="justify-between md:flex-row">
-        <Col>
-          <div className="text-3xl text-indigo-700 mb-4">
+      <Row className="justify-between gap-4">
+        <Col className="gap-4">
+          <div className="text-2xl md:text-3xl text-indigo-700">
             <Linkify text={contract.question} />
           </div>
 
+          <ResolutionOrChance
+            className="md:hidden"
+            resolution={resolution}
+            probPercent={probPercent}
+          />
+
           <ContractDetails contract={contract} />
         </Col>
 
-        {resolution ? (
-          <Col className="text-4xl mt-8 md:mt-0 md:ml-4 md:mr-6 items-end self-center md:self-start">
-            <div className="text-xl text-gray-500">Resolved</div>
-            <div className={resolutionColor}>
-              {resolution === 'CANCEL' ? 'N/A' : resolution}
-            </div>
-          </Col>
-        ) : (
-          <Col className="text-4xl mt-8 md:mt-0 md:ml-4 md:mr-6 text-primary items-end self-center md:self-start">
-            {probPercent}
-            <div className="text-xl">chance</div>
-          </Col>
-        )}
-      </Col>
+        <ResolutionOrChance
+          className="hidden md:flex md:items-end"
+          resolution={resolution}
+          probPercent={probPercent}
+        />
+      </Row>
 
       <Spacer h={4} />
 
diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index dc83bafb..715a7ffe 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -3,87 +3,17 @@ import Link from 'next/link'
 import clsx from 'clsx'
 import { useEffect, useState } from 'react'
 
-import { Row } from '../components/layout/row'
 import {
   compute,
   Contract,
   listContracts,
   path,
 } from '../lib/firebase/contracts'
-import { formatMoney } from '../lib/util/format'
 import { User } from '../lib/firebase/users'
-import { UserLink } from './user-page'
-import { Linkify } from './linkify'
 import { Col } from './layout/col'
 import { SiteLink } from './site-link'
 import { parseTags } from '../lib/util/parse'
-
-export function ContractDetails(props: { contract: Contract }) {
-  const { contract } = props
-  const { truePool, createdDate, resolvedDate } = compute(contract)
-
-  return (
-    <Row className="flex-wrap text-sm text-gray-500">
-      <div className="whitespace-nowrap">
-        <UserLink username={contract.creatorUsername} />
-      </div>
-      <div className="mx-2">•</div>
-      <div className="whitespace-nowrap">
-        {resolvedDate ? `${createdDate} - ${resolvedDate}` : createdDate}
-      </div>
-      <div className="mx-2">•</div>
-      <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
-    </Row>
-  )
-}
-
-function ContractCard(props: { contract: Contract }) {
-  const { contract } = props
-  const { probPercent } = compute(contract)
-
-  const resolutionColor = {
-    YES: 'text-primary',
-    NO: 'text-red-400',
-    MKT: 'text-blue-400',
-    CANCEL: 'text-yellow-400',
-    '': '', // Empty if unresolved
-  }[contract.resolution || '']
-
-  const resolutionText = {
-    YES: 'YES',
-    NO: 'NO',
-    MKT: 'MKT',
-    CANCEL: 'N/A',
-    '': '',
-  }[contract.resolution || '']
-
-  return (
-    <Link href={path(contract)}>
-      <a>
-        <li className="col-span-1 bg-white hover:bg-gray-100 shadow-md rounded-lg divide-y divide-gray-200">
-          <div className="card">
-            <div className="card-body p-6">
-              <Row className="justify-between gap-4 mb-2">
-                <p className="font-medium text-indigo-700">
-                  <Linkify text={contract.question} />
-                </p>
-                <div className={clsx('text-4xl', resolutionColor)}>
-                  {resolutionText || (
-                    <div className="text-primary">
-                      {probPercent}
-                      <div className="text-lg">chance</div>
-                    </div>
-                  )}
-                </div>
-              </Row>
-              <ContractDetails contract={contract} />
-            </div>
-          </div>
-        </li>
-      </a>
-    </Link>
-  )
-}
+import { ContractCard } from './contract-card'
 
 function ContractsGrid(props: { contracts: Contract[] }) {
   const [resolvedContracts, activeContracts] = _.partition(
@@ -117,7 +47,7 @@ function ContractsGrid(props: { contracts: Contract[] }) {
 
 const MAX_GROUPED_CONTRACTS_DISPLAYED = 6
 
-export function CreatorContractsGrid(props: { contracts: Contract[] }) {
+function CreatorContractsGrid(props: { contracts: Contract[] }) {
   const { contracts } = props
 
   const byCreator = _.groupBy(contracts, (contract) => contract.creatorId)
@@ -165,7 +95,7 @@ export function CreatorContractsGrid(props: { contracts: Contract[] }) {
   )
 }
 
-export function TagContractsGrid(props: { contracts: Contract[] }) {
+function TagContractsGrid(props: { contracts: Contract[] }) {
   const { contracts } = props
 
   const contractTags = _.flatMap(contracts, (contract) =>

From b375256e96824c7205103cd100bc384723386b0d Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sun, 2 Jan 2022 14:53:42 -0600
Subject: [PATCH 34/81] Reuse ResolutionOrChance component. Make smaller for
 card, larger for contract page.

---
 web/components/contract-card.tsx     | 80 +++++++++++++++++++---------
 web/components/contract-overview.tsx | 38 ++-----------
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx
index bcfd0935..8fc729f7 100644
--- a/web/components/contract-card.tsx
+++ b/web/components/contract-card.tsx
@@ -5,27 +5,13 @@ import { formatMoney } from '../lib/util/format'
 import { UserLink } from './user-page'
 import { Linkify } from './linkify'
 import { Contract, compute, path } from '../lib/firebase/contracts'
+import { Col } from './layout/col'
 
 export function ContractCard(props: { contract: Contract }) {
   const { contract } = props
+  const { resolution } = contract
   const { probPercent } = compute(contract)
 
-  const resolutionColor = {
-    YES: 'text-primary',
-    NO: 'text-red-400',
-    MKT: 'text-blue-400',
-    CANCEL: 'text-yellow-400',
-    '': '', // Empty if unresolved
-  }[contract.resolution || '']
-
-  const resolutionText = {
-    YES: 'YES',
-    NO: 'NO',
-    MKT: 'MKT',
-    CANCEL: 'N/A',
-    '': '',
-  }[contract.resolution || '']
-
   return (
     <Link href={path(contract)}>
       <a>
@@ -36,14 +22,11 @@ export function ContractCard(props: { contract: Contract }) {
                 <p className="font-medium text-indigo-700">
                   <Linkify text={contract.question} />
                 </p>
-                <div className={clsx('text-4xl', resolutionColor)}>
-                  {resolutionText || (
-                    <div className="text-primary">
-                      {probPercent}
-                      <div className="text-lg">chance</div>
-                    </div>
-                  )}
-                </div>
+                <ResolutionOrChance
+                  className="items-center"
+                  resolution={resolution}
+                  probPercent={probPercent}
+                />
               </Row>
               <ContractDetails contract={contract} />
             </div>
@@ -54,6 +37,55 @@ export function ContractCard(props: { contract: Contract }) {
   )
 }
 
+export function ResolutionOrChance(props: {
+  resolution?: 'YES' | 'NO' | 'MKT' | 'CANCEL'
+  probPercent: string
+  large?: boolean
+  className?: string
+}) {
+  const { resolution, probPercent, large, className } = props
+
+  const resolutionColor = {
+    YES: 'text-primary',
+    NO: 'text-red-400',
+    MKT: 'text-blue-400',
+    CANCEL: 'text-yellow-400',
+    '': '', // Empty if unresolved
+  }[resolution || '']
+
+  const resolutionText = {
+    YES: 'YES',
+    NO: 'NO',
+    MKT: 'MKT',
+    CANCEL: 'N/A',
+    '': '',
+  }[resolution || '']
+
+  return (
+    <Col className={clsx(large ? 'text-4xl' : 'text-3xl', className)}>
+      {resolution ? (
+        <>
+          <div
+            className={clsx('text-gray-500', large ? 'text-xl' : 'text-base')}
+          >
+            Resolved
+          </div>
+          <div className={resolutionColor}>{resolutionText}</div>
+        </>
+      ) : (
+        <>
+          <div className="text-primary">{probPercent}</div>
+          <div
+            className={clsx('text-primary', large ? 'text-xl' : 'text-base')}
+          >
+            chance
+          </div>
+        </>
+      )}
+    </Col>
+  )
+}
+
 export function ContractDetails(props: { contract: Contract }) {
   const { contract } = props
   const { truePool, createdDate, resolvedDate } = compute(contract)
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index 3dc5230c..23f2e7fb 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -14,7 +14,7 @@ import { Row } from './layout/row'
 import dayjs from 'dayjs'
 import { Linkify } from './linkify'
 import clsx from 'clsx'
-import { ContractDetails } from './contract-card'
+import { ContractDetails, ResolutionOrChance } from './contract-card'
 
 function ContractDescription(props: {
   contract: Contract
@@ -84,40 +84,6 @@ function ContractDescription(props: {
   )
 }
 
-function ResolutionOrChance(props: {
-  resolution?: 'YES' | 'NO' | 'MKT' | 'CANCEL'
-  probPercent: string
-  className?: string
-}) {
-  const { resolution, probPercent, className } = props
-
-  const resolutionColor = {
-    YES: 'text-primary',
-    NO: 'text-red-400',
-    MKT: 'text-blue-400',
-    CANCEL: 'text-yellow-400',
-    '': '', // Empty if unresolved
-  }[resolution || '']
-
-  return (
-    <Col className={clsx('text-3xl md:text-4xl', className)}>
-      {resolution ? (
-        <>
-          <div className="text-lg md:text-xl text-gray-500">Resolved</div>
-          <div className={resolutionColor}>
-            {resolution === 'CANCEL' ? 'N/A' : resolution}
-          </div>
-        </>
-      ) : (
-        <>
-          <div className="text-primary">{probPercent}</div>
-          <div className="text-lg md:text-xl text-primary">chance</div>
-        </>
-      )}
-    </Col>
-  )
-}
-
 export const ContractOverview = (props: {
   contract: Contract
   className?: string
@@ -141,6 +107,7 @@ export const ContractOverview = (props: {
             className="md:hidden"
             resolution={resolution}
             probPercent={probPercent}
+            large
           />
 
           <ContractDetails contract={contract} />
@@ -150,6 +117,7 @@ export const ContractOverview = (props: {
           className="hidden md:flex md:items-end"
           resolution={resolution}
           probPercent={probPercent}
+          large
         />
       </Row>
 

From bad7a2b54331df91e40f4fafe4c9d711db7df843 Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Sun, 2 Jan 2022 16:46:04 -0600
Subject: [PATCH 35/81] Sort & query url params (#17)

* Sort query in progress

* Search and query url params!
---
 web/components/contracts-list.tsx       | 47 ++++++++++++++-----------
 web/hooks/use-sort-and-query-params.tsx | 40 +++++++++++++++++++++
 web/pages/landing-page.tsx              | 10 +++++-
 web/pages/markets.tsx                   |  6 ++++
 web/pages/tag/[tag].tsx                 | 13 ++++++-
 5 files changed, 94 insertions(+), 22 deletions(-)
 create mode 100644 web/hooks/use-sort-and-query-params.tsx

diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index 715a7ffe..69908523 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -3,17 +3,13 @@ import Link from 'next/link'
 import clsx from 'clsx'
 import { useEffect, useState } from 'react'
 
-import {
-  compute,
-  Contract,
-  listContracts,
-  path,
-} from '../lib/firebase/contracts'
+import { compute, Contract, listContracts } from '../lib/firebase/contracts'
 import { User } from '../lib/firebase/users'
 import { Col } from './layout/col'
 import { SiteLink } from './site-link'
 import { parseTags } from '../lib/util/parse'
 import { ContractCard } from './contract-card'
+import { Sort, useQueryAndSortParams } from '../hooks/use-sort-and-query-params'
 
 function ContractsGrid(props: { contracts: Contract[] }) {
   const [resolvedContracts, activeContracts] = _.partition(
@@ -61,7 +57,7 @@ function CreatorContractsGrid(props: { contracts: Contract[] }) {
         const { creatorUsername, creatorName } = byCreator[creatorId][0]
 
         return (
-          <Col className="gap-4">
+          <Col className="gap-4" key={creatorUsername}>
             <SiteLink className="text-lg" href={`/${creatorUsername}`}>
               {creatorName}
             </SiteLink>
@@ -116,7 +112,7 @@ function TagContractsGrid(props: { contracts: Contract[] }) {
     <Col className="gap-6">
       {tags.map((tag) => {
         return (
-          <Col className="gap-4">
+          <Col className="gap-4" key={tag}>
             <SiteLink className="text-lg" href={`/tag/${tag}`}>
               #{tag}
             </SiteLink>
@@ -152,17 +148,15 @@ function TagContractsGrid(props: { contracts: Contract[] }) {
 
 const MAX_CONTRACTS_DISPLAYED = 99
 
-type Sort = 'creator' | 'tag' | 'createdTime' | 'pool' | 'resolved' | 'all'
 export function SearchableGrid(props: {
   contracts: Contract[]
-  defaultSort?: Sort
+  query: string
+  setQuery: (query: string) => void
+  sort: Sort
+  setSort: (sort: Sort) => void
   byOneCreator?: boolean
 }) {
-  const { contracts, defaultSort, byOneCreator } = props
-  const [query, setQuery] = useState('')
-  const [sort, setSort] = useState(
-    defaultSort || (byOneCreator ? 'pool' : 'creator')
-  )
+  const { contracts, query, setQuery, sort, setSort, byOneCreator } = props
 
   function check(corpus: String) {
     return corpus.toLowerCase().includes(query.toLowerCase())
@@ -175,9 +169,9 @@ export function SearchableGrid(props: {
       check(c.creatorUsername)
   )
 
-  if (sort === 'createdTime' || sort === 'resolved' || sort === 'all') {
+  if (sort === 'newest' || sort === 'resolved' || sort === 'all') {
     matches.sort((a, b) => b.createdTime - a.createdTime)
-  } else if (sort === 'pool' || sort === 'creator' || sort === 'tag') {
+  } else if (sort === 'most-traded' || sort === 'creator' || sort === 'tag') {
     matches.sort((a, b) => compute(b).truePool - compute(a).truePool)
   }
 
@@ -213,8 +207,8 @@ export function SearchableGrid(props: {
             <option value="creator">By creator</option>
           )}
           <option value="tag">By tag</option>
-          <option value="pool">Most traded</option>
-          <option value="createdTime">Newest first</option>
+          <option value="most-traded">Most traded</option>
+          <option value="newest">Newest</option>
           <option value="resolved">Resolved</option>
         </select>
       </div>
@@ -234,6 +228,10 @@ export function CreatorContractsList(props: { creator: User }) {
   const { creator } = props
   const [contracts, setContracts] = useState<Contract[] | 'loading'>('loading')
 
+  const { query, setQuery, sort, setSort } = useQueryAndSortParams({
+    defaultSort: 'all',
+  })
+
   useEffect(() => {
     if (creator?.id) {
       // TODO: stream changes from firestore
@@ -243,5 +241,14 @@ export function CreatorContractsList(props: { creator: User }) {
 
   if (contracts === 'loading') return <></>
 
-  return <SearchableGrid contracts={contracts} byOneCreator defaultSort="all" />
+  return (
+    <SearchableGrid
+      contracts={contracts}
+      byOneCreator
+      query={query}
+      setQuery={setQuery}
+      sort={sort}
+      setSort={setSort}
+    />
+  )
 }
diff --git a/web/hooks/use-sort-and-query-params.tsx b/web/hooks/use-sort-and-query-params.tsx
new file mode 100644
index 00000000..ee0db506
--- /dev/null
+++ b/web/hooks/use-sort-and-query-params.tsx
@@ -0,0 +1,40 @@
+import { useRouter } from 'next/router'
+
+export type Sort =
+  | 'creator'
+  | 'tag'
+  | 'newest'
+  | 'most-traded'
+  | 'resolved'
+  | 'all'
+
+export function useQueryAndSortParams(options?: { defaultSort: Sort }) {
+  const router = useRouter()
+
+  const { s: sort, q: query } = router.query as {
+    q?: string
+    s?: Sort
+  }
+
+  const setSort = (sort: Sort | undefined) => {
+    router.query.s = sort
+    router.push(router, undefined, { shallow: true })
+  }
+
+  const setQuery = (query: string | undefined) => {
+    if (query) {
+      router.query.q = query
+    } else {
+      delete router.query.q
+    }
+
+    router.push(router, undefined, { shallow: true })
+  }
+
+  return {
+    sort: sort ?? options?.defaultSort ?? 'creator',
+    query: query ?? '',
+    setSort,
+    setQuery,
+  }
+}
diff --git a/web/pages/landing-page.tsx b/web/pages/landing-page.tsx
index f983a6ac..13d209b6 100644
--- a/web/pages/landing-page.tsx
+++ b/web/pages/landing-page.tsx
@@ -13,6 +13,7 @@ import { SearchableGrid } from '../components/contracts-list'
 import { Col } from '../components/layout/col'
 import { NavBar } from '../components/nav-bar'
 import Link from 'next/link'
+import { useQueryAndSortParams } from '../hooks/use-sort-and-query-params'
 
 export default function LandingPage() {
   return (
@@ -159,13 +160,20 @@ function FeaturesSection() {
 
 function ExploreMarketsSection() {
   const contracts = useContracts()
+  const { query, setQuery, sort, setSort } = useQueryAndSortParams()
 
   return (
     <div className="max-w-4xl px-4 py-8 mx-auto">
       <p className="my-12 text-3xl leading-8 font-extrabold tracking-tight text-indigo-700 sm:text-4xl">
         Explore our markets
       </p>
-      <SearchableGrid contracts={contracts === 'loading' ? [] : contracts} />
+      <SearchableGrid
+        contracts={contracts === 'loading' ? [] : contracts}
+        query={query}
+        setQuery={setQuery}
+        sort={sort}
+        setSort={setSort}
+      />
     </div>
   )
 }
diff --git a/web/pages/markets.tsx b/web/pages/markets.tsx
index f14a1906..96f3c7a4 100644
--- a/web/pages/markets.tsx
+++ b/web/pages/markets.tsx
@@ -1,6 +1,7 @@
 import { SearchableGrid } from '../components/contracts-list'
 import { Page } from '../components/page'
 import { useContracts } from '../hooks/use-contracts'
+import { useQueryAndSortParams } from '../hooks/use-sort-and-query-params'
 import { Contract, listAllContracts } from '../lib/firebase/contracts'
 
 export async function getStaticProps() {
@@ -17,12 +18,17 @@ export async function getStaticProps() {
 
 export default function Markets(props: { contracts: Contract[] }) {
   const contracts = useContracts()
+  const { query, setQuery, sort, setSort } = useQueryAndSortParams()
 
   return (
     <Page>
       {(props.contracts || contracts !== 'loading') && (
         <SearchableGrid
           contracts={contracts === 'loading' ? props.contracts : contracts}
+          query={query}
+          setQuery={setQuery}
+          sort={sort}
+          setSort={setSort}
         />
       )}
     </Page>
diff --git a/web/pages/tag/[tag].tsx b/web/pages/tag/[tag].tsx
index 7f15748a..ae56f1c5 100644
--- a/web/pages/tag/[tag].tsx
+++ b/web/pages/tag/[tag].tsx
@@ -3,6 +3,7 @@ import { SearchableGrid } from '../../components/contracts-list'
 import { Page } from '../../components/page'
 import { Title } from '../../components/title'
 import { useContracts } from '../../hooks/use-contracts'
+import { useQueryAndSortParams } from '../../hooks/use-sort-and-query-params'
 
 export default function TagPage() {
   const router = useRouter()
@@ -18,13 +19,23 @@ export default function TagPage() {
     )
   }
 
+  const { query, setQuery, sort, setSort } = useQueryAndSortParams({
+    defaultSort: 'most-traded',
+  })
+
   return (
     <Page>
       <Title text={`#${tag}`} />
       {contracts === 'loading' ? (
         <></>
       ) : (
-        <SearchableGrid contracts={contracts} />
+        <SearchableGrid
+          contracts={contracts}
+          query={query}
+          setQuery={setQuery}
+          sort={sort}
+          setSort={setSort}
+        />
       )}
     </Page>
   )

From 3ba96028f41ac8e9428e9881d78c6829d55ee85b Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Sun, 2 Jan 2022 16:53:20 -0600
Subject: [PATCH 36/81] Parse tags to get unique ignoring case

---
 web/lib/util/parse.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/lib/util/parse.ts b/web/lib/util/parse.ts
index 2857b7a1..4b20778f 100644
--- a/web/lib/util/parse.ts
+++ b/web/lib/util/parse.ts
@@ -1,8 +1,9 @@
+import _ from 'lodash'
+
 export function parseTags(text: string) {
   const regex = /(?:^|\s)(?:[#][a-z0-9_]+)/gi
-  const matches = text.match(regex) || []
-  return matches.map((match) => {
-    const tag = match.trim().substring(1)
-    return tag
-  })
+  const matches = (text.match(regex) || []).map((match) =>
+    match.trim().substring(1)
+  )
+  return _.uniqBy(matches, (tag) => tag.toLowerCase())
 }

From fb0e16d6196e88e02c3aae5463894e027c877a5f Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Sun, 2 Jan 2022 21:21:25 -0800
Subject: [PATCH 37/81] Add a closing date to Create Market (#10)

* Preview a slimmed-down version of /Create

* Rework dropdown to be on bottom

* Parse the close time as just before midnight

* Prevent invalid contracts from being created

* Prevent trading after contract has closed
---
 web/components/contract-overview.tsx    |  18 +++
 web/lib/service/create-contract.ts      |   6 +-
 web/pages/[username]/[contractSlug].tsx |  12 +-
 web/pages/create.tsx                    | 160 +++++++++++++++++-------
 4 files changed, 144 insertions(+), 52 deletions(-)

diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index 23f2e7fb..114ba9b9 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -16,6 +16,19 @@ import { Linkify } from './linkify'
 import clsx from 'clsx'
 import { ContractDetails, ResolutionOrChance } from './contract-card'
 
+function ContractCloseTime(props: { contract: Contract }) {
+  const closeTime = props.contract.closeTime
+  if (!closeTime) {
+    return null
+  }
+  return (
+    <div className="text-gray-500 text-sm">
+      Trading {closeTime > Date.now() ? 'closes' : 'closed'} at{' '}
+      {dayjs(closeTime).format('MMM D, h:mma')}
+    </div>
+  )
+}
+
 function ContractDescription(props: {
   contract: Contract
   isCreator: boolean
@@ -127,9 +140,14 @@ export const ContractOverview = (props: {
 
       <Spacer h={12} />
 
+      <ContractCloseTime contract={contract} />
+
+      <Spacer h={4} />
+
       {((isCreator && !contract.resolution) || contract.description) && (
         <label className="text-gray-500 mb-2 text-sm">Description</label>
       )}
+
       <ContractDescription contract={contract} isCreator={isCreator} />
 
       {/* Show a delete button for contracts without any trading */}
diff --git a/web/lib/service/create-contract.ts b/web/lib/service/create-contract.ts
index 966115b0..7c7a59df 100644
--- a/web/lib/service/create-contract.ts
+++ b/web/lib/service/create-contract.ts
@@ -12,7 +12,8 @@ export async function createContract(
   question: string,
   description: string,
   initialProb: number,
-  creator: User
+  creator: User,
+  closeTime?: number
 ) {
   const proposedSlug = slugify(question).substring(0, 35)
 
@@ -45,6 +46,9 @@ export async function createContract(
     createdTime: Date.now(),
     lastUpdatedTime: Date.now(),
   }
+  if (closeTime) {
+    contract.closeTime = closeTime
+  }
 
   return await pushNewContract(contract)
 }
diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index fa9bbac6..8b824c44 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -53,6 +53,9 @@ export default function ContractPage(props: {
 
   const { creatorId, isResolved, resolution, question } = contract
   const isCreator = user?.id === creatorId
+  const allowTrade =
+    !isResolved && (!contract.closeTime || contract.closeTime > Date.now())
+  const allowResolve = !isResolved && isCreator && user
 
   const { probPercent } = compute(contract)
 
@@ -61,7 +64,7 @@ export default function ContractPage(props: {
     : `${probPercent} chance. ${contract.description}`
 
   return (
-    <Page wide={!isResolved}>
+    <Page wide={allowTrade}>
       <SEO
         title={question}
         description={description}
@@ -74,14 +77,13 @@ export default function ContractPage(props: {
           <BetsSection contract={contract} user={user ?? null} />
         </div>
 
-        {!isResolved && (
+        {(allowTrade || allowResolve) && (
           <>
             <div className="md:ml-8" />
 
             <Col className="flex-1">
-              <BetPanel contract={contract} />
-
-              {isCreator && user && (
+              {allowTrade && <BetPanel contract={contract} />}
+              {allowResolve && (
                 <ResolutionPanel creator={user} contract={contract} />
               )}
             </Col>
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 5806f9ec..6ad2bcb1 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -8,6 +8,9 @@ import { useUser } from '../hooks/use-user'
 import { path } from '../lib/firebase/contracts'
 import { createContract } from '../lib/service/create-contract'
 import { Page } from '../components/page'
+import { Row } from '../components/layout/row'
+import clsx from 'clsx'
+import dayjs from 'dayjs'
 
 // Allow user to create a new contract
 export default function NewContract() {
@@ -20,11 +23,33 @@ export default function NewContract() {
   const [initialProb, setInitialProb] = useState(50)
   const [question, setQuestion] = useState('')
   const [description, setDescription] = useState('')
+  const [closeDate, setCloseDate] = useState('')
   const [isSubmitting, setIsSubmitting] = useState(false)
+  const [collapsed, setCollapsed] = useState(true)
+
+  // Given a date string like '2022-04-02',
+  // return the time just before midnight on that date (in the user's local time), as millis since epoch
+  function dateToMillis(date: string) {
+    return dayjs(date)
+      .set('hour', 23)
+      .set('minute', 59)
+      .set('second', 59)
+      .valueOf()
+  }
+  const closeTime = dateToMillis(closeDate)
+  // We'd like this to look like "Apr 2, 2022, 23:59:59 PM PT" but timezones are hard with dayjs
+  const formattedCloseTime = new Date(closeTime).toString()
+
+  const isValid =
+    initialProb > 0 &&
+    initialProb < 100 &&
+    question.length > 0 &&
+    // If set, closeTime must be in the future
+    (!closeDate || closeTime > Date.now())
 
   async function submit() {
-    // TODO: add more rigorous error handling for question
-    if (!creator || !question) return
+    // TODO: Tell users why their contract is invalid
+    if (!creator || !isValid) return
 
     setIsSubmitting(true)
 
@@ -32,7 +57,8 @@ export default function NewContract() {
       question,
       description,
       initialProb,
-      creator
+      creator,
+      closeTime
     )
     await router.push(path(contract))
   }
@@ -49,52 +75,94 @@ export default function NewContract() {
         {/* Create a Tailwind form that takes in all the fields needed for a new contract */}
         {/* When the form is submitted, create a new contract in the database */}
         <form>
-          <div className="form-control">
-            <label className="label">
-              <span className="label-text">Question</span>
-            </label>
+          <div className="flex justify-between gap-4 items-center">
+            <div className="form-control w-full">
+              <label className="label">
+                <span className="label-text">Prediction</span>
+              </label>
 
-            <input
-              type="text"
-              placeholder="e.g. Will the FDA approve Paxlovid before Jun 2nd, 2022?"
-              className="input input-bordered"
-              value={question}
-              onChange={(e) => setQuestion(e.target.value || '')}
-            />
+              <input
+                type="text"
+                placeholder="e.g. The FDA will approve Paxlovid before Jun 2nd, 2022"
+                className="input input-bordered"
+                value={question}
+                onChange={(e) => setQuestion(e.target.value || '')}
+              />
+            </div>
+
+            <div className="form-control">
+              <label className="label">
+                <span className="label-text">Chance</span>
+              </label>
+              <label className="input-group input-group-md w-fit">
+                <input
+                  type="number"
+                  value={initialProb}
+                  className="input input-bordered input-md"
+                  min={1}
+                  max={99}
+                  onChange={(e) => setInitialProb(parseInt(e.target.value))}
+                />
+                <span>%</span>
+              </label>
+            </div>
           </div>
 
-          <Spacer h={4} />
+          {/* Collapsible "Advanced" section */}
+          <div
+            tabIndex={0}
+            className={clsx(
+              'cursor-pointer relative collapse collapse-arrow',
+              collapsed ? 'collapse-close' : 'collapse-open'
+            )}
+          >
+            <div
+              className="mt-4 mr-6 text-sm text-gray-400 text-right"
+              onClick={() => setCollapsed((collapsed) => !collapsed)}
+            >
+              Advanced
+            </div>
+            <Row>
+              <div
+                className="collapse-title p-0 absolute w-0 h-0 min-h-0"
+                style={{ top: -2, right: -15, color: '#9ca3af' /* gray-400 */ }}
+              />
+            </Row>
+            <div className="collapse-content !p-0 m-0 !bg-transparent">
+              <div className="form-control">
+                <label className="label">
+                  <span className="label-text">Description (optional)</span>
+                </label>
+                <textarea
+                  className="textarea w-full h-24 textarea-bordered"
+                  placeholder={descriptionPlaceholder}
+                  value={description}
+                  onClick={(e) => e.stopPropagation()}
+                  onChange={(e) => setDescription(e.target.value || '')}
+                ></textarea>
+              </div>
 
-          <div className="form-control">
-            <label className="label">
-              <span className="label-text">Description (optional)</span>
-            </label>
-
-            <textarea
-              className="textarea h-24 textarea-bordered"
-              placeholder={descriptionPlaceholder}
-              value={description}
-              onChange={(e) => setDescription(e.target.value || '')}
-            ></textarea>
-          </div>
-
-          <Spacer h={4} />
-
-          <div className="form-control">
-            <label className="label">
-              <span className="label-text">
-                Initial probability: {initialProb}%
-              </span>
-            </label>
-
-            <input
-              type="range"
-              className="range range-lg range-primary"
-              min="1"
-              max={99}
-              value={initialProb}
-              onChange={(e) => setInitialProb(parseInt(e.target.value))}
-            />
+              <div className="form-control">
+                <label className="label">
+                  <span className="label-text">Close date (optional)</span>
+                </label>
+                <input
+                  type="date"
+                  className="input input-bordered"
+                  onClick={(e) => e.stopPropagation()}
+                  onChange={(e) => setCloseDate(e.target.value || '')}
+                  min={new Date().toISOString().split('T')[0]}
+                  value={closeDate}
+                />
+              </div>
+              <label>
+                {closeDate && (
+                  <span className="label-text text-gray-400 ml-1">
+                    No new trades will be allowed after {formattedCloseTime}
+                  </span>
+                )}
+              </label>
+            </div>
           </div>
 
           <Spacer h={4} />
@@ -103,7 +171,7 @@ export default function NewContract() {
             <button
               type="submit"
               className="btn btn-primary"
-              disabled={isSubmitting || !question}
+              disabled={isSubmitting || !isValid}
               onClick={(e) => {
                 e.preventDefault()
                 submit()

From f7d4926d224740122a744c8c6c4978a2cd853915 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Mon, 3 Jan 2022 00:57:22 -0600
Subject: [PATCH 38/81] Update to show sale price in column

---
 web/components/bets-list.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 29d51346..0d0f588f 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -258,7 +258,7 @@ export function ContractBetsTable(props: {
             <th>Amount</th>
             <th>Probability</th>
             <th>Shares</th>
-            <th>{isResolved ? <>Payout</> : <>Current value</>}</th>
+            <th>{isResolved ? <>Payout</> : <>Sale price</>}</th>
             <th></th>
           </tr>
         </thead>
@@ -309,7 +309,7 @@ function BetRow(props: { bet: Bet; contract: Contract; sale?: Bet }) {
                 ? resolvedPayout(contract, bet)
                 : bet.sale
                 ? bet.sale.amount ?? 0
-                : currentValue(contract, bet)
+                : calculateSaleAmount(contract, bet)
             )}
       </td>
 
@@ -347,9 +347,11 @@ function SellButton(props: { contract: Contract; bet: Bet }) {
         setIsSubmitting(false)
       }}
     >
-      <div className="text-2xl mb-4">Sell</div>
+      <div className="text-2xl mb-4">
+        Sell <OutcomeLabel outcome={bet.outcome} />
+      </div>
       <div>
-        Do you want to sell your {formatMoney(bet.amount)} position on{' '}
+        Do you want to sell {formatWithCommas(bet.shares)} shares of{' '}
         <OutcomeLabel outcome={bet.outcome} /> for{' '}
         {formatMoney(calculateSaleAmount(contract, bet))}?
       </div>

From a331faa1a76b1d2dc72fbc7176122236b20968d9 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Mon, 3 Jan 2022 12:39:44 -0600
Subject: [PATCH 39/81] Create page: Chance => Initial probabilty, description
 out of advanced, advanced arrow clickable

---
 web/pages/create.tsx | 102 ++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 50 deletions(-)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 6ad2bcb1..0601c484 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -8,7 +8,6 @@ import { useUser } from '../hooks/use-user'
 import { path } from '../lib/firebase/contracts'
 import { createContract } from '../lib/service/create-contract'
 import { Page } from '../components/page'
-import { Row } from '../components/layout/row'
 import clsx from 'clsx'
 import dayjs from 'dayjs'
 
@@ -75,37 +74,52 @@ export default function NewContract() {
         {/* Create a Tailwind form that takes in all the fields needed for a new contract */}
         {/* When the form is submitted, create a new contract in the database */}
         <form>
-          <div className="flex justify-between gap-4 items-center">
-            <div className="form-control w-full">
-              <label className="label">
-                <span className="label-text">Prediction</span>
-              </label>
+          <div className="form-control w-full">
+            <label className="label">
+              <span className="label-text">Prediction</span>
+            </label>
 
+            <input
+              type="text"
+              placeholder="e.g. The FDA will approve Paxlovid before Jun 2nd, 2022"
+              className="input input-bordered"
+              value={question}
+              onChange={(e) => setQuestion(e.target.value || '')}
+            />
+          </div>
+
+          <Spacer h={4} />
+
+          <div className="form-control">
+            <label className="label">
+              <span className="label-text">Initial probability</span>
+            </label>
+            <label className="input-group input-group-md w-fit">
               <input
-                type="text"
-                placeholder="e.g. The FDA will approve Paxlovid before Jun 2nd, 2022"
-                className="input input-bordered"
-                value={question}
-                onChange={(e) => setQuestion(e.target.value || '')}
+                type="number"
+                value={initialProb}
+                className="input input-bordered input-md"
+                min={1}
+                max={99}
+                onChange={(e) => setInitialProb(parseInt(e.target.value))}
               />
-            </div>
+              <span>%</span>
+            </label>
+          </div>
 
-            <div className="form-control">
-              <label className="label">
-                <span className="label-text">Chance</span>
-              </label>
-              <label className="input-group input-group-md w-fit">
-                <input
-                  type="number"
-                  value={initialProb}
-                  className="input input-bordered input-md"
-                  min={1}
-                  max={99}
-                  onChange={(e) => setInitialProb(parseInt(e.target.value))}
-                />
-                <span>%</span>
-              </label>
-            </div>
+          <Spacer h={4} />
+
+          <div className="form-control">
+            <label className="label">
+              <span className="label-text">Description (optional)</span>
+            </label>
+            <textarea
+              className="textarea w-full h-24 textarea-bordered"
+              placeholder={descriptionPlaceholder}
+              value={description}
+              onClick={(e) => e.stopPropagation()}
+              onChange={(e) => setDescription(e.target.value || '')}
+            />
           </div>
 
           {/* Collapsible "Advanced" section */}
@@ -116,32 +130,20 @@ export default function NewContract() {
               collapsed ? 'collapse-close' : 'collapse-open'
             )}
           >
-            <div
-              className="mt-4 mr-6 text-sm text-gray-400 text-right"
-              onClick={() => setCollapsed((collapsed) => !collapsed)}
-            >
-              Advanced
-            </div>
-            <Row>
+            <div onClick={() => setCollapsed((collapsed) => !collapsed)}>
+              <div className="mt-4 mr-6 text-sm text-gray-400 text-right">
+                Advanced
+              </div>
               <div
                 className="collapse-title p-0 absolute w-0 h-0 min-h-0"
-                style={{ top: -2, right: -15, color: '#9ca3af' /* gray-400 */ }}
+                style={{
+                  top: -2,
+                  right: -15,
+                  color: '#9ca3af' /* gray-400 */,
+                }}
               />
-            </Row>
+            </div>
             <div className="collapse-content !p-0 m-0 !bg-transparent">
-              <div className="form-control">
-                <label className="label">
-                  <span className="label-text">Description (optional)</span>
-                </label>
-                <textarea
-                  className="textarea w-full h-24 textarea-bordered"
-                  placeholder={descriptionPlaceholder}
-                  value={description}
-                  onClick={(e) => e.stopPropagation()}
-                  onChange={(e) => setDescription(e.target.value || '')}
-                ></textarea>
-              </div>
-
               <div className="form-control">
                 <label className="label">
                   <span className="label-text">Close date (optional)</span>

From 24e873b6de92716583113f07de294d193e187b0e Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Mon, 3 Jan 2022 12:56:02 -0600
Subject: [PATCH 40/81] Show "sold for" under sale price / payout column.
 Outcome label to new file

---
 web/components/bets-list.tsx     | 57 ++++++++------------------------
 web/components/outcome-label.tsx | 26 +++++++++++++++
 2 files changed, 40 insertions(+), 43 deletions(-)
 create mode 100644 web/components/outcome-label.tsx

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 0d0f588f..c7f8cc86 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -24,6 +24,7 @@ import {
 import clsx from 'clsx'
 import { cloudFunction } from '../lib/firebase/api-call'
 import { ConfirmationButton } from './confirmation-button'
+import { OutcomeLabel, YesLabel, NoLabel } from './outcome-label'
 
 export function BetsList(props: { user: User }) {
   const { user } = props
@@ -302,26 +303,21 @@ function BetRow(props: { bet: Bet; contract: Contract; sale?: Bet }) {
       </td>
       <td>{formatWithCommas(shares)}</td>
       <td>
-        {bet.isSold
-          ? 'N/A'
-          : formatMoney(
-              isResolved
-                ? resolvedPayout(contract, bet)
-                : bet.sale
-                ? bet.sale.amount ?? 0
-                : calculateSaleAmount(contract, bet)
-            )}
+        {sale ? (
+          <>SOLD for {formatMoney(Math.abs(sale.amount))}</>
+        ) : (
+          formatMoney(
+            isResolved
+              ? resolvedPayout(contract, bet)
+              : calculateSaleAmount(contract, bet)
+          )
+        )}
       </td>
 
-      {sale ? (
-        <td>SOLD for {formatMoney(Math.abs(sale.amount))}</td>
-      ) : (
-        !isResolved &&
-        !isSold && (
-          <td className="text-neutral">
-            <SellButton contract={contract} bet={bet} />
-          </td>
-        )
+      {!isResolved && !isSold && (
+        <td className="text-neutral">
+          <SellButton contract={contract} bet={bet} />
+        </td>
       )}
     </tr>
   )
@@ -358,28 +354,3 @@ function SellButton(props: { contract: Contract; bet: Bet }) {
     </ConfirmationButton>
   )
 }
-
-function OutcomeLabel(props: { outcome: 'YES' | 'NO' | 'CANCEL' | 'MKT' }) {
-  const { outcome } = props
-
-  if (outcome === 'YES') return <YesLabel />
-  if (outcome === 'NO') return <NoLabel />
-  if (outcome === 'MKT') return <MarketLabel />
-  return <CancelLabel />
-}
-
-function YesLabel() {
-  return <span className="text-primary">YES</span>
-}
-
-function NoLabel() {
-  return <span className="text-red-400">NO</span>
-}
-
-function CancelLabel() {
-  return <span className="text-yellow-400">N/A</span>
-}
-
-function MarketLabel() {
-  return <span className="text-blue-400">MKT</span>
-}
diff --git a/web/components/outcome-label.tsx b/web/components/outcome-label.tsx
new file mode 100644
index 00000000..1eb8ac4f
--- /dev/null
+++ b/web/components/outcome-label.tsx
@@ -0,0 +1,26 @@
+export function OutcomeLabel(props: {
+  outcome: 'YES' | 'NO' | 'CANCEL' | 'MKT'
+}) {
+  const { outcome } = props
+
+  if (outcome === 'YES') return <YesLabel />
+  if (outcome === 'NO') return <NoLabel />
+  if (outcome === 'MKT') return <MarketLabel />
+  return <CancelLabel />
+}
+
+export function YesLabel() {
+  return <span className="text-primary">YES</span>
+}
+
+export function NoLabel() {
+  return <span className="text-red-400">NO</span>
+}
+
+export function CancelLabel() {
+  return <span className="text-yellow-400">N/A</span>
+}
+
+export function MarketLabel() {
+  return <span className="text-blue-400">MKT</span>
+}

From 44f44272ff116c8e1ead3420c321904f22df0744 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Mon, 3 Jan 2022 13:00:24 -0600
Subject: [PATCH 41/81] create page: minor changes

---
 web/pages/create.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 0601c484..591e21c7 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -101,7 +101,9 @@ export default function NewContract() {
                 className="input input-bordered input-md"
                 min={1}
                 max={99}
-                onChange={(e) => setInitialProb(parseInt(e.target.value))}
+                onChange={(e) =>
+                  setInitialProb(parseInt(e.target.value.substring(0, 2)))
+                }
               />
               <span>%</span>
             </label>
@@ -158,11 +160,10 @@ export default function NewContract() {
                 />
               </div>
               <label>
-                {closeDate && (
-                  <span className="label-text text-gray-400 ml-1">
-                    No new trades will be allowed after {formattedCloseTime}
-                  </span>
-                )}
+                <span className="label-text text-gray-400 ml-1">
+                  No new trades will be allowed after{' '}
+                  {closeDate ? formattedCloseTime : 'this time'}
+                </span>
               </label>
             </div>
           </div>

From 4d0646a200928a9b4dded898bafd751ad16c38b7 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Mon, 3 Jan 2022 23:44:54 -0600
Subject: [PATCH 42/81] Add payout if MKT. Current value uses MKT payout.

---
 web/components/bets-list.tsx            | 44 +++++++++++++++++--------
 web/pages/[username]/[contractSlug].tsx |  2 +-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index c7f8cc86..58d9aaf9 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -18,13 +18,12 @@ import { UserLink } from './user-page'
 import {
   calculatePayout,
   calculateSaleAmount,
-  currentValue,
   resolvedPayout,
 } from '../lib/calculate'
 import clsx from 'clsx'
 import { cloudFunction } from '../lib/firebase/api-call'
 import { ConfirmationButton } from './confirmation-button'
-import { OutcomeLabel, YesLabel, NoLabel } from './outcome-label'
+import { OutcomeLabel, YesLabel, NoLabel, MarketLabel } from './outcome-label'
 
 export function BetsList(props: { user: User }) {
   const { user } = props
@@ -84,7 +83,7 @@ export function BetsList(props: { user: User }) {
   const currentBetsValue = _.sumBy(unresolved, (contract) =>
     _.sumBy(contractBets[contract.id], (bet) => {
       if (bet.isSold || bet.sale) return 0
-      return currentValue(contract, bet)
+      return calculatePayout(contract, bet, 'MKT')
     })
   )
 
@@ -183,9 +182,10 @@ function MyContractBets(props: { contract: Contract; bets: Bet[] }) {
 export function MyBetsSummary(props: {
   contract: Contract
   bets: Bet[]
+  showMKT?: boolean
   className?: string
 }) {
-  const { bets, contract, className } = props
+  const { bets, contract, showMKT, className } = props
   const { resolution } = contract
 
   const excludeSales = bets.filter((b) => !b.isSold && !b.sale)
@@ -202,21 +202,29 @@ export function MyBetsSummary(props: {
     calculatePayout(contract, bet, 'NO')
   )
 
+  const marketWinnings = _.sumBy(excludeSales, (bet) =>
+    calculatePayout(contract, bet, 'MKT')
+  )
+
   return (
-    <Row className={clsx('gap-4 sm:gap-6', className)}>
+    <Row
+      className={clsx(
+        'gap-4 sm:gap-6',
+        showMKT && 'flex-wrap sm:flex-nowrap',
+        className
+      )}
+    >
       <Col>
         <div className="text-sm text-gray-500 whitespace-nowrap">Invested</div>
         <div className="whitespace-nowrap">{formatMoney(betsTotal)}</div>
       </Col>
       {resolution ? (
-        <>
-          <Col>
-            <div className="text-sm text-gray-500">Payout</div>
-            <div className="whitespace-nowrap">{formatMoney(betsPayout)}</div>
-          </Col>
-        </>
+        <Col>
+          <div className="text-sm text-gray-500">Payout</div>
+          <div className="whitespace-nowrap">{formatMoney(betsPayout)}</div>
+        </Col>
       ) : (
-        <>
+        <Row className="gap-4 sm:gap-6">
           <Col>
             <div className="text-sm text-gray-500 whitespace-nowrap">
               Payout if <YesLabel />
@@ -229,7 +237,17 @@ export function MyBetsSummary(props: {
             </div>
             <div className="whitespace-nowrap">{formatMoney(noWinnings)}</div>
           </Col>
-        </>
+          {showMKT && (
+            <Col>
+              <div className="text-sm text-gray-500 whitespace-nowrap">
+                Payout if <MarketLabel />
+              </div>
+              <div className="whitespace-nowrap">
+                {formatMoney(marketWinnings)}
+              </div>
+            </Col>
+          )}
+        </Row>
       )}
     </Row>
   )
diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 8b824c44..f467578a 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -110,7 +110,7 @@ function BetsSection(props: { contract: Contract; user: User | null }) {
   return (
     <div>
       <Title text="Your trades" />
-      <MyBetsSummary contract={contract} bets={userBets} />
+      <MyBetsSummary contract={contract} bets={userBets} showMKT />
       <Spacer h={6} />
       <ContractBetsTable contract={contract} bets={userBets} />
       <Spacer h={12} />

From 7d5b4359f864dba92a2f71f40a36b4e18be9ce4d Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Mon, 3 Jan 2022 23:05:41 -0600
Subject: [PATCH 43/81] align sales price

---
 web/components/bets-list.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 58d9aaf9..3cbf4ace 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -322,7 +322,7 @@ function BetRow(props: { bet: Bet; contract: Contract; sale?: Bet }) {
       <td>{formatWithCommas(shares)}</td>
       <td>
         {sale ? (
-          <>SOLD for {formatMoney(Math.abs(sale.amount))}</>
+          <>{formatMoney(Math.abs(sale.amount))} (sold)</>
         ) : (
           formatMoney(
             isResolved

From f0e045694a0a57ca6880d8b87b84eb365c73b550 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Mon, 3 Jan 2022 23:56:34 -0600
Subject: [PATCH 44/81] update about page with more info about basic betting
 mechanics

---
 web/pages/about.tsx | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index 54aa9453..fd810ed6 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -217,17 +217,35 @@ function Contents() {
         judgment on the outcome, it leads to a qualitative shift in the number,
         variety, and usefulness of prediction markets.
       </p>
-      <h3 id="how-does-betting-in-a-market-work-on-a-technical-level-">
-        How does betting in a market work on a technical level?
-      </h3>
+
+      <h3 id="how-does-betting-work">How does betting work?</h3>
+      <ul>
+        <li>
+          Markets are structured around a question with a binary outcome (either
+          YES or NO)
+        </li>
+        <li>
+          Traders can place a bet on either YES or NO. The bet amount is added
+          to the corresponding bet pool for the outcome. The trader receives
+          some shares of the final pool. The number of shares depends on the
+          current implied probability.
+        </li>
+        <li>
+          When the market is resolved, the traders who bet on the correct
+          outcome are paid out of the total pool (YES pool + NO pool) in
+          proportion to the amount of shares they own, minus any fees.
+        </li>
+      </ul>
+
+      <h3 id="type-of-market-maker">What kind of betting system do you use?</h3>
       <p>
         Mantic Markets uses a special type of automated market marker based on a
         dynamic pari-mutuel (DPM) betting system.
       </p>
       <p>
         Like traditional pari-mutuel systems, your payoff is not known at the
-        time you place your bet (it&#39;s dependent on the size of the pot when
-        the event ends).
+        time you place your bet (it&#39;s dependent on the size of the pool when
+        the event is resolved).
       </p>
       <p>
         Unlike traditional pari-mutuel systems, the price or probability that
@@ -238,6 +256,7 @@ function Contents() {
         The result is a market that can function well when trading volume is low
         without any risk to the market creator.
       </p>
+
       <h3 id="who-are-we-">Who are we?</h3>
       <p>Mantic Markets is currently a team of three:</p>
       <ul>
@@ -272,9 +291,16 @@ function Contents() {
           Join the Mantic Markets Discord Server!
         </a>
       </p>
+
       <h1 id="further-reading">Further Reading</h1>
       <hr />
+
       <ul>
+        <li>
+          <a href="https://mantic.notion.site/Technical-Overview-b9b48a09ea1f45b88d991231171730c5">
+            Technical Overview of Mantic Markets
+          </a>
+        </li>
         <li>
           <a href="https://en.wikipedia.org/wiki/Prediction_market">
             Wikipedia: Prediction markets

From 07ce27f20b9105699180be40ed87c654fde340e3 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Mon, 3 Jan 2022 23:21:14 -0800
Subject: [PATCH 45/81] Show activity feed on each market & allow comments on
 your bets (#18)

* Copy feed template from TailwindUI

* Show all bets in a feed-like manner

* Tweak design of individual trades

* Allow traders to comment on their bets

* Code cleanups

* Incorporate contract description into the feed

* Support description editing from contract feed

* Group together bets placed within 24h

* Fix build error

* Add a feed item for market resolution

* Add a feed item for markets that have closed

* Comment on a separate subcollection
---
 web/components/contract-feed.tsx     | 472 +++++++++++++++++++++++++++
 web/components/contract-overview.tsx |  89 +----
 web/hooks/use-comments.ts            |  12 +
 web/lib/firebase/bets.ts             |   1 +
 web/lib/firebase/comments.ts         |  60 ++++
 5 files changed, 551 insertions(+), 83 deletions(-)
 create mode 100644 web/components/contract-feed.tsx
 create mode 100644 web/hooks/use-comments.ts
 create mode 100644 web/lib/firebase/comments.ts

diff --git a/web/components/contract-feed.tsx b/web/components/contract-feed.tsx
new file mode 100644
index 00000000..49671d4c
--- /dev/null
+++ b/web/components/contract-feed.tsx
@@ -0,0 +1,472 @@
+// From https://tailwindui.com/components/application-ui/lists/feeds
+import { useState } from 'react'
+import {
+  BanIcon,
+  ChatAltIcon,
+  CheckIcon,
+  LockClosedIcon,
+  StarIcon,
+  ThumbDownIcon,
+  ThumbUpIcon,
+  UserIcon,
+  UsersIcon,
+  XIcon,
+} from '@heroicons/react/solid'
+import { useBets } from '../hooks/use-bets'
+import { Bet } from '../lib/firebase/bets'
+import { Comment, mapCommentsByBetId } from '../lib/firebase/comments'
+import dayjs from 'dayjs'
+import relativeTime from 'dayjs/plugin/relativeTime'
+import { OutcomeLabel } from './outcome-label'
+import { Contract, setContract } from '../lib/firebase/contracts'
+import { useUser } from '../hooks/use-user'
+import { Linkify } from './linkify'
+import { Row } from './layout/row'
+import { createComment } from '../lib/firebase/comments'
+import { useComments } from '../hooks/use-comments'
+dayjs.extend(relativeTime)
+
+function FeedComment(props: { activityItem: any }) {
+  const { activityItem } = props
+  const { person, text, amount, outcome, createdTime } = activityItem
+  return (
+    <>
+      <div className="relative">
+        <img
+          className="h-10 w-10 rounded-full bg-gray-400 flex items-center justify-center ring-8 ring-gray-50"
+          src={person.avatarUrl}
+          alt=""
+        />
+
+        <span className="absolute -bottom-3 -right-2 bg-gray-50 rounded-tl px-0.5 py-px">
+          <ChatAltIcon className="h-5 w-5 text-gray-400" aria-hidden="true" />
+        </span>
+      </div>
+      <div className="min-w-0 flex-1">
+        <div>
+          <p className="mt-0.5 text-sm text-gray-500">
+            <a href={person.href} className="font-medium text-gray-900">
+              {person.name}
+            </a>{' '}
+            placed M$ {amount} on <OutcomeLabel outcome={outcome} />{' '}
+            <Timestamp time={createdTime} />
+          </p>
+        </div>
+        <div className="mt-2 text-gray-700">
+          <p className="whitespace-pre-wrap">
+            <Linkify text={text} />
+          </p>
+        </div>
+      </div>
+    </>
+  )
+}
+
+function Timestamp(props: { time: number }) {
+  const { time } = props
+  return (
+    <span
+      className="whitespace-nowrap text-gray-300"
+      title={dayjs(time).format('MMM D, h:mma')}
+    >
+      {dayjs(time).fromNow()}
+    </span>
+  )
+}
+
+function FeedBet(props: { activityItem: any }) {
+  const { activityItem } = props
+  const { id, contractId, amount, outcome, createdTime } = activityItem
+  const user = useUser()
+  const isCreator = user?.id == activityItem.userId
+
+  const [comment, setComment] = useState('')
+  async function submitComment() {
+    if (!user || !comment) return
+    await createComment(contractId, id, comment, user)
+  }
+  return (
+    <>
+      <div>
+        <div className="relative px-1">
+          <div className="h-8 w-8 bg-gray-200 rounded-full ring-8 ring-gray-50 flex items-center justify-center">
+            <UserIcon className="h-5 w-5 text-gray-500" aria-hidden="true" />
+          </div>
+        </div>
+      </div>
+      <div className="min-w-0 flex-1 py-1.5">
+        <div className="text-sm text-gray-500">
+          <span className="text-gray-900">
+            {isCreator ? 'You' : 'A trader'}
+          </span>{' '}
+          placed M$ {amount} on <OutcomeLabel outcome={outcome} />{' '}
+          <Timestamp time={createdTime} />
+          {isCreator && (
+            // Allow user to comment in an textarea if they are the creator
+            <div className="mt-2">
+              <textarea
+                value={comment}
+                onChange={(e) => setComment(e.target.value)}
+                className="textarea textarea-bordered w-full"
+                placeholder="Add a comment..."
+              />
+              <button
+                className="btn btn-outline btn-sm mt-1"
+                onClick={submitComment}
+              >
+                Comment
+              </button>
+            </div>
+          )}
+        </div>
+      </div>
+    </>
+  )
+}
+
+export function ContractDescription(props: {
+  contract: Contract
+  isCreator: boolean
+}) {
+  const { contract, isCreator } = props
+  const [editing, setEditing] = useState(false)
+  const editStatement = () => `${dayjs().format('MMM D, h:mma')}: `
+  const [description, setDescription] = useState(editStatement())
+
+  // Append the new description (after a newline)
+  async function saveDescription(e: any) {
+    e.preventDefault()
+    setEditing(false)
+    contract.description = `${contract.description}\n${description}`.trim()
+    await setContract(contract)
+    setDescription(editStatement())
+  }
+
+  return (
+    <div className="whitespace-pre-line break-words mt-2 text-gray-700">
+      <Linkify text={contract.description} />
+      <br />
+      {isCreator &&
+        !contract.resolution &&
+        (editing ? (
+          <form className="mt-4">
+            <textarea
+              className="textarea h-24 textarea-bordered w-full mb-1"
+              value={description}
+              onChange={(e) => setDescription(e.target.value || '')}
+              autoFocus
+              onFocus={(e) =>
+                // Focus starts at end of description.
+                e.target.setSelectionRange(
+                  description.length,
+                  description.length
+                )
+              }
+            />
+            <Row className="gap-2">
+              <button
+                className="btn btn-neutral btn-outline btn-sm"
+                onClick={saveDescription}
+              >
+                Save
+              </button>
+              <button
+                className="btn btn-error btn-outline btn-sm"
+                onClick={() => setEditing(false)}
+              >
+                Cancel
+              </button>
+            </Row>
+          </form>
+        ) : (
+          <Row>
+            <button
+              className="btn btn-neutral btn-outline btn-sm mt-4"
+              onClick={() => setEditing(true)}
+            >
+              Add to description
+            </button>
+          </Row>
+        ))}
+    </div>
+  )
+}
+
+function FeedStart(props: { contract: Contract }) {
+  const { contract } = props
+  const user = useUser()
+  const isCreator = user?.id === contract.creatorId
+
+  return (
+    <>
+      <div>
+        <div className="relative px-1">
+          <div className="h-8 w-8 bg-gray-200 rounded-full ring-8 ring-gray-50 flex items-center justify-center">
+            <StarIcon className="h-5 w-5 text-gray-500" aria-hidden="true" />
+          </div>
+        </div>
+      </div>
+      <div className="min-w-0 flex-1 py-1.5">
+        <div className="text-sm text-gray-500">
+          <span className="text-gray-900">{contract.creatorName}</span> created
+          this market <Timestamp time={contract.createdTime} />
+        </div>
+        <ContractDescription contract={contract} isCreator={isCreator} />
+      </div>
+    </>
+  )
+}
+
+function OutcomeIcon(props: { outcome?: 'YES' | 'NO' | 'CANCEL' }) {
+  const { outcome } = props
+  switch (outcome) {
+    case 'YES':
+      return <CheckIcon className="h-5 w-5 text-gray-500" aria-hidden="true" />
+    case 'NO':
+      return <XIcon className="h-5 w-5 text-gray-500" aria-hidden="true" />
+    case 'CANCEL':
+    default:
+      return <BanIcon className="h-5 w-5 text-gray-500" aria-hidden="true" />
+  }
+}
+
+function FeedResolve(props: { contract: Contract }) {
+  const { contract } = props
+  const resolution = contract.resolution || 'CANCEL'
+
+  return (
+    <>
+      <div>
+        <div className="relative px-1">
+          <div className="h-8 w-8 bg-gray-200 rounded-full ring-8 ring-gray-50 flex items-center justify-center">
+            <OutcomeIcon outcome={resolution} />
+          </div>
+        </div>
+      </div>
+      <div className="min-w-0 flex-1 py-1.5">
+        <div className="text-sm text-gray-500">
+          <span className="text-gray-900">{contract.creatorName}</span> resolved
+          this market to <OutcomeLabel outcome={resolution} />{' '}
+          <Timestamp time={contract.resolutionTime || 0} />
+        </div>
+      </div>
+    </>
+  )
+}
+
+function FeedClose(props: { contract: Contract }) {
+  const { contract } = props
+
+  return (
+    <>
+      <div>
+        <div className="relative px-1">
+          <div className="h-8 w-8 bg-gray-200 rounded-full ring-8 ring-gray-50 flex items-center justify-center">
+            <LockClosedIcon
+              className="h-5 w-5 text-gray-500"
+              aria-hidden="true"
+            />
+          </div>
+        </div>
+      </div>
+      <div className="min-w-0 flex-1 py-1.5">
+        <div className="text-sm text-gray-500">
+          Trading closed in this market{' '}
+          <Timestamp time={contract.closeTime || 0} />
+        </div>
+      </div>
+    </>
+  )
+}
+
+function toFeedBet(bet: Bet) {
+  return {
+    id: bet.id,
+    contractId: bet.contractId,
+    userId: bet.userId,
+    type: 'bet',
+    amount: bet.amount,
+    outcome: bet.outcome,
+    createdTime: bet.createdTime,
+    date: dayjs(bet.createdTime).fromNow(),
+  }
+}
+
+function toFeedComment(bet: Bet, comment: Comment) {
+  return {
+    id: bet.id,
+    contractId: bet.contractId,
+    userId: bet.userId,
+    type: 'comment',
+    amount: bet.amount,
+    outcome: bet.outcome,
+    createdTime: bet.createdTime,
+    date: dayjs(bet.createdTime).fromNow(),
+
+    // Invariant: bet.comment exists
+    text: comment.text,
+    person: {
+      href: `/${comment.userUsername}`,
+      name: comment.userName,
+      avatarUrl: comment.userAvatarUrl,
+    },
+  }
+}
+
+// Group together bets that are:
+// - Within 24h of the first in the group
+// - Do not have a comment
+// - Were not created by this user
+// Return a list of ActivityItems
+function group(bets: Bet[], comments: Comment[], userId?: string) {
+  const commentsMap = mapCommentsByBetId(comments)
+  const items: any[] = []
+  let group: Bet[] = []
+
+  // Turn the current group into an ActivityItem
+  function pushGroup() {
+    if (group.length == 1) {
+      items.push(toActivityItem(group[0]))
+    } else if (group.length > 1) {
+      items.push({ type: 'betgroup', bets: [...group], id: group[0].id })
+    }
+    group = []
+  }
+
+  function toActivityItem(bet: Bet) {
+    const comment = commentsMap[bet.id]
+    return comment ? toFeedComment(bet, comment) : toFeedBet(bet)
+  }
+
+  for (const bet of bets) {
+    const isCreator = userId === bet.userId
+
+    if (commentsMap[bet.id] || isCreator) {
+      pushGroup()
+      // Create a single item for this
+      items.push(toActivityItem(bet))
+    } else {
+      if (
+        group.length > 0 &&
+        dayjs(bet.createdTime).diff(dayjs(group[0].createdTime), 'hour') > 24
+      ) {
+        // More than 24h has passed; start a new group
+        pushGroup()
+      }
+      group.push(bet)
+    }
+  }
+  if (group.length > 0) {
+    pushGroup()
+  }
+  return items as ActivityItem[]
+}
+
+// TODO: Make this expandable to show all grouped bets?
+function FeedBetGroup(props: { activityItem: any }) {
+  const { activityItem } = props
+  const bets: Bet[] = activityItem.bets
+
+  const yesAmount = bets
+    .filter((b) => b.outcome == 'YES')
+    .reduce((acc, bet) => acc + bet.amount, 0)
+  const yesSpan = yesAmount ? (
+    <span>
+      M$ {yesAmount} on <OutcomeLabel outcome={'YES'} />
+    </span>
+  ) : null
+  const noAmount = bets
+    .filter((b) => b.outcome == 'NO')
+    .reduce((acc, bet) => acc + bet.amount, 0)
+  const noSpan = noAmount ? (
+    <span>
+      M$ {noAmount} on <OutcomeLabel outcome={'NO'} />
+    </span>
+  ) : null
+  const traderCount = bets.length
+  const createdTime = bets[0].createdTime
+
+  return (
+    <>
+      <div>
+        <div className="relative px-1">
+          <div className="h-8 w-8 bg-gray-200 rounded-full ring-8 ring-gray-50 flex items-center justify-center">
+            <UsersIcon className="h-5 w-5 text-gray-500" aria-hidden="true" />
+          </div>
+        </div>
+      </div>
+      <div className="min-w-0 flex-1 py-1.5">
+        <div className="text-sm text-gray-500">
+          <span className="text-gray-900">{traderCount} traders</span> placed{' '}
+          {yesSpan}
+          {yesAmount && noAmount ? ' and ' : ''}
+          {noSpan} <Timestamp time={createdTime} />
+        </div>
+      </div>
+    </>
+  )
+}
+
+// Missing feed items:
+// - Bet sold?
+type ActivityItem = {
+  id: string
+  type: 'bet' | 'comment' | 'start' | 'betgroup' | 'close' | 'resolve'
+}
+
+export function ContractFeed(props: { contract: Contract }) {
+  const { contract } = props
+  const { id } = contract
+  const user = useUser()
+
+  let bets = useBets(id)
+  if (bets === 'loading') bets = []
+
+  let comments = useComments(id)
+  if (comments === 'loading') comments = []
+
+  const allItems = [
+    { type: 'start', id: 0 },
+    ...group(bets, comments, user?.id),
+  ]
+  if (contract.closeTime) {
+    allItems.push({ type: 'close', id: `${contract.closeTime}` })
+  }
+  if (contract.resolution) {
+    allItems.push({ type: 'resolve', id: `${contract.resolutionTime}` })
+  }
+
+  return (
+    <div className="flow-root">
+      <ul role="list" className="-mb-8">
+        {allItems.map((activityItem, activityItemIdx) => (
+          <li key={activityItem.id}>
+            <div className="relative pb-8">
+              {activityItemIdx !== allItems.length - 1 ? (
+                <span
+                  className="absolute top-5 left-5 -ml-px h-full w-0.5 bg-gray-200"
+                  aria-hidden="true"
+                />
+              ) : null}
+              <div className="relative flex items-start space-x-3">
+                {activityItem.type === 'start' ? (
+                  <FeedStart contract={contract} />
+                ) : activityItem.type === 'comment' ? (
+                  <FeedComment activityItem={activityItem} />
+                ) : activityItem.type === 'bet' ? (
+                  <FeedBet activityItem={activityItem} />
+                ) : activityItem.type === 'betgroup' ? (
+                  <FeedBetGroup activityItem={activityItem} />
+                ) : activityItem.type === 'close' ? (
+                  <FeedClose contract={contract} />
+                ) : activityItem.type === 'resolve' ? (
+                  <FeedResolve contract={contract} />
+                ) : null}
+              </div>
+            </div>
+          </li>
+        ))}
+      </ul>
+    </div>
+  )
+}
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index 114ba9b9..85dd97df 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -1,10 +1,4 @@
-import { useState } from 'react'
-import {
-  compute,
-  Contract,
-  deleteContract,
-  setContract,
-} from '../lib/firebase/contracts'
+import { compute, Contract, deleteContract } from '../lib/firebase/contracts'
 import { Col } from './layout/col'
 import { Spacer } from './layout/spacer'
 import { ContractProbGraph } from './contract-prob-graph'
@@ -15,6 +9,7 @@ import dayjs from 'dayjs'
 import { Linkify } from './linkify'
 import clsx from 'clsx'
 import { ContractDetails, ResolutionOrChance } from './contract-card'
+import { ContractFeed } from './contract-feed'
 
 function ContractCloseTime(props: { contract: Contract }) {
   const closeTime = props.contract.closeTime
@@ -29,74 +24,6 @@ function ContractCloseTime(props: { contract: Contract }) {
   )
 }
 
-function ContractDescription(props: {
-  contract: Contract
-  isCreator: boolean
-}) {
-  const { contract, isCreator } = props
-  const [editing, setEditing] = useState(false)
-  const editStatement = () => `${dayjs().format('MMM D, h:mma')}: `
-  const [description, setDescription] = useState(editStatement())
-
-  // Append the new description (after a newline)
-  async function saveDescription(e: any) {
-    e.preventDefault()
-    setEditing(false)
-    contract.description = `${contract.description}\n${description}`.trim()
-    await setContract(contract)
-    setDescription(editStatement())
-  }
-
-  return (
-    <div className="whitespace-pre-line break-words">
-      <Linkify text={contract.description} />
-      <br />
-      {isCreator &&
-        !contract.resolution &&
-        (editing ? (
-          <form className="mt-4">
-            <textarea
-              className="textarea h-24 textarea-bordered w-full mb-2"
-              value={description}
-              onChange={(e) => setDescription(e.target.value || '')}
-              autoFocus
-              onFocus={(e) =>
-                // Focus starts at end of description.
-                e.target.setSelectionRange(
-                  description.length,
-                  description.length
-                )
-              }
-            />
-            <Row className="gap-4 justify-end">
-              <button
-                className="btn btn-error btn-outline btn-sm mt-2"
-                onClick={() => setEditing(false)}
-              >
-                Cancel
-              </button>
-              <button
-                className="btn btn-neutral btn-outline btn-sm mt-2"
-                onClick={saveDescription}
-              >
-                Save
-              </button>
-            </Row>
-          </form>
-        ) : (
-          <Row className="justify-end">
-            <button
-              className="btn btn-neutral btn-outline btn-sm mt-4"
-              onClick={() => setEditing(true)}
-            >
-              Add to description
-            </button>
-          </Row>
-        ))}
-    </div>
-  )
-}
-
 export const ContractOverview = (props: {
   contract: Contract
   className?: string
@@ -142,14 +69,6 @@ export const ContractOverview = (props: {
 
       <ContractCloseTime contract={contract} />
 
-      <Spacer h={4} />
-
-      {((isCreator && !contract.resolution) || contract.description) && (
-        <label className="text-gray-500 mb-2 text-sm">Description</label>
-      )}
-
-      <ContractDescription contract={contract} isCreator={isCreator} />
-
       {/* Show a delete button for contracts without any trading */}
       {isCreator && truePool === 0 && (
         <>
@@ -166,6 +85,10 @@ export const ContractOverview = (props: {
           </button>
         </>
       )}
+
+      <Spacer h={4} />
+
+      <ContractFeed contract={contract} />
     </Col>
   )
 }
diff --git a/web/hooks/use-comments.ts b/web/hooks/use-comments.ts
new file mode 100644
index 00000000..0a9dead3
--- /dev/null
+++ b/web/hooks/use-comments.ts
@@ -0,0 +1,12 @@
+import { useEffect, useState } from 'react'
+import { Comment, listenForComments } from '../lib/firebase/comments'
+
+export const useComments = (contractId: string) => {
+  const [comments, setComments] = useState<Comment[] | 'loading'>('loading')
+
+  useEffect(() => {
+    if (contractId) return listenForComments(contractId, setComments)
+  }, [contractId])
+
+  return comments
+}
diff --git a/web/lib/firebase/bets.ts b/web/lib/firebase/bets.ts
index b09d8f8b..49d92e0e 100644
--- a/web/lib/firebase/bets.ts
+++ b/web/lib/firebase/bets.ts
@@ -22,6 +22,7 @@ export type Bet = {
   sale?: {
     amount: number // amount user makes from sale
     betId: string // id of bet being sold
+    // TODO: add sale time?
   }
 
   isSold?: boolean // true if this BUY bet has been sold
diff --git a/web/lib/firebase/comments.ts b/web/lib/firebase/comments.ts
new file mode 100644
index 00000000..d46c6ee9
--- /dev/null
+++ b/web/lib/firebase/comments.ts
@@ -0,0 +1,60 @@
+import { doc, collection, onSnapshot, setDoc } from 'firebase/firestore'
+import { db } from './init'
+import { User } from './users'
+
+// Currently, comments are created after the bet, not atomically with the bet.
+// They're uniquely identified by the pair contractId/betId.
+export type Comment = {
+  contractId: string
+  betId: string
+  text: string
+  createdTime: number
+  // Denormalized, for rendering comments
+  userName?: string
+  userUsername?: string
+  userAvatarUrl?: string
+}
+
+export async function createComment(
+  contractId: string,
+  betId: string,
+  text: string,
+  commenter: User
+) {
+  const ref = doc(getCommentsCollection(contractId), betId)
+  return await setDoc(ref, {
+    contractId,
+    betId,
+    text,
+    createdTime: Date.now(),
+    userName: commenter.name,
+    userUsername: commenter.username,
+    userAvatarUrl: commenter.avatarUrl,
+  })
+}
+
+function getCommentsCollection(contractId: string) {
+  return collection(db, 'contracts', contractId, 'comments')
+}
+
+export function listenForComments(
+  contractId: string,
+  setComments: (comments: Comment[]) => void
+) {
+  return onSnapshot(getCommentsCollection(contractId), (snap) => {
+    const comments = snap.docs.map((doc) => doc.data() as Comment)
+
+    comments.sort((c1, c2) => c1.createdTime - c2.createdTime)
+
+    setComments(comments)
+  })
+}
+
+// Return a map of betId -> comment
+export function mapCommentsByBetId(comments: Comment[]) {
+  const map: Record<string, Comment> = {}
+  for (const comment of comments) {
+    map[comment.betId] = comment
+  }
+  return map
+}

From 583dc10e6ac0668442da46e0a8cdabda50076767 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Mon, 3 Jan 2022 23:41:52 -0800
Subject: [PATCH 46/81] Don't prematurely show close times in feed

---
 web/components/contract-feed.tsx     | 2 +-
 web/components/contract-overview.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/components/contract-feed.tsx b/web/components/contract-feed.tsx
index 49671d4c..c663fa46 100644
--- a/web/components/contract-feed.tsx
+++ b/web/components/contract-feed.tsx
@@ -429,7 +429,7 @@ export function ContractFeed(props: { contract: Contract }) {
     { type: 'start', id: 0 },
     ...group(bets, comments, user?.id),
   ]
-  if (contract.closeTime) {
+  if (contract.closeTime && contract.closeTime <= Date.now()) {
     allItems.push({ type: 'close', id: `${contract.closeTime}` })
   }
   if (contract.resolution) {
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index 85dd97df..72fa3dff 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -67,8 +67,6 @@ export const ContractOverview = (props: {
 
       <Spacer h={12} />
 
-      <ContractCloseTime contract={contract} />
-
       {/* Show a delete button for contracts without any trading */}
       {isCreator && truePool === 0 && (
         <>
@@ -86,9 +84,11 @@ export const ContractOverview = (props: {
         </>
       )}
 
+      <ContractFeed contract={contract} />
+
       <Spacer h={4} />
 
-      <ContractFeed contract={contract} />
+      <ContractCloseTime contract={contract} />
     </Col>
   )
 }

From db1543ea71bca4d9ded538efeb18c1f14d2b13c1 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Tue, 4 Jan 2022 09:55:34 -0600
Subject: [PATCH 47/81] Round bet amounts in feed

---
 web/components/contract-feed.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/components/contract-feed.tsx b/web/components/contract-feed.tsx
index c663fa46..23995fa5 100644
--- a/web/components/contract-feed.tsx
+++ b/web/components/contract-feed.tsx
@@ -6,8 +6,6 @@ import {
   CheckIcon,
   LockClosedIcon,
   StarIcon,
-  ThumbDownIcon,
-  ThumbUpIcon,
   UserIcon,
   UsersIcon,
   XIcon,
@@ -24,6 +22,7 @@ import { Linkify } from './linkify'
 import { Row } from './layout/row'
 import { createComment } from '../lib/firebase/comments'
 import { useComments } from '../hooks/use-comments'
+import { formatMoney } from '../lib/util/format'
 dayjs.extend(relativeTime)
 
 function FeedComment(props: { activityItem: any }) {
@@ -99,7 +98,7 @@ function FeedBet(props: { activityItem: any }) {
           <span className="text-gray-900">
             {isCreator ? 'You' : 'A trader'}
           </span>{' '}
-          placed M$ {amount} on <OutcomeLabel outcome={outcome} />{' '}
+          placed {formatMoney(amount)} on <OutcomeLabel outcome={outcome} />{' '}
           <Timestamp time={createdTime} />
           {isCreator && (
             // Allow user to comment in an textarea if they are the creator
@@ -372,7 +371,7 @@ function FeedBetGroup(props: { activityItem: any }) {
     .reduce((acc, bet) => acc + bet.amount, 0)
   const yesSpan = yesAmount ? (
     <span>
-      M$ {yesAmount} on <OutcomeLabel outcome={'YES'} />
+      {formatMoney(yesAmount)} on <OutcomeLabel outcome={'YES'} />
     </span>
   ) : null
   const noAmount = bets
@@ -380,7 +379,7 @@ function FeedBetGroup(props: { activityItem: any }) {
     .reduce((acc, bet) => acc + bet.amount, 0)
   const noSpan = noAmount ? (
     <span>
-      M$ {noAmount} on <OutcomeLabel outcome={'NO'} />
+      {formatMoney(noAmount)} on <OutcomeLabel outcome={'NO'} />
     </span>
   ) : null
   const traderCount = bets.length

From 73f1116b8f7272283d7edfa1b209b6d54d833a70 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Tue, 4 Jan 2022 14:57:48 -0600
Subject: [PATCH 48/81] Add Tweet button to share market

---
 web/components/contract-overview.tsx | 25 +++++++++++++++--
 web/components/tweet-button.tsx      | 42 ++++++++++++++++++++++++++++
 web/pages/_document.tsx              |  3 ++
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 web/components/tweet-button.tsx

diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index 72fa3dff..e36b3d79 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -1,4 +1,9 @@
-import { compute, Contract, deleteContract } from '../lib/firebase/contracts'
+import {
+  compute,
+  Contract,
+  deleteContract,
+  path,
+} from '../lib/firebase/contracts'
 import { Col } from './layout/col'
 import { Spacer } from './layout/spacer'
 import { ContractProbGraph } from './contract-prob-graph'
@@ -10,6 +15,7 @@ import { Linkify } from './linkify'
 import clsx from 'clsx'
 import { ContractDetails, ResolutionOrChance } from './contract-card'
 import { ContractFeed } from './contract-feed'
+import { TweetButton } from './tweet-button'
 
 function ContractCloseTime(props: { contract: Contract }) {
   const closeTime = props.contract.closeTime
@@ -29,12 +35,23 @@ export const ContractOverview = (props: {
   className?: string
 }) => {
   const { contract, className } = props
-  const { resolution, creatorId } = contract
+  const { resolution, creatorId, creatorName } = contract
   const { probPercent, truePool } = compute(contract)
 
   const user = useUser()
   const isCreator = user?.id === creatorId
 
+  const tweetQuestion = isCreator
+    ? contract.question
+    : `${creatorName}: ${contract.question}`
+  const tweetDescription = resolution
+    ? isCreator
+      ? `Resolved ${resolution}!`
+      : `Resolved ${resolution} by ${creatorName}:`
+    : `Currently ${probPercent} chance, place your bets here:`
+  const url = `https://mantic.markets${path(contract)}`
+  const tweetText = `${tweetQuestion}\n\n${tweetDescription}\n\n${url}`
+
   return (
     <Col className={clsx('mb-6', className)}>
       <Row className="justify-between gap-4">
@@ -63,6 +80,10 @@ export const ContractOverview = (props: {
 
       <Spacer h={4} />
 
+      <TweetButton tweetText={tweetText} />
+
+      <Spacer h={4} />
+
       <ContractProbGraph contract={contract} />
 
       <Spacer h={12} />
diff --git a/web/components/tweet-button.tsx b/web/components/tweet-button.tsx
new file mode 100644
index 00000000..fb20fc53
--- /dev/null
+++ b/web/components/tweet-button.tsx
@@ -0,0 +1,42 @@
+export function TweetButton(props: { tweetText?: string }) {
+  const { tweetText } = props
+
+  return (
+    <a
+      className="twitter-share-button"
+      href={`https://twitter.com/intent/tweet?text=${encodeURI(
+        tweetText ?? ''
+      )}`}
+      data-size="large"
+    >
+      Tweet
+    </a>
+  )
+}
+
+export function TwitterScript() {
+  return (
+    <script
+      dangerouslySetInnerHTML={{
+        __html: `
+          window.twttr = (function(d, s, id) {
+          var js, fjs = d.getElementsByTagName(s)[0],
+            t = window.twttr || {};
+          if (d.getElementById(id)) return t;
+          js = d.createElement(s);
+          js.id = id;
+          js.src = "https://platform.twitter.com/widgets.js";
+          fjs.parentNode.insertBefore(js, fjs);
+
+          t._e = [];
+          t.ready = function(f) {
+            t._e.push(f);
+          };
+
+          return t;
+        }(document, "script", "twitter-wjs"));
+        `,
+      }}
+    />
+  )
+}
diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx
index d2ccc8e7..e1b00a59 100644
--- a/web/pages/_document.tsx
+++ b/web/pages/_document.tsx
@@ -1,4 +1,5 @@
 import { Html, Head, Main, NextScript } from 'next/document'
+import { TwitterScript } from '../components/tweet-button'
 
 export default function Document() {
   return (
@@ -31,6 +32,8 @@ export default function Document() {
           `,
           }}
         />
+
+        <TwitterScript />
       </Head>
 
       <body className="min-h-screen font-readex-pro bg-base-200">

From 596c6fe33d8045aed40af22a9c68d1bc0f20e34e Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Tue, 4 Jan 2022 16:09:03 -0600
Subject: [PATCH 49/81] Show tags in contract details.

---
 web/components/contract-card.tsx     | 56 +++++++++++++++++++---------
 web/components/contract-overview.tsx |  2 +-
 web/components/linkify.tsx           |  9 +++--
 web/components/tweet-button.tsx      |  2 +-
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx
index 8fc729f7..70e5df9f 100644
--- a/web/components/contract-card.tsx
+++ b/web/components/contract-card.tsx
@@ -6,10 +6,11 @@ import { UserLink } from './user-page'
 import { Linkify } from './linkify'
 import { Contract, compute, path } from '../lib/firebase/contracts'
 import { Col } from './layout/col'
+import { parseTags } from '../lib/util/parse'
 
 export function ContractCard(props: { contract: Contract }) {
   const { contract } = props
-  const { resolution } = contract
+  const { question, resolution } = contract
   const { probPercent } = compute(contract)
 
   return (
@@ -19,9 +20,7 @@ export function ContractCard(props: { contract: Contract }) {
           <div className="card">
             <div className="card-body p-6">
               <Row className="justify-between gap-4 mb-2">
-                <p className="font-medium text-indigo-700">
-                  <Linkify text={contract.question} />
-                </p>
+                <p className="font-medium text-indigo-700">{question}</p>
                 <ResolutionOrChance
                   className="items-center"
                   resolution={resolution}
@@ -86,21 +85,44 @@ export function ResolutionOrChance(props: {
   )
 }
 
-export function ContractDetails(props: { contract: Contract }) {
-  const { contract } = props
+export function ContractDetails(props: {
+  contract: Contract
+  inlineTags?: boolean
+}) {
+  const { contract, inlineTags } = props
+  const { question, description } = contract
   const { truePool, createdDate, resolvedDate } = compute(contract)
 
+  const tags = parseTags(`${question} ${description}`).map((tag) => `#${tag}`)
+
   return (
-    <Row className="flex-wrap text-sm text-gray-500">
-      <div className="whitespace-nowrap">
-        <UserLink username={contract.creatorUsername} />
-      </div>
-      <div className="mx-2">•</div>
-      <div className="whitespace-nowrap">
-        {resolvedDate ? `${createdDate} - ${resolvedDate}` : createdDate}
-      </div>
-      <div className="mx-2">•</div>
-      <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
-    </Row>
+    <Col
+      className={clsx(
+        'text-sm text-gray-500 gap-2',
+        inlineTags && 'sm:flex-row sm:flex-wrap'
+      )}
+    >
+      <Row className="gap-2 flex-wrap">
+        <div className="whitespace-nowrap">
+          <UserLink username={contract.creatorUsername} />
+        </div>
+        <div className="">•</div>
+        <div className="whitespace-nowrap">
+          {resolvedDate ? `${createdDate} - ${resolvedDate}` : createdDate}
+        </div>
+        <div className="">•</div>
+        <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
+      </Row>
+
+      {inlineTags && <div className="hidden sm:block">•</div>}
+
+      <Row className="gap-2 flex-wrap">
+        {tags.map((tag) => (
+          <div className="bg-gray-100 px-1">
+            <Linkify text={tag} gray />
+          </div>
+        ))}
+      </Row>
+    </Col>
   )
 }
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index e36b3d79..b3703dd3 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -67,7 +67,7 @@ export const ContractOverview = (props: {
             large
           />
 
-          <ContractDetails contract={contract} />
+          <ContractDetails contract={contract} inlineTags />
         </Col>
 
         <ResolutionOrChance
diff --git a/web/components/linkify.tsx b/web/components/linkify.tsx
index 3ee4650f..ccb63a61 100644
--- a/web/components/linkify.tsx
+++ b/web/components/linkify.tsx
@@ -2,8 +2,8 @@ import { Fragment } from 'react'
 import { SiteLink } from './site-link'
 
 // Return a JSX span, linkifying @username, #hashtags, and https://...
-export function Linkify(props: { text: string }) {
-  const { text } = props
+export function Linkify(props: { text: string; gray?: boolean }) {
+  const { text, gray } = props
   const regex = /(?:^|\s)(?:[@#][a-z0-9_]+|https?:\/\/\S+)/gi
   const matches = text.match(regex) || []
   const links = matches.map((match) => {
@@ -20,7 +20,10 @@ export function Linkify(props: { text: string }) {
     return (
       <>
         {whitespace}
-        <SiteLink className="text-indigo-700" href={href}>
+        <SiteLink
+          className={gray ? 'text-gray-500' : 'text-indigo-700'}
+          href={href}
+        >
           {symbol}
           {tag}
         </SiteLink>
diff --git a/web/components/tweet-button.tsx b/web/components/tweet-button.tsx
index fb20fc53..b9db405e 100644
--- a/web/components/tweet-button.tsx
+++ b/web/components/tweet-button.tsx
@@ -4,7 +4,7 @@ export function TweetButton(props: { tweetText?: string }) {
   return (
     <a
       className="twitter-share-button"
-      href={`https://twitter.com/intent/tweet?text=${encodeURI(
+      href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(
         tweetText ?? ''
       )}`}
       data-size="large"

From 6d97b82aee749a2ee3e031e320d6216f1d6edf59 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Tue, 4 Jan 2022 16:34:07 -0600
Subject: [PATCH 50/81] Use our own Tweet button instead of loading Twitter
 script

---
 web/components/tweet-button.tsx   | 38 ++++++++-----------------------
 web/pages/_document.tsx           |  3 ---
 web/public/twitter-icon-white.svg | 16 +++++++++++++
 3 files changed, 25 insertions(+), 32 deletions(-)
 create mode 100644 web/public/twitter-icon-white.svg

diff --git a/web/components/tweet-button.tsx b/web/components/tweet-button.tsx
index b9db405e..b3e69150 100644
--- a/web/components/tweet-button.tsx
+++ b/web/components/tweet-button.tsx
@@ -3,40 +3,20 @@ export function TweetButton(props: { tweetText?: string }) {
 
   return (
     <a
-      className="twitter-share-button"
+      className="btn btn-sm normal-case self-start border-none"
+      style={{ backgroundColor: '#1da1f2' }}
       href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(
         tweetText ?? ''
       )}`}
-      data-size="large"
+      target="_blank"
     >
+      <img
+        className="mr-2"
+        src={'/twitter-icon-white.svg'}
+        width={18}
+        height={18}
+      />
       Tweet
     </a>
   )
 }
-
-export function TwitterScript() {
-  return (
-    <script
-      dangerouslySetInnerHTML={{
-        __html: `
-          window.twttr = (function(d, s, id) {
-          var js, fjs = d.getElementsByTagName(s)[0],
-            t = window.twttr || {};
-          if (d.getElementById(id)) return t;
-          js = d.createElement(s);
-          js.id = id;
-          js.src = "https://platform.twitter.com/widgets.js";
-          fjs.parentNode.insertBefore(js, fjs);
-
-          t._e = [];
-          t.ready = function(f) {
-            t._e.push(f);
-          };
-
-          return t;
-        }(document, "script", "twitter-wjs"));
-        `,
-      }}
-    />
-  )
-}
diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx
index e1b00a59..d2ccc8e7 100644
--- a/web/pages/_document.tsx
+++ b/web/pages/_document.tsx
@@ -1,5 +1,4 @@
 import { Html, Head, Main, NextScript } from 'next/document'
-import { TwitterScript } from '../components/tweet-button'
 
 export default function Document() {
   return (
@@ -32,8 +31,6 @@ export default function Document() {
           `,
           }}
         />
-
-        <TwitterScript />
       </Head>
 
       <body className="min-h-screen font-readex-pro bg-base-200">
diff --git a/web/public/twitter-icon-white.svg b/web/public/twitter-icon-white.svg
new file mode 100644
index 00000000..d16b6a7d
--- /dev/null
+++ b/web/public/twitter-icon-white.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 248 204" style="enable-background:new 0 0 248 204;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g id="Logo_1_">
+	<path id="white_background" class="st0" d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04
+		C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66
+		c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64
+		c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76
+		c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26
+		c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z"/>
+</g>
+</svg>

From 67007c589748144f09980a0c3fc418117999fb39 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Tue, 4 Jan 2022 16:47:56 -0600
Subject: [PATCH 51/81] Make tweet button smaller

---
 web/components/contract-card.tsx     |  4 +++-
 web/components/contract-overview.tsx |  5 +----
 web/components/tweet-button.tsx      | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx
index 70e5df9f..63eaf8aa 100644
--- a/web/components/contract-card.tsx
+++ b/web/components/contract-card.tsx
@@ -114,7 +114,9 @@ export function ContractDetails(props: {
         <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
       </Row>
 
-      {inlineTags && <div className="hidden sm:block">•</div>}
+      {inlineTags && tags.length > 0 && (
+        <div className="hidden sm:block">•</div>
+      )}
 
       <Row className="gap-2 flex-wrap">
         {tags.map((tag) => (
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index b3703dd3..a3b1077e 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -68,6 +68,7 @@ export const ContractOverview = (props: {
           />
 
           <ContractDetails contract={contract} inlineTags />
+          <TweetButton tweetText={tweetText} />
         </Col>
 
         <ResolutionOrChance
@@ -80,10 +81,6 @@ export const ContractOverview = (props: {
 
       <Spacer h={4} />
 
-      <TweetButton tweetText={tweetText} />
-
-      <Spacer h={4} />
-
       <ContractProbGraph contract={contract} />
 
       <Spacer h={12} />
diff --git a/web/components/tweet-button.tsx b/web/components/tweet-button.tsx
index b3e69150..2fd4adcd 100644
--- a/web/components/tweet-button.tsx
+++ b/web/components/tweet-button.tsx
@@ -1,9 +1,14 @@
-export function TweetButton(props: { tweetText?: string }) {
-  const { tweetText } = props
+import clsx from 'clsx'
+
+export function TweetButton(props: { className?: string; tweetText?: string }) {
+  const { tweetText, className } = props
 
   return (
     <a
-      className="btn btn-sm normal-case self-start border-none"
+      className={clsx(
+        'btn btn-xs normal-case self-start border-none',
+        className
+      )}
       style={{ backgroundColor: '#1da1f2' }}
       href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(
         tweetText ?? ''
@@ -13,8 +18,8 @@ export function TweetButton(props: { tweetText?: string }) {
       <img
         className="mr-2"
         src={'/twitter-icon-white.svg'}
-        width={18}
-        height={18}
+        width={15}
+        height={15}
       />
       Tweet
     </a>

From 57ee53e133f090ce348e49a75b251073a458ba71 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Tue, 4 Jan 2022 21:03:00 -0600
Subject: [PATCH 52/81] Create page: Change "Prediction" to "Question" and make
 it gray

---
 web/pages/create.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 591e21c7..d14df94b 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -70,18 +70,18 @@ export default function NewContract() {
     <Page>
       <Title text="Create a new prediction market" />
 
-      <div className="w-full bg-white rounded-lg shadow-md px-6 py-4">
+      <div className="w-full bg-gray-100 rounded-lg shadow-md px-6 py-4">
         {/* Create a Tailwind form that takes in all the fields needed for a new contract */}
         {/* When the form is submitted, create a new contract in the database */}
         <form>
           <div className="form-control w-full">
             <label className="label">
-              <span className="label-text">Prediction</span>
+              <span className="label-text">Question</span>
             </label>
 
             <input
               type="text"
-              placeholder="e.g. The FDA will approve Paxlovid before Jun 2nd, 2022"
+              placeholder="e.g. Will the FDA will approve Paxlovid before Jun 2nd, 2022?"
               className="input input-bordered"
               value={question}
               onChange={(e) => setQuestion(e.target.value || '')}
@@ -146,7 +146,7 @@ export default function NewContract() {
               />
             </div>
             <div className="collapse-content !p-0 m-0 !bg-transparent">
-              <div className="form-control">
+              <div className="form-control mb-1">
                 <label className="label">
                   <span className="label-text">Close date (optional)</span>
                 </label>
@@ -160,7 +160,7 @@ export default function NewContract() {
                 />
               </div>
               <label>
-                <span className="label-text text-gray-400 ml-1">
+                <span className="label-text text-gray-400 ml-2">
                   No new trades will be allowed after{' '}
                   {closeDate ? formattedCloseTime : 'this time'}
                 </span>

From 7c875f80da0f1feabbe5d792206b8562c4f5d74c Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Tue, 4 Jan 2022 23:51:26 -0600
Subject: [PATCH 53/81] subsidized markets; create contract cloud function

---
 functions/src/create-contract.ts              | 149 ++++++++++++++++++
 functions/src/index.ts                        |   1 +
 functions/src/resolve-market.ts               |   2 +-
 functions/src/types/contract.ts               |   1 +
 .../src}/util/random-string.ts                |   0
 {web/lib => functions/src}/util/slugify.ts    |   0
 web/lib/firebase/init.ts                      |   4 +-
 web/lib/service/create-contract.ts            |  67 --------
 web/pages/create.tsx                          | 114 +++++++++++---
 9 files changed, 244 insertions(+), 94 deletions(-)
 create mode 100644 functions/src/create-contract.ts
 rename {web/lib => functions/src}/util/random-string.ts (100%)
 rename {web/lib => functions/src}/util/slugify.ts (100%)
 delete mode 100644 web/lib/service/create-contract.ts

diff --git a/functions/src/create-contract.ts b/functions/src/create-contract.ts
new file mode 100644
index 00000000..0b0796f6
--- /dev/null
+++ b/functions/src/create-contract.ts
@@ -0,0 +1,149 @@
+import * as functions from 'firebase-functions'
+import * as admin from 'firebase-admin'
+
+import { randomString } from './util/random-string'
+import { slugify } from './util/slugify'
+import { Contract } from './types/contract'
+import { getUser } from './utils'
+import { payUser } from '.'
+import { User } from './types/user'
+
+export const createContract = functions
+  .runWith({ minInstances: 1 })
+  .https.onCall(
+    async (
+      data: {
+        question: string
+        description: string
+        initialProb: number
+        ante?: number
+        closeTime?: number
+      },
+      context
+    ) => {
+      const userId = context?.auth?.uid
+      if (!userId) return { status: 'error', message: 'Not authorized' }
+
+      const creator = await getUser(userId)
+      if (!creator) return { status: 'error', message: 'User not found' }
+
+      const { question, description, initialProb, ante, closeTime } = data
+
+      if (ante !== undefined && (ante < 0 || ante > creator.balance))
+        return { status: 'error', message: 'Invalid ante' }
+
+      console.log(
+        'creating contract for',
+        creator.username,
+        'on',
+        question,
+        'ante:',
+        ante || 0
+      )
+
+      const slug = await getSlug(question)
+
+      const contractRef = firestore.collection('contracts').doc()
+
+      const contract = getNewContract(
+        contractRef.id,
+        slug,
+        creator,
+        question,
+        description,
+        initialProb,
+        ante,
+        closeTime
+      )
+
+      if (ante) await payUser([creator.id, -ante])
+
+      await contractRef.create(contract)
+      return { status: 'success', contract }
+    }
+  )
+
+const getSlug = async (question: string) => {
+  const proposedSlug = slugify(question).substring(0, 35)
+
+  const preexistingContract = await getContractFromSlug(proposedSlug)
+
+  return preexistingContract
+    ? proposedSlug + '-' + randomString()
+    : proposedSlug
+}
+
+function getNewContract(
+  id: string,
+  slug: string,
+  creator: User,
+  question: string,
+  description: string,
+  initialProb: number,
+  ante?: number,
+  closeTime?: number
+) {
+  const { startYes, startNo, poolYes, poolNo } = calcStartPool(
+    initialProb,
+    ante
+  )
+
+  const contract: Contract = {
+    id,
+    slug,
+    outcomeType: 'BINARY',
+
+    creatorId: creator.id,
+    creatorName: creator.name,
+    creatorUsername: creator.username,
+
+    question: question.trim(),
+    description: description.trim(),
+
+    startPool: { YES: startYes, NO: startNo },
+    pool: { YES: poolYes, NO: poolNo },
+    totalShares: { YES: 0, NO: 0 },
+    totalBets: { YES: 0, NO: 0 },
+    isResolved: false,
+
+    createdTime: Date.now(),
+    lastUpdatedTime: Date.now(),
+  }
+
+  if (closeTime) contract.closeTime = closeTime
+
+  return contract
+}
+
+const calcStartPool = (
+  initialProbInt: number,
+  ante?: number,
+  phantomAnte = 200
+) => {
+  const p = initialProbInt / 100.0
+  const totalAnte = phantomAnte + (ante || 0)
+
+  const poolYes =
+    p === 0.5
+      ? p * totalAnte
+      : -(totalAnte * (-p + Math.sqrt((-1 + p) * -p))) / (-1 + 2 * p)
+
+  const poolNo = totalAnte - poolYes
+
+  const f = phantomAnte / totalAnte
+  const startYes = f * poolYes
+  const startNo = f * poolNo
+
+  return { startYes, startNo, poolYes, poolNo }
+}
+
+const firestore = admin.firestore()
+
+export async function getContractFromSlug(slug: string) {
+  const snap = await firestore
+    .collection('contracts')
+    .where('slug', '==', slug)
+    .get()
+
+  return snap.empty ? undefined : (snap.docs[0].data() as Contract)
+}
diff --git a/functions/src/index.ts b/functions/src/index.ts
index dfb09c89..1d462422 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -6,3 +6,4 @@ export * from './keep-awake'
 export * from './place-bet'
 export * from './resolve-market'
 export * from './sell-bet'
+export * from './create-contract'
diff --git a/functions/src/resolve-market.ts b/functions/src/resolve-market.ts
index 4862703f..aad9d32c 100644
--- a/functions/src/resolve-market.ts
+++ b/functions/src/resolve-market.ts
@@ -222,7 +222,7 @@ const getMktPayouts = (truePool: number, contract: Contract, bets: Bet[]) => {
   ]
 }
 
-const payUser = ([userId, payout]: [string, number]) => {
+export const payUser = ([userId, payout]: [string, number]) => {
   return firestore.runTransaction(async (transaction) => {
     const userDoc = firestore.doc(`users/${userId}`)
     const userSnap = await transaction.get(userDoc)
diff --git a/functions/src/types/contract.ts b/functions/src/types/contract.ts
index 2cb86ac2..816cb9f7 100644
--- a/functions/src/types/contract.ts
+++ b/functions/src/types/contract.ts
@@ -4,6 +4,7 @@ export type Contract = {
 
   creatorId: string
   creatorName: string
+  creatorUsername: string
 
   question: string
   description: string // More info about what the contract is about
diff --git a/web/lib/util/random-string.ts b/functions/src/util/random-string.ts
similarity index 100%
rename from web/lib/util/random-string.ts
rename to functions/src/util/random-string.ts
diff --git a/web/lib/util/slugify.ts b/functions/src/util/slugify.ts
similarity index 100%
rename from web/lib/util/slugify.ts
rename to functions/src/util/slugify.ts
diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts
index 98734946..ba10545a 100644
--- a/web/lib/firebase/init.ts
+++ b/web/lib/firebase/init.ts
@@ -2,8 +2,8 @@ import { getFirestore } from '@firebase/firestore'
 import { initializeApp } from 'firebase/app'
 
 // TODO: Reenable this when we have a way to set the Firebase db in dev
-// export const isProd = process.env.NODE_ENV === 'production'
-export const isProd = true
+export const isProd = process.env.NODE_ENV === 'production'
+// export const isProd = true
 
 const firebaseConfig = isProd
   ? {
diff --git a/web/lib/service/create-contract.ts b/web/lib/service/create-contract.ts
deleted file mode 100644
index 7c7a59df..00000000
--- a/web/lib/service/create-contract.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import {
-  Contract,
-  getContractFromSlug,
-  pushNewContract,
-} from '../firebase/contracts'
-import { User } from '../firebase/users'
-import { randomString } from '../util/random-string'
-import { slugify } from '../util/slugify'
-
-// consider moving to cloud function for security
-export async function createContract(
-  question: string,
-  description: string,
-  initialProb: number,
-  creator: User,
-  closeTime?: number
-) {
-  const proposedSlug = slugify(question).substring(0, 35)
-
-  const preexistingContract = await getContractFromSlug(proposedSlug)
-
-  const slug = preexistingContract
-    ? proposedSlug + '-' + randomString()
-    : proposedSlug
-
-  const { startYes, startNo } = calcStartPool(initialProb)
-
-  const contract: Omit<Contract, 'id'> = {
-    slug,
-    outcomeType: 'BINARY',
-
-    creatorId: creator.id,
-    creatorName: creator.name,
-    creatorUsername: creator.username,
-
-    question: question.trim(),
-    description: description.trim(),
-
-    startPool: { YES: startYes, NO: startNo },
-    pool: { YES: startYes, NO: startNo },
-    totalShares: { YES: 0, NO: 0 },
-    totalBets: { YES: 0, NO: 0 },
-    isResolved: false,
-
-    // TODO: Set create time to Firestore timestamp
-    createdTime: Date.now(),
-    lastUpdatedTime: Date.now(),
-  }
-  if (closeTime) {
-    contract.closeTime = closeTime
-  }
-
-  return await pushNewContract(contract)
-}
-
-export function calcStartPool(initialProbInt: number, initialCapital = 200) {
-  const p = initialProbInt / 100.0
-
-  const startYes =
-    p === 0.5
-      ? p * initialCapital
-      : -(initialCapital * (-p + Math.sqrt((-1 + p) * -p))) / (-1 + 2 * p)
-
-  const startNo = initialCapital - startYes
-
-  return { startYes, startNo }
-}
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index d14df94b..c4303148 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -1,15 +1,16 @@
 import router from 'next/router'
 import { useEffect, useState } from 'react'
+import clsx from 'clsx'
+import dayjs from 'dayjs'
+import { getFunctions, httpsCallable } from 'firebase/functions'
 
 import { CreatorContractsList } from '../components/contracts-list'
 import { Spacer } from '../components/layout/spacer'
 import { Title } from '../components/title'
 import { useUser } from '../hooks/use-user'
-import { path } from '../lib/firebase/contracts'
-import { createContract } from '../lib/service/create-contract'
+import { Contract, path } from '../lib/firebase/contracts'
 import { Page } from '../components/page'
-import clsx from 'clsx'
-import dayjs from 'dayjs'
+import { formatMoney } from '../lib/util/format'
 
 // Allow user to create a new contract
 export default function NewContract() {
@@ -22,29 +23,28 @@ export default function NewContract() {
   const [initialProb, setInitialProb] = useState(50)
   const [question, setQuestion] = useState('')
   const [description, setDescription] = useState('')
+
+  const [ante, setAnte] = useState<number | undefined>(0)
+  const [anteError, setAnteError] = useState('')
   const [closeDate, setCloseDate] = useState('')
+
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [collapsed, setCollapsed] = useState(true)
 
-  // Given a date string like '2022-04-02',
-  // return the time just before midnight on that date (in the user's local time), as millis since epoch
-  function dateToMillis(date: string) {
-    return dayjs(date)
-      .set('hour', 23)
-      .set('minute', 59)
-      .set('second', 59)
-      .valueOf()
-  }
-  const closeTime = dateToMillis(closeDate)
+  const closeTime = dateToMillis(closeDate) || undefined
   // We'd like this to look like "Apr 2, 2022, 23:59:59 PM PT" but timezones are hard with dayjs
-  const formattedCloseTime = new Date(closeTime).toString()
+  const formattedCloseTime = closeTime ? new Date(closeTime).toString() : ''
+
+  const user = useUser()
+  const remainingBalance = (user?.balance || 0) - (ante || 0)
 
   const isValid =
     initialProb > 0 &&
     initialProb < 100 &&
     question.length > 0 &&
+    (ante === undefined || (ante >= 0 && ante <= remainingBalance)) &&
     // If set, closeTime must be in the future
-    (!closeDate || closeTime > Date.now())
+    (!closeTime || closeTime > Date.now())
 
   async function submit() {
     // TODO: Tell users why their contract is invalid
@@ -52,14 +52,31 @@ export default function NewContract() {
 
     setIsSubmitting(true)
 
-    const contract = await createContract(
+    const result: any = await createContract({
       question,
       description,
       initialProb,
-      creator,
-      closeTime
-    )
-    await router.push(path(contract))
+      ante,
+      closeTime: closeTime || undefined,
+    }).then((r) => r.data || {})
+
+    if (result.status !== 'success') {
+      console.log('error creating contract', result)
+      return
+    }
+
+    await router.push(path(result.contract as Contract))
+  }
+
+  function onAnteChange(str: string) {
+    const amount = parseInt(str)
+
+    if (str && isNaN(amount)) return
+
+    setAnte(str ? amount : undefined)
+
+    if (user && user.balance < amount) setAnteError('Insufficient balance')
+    else setAnteError('')
   }
 
   const descriptionPlaceholder = `e.g. This market will resolve to “Yes” if, by June 2, 2021, 11:59:59 PM ET, Paxlovid (also known under PF-07321332)...`
@@ -113,7 +130,7 @@ export default function NewContract() {
 
           <div className="form-control">
             <label className="label">
-              <span className="label-text">Description (optional)</span>
+              <span className="label-text">Description</span>
             </label>
             <textarea
               className="textarea w-full h-24 textarea-bordered"
@@ -145,8 +162,40 @@ export default function NewContract() {
                 }}
               />
             </div>
+
             <div className="collapse-content !p-0 m-0 !bg-transparent">
               <div className="form-control mb-1">
+                <label className="label">
+                  <span className="label-text">Subsidize your market</span>
+                </label>
+
+                <label className="input-group">
+                  <span className="text-sm bg-gray-200">M$</span>
+                  <input
+                    className={clsx(
+                      'input input-bordered',
+                      anteError && 'input-error'
+                    )}
+                    type="text"
+                    placeholder="0"
+                    maxLength={9}
+                    value={ante ?? ''}
+                    disabled={isSubmitting}
+                    onChange={(e) => onAnteChange(e.target.value)}
+                  />
+                </label>
+
+                <div className="mt-3 mb-1 text-sm text-gray-400">
+                  Remaining balance
+                </div>
+                <div>
+                  {formatMoney(remainingBalance > 0 ? remainingBalance : 0)}
+                </div>
+              </div>
+
+              <Spacer h={4} />
+
+              <div className="form-control">
                 <label className="label">
                   <span className="label-text">Close date (optional)</span>
                 </label>
@@ -156,6 +205,7 @@ export default function NewContract() {
                   onClick={(e) => e.stopPropagation()}
                   onChange={(e) => setCloseDate(e.target.value || '')}
                   min={new Date().toISOString().split('T')[0]}
+                  disabled={isSubmitting}
                   value={closeDate}
                 />
               </div>
@@ -173,14 +223,17 @@ export default function NewContract() {
           <div className="flex justify-end my-4">
             <button
               type="submit"
-              className="btn btn-primary"
+              className={clsx(
+                'btn btn-primary',
+                isSubmitting && 'loading disabled'
+              )}
               disabled={isSubmitting || !isValid}
               onClick={(e) => {
                 e.preventDefault()
                 submit()
               }}
             >
-              Create market
+              {isSubmitting ? 'Creating...' : 'Create market'}
             </button>
           </div>
         </form>
@@ -194,3 +247,16 @@ export default function NewContract() {
     </Page>
   )
 }
+
+const functions = getFunctions()
+export const createContract = httpsCallable(functions, 'createContract')
+
+// Given a date string like '2022-04-02',
+// return the time just before midnight on that date (in the user's local time), as millis since epoch
+function dateToMillis(date: string) {
+  return dayjs(date)
+    .set('hour', 23)
+    .set('minute', 59)
+    .set('second', 59)
+    .valueOf()
+}

From 4386422f026da85d859a8a159c4018e4c479d1b3 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 00:07:36 -0600
Subject: [PATCH 54/81] fix make-predictions

---
 web/pages/make-predictions.tsx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/web/pages/make-predictions.tsx b/web/pages/make-predictions.tsx
index 7b8c8405..23144ff0 100644
--- a/web/pages/make-predictions.tsx
+++ b/web/pages/make-predictions.tsx
@@ -1,4 +1,5 @@
 import clsx from 'clsx'
+import { getFunctions, httpsCallable } from 'firebase/functions'
 import Link from 'next/link'
 import { useState } from 'react'
 import { Col } from '../components/layout/col'
@@ -9,7 +10,9 @@ import { Page } from '../components/page'
 import { Title } from '../components/title'
 import { useUser } from '../hooks/use-user'
 import { compute, Contract, path } from '../lib/firebase/contracts'
-import { createContract } from '../lib/service/create-contract'
+
+const functions = getFunctions()
+export const createContract = httpsCallable(functions, 'createContract')
 
 type Prediction = {
   question: string
@@ -129,12 +132,12 @@ ${TEST_VALUE}
     }
     setIsSubmitting(true)
     for (const prediction of predictions) {
-      const contract = await createContract(
-        prediction.question,
-        prediction.description,
-        prediction.initialProb,
-        user
-      )
+      const contract = await createContract({
+        question: prediction.question,
+        description: prediction.description,
+        initialProb: prediction.initialProb,
+      }).then((r) => (r.data as any).contract)
+
       setCreatedContracts((prev) => [...prev, contract])
     }
     setPredictionsString('')

From 1bc323d57554658c01048fb26806fc0aee13654b Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Wed, 5 Jan 2022 00:32:52 -0600
Subject: [PATCH 55/81] =?UTF-8?q?Hot=20markets!=20=F0=9F=94=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/components/contract-card.tsx  |  2 +-
 web/components/contracts-list.tsx |  2 +-
 web/hooks/use-contracts.ts        | 21 ++++++++++++++-
 web/lib/firebase/bets.ts          | 33 ++++++++++++++++++++++++
 web/lib/firebase/contracts.ts     | 17 +++++++++++-
 web/pages/index.tsx               | 24 ++++++++++++++---
 web/pages/markets.tsx             | 43 ++++++++++++++++++++++++++-----
 7 files changed, 128 insertions(+), 14 deletions(-)

diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx
index 63eaf8aa..e1dc939b 100644
--- a/web/components/contract-card.tsx
+++ b/web/components/contract-card.tsx
@@ -120,7 +120,7 @@ export function ContractDetails(props: {
 
       <Row className="gap-2 flex-wrap">
         {tags.map((tag) => (
-          <div className="bg-gray-100 px-1">
+          <div key={tag} className="bg-gray-100 px-1">
             <Linkify text={tag} gray />
           </div>
         ))}
diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx
index 69908523..e1044d65 100644
--- a/web/components/contracts-list.tsx
+++ b/web/components/contracts-list.tsx
@@ -11,7 +11,7 @@ import { parseTags } from '../lib/util/parse'
 import { ContractCard } from './contract-card'
 import { Sort, useQueryAndSortParams } from '../hooks/use-sort-and-query-params'
 
-function ContractsGrid(props: { contracts: Contract[] }) {
+export function ContractsGrid(props: { contracts: Contract[] }) {
   const [resolvedContracts, activeContracts] = _.partition(
     props.contracts,
     (c) => c.isResolved
diff --git a/web/hooks/use-contracts.ts b/web/hooks/use-contracts.ts
index 674c570c..bec304a9 100644
--- a/web/hooks/use-contracts.ts
+++ b/web/hooks/use-contracts.ts
@@ -1,5 +1,11 @@
+import _ from 'lodash'
 import { useEffect, useState } from 'react'
-import { Contract, listenForContracts } from '../lib/firebase/contracts'
+import { Bet, listenForRecentBets } from '../lib/firebase/bets'
+import {
+  computeHotContracts,
+  Contract,
+  listenForContracts,
+} from '../lib/firebase/contracts'
 
 export const useContracts = () => {
   const [contracts, setContracts] = useState<Contract[] | 'loading'>('loading')
@@ -10,3 +16,16 @@ export const useContracts = () => {
 
   return contracts
 }
+
+export const useHotContracts = () => {
+  const [recentBets, setRecentBets] = useState<Bet[] | 'loading'>('loading')
+
+  useEffect(() => {
+    const oneDay = 1000 * 60 * 60 * 24
+    return listenForRecentBets(oneDay, setRecentBets)
+  }, [])
+
+  if (recentBets === 'loading') return 'loading'
+
+  return computeHotContracts(recentBets)
+}
diff --git a/web/lib/firebase/bets.ts b/web/lib/firebase/bets.ts
index 49d92e0e..818c09bc 100644
--- a/web/lib/firebase/bets.ts
+++ b/web/lib/firebase/bets.ts
@@ -4,7 +4,9 @@ import {
   query,
   onSnapshot,
   where,
+  getDocs,
 } from 'firebase/firestore'
+import _ from 'lodash'
 import { db } from './init'
 
 export type Bet = {
@@ -62,3 +64,34 @@ export function listenForUserBets(
     setBets(bets)
   })
 }
+
+export function listenForRecentBets(
+  timePeriodMs: number,
+  setBets: (bets: Bet[]) => void
+) {
+  const recentQuery = query(
+    collectionGroup(db, 'bets'),
+    where('createdTime', '>', Date.now() - timePeriodMs)
+  )
+  return onSnapshot(recentQuery, (snap) => {
+    const bets = snap.docs.map((doc) => doc.data() as Bet)
+
+    bets.sort((bet1, bet2) => bet1.createdTime - bet2.createdTime)
+
+    setBets(bets)
+  })
+}
+
+export async function getRecentBets(timePeriodMs: number) {
+  const recentQuery = query(
+    collectionGroup(db, 'bets'),
+    where('createdTime', '>', Date.now() - timePeriodMs)
+  )
+
+  const snapshot = await getDocs(recentQuery)
+  const bets = snapshot.docs.map((doc) => doc.data() as Bet)
+
+  bets.sort((bet1, bet2) => bet1.createdTime - bet2.createdTime)
+
+  return bets
+}
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index 1db5d00e..891831c4 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -11,9 +11,10 @@ import {
   onSnapshot,
   orderBy,
   getDoc,
-  limit,
 } from 'firebase/firestore'
 import dayjs from 'dayjs'
+import { Bet, getRecentBets } from './bets'
+import _ from 'lodash'
 
 export type Contract = {
   id: string
@@ -131,3 +132,17 @@ export function listenForContract(
     setContract((contractSnap.data() ?? null) as Contract | null)
   })
 }
+
+export function computeHotContracts(recentBets: Bet[]) {
+  const contractBets = _.groupBy(recentBets, (bet) => bet.contractId)
+  const hotContractIds = _.sortBy(Object.keys(contractBets), (contractId) =>
+    _.sumBy(contractBets[contractId], (bet) => -1 * bet.amount)
+  ).slice(0, 4)
+  return hotContractIds
+}
+
+export async function getHotContracts() {
+  const oneDay = 1000 * 60 * 60 * 24
+  const recentBets = await getRecentBets(oneDay)
+  return computeHotContracts(recentBets)
+}
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index 6e4ba609..cd409aba 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -3,26 +3,42 @@ import React from 'react'
 import { useUser } from '../hooks/use-user'
 import Markets from './markets'
 import LandingPage from './landing-page'
-import { Contract, listAllContracts } from '../lib/firebase/contracts'
+import {
+  Contract,
+  getHotContracts,
+  listAllContracts,
+} from '../lib/firebase/contracts'
+import _ from 'lodash'
 
 export async function getStaticProps() {
-  const contracts = await listAllContracts().catch((_) => [])
+  const [contracts, hotContractIds] = await Promise.all([
+    listAllContracts().catch((_) => []),
+    getHotContracts().catch(() => []),
+  ])
 
   return {
     props: {
       contracts,
+      hotContractIds,
     },
 
     revalidate: 60, // regenerate after a minute
   }
 }
 
-const Home = (props: { contracts: Contract[] }) => {
+const Home = (props: { contracts: Contract[]; hotContractIds: string[] }) => {
   const user = useUser()
 
   if (user === undefined) return <></>
 
-  return user ? <Markets contracts={props.contracts} /> : <LandingPage />
+  return user ? (
+    <Markets
+      contracts={props.contracts}
+      hotContractIds={props.hotContractIds}
+    />
+  ) : (
+    <LandingPage />
+  )
 }
 
 export default Home
diff --git a/web/pages/markets.tsx b/web/pages/markets.tsx
index 96f3c7a4..f28c493d 100644
--- a/web/pages/markets.tsx
+++ b/web/pages/markets.tsx
@@ -1,30 +1,61 @@
-import { SearchableGrid } from '../components/contracts-list'
+import _ from 'lodash'
+import { ContractsGrid, SearchableGrid } from '../components/contracts-list'
+import { Spacer } from '../components/layout/spacer'
 import { Page } from '../components/page'
-import { useContracts } from '../hooks/use-contracts'
+import { Title } from '../components/title'
+import { useContracts, useHotContracts } from '../hooks/use-contracts'
 import { useQueryAndSortParams } from '../hooks/use-sort-and-query-params'
-import { Contract, listAllContracts } from '../lib/firebase/contracts'
+import {
+  Contract,
+  getHotContracts,
+  listAllContracts,
+} from '../lib/firebase/contracts'
 
 export async function getStaticProps() {
-  const contracts = await listAllContracts().catch((_) => [])
+  const [contracts, hotContractIds] = await Promise.all([
+    listAllContracts().catch((_) => []),
+    getHotContracts().catch(() => []),
+  ])
 
   return {
     props: {
       contracts,
+      hotContractIds,
     },
 
     revalidate: 60, // regenerate after a minute
   }
 }
 
-export default function Markets(props: { contracts: Contract[] }) {
+export default function Markets(props: {
+  contracts: Contract[]
+  hotContractIds: string[]
+}) {
   const contracts = useContracts()
   const { query, setQuery, sort, setSort } = useQueryAndSortParams()
+  const hotContractIds = useHotContracts()
+
+  const readyHotContractIds =
+    hotContractIds === 'loading' ? props.hotContractIds : hotContractIds
+  const readyContracts = contracts === 'loading' ? props.contracts : contracts
+
+  const hotContracts = readyHotContractIds.map(
+    (hotId) =>
+      _.find(readyContracts, (contract) => contract.id === hotId) as Contract
+  )
 
   return (
     <Page>
+      <div className="w-full bg-indigo-50 border-2 border-indigo-100 p-6 rounded-lg shadow-md">
+        <Title className="mt-0" text="🔥 Markets" />
+        <ContractsGrid contracts={hotContracts} />
+      </div>
+
+      <Spacer h={10} />
+
       {(props.contracts || contracts !== 'loading') && (
         <SearchableGrid
-          contracts={contracts === 'loading' ? props.contracts : contracts}
+          contracts={readyContracts}
           query={query}
           setQuery={setQuery}
           sort={sort}

From e20537bf491ad20f447bb59231089d2cbc2bc029 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Wed, 5 Jan 2022 01:06:30 -0600
Subject: [PATCH 56/81] Remove tags and date from card.

---
 web/components/contract-card.tsx     | 55 +++++++++++++++++-----------
 web/components/contract-overview.tsx |  2 +-
 web/lib/firebase/init.ts             |  4 +-
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx
index e1dc939b..438f7ab2 100644
--- a/web/components/contract-card.tsx
+++ b/web/components/contract-card.tsx
@@ -27,7 +27,7 @@ export function ContractCard(props: { contract: Contract }) {
                   probPercent={probPercent}
                 />
               </Row>
-              <ContractDetails contract={contract} />
+              <AbbrContractDetails contract={contract} />
             </div>
           </div>
         </li>
@@ -85,23 +85,32 @@ export function ResolutionOrChance(props: {
   )
 }
 
-export function ContractDetails(props: {
-  contract: Contract
-  inlineTags?: boolean
-}) {
-  const { contract, inlineTags } = props
+export function AbbrContractDetails(props: { contract: Contract }) {
+  const { contract } = props
+  const { truePool } = compute(contract)
+
+  return (
+    <Col className={clsx('text-sm text-gray-500 gap-2')}>
+      <Row className="gap-2 flex-wrap">
+        <div className="whitespace-nowrap">
+          <UserLink username={contract.creatorUsername} />
+        </div>
+        <div className="">•</div>
+        <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
+      </Row>
+    </Col>
+  )
+}
+
+export function ContractDetails(props: { contract: Contract }) {
+  const { contract } = props
   const { question, description } = contract
   const { truePool, createdDate, resolvedDate } = compute(contract)
 
   const tags = parseTags(`${question} ${description}`).map((tag) => `#${tag}`)
 
   return (
-    <Col
-      className={clsx(
-        'text-sm text-gray-500 gap-2',
-        inlineTags && 'sm:flex-row sm:flex-wrap'
-      )}
-    >
+    <Col className="text-sm text-gray-500 gap-2 sm:flex-row sm:flex-wrap">
       <Row className="gap-2 flex-wrap">
         <div className="whitespace-nowrap">
           <UserLink username={contract.creatorUsername} />
@@ -114,17 +123,19 @@ export function ContractDetails(props: {
         <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
       </Row>
 
-      {inlineTags && tags.length > 0 && (
-        <div className="hidden sm:block">•</div>
-      )}
+      {tags.length > 0 && (
+        <>
+          <div className="hidden sm:block">•</div>
 
-      <Row className="gap-2 flex-wrap">
-        {tags.map((tag) => (
-          <div key={tag} className="bg-gray-100 px-1">
-            <Linkify text={tag} gray />
-          </div>
-        ))}
-      </Row>
+          <Row className="gap-2 flex-wrap">
+            {tags.map((tag) => (
+              <div key={tag} className="bg-gray-100 px-1">
+                <Linkify text={tag} gray />
+              </div>
+            ))}
+          </Row>
+        </>
+      )}
     </Col>
   )
 }
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index a3b1077e..88f788e9 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -67,7 +67,7 @@ export const ContractOverview = (props: {
             large
           />
 
-          <ContractDetails contract={contract} inlineTags />
+          <ContractDetails contract={contract} />
           <TweetButton tweetText={tweetText} />
         </Col>
 
diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts
index ba10545a..98734946 100644
--- a/web/lib/firebase/init.ts
+++ b/web/lib/firebase/init.ts
@@ -2,8 +2,8 @@ import { getFirestore } from '@firebase/firestore'
 import { initializeApp } from 'firebase/app'
 
 // TODO: Reenable this when we have a way to set the Firebase db in dev
-export const isProd = process.env.NODE_ENV === 'production'
-// export const isProd = true
+// export const isProd = process.env.NODE_ENV === 'production'
+export const isProd = true
 
 const firebaseConfig = isProd
   ? {

From 2453fcf1efd9c7a342acdc7eacc2d4351371f116 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 11:42:43 -0600
Subject: [PATCH 57/81] basic firestore rules

---
 firestore.rules | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 firestore.rules

diff --git a/firestore.rules b/firestore.rules
new file mode 100644
index 00000000..14047e59
--- /dev/null
+++ b/firestore.rules
@@ -0,0 +1,25 @@
+rules_version = '2';
+
+service cloud.firestore {
+  match /databases/{database}/documents {
+
+    match /users/{userId} {
+      allow read;
+      allow create: if request.auth != null;
+    }
+
+    match /contracts/{contractId} {
+      allow read;
+    }
+
+    match /contracts/bets/{betId} {
+      allow read;
+    }
+
+    match /contracts/comments/{commentId} {
+      allow read;
+      allow create: if request.auth != null;
+    }
+
+  }
+}
\ No newline at end of file

From 8f3a002840968c18352fa6aa27185b579b156d0e Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 11:47:39 -0600
Subject: [PATCH 58/81] rules: handle querying all bets

---
 firestore.rules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/firestore.rules b/firestore.rules
index 14047e59..3ba7d2cf 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -16,6 +16,10 @@ service cloud.firestore {
       allow read;
     }
 
+    match /{somePath=**}/bets/{betId} {
+      allow read;
+    }
+
     match /contracts/comments/{commentId} {
       allow read;
       allow create: if request.auth != null;

From 3302cbddbd44a774805ae02b88d11f8c101f249f Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Wed, 5 Jan 2022 11:49:20 -0600
Subject: [PATCH 59/81] Move contract close time into contract details

---
 web/components/contract-card.tsx     | 12 +++++++++++-
 web/components/contract-feed.tsx     |  2 +-
 web/components/contract-overview.tsx | 18 ------------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/web/components/contract-card.tsx b/web/components/contract-card.tsx
index 438f7ab2..1920c494 100644
--- a/web/components/contract-card.tsx
+++ b/web/components/contract-card.tsx
@@ -7,6 +7,7 @@ import { Linkify } from './linkify'
 import { Contract, compute, path } from '../lib/firebase/contracts'
 import { Col } from './layout/col'
 import { parseTags } from '../lib/util/parse'
+import dayjs from 'dayjs'
 
 export function ContractCard(props: { contract: Contract }) {
   const { contract } = props
@@ -104,7 +105,7 @@ export function AbbrContractDetails(props: { contract: Contract }) {
 
 export function ContractDetails(props: { contract: Contract }) {
   const { contract } = props
-  const { question, description } = contract
+  const { question, description, closeTime } = contract
   const { truePool, createdDate, resolvedDate } = compute(contract)
 
   const tags = parseTags(`${question} ${description}`).map((tag) => `#${tag}`)
@@ -119,6 +120,15 @@ export function ContractDetails(props: { contract: Contract }) {
         <div className="whitespace-nowrap">
           {resolvedDate ? `${createdDate} - ${resolvedDate}` : createdDate}
         </div>
+        {!resolvedDate && closeTime && (
+          <>
+            <div className="">•</div>
+            <div className="whitespace-nowrap">
+              {closeTime > Date.now() ? 'Closes' : 'Closed'}{' '}
+              {dayjs(closeTime).format('MMM D, h:mma')}
+            </div>
+          </>
+        )}
         <div className="">•</div>
         <div className="whitespace-nowrap">{formatMoney(truePool)} pool</div>
       </Row>
diff --git a/web/components/contract-feed.tsx b/web/components/contract-feed.tsx
index 23995fa5..3e028e76 100644
--- a/web/components/contract-feed.tsx
+++ b/web/components/contract-feed.tsx
@@ -65,7 +65,7 @@ function Timestamp(props: { time: number }) {
   const { time } = props
   return (
     <span
-      className="whitespace-nowrap text-gray-300"
+      className="whitespace-nowrap text-gray-300 ml-1"
       title={dayjs(time).format('MMM D, h:mma')}
     >
       {dayjs(time).fromNow()}
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index 88f788e9..0e0b7ecc 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -10,26 +10,12 @@ import { ContractProbGraph } from './contract-prob-graph'
 import router from 'next/router'
 import { useUser } from '../hooks/use-user'
 import { Row } from './layout/row'
-import dayjs from 'dayjs'
 import { Linkify } from './linkify'
 import clsx from 'clsx'
 import { ContractDetails, ResolutionOrChance } from './contract-card'
 import { ContractFeed } from './contract-feed'
 import { TweetButton } from './tweet-button'
 
-function ContractCloseTime(props: { contract: Contract }) {
-  const closeTime = props.contract.closeTime
-  if (!closeTime) {
-    return null
-  }
-  return (
-    <div className="text-gray-500 text-sm">
-      Trading {closeTime > Date.now() ? 'closes' : 'closed'} at{' '}
-      {dayjs(closeTime).format('MMM D, h:mma')}
-    </div>
-  )
-}
-
 export const ContractOverview = (props: {
   contract: Contract
   className?: string
@@ -103,10 +89,6 @@ export const ContractOverview = (props: {
       )}
 
       <ContractFeed contract={contract} />
-
-      <Spacer h={4} />
-
-      <ContractCloseTime contract={contract} />
     </Col>
   )
 }

From 5eaf50612d283db81c7babbdc11913a62223d114 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Wed, 5 Jan 2022 12:23:44 -0600
Subject: [PATCH 60/81] Advanced metrics for bet panel

---
 web/components/advanced-panel.tsx |  35 +++++++++
 web/components/bet-panel.tsx      |  33 +++++++-
 web/pages/create.tsx              | 125 ++++++++++++------------------
 3 files changed, 118 insertions(+), 75 deletions(-)
 create mode 100644 web/components/advanced-panel.tsx

diff --git a/web/components/advanced-panel.tsx b/web/components/advanced-panel.tsx
new file mode 100644
index 00000000..491e9c3b
--- /dev/null
+++ b/web/components/advanced-panel.tsx
@@ -0,0 +1,35 @@
+import clsx from 'clsx'
+import { useState } from 'react'
+
+export function AdvancedPanel(props: { children: any }) {
+  const { children } = props
+  const [collapsed, setCollapsed] = useState(true)
+
+  return (
+    <div
+      tabIndex={0}
+      className={clsx(
+        'cursor-pointer relative collapse collapse-arrow',
+        collapsed ? 'collapse-close' : 'collapse-open'
+      )}
+    >
+      <div onClick={() => setCollapsed((collapsed) => !collapsed)}>
+        <div className="mt-4 mr-6 text-sm text-gray-400 text-right">
+          Advanced
+        </div>
+        <div
+          className="collapse-title p-0 absolute w-0 h-0 min-h-0"
+          style={{
+            top: -2,
+            right: -15,
+            color: '#9ca3af' /* gray-400 */,
+          }}
+        />
+      </div>
+
+      <div className="collapse-content !p-0 m-0 !bg-transparent">
+        {children}
+      </div>
+    </div>
+  )
+}
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index 55467527..4bb5702d 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -8,14 +8,22 @@ import { Col } from './layout/col'
 import { Row } from './layout/row'
 import { Spacer } from './layout/spacer'
 import { YesNoSelector } from './yes-no-selector'
-import { formatMoney, formatPercent } from '../lib/util/format'
+import {
+  formatMoney,
+  formatPercent,
+  formatWithCommas,
+} from '../lib/util/format'
 import { Title } from './title'
 import {
   getProbability,
   calculateShares,
   getProbabilityAfterBet,
+  calculatePayout,
 } from '../lib/calculate'
 import { firebaseLogin } from '../lib/firebase/users'
+import { OutcomeLabel } from './outcome-label'
+import { AdvancedPanel } from './advanced-panel'
+import { Bet } from '../lib/firebase/bets'
 
 export function BetPanel(props: { contract: Contract; className?: string }) {
   const { contract, className } = props
@@ -151,6 +159,29 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
         {formatMoney(estimatedWinnings)} &nbsp; (+{estimatedReturnPercent})
       </div>
 
+      <AdvancedPanel>
+        <div className="mt-2 mb-1 text-sm text-gray-400">
+          <OutcomeLabel outcome={betChoice} /> shares
+        </div>
+        <div>
+          {formatWithCommas(shares)} of{' '}
+          {formatWithCommas(shares + contract.totalShares[betChoice])}
+        </div>
+
+        <div className="mt-2 mb-1 text-sm text-gray-400">
+          Current payout if <OutcomeLabel outcome={betChoice} />
+        </div>
+        <div>
+          {formatMoney(
+            calculatePayout(
+              contract,
+              { outcome: betChoice, amount: betAmount ?? 0, shares } as Bet,
+              betChoice
+            )
+          )}
+        </div>
+      </AdvancedPanel>
+
       <Spacer h={6} />
 
       {user ? (
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index c4303148..2d6c2027 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -11,6 +11,7 @@ import { useUser } from '../hooks/use-user'
 import { Contract, path } from '../lib/firebase/contracts'
 import { Page } from '../components/page'
 import { formatMoney } from '../lib/util/format'
+import { AdvancedPanel } from '../components/advanced-panel'
 
 // Allow user to create a new contract
 export default function NewContract() {
@@ -29,7 +30,6 @@ export default function NewContract() {
   const [closeDate, setCloseDate] = useState('')
 
   const [isSubmitting, setIsSubmitting] = useState(false)
-  const [collapsed, setCollapsed] = useState(true)
 
   const closeTime = dateToMillis(closeDate) || undefined
   // We'd like this to look like "Apr 2, 2022, 23:59:59 PM PT" but timezones are hard with dayjs
@@ -141,82 +141,59 @@ export default function NewContract() {
             />
           </div>
 
-          {/* Collapsible "Advanced" section */}
-          <div
-            tabIndex={0}
-            className={clsx(
-              'cursor-pointer relative collapse collapse-arrow',
-              collapsed ? 'collapse-close' : 'collapse-open'
-            )}
-          >
-            <div onClick={() => setCollapsed((collapsed) => !collapsed)}>
-              <div className="mt-4 mr-6 text-sm text-gray-400 text-right">
-                Advanced
+          <AdvancedPanel>
+            <div className="form-control mb-1">
+              <label className="label">
+                <span className="label-text">Subsidize your market</span>
+              </label>
+
+              <label className="input-group">
+                <span className="text-sm bg-gray-200">M$</span>
+                <input
+                  className={clsx(
+                    'input input-bordered',
+                    anteError && 'input-error'
+                  )}
+                  type="text"
+                  placeholder="0"
+                  maxLength={9}
+                  value={ante ?? ''}
+                  disabled={isSubmitting}
+                  onChange={(e) => onAnteChange(e.target.value)}
+                />
+              </label>
+
+              <div className="mt-3 mb-1 text-sm text-gray-400">
+                Remaining balance
               </div>
-              <div
-                className="collapse-title p-0 absolute w-0 h-0 min-h-0"
-                style={{
-                  top: -2,
-                  right: -15,
-                  color: '#9ca3af' /* gray-400 */,
-                }}
+              <div>
+                {formatMoney(remainingBalance > 0 ? remainingBalance : 0)}
+              </div>
+            </div>
+
+            <Spacer h={4} />
+
+            <div className="form-control">
+              <label className="label">
+                <span className="label-text">Close date (optional)</span>
+              </label>
+              <input
+                type="date"
+                className="input input-bordered"
+                onClick={(e) => e.stopPropagation()}
+                onChange={(e) => setCloseDate(e.target.value || '')}
+                min={new Date().toISOString().split('T')[0]}
+                disabled={isSubmitting}
+                value={closeDate}
               />
             </div>
-
-            <div className="collapse-content !p-0 m-0 !bg-transparent">
-              <div className="form-control mb-1">
-                <label className="label">
-                  <span className="label-text">Subsidize your market</span>
-                </label>
-
-                <label className="input-group">
-                  <span className="text-sm bg-gray-200">M$</span>
-                  <input
-                    className={clsx(
-                      'input input-bordered',
-                      anteError && 'input-error'
-                    )}
-                    type="text"
-                    placeholder="0"
-                    maxLength={9}
-                    value={ante ?? ''}
-                    disabled={isSubmitting}
-                    onChange={(e) => onAnteChange(e.target.value)}
-                  />
-                </label>
-
-                <div className="mt-3 mb-1 text-sm text-gray-400">
-                  Remaining balance
-                </div>
-                <div>
-                  {formatMoney(remainingBalance > 0 ? remainingBalance : 0)}
-                </div>
-              </div>
-
-              <Spacer h={4} />
-
-              <div className="form-control">
-                <label className="label">
-                  <span className="label-text">Close date (optional)</span>
-                </label>
-                <input
-                  type="date"
-                  className="input input-bordered"
-                  onClick={(e) => e.stopPropagation()}
-                  onChange={(e) => setCloseDate(e.target.value || '')}
-                  min={new Date().toISOString().split('T')[0]}
-                  disabled={isSubmitting}
-                  value={closeDate}
-                />
-              </div>
-              <label>
-                <span className="label-text text-gray-400 ml-2">
-                  No new trades will be allowed after{' '}
-                  {closeDate ? formattedCloseTime : 'this time'}
-                </span>
-              </label>
-            </div>
-          </div>
+            <label>
+              <span className="label-text text-gray-400 ml-2">
+                No new trades will be allowed after{' '}
+                {closeDate ? formattedCloseTime : 'this time'}
+              </span>
+            </label>
+          </AdvancedPanel>
 
           <Spacer h={4} />
 

From 0b8ad76b0f1fb2adef8a7db3f8fd7bd84c3389b4 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 12:23:58 -0600
Subject: [PATCH 61/81] global warming: warm up all cloud functions on client

---
 functions/src/create-contract.ts    |  3 +++
 web/components/bet-panel.tsx        | 11 +++++++----
 web/components/bets-list.tsx        | 12 ++++++++----
 web/components/resolution-panel.tsx | 12 +++++++-----
 web/lib/firebase/api-call.ts        |  7 +++++++
 web/pages/create.tsx                | 12 +++++++-----
 web/pages/make-predictions.tsx      |  6 ++----
 7 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/functions/src/create-contract.ts b/functions/src/create-contract.ts
index 0b0796f6..d37919ab 100644
--- a/functions/src/create-contract.ts
+++ b/functions/src/create-contract.ts
@@ -29,6 +29,9 @@ export const createContract = functions
 
       const { question, description, initialProb, ante, closeTime } = data
 
+      if (!question || !initialProb)
+        return { status: 'error', message: 'Missing contract attributes' }
+
       if (ante !== undefined && (ante < 0 || ante > creator.balance))
         return { status: 'error', message: 'Invalid ante' }
 
diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index 4bb5702d..f6f35676 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -1,6 +1,6 @@
 import { getFunctions, httpsCallable } from 'firebase/functions'
 import clsx from 'clsx'
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 
 import { useUser } from '../hooks/use-user'
 import { Contract } from '../lib/firebase/contracts'
@@ -24,8 +24,14 @@ import { firebaseLogin } from '../lib/firebase/users'
 import { OutcomeLabel } from './outcome-label'
 import { AdvancedPanel } from './advanced-panel'
 import { Bet } from '../lib/firebase/bets'
+import { placeBet } from '../lib/firebase/api-call'
 
 export function BetPanel(props: { contract: Contract; className?: string }) {
+  useEffect(() => {
+    // warm up cloud function
+    placeBet({}).catch()
+  }, [])
+
   const { contract, className } = props
 
   const user = useUser()
@@ -212,6 +218,3 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
     </Col>
   )
 }
-
-const functions = getFunctions()
-export const placeBet = httpsCallable(functions, 'placeBet')
diff --git a/web/components/bets-list.tsx b/web/components/bets-list.tsx
index 3cbf4ace..b622c58e 100644
--- a/web/components/bets-list.tsx
+++ b/web/components/bets-list.tsx
@@ -2,6 +2,8 @@ import Link from 'next/link'
 import _ from 'lodash'
 import dayjs from 'dayjs'
 import { useEffect, useState } from 'react'
+import clsx from 'clsx'
+
 import { useUserBets } from '../hooks/use-user-bets'
 import { Bet } from '../lib/firebase/bets'
 import { User } from '../lib/firebase/users'
@@ -20,8 +22,7 @@ import {
   calculateSaleAmount,
   resolvedPayout,
 } from '../lib/calculate'
-import clsx from 'clsx'
-import { cloudFunction } from '../lib/firebase/api-call'
+import { sellBet } from '../lib/firebase/api-call'
 import { ConfirmationButton } from './confirmation-button'
 import { OutcomeLabel, YesLabel, NoLabel, MarketLabel } from './outcome-label'
 
@@ -341,9 +342,12 @@ function BetRow(props: { bet: Bet; contract: Contract; sale?: Bet }) {
   )
 }
 
-const sellBet = cloudFunction('sellBet')
-
 function SellButton(props: { contract: Contract; bet: Bet }) {
+  useEffect(() => {
+    // warm up cloud function
+    sellBet({}).catch()
+  }, [])
+
   const { contract, bet } = props
   const [isSubmitting, setIsSubmitting] = useState(false)
 
diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx
index d5ccbfd5..3e282fa8 100644
--- a/web/components/resolution-panel.tsx
+++ b/web/components/resolution-panel.tsx
@@ -1,6 +1,5 @@
 import clsx from 'clsx'
-import React, { useState } from 'react'
-import { getFunctions, httpsCallable } from 'firebase/functions'
+import React, { useEffect, useState } from 'react'
 
 import { Contract } from '../lib/firebase/contracts'
 import { Col } from './layout/col'
@@ -9,15 +8,18 @@ import { User } from '../lib/firebase/users'
 import { YesNoCancelSelector } from './yes-no-selector'
 import { Spacer } from './layout/spacer'
 import { ConfirmationButton as ConfirmationButton } from './confirmation-button'
-
-const functions = getFunctions()
-export const resolveMarket = httpsCallable(functions, 'resolveMarket')
+import { resolveMarket } from '../lib/firebase/api-call'
 
 export function ResolutionPanel(props: {
   creator: User
   contract: Contract
   className?: string
 }) {
+  useEffect(() => {
+    // warm up cloud function
+    resolveMarket({}).catch()
+  }, [])
+
   const { contract, className } = props
 
   const [outcome, setOutcome] = useState<
diff --git a/web/lib/firebase/api-call.ts b/web/lib/firebase/api-call.ts
index fc054386..3d541291 100644
--- a/web/lib/firebase/api-call.ts
+++ b/web/lib/firebase/api-call.ts
@@ -4,3 +4,10 @@ const functions = getFunctions()
 
 export const cloudFunction = (name: string) => httpsCallable(functions, name)
 
+export const createContract = cloudFunction('createContract')
+
+export const placeBet = cloudFunction('placeBet')
+
+export const resolveMarket = cloudFunction('resolveMarket')
+
+export const sellBet = cloudFunction('sellBet')
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 2d6c2027..ab76e667 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -2,7 +2,6 @@ import router from 'next/router'
 import { useEffect, useState } from 'react'
 import clsx from 'clsx'
 import dayjs from 'dayjs'
-import { getFunctions, httpsCallable } from 'firebase/functions'
 
 import { CreatorContractsList } from '../components/contracts-list'
 import { Spacer } from '../components/layout/spacer'
@@ -12,6 +11,7 @@ import { Contract, path } from '../lib/firebase/contracts'
 import { Page } from '../components/page'
 import { formatMoney } from '../lib/util/format'
 import { AdvancedPanel } from '../components/advanced-panel'
+import { createContract } from '../lib/firebase/api-call'
 
 // Allow user to create a new contract
 export default function NewContract() {
@@ -19,7 +19,12 @@ export default function NewContract() {
 
   useEffect(() => {
     if (creator === null) router.push('/')
-  })
+  }, [creator])
+
+  useEffect(() => {
+    // warm up function
+    createContract({}).catch()
+  }, [])
 
   const [initialProb, setInitialProb] = useState(50)
   const [question, setQuestion] = useState('')
@@ -225,9 +230,6 @@ export default function NewContract() {
   )
 }
 
-const functions = getFunctions()
-export const createContract = httpsCallable(functions, 'createContract')
-
 // Given a date string like '2022-04-02',
 // return the time just before midnight on that date (in the user's local time), as millis since epoch
 function dateToMillis(date: string) {
diff --git a/web/pages/make-predictions.tsx b/web/pages/make-predictions.tsx
index 23144ff0..c2a2fe5f 100644
--- a/web/pages/make-predictions.tsx
+++ b/web/pages/make-predictions.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx'
-import { getFunctions, httpsCallable } from 'firebase/functions'
 import Link from 'next/link'
 import { useState } from 'react'
+
 import { Col } from '../components/layout/col'
 import { Row } from '../components/layout/row'
 import { Spacer } from '../components/layout/spacer'
@@ -9,11 +9,9 @@ import { Linkify } from '../components/linkify'
 import { Page } from '../components/page'
 import { Title } from '../components/title'
 import { useUser } from '../hooks/use-user'
+import { createContract } from '../lib/firebase/api-call'
 import { compute, Contract, path } from '../lib/firebase/contracts'
 
-const functions = getFunctions()
-export const createContract = httpsCallable(functions, 'createContract')
-
 type Prediction = {
   question: string
   description: string

From 8594700fb421e2a548ec18480a6f20a1b1bc1a5c Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 12:24:59 -0600
Subject: [PATCH 62/81] turn off keepAwake

---
 functions/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/src/index.ts b/functions/src/index.ts
index 1d462422..088ca534 100644
--- a/functions/src/index.ts
+++ b/functions/src/index.ts
@@ -2,7 +2,7 @@ import * as admin from 'firebase-admin'
 
 admin.initializeApp()
 
-export * from './keep-awake'
+// export * from './keep-awake'
 export * from './place-bet'
 export * from './resolve-market'
 export * from './sell-bet'

From fbc61fe28fce261945cd66a6a98af4f1c9693d5c Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 16:52:54 -0600
Subject: [PATCH 63/81] rules fix

---
 firestore.rules | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/firestore.rules b/firestore.rules
index 3ba7d2cf..be39de5f 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -12,7 +12,7 @@ service cloud.firestore {
       allow read;
     }
 
-    match /contracts/bets/{betId} {
+    match /contracts/{contractId}/bets/{betId} {
       allow read;
     }
 
@@ -20,10 +20,14 @@ service cloud.firestore {
       allow read;
     }
 
-    match /contracts/comments/{commentId} {
+    match /contracts/{contractId}/comments/{commentId} {
       allow read;
       allow create: if request.auth != null;
     }
 
+    match /{somePath=**}/comments/{commentId} {
+      allow read;
+    }
+
   }
 }
\ No newline at end of file

From 75e9d419eeac67dc62fba0b1746309149ff6a711 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Wed, 5 Jan 2022 17:03:26 -0600
Subject: [PATCH 64/81] Fix payout calculation for correct bet in bet panel.

---
 web/components/bet-panel.tsx | 14 ++++++++------
 web/lib/calculate.ts         | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index f6f35676..be89621f 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -18,7 +18,7 @@ import {
   getProbability,
   calculateShares,
   getProbabilityAfterBet,
-  calculatePayout,
+  calculatePayoutAfterCorrectBet,
 } from '../lib/calculate'
 import { firebaseLogin } from '../lib/firebase/users'
 import { OutcomeLabel } from './outcome-label'
@@ -179,11 +179,13 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
         </div>
         <div>
           {formatMoney(
-            calculatePayout(
-              contract,
-              { outcome: betChoice, amount: betAmount ?? 0, shares } as Bet,
-              betChoice
-            )
+            betAmount
+              ? calculatePayoutAfterCorrectBet(contract, {
+                  outcome: betChoice,
+                  amount: betAmount,
+                  shares,
+                } as Bet)
+              : 0
           )}
         </div>
       </AdvancedPanel>
diff --git a/web/lib/calculate.ts b/web/lib/calculate.ts
index b265f228..6e446155 100644
--- a/web/lib/calculate.ts
+++ b/web/lib/calculate.ts
@@ -62,6 +62,25 @@ export function calculatePayout(
   return (1 - fees) * (amount + ((shares - amount) / total) * winningsPool)
 }
 
+export function calculatePayoutAfterCorrectBet(contract: Contract, bet: Bet) {
+  const { amount, outcome, shares } = bet
+  const { totalShares, totalBets } = contract
+
+  const startPool = contract.startPool.YES + contract.startPool.NO
+  const truePool = amount + contract.pool.YES + contract.pool.NO - startPool
+
+  const totalBetsOutcome = totalBets[outcome] + amount
+  const totalSharesOutcome = totalShares[outcome] + shares
+
+  if (totalBetsOutcome >= truePool)
+    return (amount / totalBetsOutcome) * truePool
+
+  const total = totalSharesOutcome - totalBetsOutcome
+  const winningsPool = truePool - totalBetsOutcome
+
+  return (1 - fees) * (amount + ((shares - amount) / total) * winningsPool)
+}
+
 function calculateMktPayout(contract: Contract, bet: Bet) {
   const p =
     contract.pool.YES ** 2 / (contract.pool.YES ** 2 + contract.pool.NO ** 2)

From 22894cb44e35cdf041c80f99f2312bbe6580d4a6 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Wed, 5 Jan 2022 15:51:56 -0800
Subject: [PATCH 65/81] Update Notion link

---
 web/pages/about.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index fd810ed6..1f5d9666 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -297,7 +297,7 @@ function Contents() {
 
       <ul>
         <li>
-          <a href="https://mantic.notion.site/Technical-Overview-b9b48a09ea1f45b88d991231171730c5">
+          <a href="https://manifoldmarkets.notion.site/Technical-Overview-b9b48a09ea1f45b88d991231171730c5">
             Technical Overview of Mantic Markets
           </a>
         </li>

From 3d780be70aa5cc2e58e0424c4591c1cc3da8665d Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 21:04:10 -0600
Subject: [PATCH 66/81] rules: allow contract deletion by creator

---
 firestore.rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/firestore.rules b/firestore.rules
index be39de5f..d7149344 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -10,6 +10,7 @@ service cloud.firestore {
 
     match /contracts/{contractId} {
       allow read;
+      allow delete: if resource.data.creatorId == request.auth.uid;
     }
 
     match /contracts/{contractId}/bets/{betId} {

From 95b28bd536ae4a7f22d01392db1f36544c8aae9b Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Wed, 5 Jan 2022 21:05:46 -0600
Subject: [PATCH 67/81] create page: disable form elements after submitting

---
 web/pages/create.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index ab76e667..467cb407 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -105,6 +105,7 @@ export default function NewContract() {
               type="text"
               placeholder="e.g. Will the FDA will approve Paxlovid before Jun 2nd, 2022?"
               className="input input-bordered"
+              disabled={isSubmitting}
               value={question}
               onChange={(e) => setQuestion(e.target.value || '')}
             />
@@ -121,6 +122,7 @@ export default function NewContract() {
                 type="number"
                 value={initialProb}
                 className="input input-bordered input-md"
+                disabled={isSubmitting}
                 min={1}
                 max={99}
                 onChange={(e) =>
@@ -141,6 +143,7 @@ export default function NewContract() {
               className="textarea w-full h-24 textarea-bordered"
               placeholder={descriptionPlaceholder}
               value={description}
+              disabled={isSubmitting}
               onClick={(e) => e.stopPropagation()}
               onChange={(e) => setDescription(e.target.value || '')}
             />

From 477878a09fe91c44fa5405628d5bd8a362f0fd1d Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Wed, 5 Jan 2022 23:02:36 -0600
Subject: [PATCH 68/81] Right align tweet button

---
 web/components/contract-overview.tsx | 17 ++++++++++-------
 web/components/tweet-button.tsx      |  7 ++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index 0e0b7ecc..e044ec18 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -54,15 +54,18 @@ export const ContractOverview = (props: {
           />
 
           <ContractDetails contract={contract} />
-          <TweetButton tweetText={tweetText} />
+          <TweetButton className="self-end md:hidden" tweetText={tweetText} />
         </Col>
 
-        <ResolutionOrChance
-          className="hidden md:flex md:items-end"
-          resolution={resolution}
-          probPercent={probPercent}
-          large
-        />
+        <Col className="hidden md:flex justify-between items-end">
+          <ResolutionOrChance
+            className="items-end"
+            resolution={resolution}
+            probPercent={probPercent}
+            large
+          />
+          <TweetButton className="mt-6" tweetText={tweetText} />
+        </Col>
       </Row>
 
       <Spacer h={4} />
diff --git a/web/components/tweet-button.tsx b/web/components/tweet-button.tsx
index 2fd4adcd..60a9f732 100644
--- a/web/components/tweet-button.tsx
+++ b/web/components/tweet-button.tsx
@@ -5,11 +5,8 @@ export function TweetButton(props: { className?: string; tweetText?: string }) {
 
   return (
     <a
-      className={clsx(
-        'btn btn-xs normal-case self-start border-none',
-        className
-      )}
-      style={{ backgroundColor: '#1da1f2' }}
+      className={clsx('btn btn-xs normal-case border-none', className)}
+      style={{ backgroundColor: '#1da1f2', width: 75 }}
       href={`https://twitter.com/intent/tweet?text=${encodeURIComponent(
         tweetText ?? ''
       )}`}

From f218a74a0c4985d76d4ffa526ff60591476060f7 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 6 Jan 2022 00:45:30 -0800
Subject: [PATCH 69/81] Add probability slider to Create Market

---
 web/package.json     |  3 ++-
 web/pages/create.tsx | 61 ++++++++++++++++++++++++++------------------
 web/yarn.lock        | 23 ++++++++++++++++-
 3 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/web/package.json b/web/package.json
index d21da96b..f5ad181f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -22,7 +22,8 @@
     "lodash": "4.17.21",
     "next": "12.0.7",
     "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react-dom": "17.0.2",
+    "react-expanding-textarea": "^2.3.4"
   },
   "devDependencies": {
     "@tailwindcss/forms": "0.4.0",
diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 467cb407..980443cc 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -2,6 +2,7 @@ import router from 'next/router'
 import { useEffect, useState } from 'react'
 import clsx from 'clsx'
 import dayjs from 'dayjs'
+import Textarea from 'react-expanding-textarea'
 
 import { CreatorContractsList } from '../components/contracts-list'
 import { Spacer } from '../components/layout/spacer'
@@ -12,6 +13,7 @@ import { Page } from '../components/page'
 import { formatMoney } from '../lib/util/format'
 import { AdvancedPanel } from '../components/advanced-panel'
 import { createContract } from '../lib/firebase/api-call'
+import { Row } from '../components/layout/row'
 
 // Allow user to create a new contract
 export default function NewContract() {
@@ -101,10 +103,9 @@ export default function NewContract() {
               <span className="label-text">Question</span>
             </label>
 
-            <input
-              type="text"
+            <Textarea
               placeholder="e.g. Will the FDA will approve Paxlovid before Jun 2nd, 2022?"
-              className="input input-bordered"
+              className="input input-bordered resize-none"
               disabled={isSubmitting}
               value={question}
               onChange={(e) => setQuestion(e.target.value || '')}
@@ -117,20 +118,30 @@ export default function NewContract() {
             <label className="label">
               <span className="label-text">Initial probability</span>
             </label>
-            <label className="input-group input-group-md w-fit">
+            <Row className="items-center gap-2">
+              <label className="input-group input-group-lg w-fit text-xl">
+                <input
+                  type="number"
+                  value={initialProb}
+                  className="input input-bordered input-md text-primary text-4xl w-24"
+                  disabled={isSubmitting}
+                  min={1}
+                  max={99}
+                  onChange={(e) =>
+                    setInitialProb(parseInt(e.target.value.substring(0, 2)))
+                  }
+                />
+                <span>%</span>
+              </label>
               <input
-                type="number"
-                value={initialProb}
-                className="input input-bordered input-md"
-                disabled={isSubmitting}
+                type="range"
+                className="range range-primary"
                 min={1}
                 max={99}
-                onChange={(e) =>
-                  setInitialProb(parseInt(e.target.value.substring(0, 2)))
-                }
+                value={initialProb}
+                onChange={(e) => setInitialProb(parseInt(e.target.value))}
               />
-              <span>%</span>
-            </label>
+            </Row>
           </div>
 
           <Spacer h={4} />
@@ -139,8 +150,9 @@ export default function NewContract() {
             <label className="label">
               <span className="label-text">Description</span>
             </label>
-            <textarea
-              className="textarea w-full h-24 textarea-bordered"
+            <Textarea
+              className="textarea w-full textarea-bordered"
+              rows={3}
               placeholder={descriptionPlaceholder}
               value={description}
               disabled={isSubmitting}
@@ -156,7 +168,7 @@ export default function NewContract() {
               </label>
 
               <label className="input-group">
-                <span className="text-sm bg-gray-200">M$</span>
+                <span className="text-sm ">M$</span>
                 <input
                   className={clsx(
                     'input input-bordered',
@@ -170,20 +182,19 @@ export default function NewContract() {
                   onChange={(e) => onAnteChange(e.target.value)}
                 />
               </label>
-
-              <div className="mt-3 mb-1 text-sm text-gray-400">
-                Remaining balance
-              </div>
-              <div>
-                {formatMoney(remainingBalance > 0 ? remainingBalance : 0)}
-              </div>
+              <label>
+                <span className="label-text text-gray-400 ml-1">
+                  Remaining balance:{' '}
+                  {formatMoney(remainingBalance > 0 ? remainingBalance : 0)}
+                </span>
+              </label>
             </div>
 
             <Spacer h={4} />
 
             <div className="form-control">
               <label className="label">
-                <span className="label-text">Close date (optional)</span>
+                <span className="label-text">Close date</span>
               </label>
               <input
                 type="date"
@@ -196,7 +207,7 @@ export default function NewContract() {
               />
             </div>
             <label>
-              <span className="label-text text-gray-400 ml-2">
+              <span className="label-text text-gray-400 ml-1">
                 No new trades will be allowed after{' '}
                 {closeDate ? formattedCloseTime : 'this time'}
               </span>
diff --git a/web/yarn.lock b/web/yarn.lock
index f1f30d9d..ade299cf 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -2289,6 +2289,11 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-shallow-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b"
+  integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==
+
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -3837,6 +3842,15 @@ react-dom@17.0.2:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
+react-expanding-textarea@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/react-expanding-textarea/-/react-expanding-textarea-2.3.4.tgz#3eee788cf3b36798d0f9aed5a50f752278d44a49"
+  integrity sha512-zg/14CyPrIbjPgjfQGxcCmSv9nCrSNpmYpnqyOnNwaOJb8zxWD/GXN8Dgnp5jx8CPU6uIfZVhxs7h2hiOXiSHQ==
+  dependencies:
+    fast-shallow-equal "^1.0.0"
+    react-with-forwarded-ref "^0.3.3"
+    tslib "^2.0.3"
+
 react-is@17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
@@ -3866,6 +3880,13 @@ react-refresh@0.8.3:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
   integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==
 
+react-with-forwarded-ref@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/react-with-forwarded-ref/-/react-with-forwarded-ref-0.3.4.tgz#b1e884ea081ec3c5dd578f37889159797454c0a5"
+  integrity sha512-SRq/uTdTh+02JDwYzEEhY2aNNWl/CP2EKP2nQtXzhJw06w6PgYnJt2ObrebvFJu6+wGzX3vDHU3H/ux9hxyZUQ==
+  dependencies:
+    tslib "^2.0.3"
+
 react@17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
@@ -4508,7 +4529,7 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.1.0:
+tslib@^2.0.3, tslib@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==

From 4659cab18c04d35703387246bc8ab44faedc1fe1 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 6 Jan 2022 01:48:27 -0800
Subject: [PATCH 70/81] Only "Advanced" label should look clickable

---
 web/components/advanced-panel.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/components/advanced-panel.tsx b/web/components/advanced-panel.tsx
index 491e9c3b..c607a75d 100644
--- a/web/components/advanced-panel.tsx
+++ b/web/components/advanced-panel.tsx
@@ -9,11 +9,14 @@ export function AdvancedPanel(props: { children: any }) {
     <div
       tabIndex={0}
       className={clsx(
-        'cursor-pointer relative collapse collapse-arrow',
+        'relative collapse collapse-arrow',
         collapsed ? 'collapse-close' : 'collapse-open'
       )}
     >
-      <div onClick={() => setCollapsed((collapsed) => !collapsed)}>
+      <div
+        onClick={() => setCollapsed((collapsed) => !collapsed)}
+        className="cursor-pointer"
+      >
         <div className="mt-4 mr-6 text-sm text-gray-400 text-right">
           Advanced
         </div>

From 95472c5faf4e6b0c600dbfcd9097ffa01008bbd6 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 6 Jan 2022 01:49:41 -0800
Subject: [PATCH 71/81] Tweak bet panel UI

---
 web/components/bet-panel.tsx | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx
index be89621f..bf92f033 100644
--- a/web/components/bet-panel.tsx
+++ b/web/components/bet-panel.tsx
@@ -109,8 +109,10 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
   const remainingBalance = (user?.balance || 0) - (betAmount || 0)
 
   return (
-    <Col className={clsx('bg-white shadow-md px-8 py-6 rounded-md', className)}>
-      <Title className="!mt-0 whitespace-nowrap" text="Place a trade" />
+    <Col
+      className={clsx('bg-gray-100 shadow-md px-8 py-6 rounded-md', className)}
+    >
+      <Title className="!mt-0 whitespace-nowrap" text={`Buy ${betChoice}`} />
 
       <div className="mt-2 mb-1 text-sm text-gray-400">Outcome</div>
       <YesNoSelector
@@ -119,7 +121,14 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
         onSelect={(choice) => onBetChoice(choice)}
       />
 
-      <div className="mt-3 mb-1 text-sm text-gray-400">Amount</div>
+      <div className="mt-3 mb-1 text-sm text-gray-400">
+        Amount{' '}
+        {user && (
+          <span className="float-right">
+            {formatMoney(remainingBalance > 0 ? remainingBalance : 0)} left
+          </span>
+        )}
+      </div>
       <Col className="my-2">
         <label className="input-group">
           <span className="text-sm bg-gray-200">M$</span>
@@ -142,15 +151,6 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
         )}
       </Col>
 
-      {user && (
-        <>
-          <div className="mt-3 mb-1 text-sm text-gray-400">
-            Remaining balance
-          </div>
-          <div>{formatMoney(remainingBalance > 0 ? remainingBalance : 0)}</div>
-        </>
-      )}
-
       <div className="mt-2 mb-1 text-sm text-gray-400">Implied probability</div>
       <Row>
         <div>{formatPercent(initialProb)}</div>
@@ -159,10 +159,11 @@ export function BetPanel(props: { contract: Contract; className?: string }) {
       </Row>
 
       <div className="mt-2 mb-1 text-sm text-gray-400">
-        Max payout (estimated)
+        Estimated max payout
       </div>
       <div>
-        {formatMoney(estimatedWinnings)} &nbsp; (+{estimatedReturnPercent})
+        {formatMoney(estimatedWinnings)} &nbsp;{' '}
+        {estimatedWinnings ? <span>(+{estimatedReturnPercent})</span> : null}
       </div>
 
       <AdvancedPanel>

From 0c9984287c01d9433ffb7c3eb5ba3b7916a94615 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 6 Jan 2022 11:57:20 -0600
Subject: [PATCH 72/81] Update logo and about page to manifold

---
 web/components/mantic-logo.tsx  |  4 ++--
 web/components/profile-menu.tsx |  2 +-
 web/pages/about.tsx             | 34 +++++++++++++++++----------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/web/components/mantic-logo.tsx b/web/components/mantic-logo.tsx
index 904844cb..070838dc 100644
--- a/web/components/mantic-logo.tsx
+++ b/web/components/mantic-logo.tsx
@@ -14,11 +14,11 @@ export function ManticLogo(props: { darkBackground?: boolean }) {
         />
         <div
           className={clsx(
-            'font-major-mono lowercase mt-1 sm:text-2xl md:whitespace-nowrap',
+            'hidden sm:flex font-major-mono lowercase mt-1 sm:text-2xl md:whitespace-nowrap',
             darkBackground && 'text-white'
           )}
         >
-          Mantic Markets
+          Manifold Markets
         </div>
       </a>
     </Link>
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index b5e88d43..2c8ad379 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -67,7 +67,7 @@ function ProfileSummary(props: { user: User }) {
       <div className="rounded-full w-10 h-10 mr-4">
         <Image src={user.avatarUrl} width={40} height={40} />
       </div>
-      <div className="truncate text-left" style={{ maxWidth: 140 }}>
+      <div className="truncate text-left" style={{ maxWidth: 170 }}>
         {user.name}
         <div className="text-gray-700 text-sm">{formatMoney(user.balance)}</div>
       </div>
diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index 1f5d9666..d3421020 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -42,7 +42,7 @@ function Contents() {
       <h1 id="about">About</h1>
       <hr />
       <p>
-        Mantic Markets is creating better forecasting through user-created
+        Manifold Markets is creating better forecasting through user-created
         prediction markets.
       </p>
       <p>
@@ -77,7 +77,9 @@ function Contents() {
         </a>
         . This is the power of prediction markets!
       </p>
-      <h3 id="how-does-mantic-markets-work-">How does Mantic Markets work?</h3>
+      <h3 id="how-does-manifold-markets-work-">
+        How does Manifold Markets work?
+      </h3>
       <ol>
         <li>
           <strong>
@@ -96,7 +98,7 @@ function Contents() {
         </p>
         <li>
           <strong>
-            Anyone can bet on a market using Mantic Dollars (M$), our platform
+            Anyone can bet on a market using Manifold Dollars (M$), our platform
             currency.
           </strong>
         </li>
@@ -104,15 +106,15 @@ function Contents() {
       <p>
         You get M$ 1,000 just for signing up, so you can start betting
         immediately! When a market creator decides an outcome in your favor,
-        you&#39;ll win Mantic Dollars from people who bet against you.
+        you&#39;ll win Manifold Dollars from people who bet against you.
       </p>
       {/* <p>
         If you run out of money, you can purchase more at a rate of $1 USD to M$
-        100. (Note that Mantic Dollars are not convertible to cash and can only
+        100. (Note that Manifold Dollars are not convertible to cash and can only
         be used within our platform.)
       </p> */}
       <aside>
-        💡 We&#39;re still in Open Beta; we&#39;ll tweak the amounts of Mantic
+        💡 We&#39;re still in Open Beta; we&#39;ll tweak the amounts of Manifold
         Dollars given out and periodically reset balances before our official
         launch.
         {/* If you purchase
@@ -130,7 +132,7 @@ function Contents() {
       </p>
       <p>By buying M$, you support:</p>
       <ul>
-        <li>The continued development of Mantic Markets</li>
+        <li>The continued development of Manifold Markets</li>
         <li>Cash payouts to market creators (TBD)</li>
         <li>Forecasting tournaments for bettors (TBD)</li>
       </ul>
@@ -206,12 +208,12 @@ function Contents() {
         they use on our platform.
       </p>
       <p>
-        With Mantic Dollars being a scarce resource, people will bet more
+        With Manifold Dollars being a scarce resource, people will bet more
         carefully and can&#39;t rig the outcome by creating multiple accounts.
         The result is more accurate predictions.
       </p> */}
       <p>
-        Mantic Markets is focused on accessibility and allowing anyone to
+        Manifold Markets is focused on accessibility and allowing anyone to
         quickly create and judge a prediction market. When we all have the power
         to create and share prediction markets in seconds and apply our own
         judgment on the outcome, it leads to a qualitative shift in the number,
@@ -239,8 +241,8 @@ function Contents() {
 
       <h3 id="type-of-market-maker">What kind of betting system do you use?</h3>
       <p>
-        Mantic Markets uses a special type of automated market marker based on a
-        dynamic pari-mutuel (DPM) betting system.
+        Manifold Markets uses a special type of automated market marker based on
+        a dynamic pari-mutuel (DPM) betting system.
       </p>
       <p>
         Like traditional pari-mutuel systems, your payoff is not known at the
@@ -258,7 +260,7 @@ function Contents() {
       </p>
 
       <h3 id="who-are-we-">Who are we?</h3>
-      <p>Mantic Markets is currently a team of three:</p>
+      <p>Manifold Markets is currently a team of three:</p>
       <ul>
         <li>James Grugett</li>
         <li>Stephen Grugett</li>
@@ -278,7 +280,7 @@ function Contents() {
       </p>
       <ul>
         <li>
-          Email: <code>info@mantic.markets</code>
+          Email: <code>info@manifold.markets</code>
         </li>
         <li>
           Office hours:{' '}
@@ -288,7 +290,7 @@ function Contents() {
       </ul>
       <p>
         <a href="https://discord.gg/eHQBNBqXuh">
-          Join the Mantic Markets Discord Server!
+          Join the Manifold Markets Discord Server!
         </a>
       </p>
 
@@ -298,7 +300,7 @@ function Contents() {
       <ul>
         <li>
           <a href="https://manifoldmarkets.notion.site/Technical-Overview-b9b48a09ea1f45b88d991231171730c5">
-            Technical Overview of Mantic Markets
+            Technical Overview of Manifold Markets
           </a>
         </li>
         <li>
@@ -322,7 +324,7 @@ function Contents() {
           </a>
         </li>
         <li>
-          <a href="https://mantic.markets/simulator">
+          <a href="https://manifold.markets/simulator">
             Dynamic parimutuel market simulator
           </a>
         </li>

From b928d0e70ccd6d838b2421074de7a17f80a584b8 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 6 Jan 2022 12:40:27 -0600
Subject: [PATCH 73/81] Change urls, titles / metatags, landing page

---
 README.md                            |  3 ++-
 functions/src/emails.ts              |  2 +-
 web/README.md                        |  2 +-
 web/components/SEO.tsx               |  4 ++--
 web/components/contract-overview.tsx |  2 +-
 web/pages/_app.tsx                   | 14 +++++++-------
 web/pages/landing-page.tsx           |  4 ++--
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index c21c87ac..496fa34c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # mantic
-Mantic Markets
+
+Manifold Markets
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index ba4874d3..0f85638f 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -26,7 +26,7 @@ Resolution: ${toDisplayResolution[resolution]}
 Your payout is M$ ${Math.round(payout)}
 
 View the market here:
-https://mantic.markets/${creator.username}/${contract.slug}
+https://manifold.markets/${creator.username}/${contract.slug}
 `
   await sendEmail(user.email, subject, body)
 }
diff --git a/web/README.md b/web/README.md
index ff9d1ec0..e16f0e9c 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,4 +1,4 @@
-# Mantic Markets web
+# Manifold Markets web
 
 ## Getting Started
 
diff --git a/web/components/SEO.tsx b/web/components/SEO.tsx
index 6e4b76b6..e8d6547f 100644
--- a/web/components/SEO.tsx
+++ b/web/components/SEO.tsx
@@ -10,7 +10,7 @@ export function SEO(props: {
 
   return (
     <Head>
-      <title>{title} | Mantic Markets</title>
+      <title>{title} | Manifold Markets</title>
 
       <meta
         property="og:title"
@@ -29,7 +29,7 @@ export function SEO(props: {
       {url && (
         <meta
           property="og:url"
-          content={'https://mantic.markets' + url}
+          content={'https://manifold.markets' + url}
           key="url"
         />
       )}
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index e044ec18..6eff1bda 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -35,7 +35,7 @@ export const ContractOverview = (props: {
       ? `Resolved ${resolution}!`
       : `Resolved ${resolution} by ${creatorName}:`
     : `Currently ${probPercent} chance, place your bets here:`
-  const url = `https://mantic.markets${path(contract)}`
+  const url = `https://manifold.markets${path(contract)}`
   const tweetText = `${tweetQuestion}\n\n${tweetDescription}\n\n${url}`
 
   return (
diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index 1448a27e..b9c8d164 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -6,32 +6,32 @@ function MyApp({ Component, pageProps }: AppProps) {
   return (
     <>
       <Head>
-        <title>Mantic Markets</title>
+        <title>Manifold Markets</title>
 
         <meta
           property="og:title"
           name="twitter:title"
-          content="Mantic Markets"
+          content="Manifold Markets"
           key="title"
         />
         <meta
           name="description"
-          content="Mantic Markets is creating better forecasting through user-created prediction markets."
+          content="Manifold Markets is creating better forecasting through user-created prediction markets."
           key="description1"
         />
         <meta
           property="og:description"
           name="twitter:description"
-          content="Mantic Markets is creating better forecasting through user-created prediction markets."
+          content="Manifold Markets is creating better forecasting through user-created prediction markets."
           key="description2"
         />
-        <meta property="og:url" content="https://mantic.markets" key="url" />
+        <meta property="og:url" content="https://manifold.markets" key="url" />
         <meta name="twitter:card" content="summary_large_image" />
-        <meta name="twitter:site" content="@manticmarkets" />
+        <meta name="twitter:site" content="@manifoldmarkets" />
         <meta
           property="og:image"
           name="twitter:image"
-          content="https://mantic.markets/logo-cover.png"
+          content="https://manifold.markets/logo-cover.png"
         />
       </Head>
 
diff --git a/web/pages/landing-page.tsx b/web/pages/landing-page.tsx
index 13d209b6..c85aa5f3 100644
--- a/web/pages/landing-page.tsx
+++ b/web/pages/landing-page.tsx
@@ -94,7 +94,7 @@ function FeaturesSection() {
     {
       name: 'Play money, real results',
       description:
-        'Get accurate predictions by betting with Mantic Dollars, our virtual currency.',
+        'Get accurate predictions by betting with Manifold Dollars, our virtual currency.',
       icon: LightningBoltIcon,
     },
     {
@@ -117,7 +117,7 @@ function FeaturesSection() {
         <div className="max-w-7xl mx-auto px-6 lg:px-8">
           <div className="lg:text-center">
             <h2 className="text-base text-teal-600 font-semibold tracking-wide uppercase">
-              Mantic Markets
+              Manifold Markets
             </h2>
             <p className="mt-2 text-3xl leading-8 font-extrabold tracking-tight text-gray-900 sm:text-4xl">
               Better forecasting for everyone

From 85b5ee5cbc10b0024afcb54a6645b5658e0bc1ea Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Thu, 6 Jan 2022 12:48:30 -0600
Subject: [PATCH 74/81] Rename to Manifold Markets! (#19)

* Update logo and about page to manifold

* Change urls, titles / metatags, landing page
---
 README.md                            |  3 ++-
 functions/src/emails.ts              |  2 +-
 web/README.md                        |  2 +-
 web/components/SEO.tsx               |  4 ++--
 web/components/contract-overview.tsx |  2 +-
 web/components/mantic-logo.tsx       |  4 ++--
 web/components/profile-menu.tsx      |  2 +-
 web/pages/_app.tsx                   | 14 ++++++------
 web/pages/about.tsx                  | 34 +++++++++++++++-------------
 web/pages/landing-page.tsx           |  4 ++--
 10 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index c21c87ac..496fa34c 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # mantic
-Mantic Markets
+
+Manifold Markets
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index ba4874d3..0f85638f 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -26,7 +26,7 @@ Resolution: ${toDisplayResolution[resolution]}
 Your payout is M$ ${Math.round(payout)}
 
 View the market here:
-https://mantic.markets/${creator.username}/${contract.slug}
+https://manifold.markets/${creator.username}/${contract.slug}
 `
   await sendEmail(user.email, subject, body)
 }
diff --git a/web/README.md b/web/README.md
index ff9d1ec0..e16f0e9c 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,4 +1,4 @@
-# Mantic Markets web
+# Manifold Markets web
 
 ## Getting Started
 
diff --git a/web/components/SEO.tsx b/web/components/SEO.tsx
index 6e4b76b6..e8d6547f 100644
--- a/web/components/SEO.tsx
+++ b/web/components/SEO.tsx
@@ -10,7 +10,7 @@ export function SEO(props: {
 
   return (
     <Head>
-      <title>{title} | Mantic Markets</title>
+      <title>{title} | Manifold Markets</title>
 
       <meta
         property="og:title"
@@ -29,7 +29,7 @@ export function SEO(props: {
       {url && (
         <meta
           property="og:url"
-          content={'https://mantic.markets' + url}
+          content={'https://manifold.markets' + url}
           key="url"
         />
       )}
diff --git a/web/components/contract-overview.tsx b/web/components/contract-overview.tsx
index e044ec18..6eff1bda 100644
--- a/web/components/contract-overview.tsx
+++ b/web/components/contract-overview.tsx
@@ -35,7 +35,7 @@ export const ContractOverview = (props: {
       ? `Resolved ${resolution}!`
       : `Resolved ${resolution} by ${creatorName}:`
     : `Currently ${probPercent} chance, place your bets here:`
-  const url = `https://mantic.markets${path(contract)}`
+  const url = `https://manifold.markets${path(contract)}`
   const tweetText = `${tweetQuestion}\n\n${tweetDescription}\n\n${url}`
 
   return (
diff --git a/web/components/mantic-logo.tsx b/web/components/mantic-logo.tsx
index 904844cb..070838dc 100644
--- a/web/components/mantic-logo.tsx
+++ b/web/components/mantic-logo.tsx
@@ -14,11 +14,11 @@ export function ManticLogo(props: { darkBackground?: boolean }) {
         />
         <div
           className={clsx(
-            'font-major-mono lowercase mt-1 sm:text-2xl md:whitespace-nowrap',
+            'hidden sm:flex font-major-mono lowercase mt-1 sm:text-2xl md:whitespace-nowrap',
             darkBackground && 'text-white'
           )}
         >
-          Mantic Markets
+          Manifold Markets
         </div>
       </a>
     </Link>
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index b5e88d43..2c8ad379 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -67,7 +67,7 @@ function ProfileSummary(props: { user: User }) {
       <div className="rounded-full w-10 h-10 mr-4">
         <Image src={user.avatarUrl} width={40} height={40} />
       </div>
-      <div className="truncate text-left" style={{ maxWidth: 140 }}>
+      <div className="truncate text-left" style={{ maxWidth: 170 }}>
         {user.name}
         <div className="text-gray-700 text-sm">{formatMoney(user.balance)}</div>
       </div>
diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index 1448a27e..b9c8d164 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -6,32 +6,32 @@ function MyApp({ Component, pageProps }: AppProps) {
   return (
     <>
       <Head>
-        <title>Mantic Markets</title>
+        <title>Manifold Markets</title>
 
         <meta
           property="og:title"
           name="twitter:title"
-          content="Mantic Markets"
+          content="Manifold Markets"
           key="title"
         />
         <meta
           name="description"
-          content="Mantic Markets is creating better forecasting through user-created prediction markets."
+          content="Manifold Markets is creating better forecasting through user-created prediction markets."
           key="description1"
         />
         <meta
           property="og:description"
           name="twitter:description"
-          content="Mantic Markets is creating better forecasting through user-created prediction markets."
+          content="Manifold Markets is creating better forecasting through user-created prediction markets."
           key="description2"
         />
-        <meta property="og:url" content="https://mantic.markets" key="url" />
+        <meta property="og:url" content="https://manifold.markets" key="url" />
         <meta name="twitter:card" content="summary_large_image" />
-        <meta name="twitter:site" content="@manticmarkets" />
+        <meta name="twitter:site" content="@manifoldmarkets" />
         <meta
           property="og:image"
           name="twitter:image"
-          content="https://mantic.markets/logo-cover.png"
+          content="https://manifold.markets/logo-cover.png"
         />
       </Head>
 
diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index 1f5d9666..d3421020 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -42,7 +42,7 @@ function Contents() {
       <h1 id="about">About</h1>
       <hr />
       <p>
-        Mantic Markets is creating better forecasting through user-created
+        Manifold Markets is creating better forecasting through user-created
         prediction markets.
       </p>
       <p>
@@ -77,7 +77,9 @@ function Contents() {
         </a>
         . This is the power of prediction markets!
       </p>
-      <h3 id="how-does-mantic-markets-work-">How does Mantic Markets work?</h3>
+      <h3 id="how-does-manifold-markets-work-">
+        How does Manifold Markets work?
+      </h3>
       <ol>
         <li>
           <strong>
@@ -96,7 +98,7 @@ function Contents() {
         </p>
         <li>
           <strong>
-            Anyone can bet on a market using Mantic Dollars (M$), our platform
+            Anyone can bet on a market using Manifold Dollars (M$), our platform
             currency.
           </strong>
         </li>
@@ -104,15 +106,15 @@ function Contents() {
       <p>
         You get M$ 1,000 just for signing up, so you can start betting
         immediately! When a market creator decides an outcome in your favor,
-        you&#39;ll win Mantic Dollars from people who bet against you.
+        you&#39;ll win Manifold Dollars from people who bet against you.
       </p>
       {/* <p>
         If you run out of money, you can purchase more at a rate of $1 USD to M$
-        100. (Note that Mantic Dollars are not convertible to cash and can only
+        100. (Note that Manifold Dollars are not convertible to cash and can only
         be used within our platform.)
       </p> */}
       <aside>
-        💡 We&#39;re still in Open Beta; we&#39;ll tweak the amounts of Mantic
+        💡 We&#39;re still in Open Beta; we&#39;ll tweak the amounts of Manifold
         Dollars given out and periodically reset balances before our official
         launch.
         {/* If you purchase
@@ -130,7 +132,7 @@ function Contents() {
       </p>
       <p>By buying M$, you support:</p>
       <ul>
-        <li>The continued development of Mantic Markets</li>
+        <li>The continued development of Manifold Markets</li>
         <li>Cash payouts to market creators (TBD)</li>
         <li>Forecasting tournaments for bettors (TBD)</li>
       </ul>
@@ -206,12 +208,12 @@ function Contents() {
         they use on our platform.
       </p>
       <p>
-        With Mantic Dollars being a scarce resource, people will bet more
+        With Manifold Dollars being a scarce resource, people will bet more
         carefully and can&#39;t rig the outcome by creating multiple accounts.
         The result is more accurate predictions.
       </p> */}
       <p>
-        Mantic Markets is focused on accessibility and allowing anyone to
+        Manifold Markets is focused on accessibility and allowing anyone to
         quickly create and judge a prediction market. When we all have the power
         to create and share prediction markets in seconds and apply our own
         judgment on the outcome, it leads to a qualitative shift in the number,
@@ -239,8 +241,8 @@ function Contents() {
 
       <h3 id="type-of-market-maker">What kind of betting system do you use?</h3>
       <p>
-        Mantic Markets uses a special type of automated market marker based on a
-        dynamic pari-mutuel (DPM) betting system.
+        Manifold Markets uses a special type of automated market marker based on
+        a dynamic pari-mutuel (DPM) betting system.
       </p>
       <p>
         Like traditional pari-mutuel systems, your payoff is not known at the
@@ -258,7 +260,7 @@ function Contents() {
       </p>
 
       <h3 id="who-are-we-">Who are we?</h3>
-      <p>Mantic Markets is currently a team of three:</p>
+      <p>Manifold Markets is currently a team of three:</p>
       <ul>
         <li>James Grugett</li>
         <li>Stephen Grugett</li>
@@ -278,7 +280,7 @@ function Contents() {
       </p>
       <ul>
         <li>
-          Email: <code>info@mantic.markets</code>
+          Email: <code>info@manifold.markets</code>
         </li>
         <li>
           Office hours:{' '}
@@ -288,7 +290,7 @@ function Contents() {
       </ul>
       <p>
         <a href="https://discord.gg/eHQBNBqXuh">
-          Join the Mantic Markets Discord Server!
+          Join the Manifold Markets Discord Server!
         </a>
       </p>
 
@@ -298,7 +300,7 @@ function Contents() {
       <ul>
         <li>
           <a href="https://manifoldmarkets.notion.site/Technical-Overview-b9b48a09ea1f45b88d991231171730c5">
-            Technical Overview of Mantic Markets
+            Technical Overview of Manifold Markets
           </a>
         </li>
         <li>
@@ -322,7 +324,7 @@ function Contents() {
           </a>
         </li>
         <li>
-          <a href="https://mantic.markets/simulator">
+          <a href="https://manifold.markets/simulator">
             Dynamic parimutuel market simulator
           </a>
         </li>
diff --git a/web/pages/landing-page.tsx b/web/pages/landing-page.tsx
index 13d209b6..c85aa5f3 100644
--- a/web/pages/landing-page.tsx
+++ b/web/pages/landing-page.tsx
@@ -94,7 +94,7 @@ function FeaturesSection() {
     {
       name: 'Play money, real results',
       description:
-        'Get accurate predictions by betting with Mantic Dollars, our virtual currency.',
+        'Get accurate predictions by betting with Manifold Dollars, our virtual currency.',
       icon: LightningBoltIcon,
     },
     {
@@ -117,7 +117,7 @@ function FeaturesSection() {
         <div className="max-w-7xl mx-auto px-6 lg:px-8">
           <div className="lg:text-center">
             <h2 className="text-base text-teal-600 font-semibold tracking-wide uppercase">
-              Mantic Markets
+              Manifold Markets
             </h2>
             <p className="mt-2 text-3xl leading-8 font-extrabold tracking-tight text-gray-900 sm:text-4xl">
               Better forecasting for everyone

From a333d8334e2aba026a9d0a5e32110122e345e6b0 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Thu, 6 Jan 2022 10:55:31 -0800
Subject: [PATCH 75/81] Return the new bet ID

---
 functions/src/place-bet.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/src/place-bet.ts b/functions/src/place-bet.ts
index d26c07de..8cb88b3a 100644
--- a/functions/src/place-bet.ts
+++ b/functions/src/place-bet.ts
@@ -54,7 +54,7 @@ export const placeBet = functions.runWith({ minInstances: 1 }).https.onCall(
       })
       transaction.update(userDoc, { balance: newBalance })
 
-      return { status: 'success' }
+      return { status: 'success', betId: newBetDoc.id }
     })
   }
 )

From bcd86ddce9a795f2453bf4b039211f60b1d229ca Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 6 Jan 2022 18:05:48 -0600
Subject: [PATCH 76/81] Rename user contracts

---
 functions/src/scripts/recalculate.ts          | 61 -------------------
 .../src/scripts/rename-user-contracts.ts      | 46 ++++++++++++++
 functions/src/utils.ts                        | 16 ++---
 3 files changed, 54 insertions(+), 69 deletions(-)
 delete mode 100644 functions/src/scripts/recalculate.ts
 create mode 100644 functions/src/scripts/rename-user-contracts.ts

diff --git a/functions/src/scripts/recalculate.ts b/functions/src/scripts/recalculate.ts
deleted file mode 100644
index 103152c9..00000000
--- a/functions/src/scripts/recalculate.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import * as admin from 'firebase-admin'
-import * as _ from 'lodash'
-import { Bet } from '../types/bet'
-import { Contract } from '../types/contract'
-
-type DocRef = admin.firestore.DocumentReference
-
-// Generate your own private key, and set the path below:
-// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
-const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
-
-admin.initializeApp({
-  credential: admin.credential.cert(serviceAccount),
-})
-const firestore = admin.firestore()
-
-async function recalculateContract(contractRef: DocRef, contract: Contract) {
-  const bets = await contractRef
-    .collection('bets')
-    .get()
-    .then((snap) => snap.docs.map((bet) => bet.data() as Bet))
-
-  const openBets = bets.filter((b) => !b.isSold && !b.sale)
-
-  const totalShares = {
-    YES: _.sumBy(openBets, (bet) => (bet.outcome === 'YES' ? bet.shares : 0)),
-    NO: _.sumBy(openBets, (bet) => (bet.outcome === 'NO' ? bet.shares : 0)),
-  }
-
-  const totalBets = {
-    YES: _.sumBy(openBets, (bet) => (bet.outcome === 'YES' ? bet.amount : 0)),
-    NO: _.sumBy(openBets, (bet) => (bet.outcome === 'NO' ? bet.amount : 0)),
-  }
-
-  await contractRef.update({ totalShares, totalBets })
-
-  console.log(
-    'calculating totals for "',
-    contract.question,
-    '" total bets:',
-    totalBets
-  )
-  console.log()
-}
-
-async function migrateContracts() {
-  console.log('Recalculating contract info')
-
-  const snapshot = await firestore.collection('contracts').get()
-  const contracts = snapshot.docs.map((doc) => doc.data() as Contract)
-
-  console.log('Loaded', contracts.length, 'contracts')
-
-  for (const contract of contracts) {
-    const contractRef = firestore.doc(`contracts/${contract.id}`)
-
-    await recalculateContract(contractRef, contract)
-  }
-}
-
-if (require.main === module) migrateContracts().then(() => process.exit())
diff --git a/functions/src/scripts/rename-user-contracts.ts b/functions/src/scripts/rename-user-contracts.ts
new file mode 100644
index 00000000..2debd9e7
--- /dev/null
+++ b/functions/src/scripts/rename-user-contracts.ts
@@ -0,0 +1,46 @@
+import * as admin from 'firebase-admin'
+import * as _ from 'lodash'
+import { Contract } from '../types/contract'
+import { getValues } from '../utils'
+
+// Generate your own private key, and set the path below:
+// https://console.firebase.google.com/u/0/project/mantic-markets/settings/serviceaccounts/adminsdk
+// James:
+const serviceAccount = require('../../../../Downloads/mantic-markets-firebase-adminsdk-1ep46-820891bb87.json')
+// Stephen:
+// const serviceAccount = require('../../../../Downloads/dev-mantic-markets-firebase-adminsdk-sir5m-b2d27f8970.json')
+
+admin.initializeApp({
+  credential: admin.credential.cert(serviceAccount),
+})
+const firestore = admin.firestore()
+
+async function renameUserContracts(
+  username: string,
+  newNames: { name: string; username: string }
+) {
+  console.log(`Renaming contracts of ${username} to`, newNames)
+
+  const contracts = await getValues<Contract>(
+    firestore.collection('contracts').where('creatorUsername', '==', username)
+  )
+
+  console.log('Loaded', contracts.length, 'contracts by', username)
+
+  for (const contract of contracts) {
+    const contractRef = firestore.doc(`contracts/${contract.id}`)
+
+    console.log('Renaming', contract.slug)
+
+    await contractRef.update({
+      creatorUsername: newNames.username,
+      creatorName: newNames.name,
+    } as Partial<Contract>)
+  }
+}
+
+if (require.main === module)
+  renameUserContracts('ManticMarkets', {
+    username: 'ManifoldMarkets',
+    name: 'Manifold Markets',
+  }).then(() => process.exit())
diff --git a/functions/src/utils.ts b/functions/src/utils.ts
index ff3e8fb3..85f5b3fa 100644
--- a/functions/src/utils.ts
+++ b/functions/src/utils.ts
@@ -4,14 +4,14 @@ import { Contract } from './types/contract'
 import { User } from './types/user'
 
 export const getValue = async <T>(collection: string, doc: string) => {
-  const snap = await admin.firestore()
-    .collection(collection)
-    .doc(doc)
-    .get()
+  const snap = await admin.firestore().collection(collection).doc(doc).get()
 
-  return snap.exists
-    ? snap.data() as T
-    : undefined
+  return snap.exists ? (snap.data() as T) : undefined
+}
+
+export const getValues = async <T>(query: admin.firestore.Query) => {
+  const snap = await query.get()
+  return snap.docs.map((doc) => doc.data() as T)
 }
 
 export const getContract = (contractId: string) => {
@@ -20,4 +20,4 @@ export const getContract = (contractId: string) => {
 
 export const getUser = (userId: string) => {
   return getValue<User>('users', userId)
-}
\ No newline at end of file
+}

From 4390ee4314db0aa799b50169fac562cc7529a1ed Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 6 Jan 2022 18:33:19 -0600
Subject: [PATCH 77/81] Send transactional email from manifold.markets

---
 functions/src/send-email.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions/src/send-email.ts b/functions/src/send-email.ts
index 98948fcf..fd995e59 100644
--- a/functions/src/send-email.ts
+++ b/functions/src/send-email.ts
@@ -1,12 +1,12 @@
 import * as mailgun from 'mailgun-js'
 import * as functions from 'firebase-functions'
 
-const DOMAIN = 'mg.mantic.markets'
+const DOMAIN = 'mg.manifold.markets'
 const mg = mailgun({ apiKey: functions.config().mailgun.key, domain: DOMAIN })
 
 export const sendEmail = (to: string, subject: string, text: string) => {
   const data = {
-    from: 'Mantic Markets <no-reply@mantic.markets>',
+    from: 'Manifold Markets <no-reply@manifold.markets>',
     to,
     subject,
     text,

From bdb46fc7c112d44d15530a65be1d833ca309b9c3 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 6 Jan 2022 21:32:46 -0600
Subject: [PATCH 78/81] Tweaks for create market page

---
 web/pages/create.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/pages/create.tsx b/web/pages/create.tsx
index 980443cc..683bb360 100644
--- a/web/pages/create.tsx
+++ b/web/pages/create.tsx
@@ -100,7 +100,7 @@ export default function NewContract() {
         <form>
           <div className="form-control w-full">
             <label className="label">
-              <span className="label-text">Question</span>
+              <span className="mb-1">Question</span>
             </label>
 
             <Textarea
@@ -116,14 +116,14 @@ export default function NewContract() {
 
           <div className="form-control">
             <label className="label">
-              <span className="label-text">Initial probability</span>
+              <span className="mb-1">Initial probability</span>
             </label>
             <Row className="items-center gap-2">
               <label className="input-group input-group-lg w-fit text-xl">
                 <input
                   type="number"
                   value={initialProb}
-                  className="input input-bordered input-md text-primary text-4xl w-24"
+                  className="input input-bordered input-md text-primary text-3xl w-24"
                   disabled={isSubmitting}
                   min={1}
                   max={99}
@@ -148,7 +148,7 @@ export default function NewContract() {
 
           <div className="form-control">
             <label className="label">
-              <span className="label-text">Description</span>
+              <span className="mb-1">Description</span>
             </label>
             <Textarea
               className="textarea w-full textarea-bordered"
@@ -164,7 +164,7 @@ export default function NewContract() {
           <AdvancedPanel>
             <div className="form-control mb-1">
               <label className="label">
-                <span className="label-text">Subsidize your market</span>
+                <span className="mb-1">Subsidize your market</span>
               </label>
 
               <label className="input-group">
@@ -194,7 +194,7 @@ export default function NewContract() {
 
             <div className="form-control">
               <label className="label">
-                <span className="label-text">Close date</span>
+                <span className="mb-1">Close date</span>
               </label>
               <input
                 type="date"

From 59034839a9983ababe81f610a02f2fb5737f6c0a Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 6 Jan 2022 21:41:19 -0600
Subject: [PATCH 79/81] meta tag image

---
 web/pages/_app.tsx         |   4 ++--
 web/public/logo-banner.png | Bin 0 -> 40611 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 web/public/logo-banner.png

diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index b9c8d164..f64ca4f9 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -26,12 +26,12 @@ function MyApp({ Component, pageProps }: AppProps) {
           key="description2"
         />
         <meta property="og:url" content="https://manifold.markets" key="url" />
-        <meta name="twitter:card" content="summary_large_image" />
+        <meta name="twitter:card" content="summary" />
         <meta name="twitter:site" content="@manifoldmarkets" />
         <meta
           property="og:image"
           name="twitter:image"
-          content="https://manifold.markets/logo-cover.png"
+          content="https://manifold.markets/logo-banner.png"
         />
       </Head>
 
diff --git a/web/public/logo-banner.png b/web/public/logo-banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a992b7925fa88754b9eee9942f9e85d35bde62c
GIT binary patch
literal 40611
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

literal 0
HcmV?d00001


From a7c42ee8ec8bbb283e118d202f795c86917bd198 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 6 Jan 2022 21:54:11 -0600
Subject: [PATCH 80/81] meta image tag

---
 web/pages/_app.tsx     |   5 ++++-
 web/public/logo-bg.png | Bin 0 -> 39314 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 web/public/logo-bg.png

diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index f64ca4f9..f2f2619d 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -30,8 +30,11 @@ function MyApp({ Component, pageProps }: AppProps) {
         <meta name="twitter:site" content="@manifoldmarkets" />
         <meta
           property="og:image"
+          content="https://manifold.markets/logo-cover.png"
+        />
+        <meta
           name="twitter:image"
-          content="https://manifold.markets/logo-banner.png"
+          content="https://manifold.markets/logo-bg.png"
         />
       </Head>
 
diff --git a/web/public/logo-bg.png b/web/public/logo-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..4afc4e7de51d6ebe816159458089a976f797ad16
GIT binary patch
literal 39314
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
G>i+=KAZv*L

literal 0
HcmV?d00001


From e3800de2adcced04afeea9a81c4ef2e65a2d89e3 Mon Sep 17 00:00:00 2001
From: jahooma <jahooma@gmail.com>
Date: Thu, 6 Jan 2022 22:00:19 -0600
Subject: [PATCH 81/81] Update resolution panel to gray bg

---
 web/components/resolution-panel.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/components/resolution-panel.tsx b/web/components/resolution-panel.tsx
index 3e282fa8..131b9f2e 100644
--- a/web/components/resolution-panel.tsx
+++ b/web/components/resolution-panel.tsx
@@ -57,7 +57,9 @@ export function ResolutionPanel(props: {
       : 'btn-disabled'
 
   return (
-    <Col className={clsx('bg-white shadow-md px-8 py-6 rounded-md', className)}>
+    <Col
+      className={clsx('bg-gray-100 shadow-md px-8 py-6 rounded-md', className)}
+    >
       <Title className="mt-0" text="Your market" />
 
       <div className="pt-2 pb-1 text-sm text-gray-400">Resolve outcome</div>