fix: calculations now sum all numerators and divide by a given denomi…

programs/conditional_vault/src/instructions/redeem_tokens.rs

@@ -40,7 +40,7 @@ impl<'info, 'c: 'info> InteractWithVault<'info> {
             .max()
             .unwrap();
 
-        let mut total_redeemable = 0;
+        let mut total_numerator: u128 = 0;
 
         for (conditional_mint, user_conditional_token_account) in conditional_token_mints
             .iter()
@@ -53,9 +53,8 @@ impl<'info, 'c: 'info> InteractWithVault<'info> {
                 .position(|mint| mint == &conditional_mint.key())
                 .unwrap();
 
-            total_redeemable += ((user_conditional_token_account.amount as u128
-                * question.payout_numerators[payout_index] as u128)
-                / question.payout_denominator as u128) as u64;
+            total_numerator += user_conditional_token_account.amount as u128
+                * question.payout_numerators[payout_index] as u128;
 
             token::burn(
                 CpiContext::new(
@@ -70,6 +69,8 @@ impl<'info, 'c: 'info> InteractWithVault<'info> {
             )?;
         }
 
+        let total_redeemable = (total_numerator / question.payout_denominator as u128) as u64;
+
         token::transfer(
             CpiContext::new_with_signer(
                 accs.token_program.to_account_info(),

programs/conditional_vault/src/state/conditional_vault.rs

@@ -40,18 +40,21 @@ impl ConditionalVault {
         // tokens than the sum of the conditional token mint's supplies multiplied
         // by their respective payouts
 
+
         let max_possible_liability = if !question.is_resolved() {
             // safe because conditional_token_supplies is non-empty
             *conditional_token_supplies.iter().max().unwrap()
         } else {
-            conditional_token_supplies
+            // Sum all numerators first, then divide once
+            let total_numerator: u128 = conditional_token_supplies
                 .iter()
                 .enumerate()
                 .map(|(i, supply)| {
                     *supply as u128 * question.payout_numerators[i] as u128
-                        / question.payout_denominator as u128
                 })
-                .sum::<u128>() as u64
+                .sum();
+
+            (total_numerator / question.payout_denominator as u128) as u64
         };
 
         require_gte!(

tests/conditionalVault/unit/redeemTokens.test.ts

@@ -183,8 +183,7 @@ export default function suite() {
     ).then((acc) => acc.amount);
 
     assert.isTrue(balanceAfter > balanceBefore);
-    assert.isTrue(balanceAfter - balanceBefore < 1000); //dont need both these checks lol but just in case
-    assert.isTrue(balanceAfter - balanceBefore == 999);
+    assert.isTrue(balanceAfter - balanceBefore == 1000); 
 
     // console.log('balanceAfter', balanceAfter);