fix: claim

notrustverify · May 9, 2024 · 75dd7ca · 75dd7ca
1 parent 8bce5a5
commit 75dd7ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/services/bet.service.ts b/src/services/bet.service.ts
@@ -22,8 +22,9 @@ export class BetService {
 
     async claimMyRound(game: Game): Promise<boolean> {
         const curr = await this.getCurrentRound(game);
+        console.log(curr)
         const bets = (await this.getPlayerBets(game))
-            .filter(b => b.epoch < curr.epoch)
+            .filter(b => b.epoch < curr.epoch || curr.rewardsComputed)
             .filter(b => b.status === BetStatus.NOTCLAIMED)
         const tx = await this.wallet.claim(bets, game);
         return this.wallet.waitTx(tx);

diff --git a/src/services/wallet.connector.ts b/src/services/wallet.connector.ts
@@ -107,11 +107,11 @@ export class WalletConnector implements WalletConnector {
             });
             return res.txId;
         } else if (game.type === GameType.MULTIPLE_CHOICE) {
-            console.log("get bet"+game.contract.id)
+            console.log(bets.map(b => Number(b.epoch)))
                 const res = await WithdrawMultipleChoice.execute(this.window, {
                     initialFields: {
                         predict: game.contract.id,
-                        epochParticipation: arrayEpochToBytes([0]),
+                        epochParticipation: arrayEpochToBytes(bets.map(b => Number(b.epoch))),
                         addressToClaim: (await this.getAccount()).address
                     },
                     attoAlphAmount:  BigInt(2) * DUST_AMOUNT,