withdraw liquidity: redeem surplus shares, adjust total depostits, adjust amount for current prob, set isLiquidityProvision for surplus bets, error handling

functions/src/withdraw-liquidity.ts

@@ -11,6 +11,7 @@ import { getProbability } from '../../common/calculate'
 import { noFees } from '../../common/fees'
 
 import { APIError } from './api'
+import { redeemShares } from './redeem-shares'
 
 export const withdrawLiquidity = functions
   .runWith({ minInstances: 1 })
@@ -28,83 +29,103 @@ export const withdrawLiquidity = functions
       if (!contractId)
         return { status: 'error', message: 'Missing contract id' }
 
-      const result = await firestore.runTransaction(async (trans) => {
+      return await firestore
-        const lpDoc = firestore.doc(`users/${userId}`)
+        .runTransaction(async (trans) => {
-        const lpSnap = await trans.get(lpDoc)
+          const lpDoc = firestore.doc(`users/${userId}`)
-        if (!lpSnap.exists) throw new APIError(400, 'User not found.')
+          const lpSnap = await trans.get(lpDoc)
-        const lp = lpSnap.data() as User
+          if (!lpSnap.exists) throw new APIError(400, 'User not found.')
+          const lp = lpSnap.data() as User
 
-        const contractDoc = firestore.doc(`contracts/${contractId}`)
+          const contractDoc = firestore.doc(`contracts/${contractId}`)
-        const contractSnap = await trans.get(contractDoc)
+          const contractSnap = await trans.get(contractDoc)
-        if (!contractSnap.exists) throw new APIError(400, 'Contract not found.')
+          if (!contractSnap.exists)
-        const contract = contractSnap.data() as CPMMContract
+            throw new APIError(400, 'Contract not found.')
+          const contract = contractSnap.data() as CPMMContract
 
-        const liquidityCollection = firestore.collection(
+          const liquidityCollection = firestore.collection(
-          `contracts/${contractId}/liquidity`
+            `contracts/${contractId}/liquidity`
-        )
-
-        const liquiditiesSnap = await trans.get(liquidityCollection)
-
-        const liquidities = liquiditiesSnap.docs.map(
-          (doc) => doc.data() as LiquidityProvision
-        )
-
-        const userShares = getUserLiquidityShares(userId, contract, liquidities)
-
-        // zero all added amounts for now
-        // can add support for partial withdrawals in the future
-        liquiditiesSnap.docs
-          .filter(
-            (_, i) => !liquidities[i].isAnte && liquidities[i].userId === userId
           )
-          .forEach((doc) => trans.update(doc.ref, { amount: 0 }))
 
-        const payout = Math.min(...Object.values(userShares))
+          const liquiditiesSnap = await trans.get(liquidityCollection)
-        if (payout <= 0) return {}
 
-        const newBalance = lp.balance + payout
+          const liquidities = liquiditiesSnap.docs.map(
-        trans.update(lpDoc, { balance: newBalance })
+            (doc) => doc.data() as LiquidityProvision
+          )
 
-        const newPool = subtractObjects(contract.pool, userShares)
+          const userShares = getUserLiquidityShares(
-        const newTotalLiquidity = contract.totalLiquidity - payout
+            userId,
-        trans.update(contractDoc, {
+            contract,
-          pool: newPool,
+            liquidities
-          totalLiquidity: newTotalLiquidity,
+          )
+
+          // zero all added amounts for now
+          // can add support for partial withdrawals in the future
+          liquiditiesSnap.docs
+            .filter(
+              (_, i) =>
+                !liquidities[i].isAnte && liquidities[i].userId === userId
+            )
+            .forEach((doc) => trans.update(doc.ref, { amount: 0 }))
+
+          const payout = Math.min(...Object.values(userShares))
+          if (payout <= 0) return {}
+
+          const newBalance = lp.balance + payout
+          const newTotalDeposits = lp.totalDeposits + payout
+          trans.update(lpDoc, {
+            balance: newBalance,
+            totalDeposits: newTotalDeposits,
+          } as Partial<User>)
+
+          const newPool = subtractObjects(contract.pool, userShares)
+          const newTotalLiquidity = contract.totalLiquidity - payout
+          trans.update(contractDoc, {
+            pool: newPool,
+            totalLiquidity: newTotalLiquidity,
+          })
+
+          const prob = getProbability(contract)
+
+          // surplus shares become user's bets
+          const bets = Object.entries(userShares)
+            .map(([outcome, shares]) =>
+              shares - payout < 1 // don't create bet if less than 1 share
+                ? undefined
+                : ({
+                    userId: userId,
+                    contractId: contract.id,
+                    amount:
+                      (outcome === 'YES' ? prob : 1 - prob) * (shares - payout),
+                    shares: shares - payout,
+                    outcome,
+                    probBefore: prob,
+                    probAfter: prob,
+                    createdTime: Date.now(),
+                    isLiquidityProvision: true,
+                    fees: noFees,
+                  } as Omit<Bet, 'id'>)
+            )
+            .filter((x) => x !== undefined)
+
+          for (const bet of bets) {
+            const doc = firestore
+              .collection(`contracts/${contract.id}/bets`)
+              .doc()
+            trans.create(doc, { id: doc.id, ...bet })
+          }
+
+          return userShares
         })
+        .then(async (result) => {
+          // redeem surplus bet with pre-existing bets
+          await redeemShares(userId, contractId)
 
-        const prob = getProbability(contract)
+          console.log('userid', userId, 'withdraws', result)
-
+          return { status: 'success', userShares: result }
-        // surplus shares become user's bets
+        })
-        const bets = Object.entries(userShares)
+        .catch((e) => {
-          .map(([outcome, shares]) =>
+          return { status: 'error', message: e.message }
-            shares - payout < 1 // don't create bet if less than 1 share
+        })
-              ? undefined
-              : ({
-                  userId: userId,
-                  contractId: contract.id,
-                  amount: shares - payout,
-                  shares: shares - payout,
-                  outcome,
-                  probBefore: prob,
-                  probAfter: prob,
-                  createdTime: Date.now(),
-                  fees: noFees,
-                } as Omit<Bet, 'id'>)
-          )
-          .filter((x) => x !== undefined)
-
-        for (const bet of bets) {
-          const doc = firestore
-            .collection(`contracts/${contract.id}/bets`)
-            .doc()
-          trans.create(doc, { id: doc.id, ...bet })
-        }
-
-        return userShares
-      })
-
-      console.log('userid', userId, 'withdraws', result)
-      return { status: 'success', userShares: result }
     }
   )