From b515ca8bd027f5a69d30da8023f041d57eccf547 Mon Sep 17 00:00:00 2001
From: mantikoros <sgrugett@gmail.com>
Date: Thu, 10 Mar 2022 15:15:52 -0600
Subject: [PATCH] small fixes

---
 functions/src/redeem-shares.ts                |  3 +++
 .../src/scripts/pay-out-contract-again.ts     | 22 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/functions/src/redeem-shares.ts b/functions/src/redeem-shares.ts
index e052fa3e..ffb5ab5e 100644
--- a/functions/src/redeem-shares.ts
+++ b/functions/src/redeem-shares.ts
@@ -5,6 +5,7 @@ import { Bet } from '../../common/bet'
 import { getProbability } from '../../common/calculate'
 
 import { Binary, CPMM, FullContract } from '../../common/contract'
+import { noFees } from '../../common/fees'
 import { User } from '../../common/user'
 
 export const redeemShares = async (userId: string, contractId: string) => {
@@ -46,6 +47,7 @@ export const redeemShares = async (userId: string, contractId: string) => {
       probAfter: p,
       createdTime,
       isRedemption: true,
+      fees: noFees,
     }
 
     const noDoc = firestore.collection(`contracts/${contract.id}/bets`).doc()
@@ -60,6 +62,7 @@ export const redeemShares = async (userId: string, contractId: string) => {
       probAfter: p,
       createdTime,
       isRedemption: true,
+      fees: noFees,
     }
 
     const userDoc = firestore.doc(`users/${userId}`)
diff --git a/functions/src/scripts/pay-out-contract-again.ts b/functions/src/scripts/pay-out-contract-again.ts
index 96671ed8..2696ddcb 100644
--- a/functions/src/scripts/pay-out-contract-again.ts
+++ b/functions/src/scripts/pay-out-contract-again.ts
@@ -6,13 +6,8 @@ initAdmin('james')
 
 import { Bet } from '../../../common/bet'
 import { Contract } from '../../../common/contract'
-import {
-  getLoanPayouts,
-  getPayouts,
-  getPayoutsMultiOutcome,
-} from '../../../common/payouts'
+import { getLoanPayouts, getPayouts } from '../../../common/payouts'
 import { filterDefined } from '../../../common/util/array'
-import { payUser } from '../utils'
 
 type DocRef = admin.firestore.DocumentReference
 
@@ -28,12 +23,15 @@ async function checkIfPayOutAgain(contractRef: DocRef, contract: Contract) {
   const loanedBets = openBets.filter((bet) => bet.loanAmount)
 
   if (loanedBets.length && contract.resolution) {
-    const { resolution, outcomeType, resolutions, resolutionProbability } =
-      contract
-    const payouts =
-      outcomeType === 'FREE_RESPONSE' && resolutions
-        ? getPayoutsMultiOutcome(resolutions, contract, openBets)
-        : getPayouts(resolution, contract, openBets, resolutionProbability)
+    const { resolution, resolutions, resolutionProbability } = contract as any
+    const [payouts] = getPayouts(
+      resolution,
+      resolutions,
+      contract,
+      openBets,
+      [],
+      resolutionProbability
+    )
 
     const loanPayouts = getLoanPayouts(openBets)
     const groups = _.groupBy(