From ac4964f05817bab79d731818fabef3c3999cb445 Mon Sep 17 00:00:00 2001
From: Ian Philips <iansphilips@gmail.com>
Date: Thu, 21 Jul 2022 12:01:33 -0600
Subject: [PATCH] Fix before and after probs

---
 common/challenge.ts                           |  3 ++
 functions/src/accept-challenge.ts             | 50 ++++++++-----------
 web/components/bet-row.tsx                    |  5 --
 web/components/copy-link-button.tsx           |  2 +-
 web/pages/[username]/[contractSlug].tsx       |  5 --
 .../[contractSlug]/[challengeSlug].tsx        | 30 +++++++----
 6 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/common/challenge.ts b/common/challenge.ts
index b49bd836..2cafe019 100644
--- a/common/challenge.ts
+++ b/common/challenge.ts
@@ -37,15 +37,18 @@ export type Challenge = {
   // Successful redemptions of the link
   acceptances: Acceptance[]
 
+  // TODO: will have to fill this on resolve contract
   isResolved: boolean
   resolutionOutcome?: string
 }
 
 export type Acceptance = {
+  // User that accepted the challenge
   userId: string
   userUsername: string
   userName: string
   userAvatarUrl: string
+
   // The ID of the successful bet that tracks the money moved
   betId: string
 
diff --git a/functions/src/accept-challenge.ts b/functions/src/accept-challenge.ts
index eb6c0350..a43afa9a 100644
--- a/functions/src/accept-challenge.ts
+++ b/functions/src/accept-challenge.ts
@@ -8,10 +8,7 @@ import { FieldValue } from 'firebase-admin/firestore'
 import { removeUndefinedProps } from '../../common/util/object'
 import { Acceptance, Challenge } from '../../common/challenge'
 import { CandidateBet } from '../../common/new-bet'
-import {
-  calculateCpmmPurchase,
-  getCpmmProbability,
-} from '../../common/calculate-cpmm'
+import { getCpmmProbability } from '../../common/calculate-cpmm'
 import { createChallengeAcceptedNotification } from './create-notification'
 
 const bodySchema = z.object({
@@ -63,11 +60,19 @@ export const acceptchallenge = newEndpoint({}, async (req, auth) => {
       throw new APIError(400, 'Challenges only accepted for binary markets.')
 
     const contract = anyContract as CPMMBinaryContract
-    log('contract stats:', contract.pool, contract.p)
-    const probs = getCpmmProbability(contract.pool, contract.p)
-    log('probs:', probs)
-
+    const { YES: y, NO: n } = contract.pool
     const yourShares = (1 / (1 - creatorsOutcomeProb)) * amount
+    const creatorShares = (1 / creatorsOutcomeProb) * amount
+
+    const newYesShares = creatorsOutcome === 'YES' ? creatorShares : yourShares
+    const newNoShares = creatorsOutcome === 'NO' ? creatorShares : yourShares
+    const newPool = {
+      YES: y + newYesShares,
+      NO: n + newNoShares,
+    }
+    const probBefore = getCpmmProbability(contract.pool, contract.p)
+    const probAfter = getCpmmProbability(newPool, contract.p)
+
     const yourNewBet: CandidateBet = removeUndefinedProps({
       orderAmount: amount,
       amount: amount,
@@ -75,8 +80,8 @@ export const acceptchallenge = newEndpoint({}, async (req, auth) => {
       isCancelled: false,
       contractId: contract.id,
       outcome: yourOutcome,
-      probBefore: probs,
-      probAfter: probs,
+      probBefore,
+      probAfter,
       loanAmount: 0,
       createdTime: Date.now(),
       fees: { creatorFee: 0, platformFee: 0, liquidityFee: 0 },
@@ -92,15 +97,6 @@ export const acceptchallenge = newEndpoint({}, async (req, auth) => {
     trans.update(userDoc, { balance: FieldValue.increment(-yourNewBet.amount) })
     log('Updated user balance.')
 
-    let cpmmState = { pool: contract.pool, p: contract.p }
-    const { newPool, newP } = calculateCpmmPurchase(
-      cpmmState,
-      yourNewBet.amount,
-      yourNewBet.outcome
-    )
-    cpmmState = { pool: newPool, p: newP }
-
-    const creatorShares = (1 / creatorsOutcomeProb) * amount
     const creatorNewBet: CandidateBet = removeUndefinedProps({
       orderAmount: amount,
       amount: amount,
@@ -108,8 +104,8 @@ export const acceptchallenge = newEndpoint({}, async (req, auth) => {
       isCancelled: false,
       contractId: contract.id,
       outcome: creatorsOutcome,
-      probBefore: probs,
-      probAfter: probs,
+      probBefore,
+      probAfter,
       loanAmount: 0,
       createdTime: Date.now(),
       fees: { creatorFee: 0, platformFee: 0, liquidityFee: 0 },
@@ -126,19 +122,11 @@ export const acceptchallenge = newEndpoint({}, async (req, auth) => {
       balance: FieldValue.increment(-creatorNewBet.amount),
     })
     log('Updated user balance.')
-    const newPurchaseStats = calculateCpmmPurchase(
-      cpmmState,
-      creatorNewBet.amount,
-      creatorNewBet.outcome
-    )
-    cpmmState = { pool: newPurchaseStats.newPool, p: newPurchaseStats.newP }
 
     trans.update(
       contractDoc,
       removeUndefinedProps({
-        pool: cpmmState.pool,
-        // p shouldn't have changed
-        p: contract.p,
+        pool: newPool,
         volume: contract.volume + yourNewBet.amount + creatorNewBet.amount,
       })
     )
@@ -160,6 +148,7 @@ export const acceptchallenge = newEndpoint({}, async (req, auth) => {
         ],
       })
     )
+    log('Updated challenge properties with new acceptance.')
 
     await createChallengeAcceptedNotification(
       user,
@@ -167,6 +156,7 @@ export const acceptchallenge = newEndpoint({}, async (req, auth) => {
       challenge,
       contract
     )
+    log('Created notification.')
     return yourNewBetDoc
   })
 
diff --git a/web/components/bet-row.tsx b/web/components/bet-row.tsx
index 933eb02f..28dabb86 100644
--- a/web/components/bet-row.tsx
+++ b/web/components/bet-row.tsx
@@ -8,7 +8,6 @@ import { useUser } from 'web/hooks/use-user'
 import { useUserContractBets } from 'web/hooks/use-user-bets'
 import { useSaveBinaryShares } from './use-save-binary-shares'
 import { Col } from './layout/col'
-import { CreateChallengeButton } from 'web/components/challenges/create-challenge-button'
 
 // Inline version of a bet panel. Opens BetPanel in a new modal.
 export default function BetRow(props: {
@@ -49,10 +48,6 @@ export default function BetRow(props: {
             : ''}
         </div>
       </Col>
-      <Col className={clsx('items-center', className)}>
-        <CreateChallengeButton user={user} contract={contract} />
-      </Col>
-
       <Modal open={open} setOpen={setOpen}>
         <SimpleBetPanel
           className={betPanelClassName}
diff --git a/web/components/copy-link-button.tsx b/web/components/copy-link-button.tsx
index fb0afdf5..a0f12bfa 100644
--- a/web/components/copy-link-button.tsx
+++ b/web/components/copy-link-button.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import React, { Fragment, useEffect } from 'react'
 import { LinkIcon } from '@heroicons/react/outline'
 import { Menu, Transition } from '@headlessui/react'
 import clsx from 'clsx'
diff --git a/web/pages/[username]/[contractSlug].tsx b/web/pages/[username]/[contractSlug].tsx
index 7f66dbc4..a487a7c8 100644
--- a/web/pages/[username]/[contractSlug].tsx
+++ b/web/pages/[username]/[contractSlug].tsx
@@ -46,8 +46,6 @@ import { CommentTipMap, useTipTxns } from 'web/hooks/use-tip-txns'
 import { useRouter } from 'next/router'
 import { useLiquidity } from 'web/hooks/use-liquidity'
 import { richTextToString } from 'common/util/parse'
-import { CreateChallengeButton } from 'web/components/challenges/create-challenge-button'
-import { Row } from 'web/components/layout/row'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: {
@@ -176,9 +174,6 @@ export function ContractPageContent(
           <NumericBetPanel className="hidden xl:flex" contract={contract} />
         ) : (
           <div>
-            <Row className={'my-4 hidden justify-end xl:flex'}>
-              <CreateChallengeButton user={user} contract={contract} />
-            </Row>
             <BetPanel
               className="hidden xl:flex"
               contract={contract as CPMMBinaryContract}
diff --git a/web/pages/challenges/[username]/[contractSlug]/[challengeSlug].tsx b/web/pages/challenges/[username]/[contractSlug]/[challengeSlug].tsx
index 13dad4c1..85c0d2f8 100644
--- a/web/pages/challenges/[username]/[contractSlug]/[challengeSlug].tsx
+++ b/web/pages/challenges/[username]/[contractSlug]/[challengeSlug].tsx
@@ -103,6 +103,7 @@ export default function ChallengePage(props: {
       contract={contract}
       challenge={challenge}
       creator={user}
+      bets={bets}
     />
   )
 }
@@ -282,7 +283,7 @@ function ChallengeContract(props: { contract: Contract; bets: Bet[] }) {
   const isBinary = contract.outcomeType === 'BINARY'
   const isPseudoNumeric = contract.outcomeType === 'PSEUDO_NUMERIC'
   return (
-    <Col className="w-full flex-1 bg-white">
+    <Col className="mt-5 w-full flex-1 bg-white px-10">
       <div className="relative flex flex-col pt-2">
         <Row className="justify-between px-3 text-xl text-indigo-700 md:text-2xl">
           <SiteLink href={href}>{question}</SiteLink>
@@ -292,13 +293,9 @@ function ChallengeContract(props: { contract: Contract; bets: Bet[] }) {
           )}
         </Row>
 
-        <Spacer h={3} />
-
-        <div className="mx-1" style={{ paddingBottom: 50 }}>
-          {(isBinary || isPseudoNumeric) && (
-            <ContractProbGraph contract={contract} bets={bets} height={500} />
-          )}
-        </div>
+        {(isBinary || isPseudoNumeric) && (
+          <ContractProbGraph contract={contract} bets={bets} height={400} />
+        )}
       </div>
     </Col>
   )
@@ -309,8 +306,9 @@ function OpenChallengeContent(props: {
   challenge: Challenge
   creator: User
   user: User | null | undefined
+  bets: Bet[]
 }) {
-  const { contract, challenge, creator, user } = props
+  const { contract, challenge, creator, user, bets } = props
   const { question } = contract
   const [creatorPortfolioHistory, setUsersCreatorPortfolioHistory] = useState<
     PortfolioMetrics[]
@@ -332,6 +330,9 @@ function OpenChallengeContent(props: {
     (containerRef?.offsetTop ?? 0) -
     bottomBarHeight
 
+  const isBinary = contract.outcomeType === 'BINARY'
+  const isPseudoNumeric = contract.outcomeType === 'PSEUDO_NUMERIC'
+
   const userColumn = (
     challenger: User | null | undefined,
     portfolioHistory: PortfolioMetrics[],
@@ -389,8 +390,17 @@ function OpenChallengeContent(props: {
       <Col
         ref={setContainerRef}
         style={{ height: remainingHeight }}
-        className=" w-full justify-between rounded border-0 border-gray-100 bg-white py-6 pl-1 pr-2 sm:px-2 md:px-6 md:py-8"
+        className=" relative w-full justify-between rounded border-0 border-gray-100 bg-white py-6 pl-1 pr-2 sm:px-2 md:px-6 md:py-8"
       >
+        {(isBinary || isPseudoNumeric) && (
+          <div
+            className={`absolute top-52 flex h-[${
+              remainingHeight / 2
+            }] w-full flex-row opacity-40`}
+          >
+            <ContractProbGraph contract={contract} bets={bets} height={400} />
+          </div>
+        )}
         <Row className="px-3 pb-4 text-xl text-indigo-700 md:text-2xl">
           <SiteLink href={href}>{question}</SiteLink>
         </Row>