Merge pull request #187 from quicknode/claude/vibrant-davinci-v85r1n

finance/betting-market: drop the per-wallet User index and its 32-bet cap

Author: mikemaccana

finance/betting-market/anchor-v1/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [2026-10-03]
+
+### Removed
+
+- The per-wallet `User` index account (`seeds = [b"user", wallet]`), its
+  `MAX_BETS_PER_USER` cap of 32 open positions, and the `TooManyBets` and
+  `BetNotInUserIndex` errors. `place_bet`, `claim_winnings`, `claim_refund` and
+  `close_losing_bet` no longer take a `user` account. A client lists a wallet's
+  open bets with `getProgramAccounts` and a `memcmp` filter on `Bet.bettor` at
+  offset 8, so a wallet can hold any number of open positions
+  (`test_no_cap_on_open_bets_per_wallet`). Error codes after `ZeroAmount` move down by two.
+- Outcome labels in the tests are invented film titles.
+
 ## [2026-09-23]
 
 ### Changed

finance/betting-market/anchor-v1/README.md

@@ -44,12 +44,9 @@ cancelling).
   the same outcome adds to the existing Bet, so there is exactly one per (outcome, bettor). The
   account exists only while the position is open: it closes (rent back to the bettor) via
   `claim_winnings`, `claim_refund`, or `close_losing_bet`, which is also what makes a second claim
-  impossible.
-- **User** (`seeds = [b"user", wallet]`) - a per-wallet index listing the bettor's open Bet
-  addresses, so a client can find someone's positions without scanning every Bet on the program.
-  `place_bet` adds an entry and every instruction that closes a Bet removes it, so the cap (see
-  `MAX_BETS_PER_USER`) limits concurrent open positions, not lifetime bets. The fixed cap keeps the
-  account a constant size; the Bet accounts are the authoritative stake record.
+  impossible. `bettor` is the first field after the 8-byte discriminator, so a client lists a
+  wallet's open positions with `getProgramAccounts` and a `memcmp` filter on the wallet's address at
+  offset 8. The program keeps no per-wallet index, so a wallet can hold any number of open bets.
 
 ### The vault
 
@@ -91,17 +88,14 @@ division floors each share, leaving at most a few minor units of dust in the vau
 - `open_betting` - admin. Moves a `Draft` with at least two outcomes to `Open`, which fixes the
   outcome list.
 - `place_bet` - bettor. Stakes tokens on one outcome of an `Open` event, before
-  `betting_closes_at`; updates the pools and adds the Bet to the user's index (rejected with
-  `TooManyBets` if all `MAX_BETS_PER_USER` slots hold open positions).
+  `betting_closes_at`; creates or tops up the Bet and updates the pools.
 - `settle_event` - admin. Once `betting_closes_at` has passed, resolves to a winning outcome, takes
   the fee, records the payout figures.
 - `claim_winnings` - winning bettor. Withdraws stake plus pro-rata share of the losing pool, then
-  closes the Bet account and removes it from the user's index.
-- `close_losing_bet` - losing bettor. After settlement, closes a worthless Bet to reclaim its rent
-  and free the slot in the user's index.
+  closes the Bet account.
+- `close_losing_bet` - losing bettor. After settlement, closes a worthless Bet to reclaim its rent.
 - `cancel_event` - admin. Voids a draft or unresolved market.
-- `claim_refund` - bettor. After a cancellation, reclaims the exact stake; the Bet account closes
-  and leaves the user's index.
+- `claim_refund` - bettor. After a cancellation, reclaims the exact stake; the Bet account closes.
 
 ### Lifecycle
 
@@ -142,8 +136,8 @@ Tests are Rust integration tests running against
 settle → claim with exact payout and fee assertions), admin authorization, the bet-after-settle and
 double-claim guards, the outcome list locking when betting opens, the two-outcome minimum, both
 edges of the betting close time, settling an outcome with no bets, the cancel/refund path, the
-`close_losing_bet` guards, and the User index: claims, refunds, and losing-bet closes remove the
-Bet's entry, and a wallet whose index is full can bet again after closing a position.
+`close_losing_bet` guards, and a wallet holding forty open bets at once, which shows there is no
+per-wallet cap.
 
 ```sh
 anchor test

finance/betting-market/anchor-v1/programs/betting-market/Cargo.toml

@@ -20,7 +20,7 @@ custom-heap = []
 custom-panic = []
 
 [dependencies]
-# init-if-needed: place_bet and the lazy User index create accounts only on first use.
+# init-if-needed: place_bet creates the Bet account only on a bettor's first bet on an outcome.
 anchor-lang = { version = "1.2.0", features = ["init-if-needed"] }
 anchor-spl = "1.2.0"
 

finance/betting-market/anchor-v1/programs/betting-market/src/error.rs

@@ -22,10 +22,6 @@ pub enum BettingError {
     BetWon,
     #[msg("The bet amount must be greater than zero")]
     ZeroAmount,
-    #[msg("This bettor already holds the maximum number of open positions")]
-    TooManyBets,
-    #[msg("This bet is not in the bettor's User index")]
-    BetNotInUserIndex,
     #[msg("Arithmetic overflow")]
     MathOverflow,
     #[msg("Outcomes can only be added, and betting opened, while the event is a draft")]

finance/betting-market/anchor-v1/programs/betting-market/src/instructions/claim_refund.rs

@@ -1,7 +1,7 @@
 use anchor_lang::prelude::*;
 use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
-use crate::{error::BettingError, Bet, Event, EventStatus, User};
+use crate::{error::BettingError, Bet, Event, EventStatus};
 
 use super::transfer_tokens_from_vault;
 
@@ -31,13 +31,6 @@ pub struct ClaimRefundAccountConstraints<'info> {
     )]
     pub bet: Account<'info, Bet>,
 
-    #[account(
-        mut,
-        seeds = [b"user", bettor.key().as_ref()],
-        bump = user.bump,
-    )]
-    pub user: Account<'info, User>,
-
     #[account(
         mut,
         associated_token::mint = token_mint,
@@ -65,12 +58,6 @@ pub fn handle_claim_refund(context: Context<ClaimRefundAccountConstraints>) -> R
 
     let stake = context.accounts.bet.amount;
 
-    // The position is over, so drop the Bet from the bettor's index before the
-    // transfer (effects before interactions); the Bet account itself closes
-    // when the instruction finishes.
-    let bet_key = context.accounts.bet.key();
-    context.accounts.user.remove_bet(&bet_key)?;
-
     let event_id = context.accounts.event.event_id;
     let event_bump = context.accounts.event.bump;
     transfer_tokens_from_vault(

finance/betting-market/anchor-v1/programs/betting-market/src/instructions/claim_winnings.rs

@@ -1,7 +1,7 @@
 use anchor_lang::prelude::*;
 use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
 
-use crate::{error::BettingError, Bet, Event, EventStatus, User};
+use crate::{error::BettingError, Bet, Event, EventStatus};
 
 use super::transfer_tokens_from_vault;
 
@@ -31,13 +31,6 @@ pub struct ClaimWinningsAccountConstraints<'info> {
     )]
     pub bet: Account<'info, Bet>,
 
-    #[account(
-        mut,
-        seeds = [b"user", bettor.key().as_ref()],
-        bump = user.bump,
-    )]
-    pub user: Account<'info, User>,
-
     #[account(
         mut,
         associated_token::mint = token_mint,
@@ -90,12 +83,6 @@ pub fn handle_claim_winnings(context: Context<ClaimWinningsAccountConstraints>)
         .checked_add(winnings)
         .ok_or(BettingError::MathOverflow)?;
 
-    // The position is over, so drop the Bet from the bettor's index before the
-    // transfer (effects before interactions); the Bet account itself closes
-    // when the instruction finishes.
-    let bet_key = context.accounts.bet.key();
-    context.accounts.user.remove_bet(&bet_key)?;
-
     let event_id = context.accounts.event.event_id;
     let event_bump = context.accounts.event.bump;
     transfer_tokens_from_vault(

finance/betting-market/anchor-v1/programs/betting-market/src/instructions/close_losing_bet.rs

@@ -1,11 +1,10 @@
 use anchor_lang::prelude::*;
 
-use crate::{error::BettingError, Bet, Event, EventStatus, User};
+use crate::{error::BettingError, Bet, Event, EventStatus};
 
-// A losing bet pays nothing, but it still occupies a slot in the bettor's
-// User index and holds rent. Closing it frees the slot (so the bettor can
-// open a new position) and returns the rent. Winning bets must go through
-// claim_winnings instead, which also pays out the stake and winnings.
+// A losing bet pays nothing, but its account still holds rent. Closing it
+// returns the rent to the bettor. Winning bets must go through claim_winnings
+// instead, which also pays out the stake and winnings.
 #[derive(Accounts)]
 pub struct CloseLosingBetAccountConstraints<'info> {
     #[account(mut)]
@@ -26,13 +25,6 @@ pub struct CloseLosingBetAccountConstraints<'info> {
         bump = bet.bump,
     )]
     pub bet: Account<'info, Bet>,
-
-    #[account(
-        mut,
-        seeds = [b"user", bettor.key().as_ref()],
-        bump = user.bump,
-    )]
-    pub user: Account<'info, User>,
 }
 
 pub fn handle_close_losing_bet(context: Context<CloseLosingBetAccountConstraints>) -> Result<()> {
@@ -45,7 +37,5 @@ pub fn handle_close_losing_bet(context: Context<CloseLosingBetAccountConstraints
         BettingError::BetWon
     );
 
-    let bet_key = context.accounts.bet.key();
-    context.accounts.user.remove_bet(&bet_key)?;
     Ok(())
 }

finance/betting-market/anchor-v1/programs/betting-market/src/instructions/place_bet.rs

@@ -4,10 +4,7 @@ use anchor_spl::{
     token_interface::{Mint, TokenAccount, TokenInterface},
 };
 
-use crate::{
-    betting_is_open, error::BettingError, Bet, Config, Event, EventStatus, Outcome, User,
-    MAX_BETS_PER_USER,
-};
+use crate::{betting_is_open, error::BettingError, Bet, Config, Event, EventStatus, Outcome};
 
 use super::transfer_tokens_to_vault;
 
@@ -66,15 +63,6 @@ pub struct PlaceBetAccountConstraints<'info> {
     )]
     pub bet: Box<Account<'info, Bet>>,
 
-    #[account(
-        init_if_needed,
-        payer = bettor,
-        space = User::DISCRIMINATOR.len() + User::INIT_SPACE,
-        seeds = [b"user", bettor.key().as_ref()],
-        bump
-    )]
-    pub user: Box<Account<'info, User>>,
-
     pub associated_token_program: Program<'info, AssociatedToken>,
     pub token_program: Interface<'info, TokenInterface>,
     pub system_program: Program<'info, System>,
@@ -105,9 +93,7 @@ pub fn handle_place_bet(context: Context<PlaceBetAccountConstraints>, amount: u6
     let event_key = context.accounts.event.key();
     let outcome_key = context.accounts.outcome.key();
     let outcome_index = context.accounts.outcome.index;
-    let bet_key = context.accounts.bet.key();
     let bet_bump = context.bumps.bet;
-    let user_bump = context.bumps.user;
 
     let bet = &mut context.accounts.bet;
     // A fresh init_if_needed Bet has amount 0; that is how we tell a first bet
@@ -143,18 +129,5 @@ pub fn handle_place_bet(context: Context<PlaceBetAccountConstraints>, amount: u6
         .checked_add(amount)
         .ok_or(BettingError::MathOverflow)?;
 
-    let user = &mut context.accounts.user;
-    if user.authority == Pubkey::default() {
-        user.authority = bettor_key;
-        user.bump = user_bump;
-    }
-    if is_new_bet {
-        require!(
-            user.bets.len() < MAX_BETS_PER_USER,
-            BettingError::TooManyBets
-        );
-        user.bets.push(bet_key);
-    }
-
     Ok(())
 }

finance/betting-market/anchor-v1/programs/betting-market/src/lib.rs

@@ -74,13 +74,13 @@ pub mod betting_market {
     }
 
     // A winner withdraws their stake plus their pro-rata share of the losing
-    // pool. The Bet account closes and leaves the bettor's User index.
+    // pool. The Bet account closes.
     pub fn claim_winnings(context: Context<ClaimWinningsAccountConstraints>) -> Result<()> {
         instructions::claim_winnings::handle_claim_winnings(context)
     }
 
     // A loser closes their worthless bet after settlement, reclaiming the
-    // Bet account's rent and freeing the slot in their User index.
+    // Bet account's rent.
     pub fn close_losing_bet(context: Context<CloseLosingBetAccountConstraints>) -> Result<()> {
         instructions::close_losing_bet::handle_close_losing_bet(context)
     }
@@ -91,7 +91,7 @@ pub mod betting_market {
     }
 
     // After a cancellation, a bettor reclaims their exact stake. The Bet
-    // account closes and leaves the bettor's User index.
+    // account closes.
     pub fn claim_refund(context: Context<ClaimRefundAccountConstraints>) -> Result<()> {
         instructions::claim_refund::handle_claim_refund(context)
     }

finance/betting-market/anchor-v1/programs/betting-market/src/state/bet.rs

@@ -5,6 +5,11 @@ use anchor_lang::prelude::*;
 // one Bet per (outcome, bettor). The account lives only while the position is
 // open: it closes (rent back to the bettor) on claim_winnings, claim_refund,
 // or close_losing_bet, which is also what prevents double claims.
+//
+// `bettor` is the first field, right after the 8-byte discriminator, so a
+// client lists a wallet's open positions with getProgramAccounts and a memcmp
+// filter on the wallet's address at offset 8. The program keeps no per-wallet
+// index, so there is no limit on how many positions a wallet holds.
 #[account]
 #[derive(InitSpace)]
 pub struct Bet {