From 20184fdc4843a664b7b9faa4609befb7d4dc2565 Mon Sep 17 00:00:00 2001 From: Sewmina Dilshan Date: Tue, 29 Jul 2025 16:23:59 +0530 Subject: [PATCH] seeds constants --- programs/bets/src/constants.rs | 11 +++++++++++ programs/bets/src/instructions/buy_tickets.rs | 4 ++-- programs/bets/src/instructions/create_leaderboard.rs | 4 ++-- programs/bets/src/instructions/enter_leaderboard.rs | 6 +++--- .../bets/src/instructions/init_leaderboard_list.rs | 2 +- programs/bets/src/instructions/remove_leaderboard.rs | 4 ++-- programs/bets/src/instructions/update_leaderboard.rs | 6 +++--- 7 files changed, 24 insertions(+), 13 deletions(-) diff --git a/programs/bets/src/constants.rs b/programs/bets/src/constants.rs index c211841..f47c53e 100644 --- a/programs/bets/src/constants.rs +++ b/programs/bets/src/constants.rs @@ -9,3 +9,14 @@ pub const FEE_COLLECTOR: &str= "9esrj2X33pr5og6fdkDMjaW6fdnnb9hT1cWshamxTdL4"; #[constant] pub const TICKET_SALE_VAULT_ADDRESS: &str= "9esrj2X33pr5og6fdkDMjaW6fdnnb9hT1cWshamxTdL4"; +#[constant] +pub const RECEIPT_ACCOUNT_SEED: &[u8] = b"receipt_account"; + +#[constant] +pub const TICKET_LEADERBOARD_LIST_SEED: &[u8] = b"ticket_leaderboards_list"; + +#[constant] +pub const TICKET_LEADERBOARD_SEED: &[u8] = b"ticket_leaderboard"; + +#[constant] +pub const LEADERBOARD_ENTRY_SEED: &[u8] = b"leaderboard_entry"; \ No newline at end of file diff --git a/programs/bets/src/instructions/buy_tickets.rs b/programs/bets/src/instructions/buy_tickets.rs index 2142aa5..eeef2c8 100644 --- a/programs/bets/src/instructions/buy_tickets.rs +++ b/programs/bets/src/instructions/buy_tickets.rs @@ -32,7 +32,7 @@ pub fn buy(ctx: Context, amount: u64) -> Result<()> { }; let seeds = &[ - b"ticket_leaderboards_list".as_ref(), + TICKET_LEADERBOARD_LIST_SEED.as_ref(), &[ctx.bumps.ticket_leaderboard_list][..] ]; @@ -59,7 +59,7 @@ pub struct BuyTickets<'info>{ #[account( mut, - seeds = [b"ticket_leaderboards_list"], + seeds = [TICKET_LEADERBOARD_LIST_SEED], bump )] pub ticket_leaderboard_list: Account<'info, TicketLeaderboardList>, diff --git a/programs/bets/src/instructions/create_leaderboard.rs b/programs/bets/src/instructions/create_leaderboard.rs index 12d490f..590ee77 100644 --- a/programs/bets/src/instructions/create_leaderboard.rs +++ b/programs/bets/src/instructions/create_leaderboard.rs @@ -25,7 +25,7 @@ pub struct CreateLeaderboard<'info>{ #[account( mut, - seeds = [b"ticket_leaderboards_list"], + seeds = [TICKET_LEADERBOARD_LIST_SEED], bump )] pub ticket_leaderboard_list: Account<'info, TicketLeaderboardList>, @@ -34,7 +34,7 @@ pub struct CreateLeaderboard<'info>{ init, payer = payer, space = 8 + TicketLeaderboard::INIT_SPACE, - seeds = [b"ticket_leaderboard", id.to_le_bytes().as_ref()], + seeds = [TICKET_LEADERBOARD_SEED, id.to_le_bytes().as_ref()], bump )] pub ticket_leaderboard: Account<'info, TicketLeaderboard>, diff --git a/programs/bets/src/instructions/enter_leaderboard.rs b/programs/bets/src/instructions/enter_leaderboard.rs index f22ba9c..b7de90a 100644 --- a/programs/bets/src/instructions/enter_leaderboard.rs +++ b/programs/bets/src/instructions/enter_leaderboard.rs @@ -36,7 +36,7 @@ pub struct EnterLeaderboard<'info>{ #[account( mut, - seeds = [b"ticket_leaderboard", id.to_le_bytes().as_ref()], + seeds = [TICKET_LEADERBOARD_SEED, id.to_le_bytes().as_ref()], bump )] pub ticket_leaderboard: Account<'info, TicketLeaderboard>, @@ -45,8 +45,8 @@ pub struct EnterLeaderboard<'info>{ init_if_needed, payer= payer, space = 8 + TicketReceiptVault::INIT_SPACE, - seeds = [b"receipt", payer.key().as_ref()], - bump + seeds = [RECEIPT_ACCOUNT_SEED, payer.key().as_ref()], + bump, )] pub receipt_account: Account<'info, TicketReceiptVault>, diff --git a/programs/bets/src/instructions/init_leaderboard_list.rs b/programs/bets/src/instructions/init_leaderboard_list.rs index 968434d..0f9db85 100644 --- a/programs/bets/src/instructions/init_leaderboard_list.rs +++ b/programs/bets/src/instructions/init_leaderboard_list.rs @@ -17,7 +17,7 @@ pub struct InitLeaderboardList<'info>{ init, payer = payer, space = 8 + TicketLeaderboardList::INIT_SPACE, - seeds = [b"ticket_leaderboards_list"], + seeds = [TICKET_LEADERBOARD_LIST_SEED], bump )] pub ticket_leaderboard_list: Account<'info, TicketLeaderboardList>, diff --git a/programs/bets/src/instructions/remove_leaderboard.rs b/programs/bets/src/instructions/remove_leaderboard.rs index 3762778..795c3aa 100644 --- a/programs/bets/src/instructions/remove_leaderboard.rs +++ b/programs/bets/src/instructions/remove_leaderboard.rs @@ -21,14 +21,14 @@ pub struct RemoveLeaderboard<'info>{ #[account( mut, - seeds = [b"ticket_leaderboards_list"], + seeds = [TICKET_LEADERBOARD_LIST_SEED], bump )] pub ticket_leaderboard_list: Account<'info, TicketLeaderboardList>, #[account( mut, - seeds = [b"ticket_leaderboard", id.to_le_bytes().as_ref()], + seeds = [TICKET_LEADERBOARD_SEED, id.to_le_bytes().as_ref()], bump )] pub ticket_leaderboard: Account<'info, TicketLeaderboard>, diff --git a/programs/bets/src/instructions/update_leaderboard.rs b/programs/bets/src/instructions/update_leaderboard.rs index a8ef534..d9e4c9b 100644 --- a/programs/bets/src/instructions/update_leaderboard.rs +++ b/programs/bets/src/instructions/update_leaderboard.rs @@ -42,7 +42,7 @@ pub struct UpdateLeaderboard<'info>{ #[account( mut, - seeds = [b"ticket_leaderboard", id.to_le_bytes().as_ref()], + seeds = [TICKET_LEADERBOARD_SEED, id.to_le_bytes().as_ref()], bump )] pub ticket_leaderboard: Account<'info, TicketLeaderboard>, @@ -51,14 +51,14 @@ pub struct UpdateLeaderboard<'info>{ init_if_needed, payer= payer, space = 8 + LeaderboardEntry::INIT_SPACE, - seeds = [b"leaderboard_entry", ticket_leaderboard.key().as_ref(), player.as_ref()], + seeds = [LEADERBOARD_ENTRY_SEED, ticket_leaderboard.key().as_ref(), player.as_ref()], bump )] pub leaderboard_entry: Account<'info, LeaderboardEntry>, #[account( mut, - seeds = [b"receipt", player.as_ref()], + seeds = [RECEIPT_ACCOUNT_SEED, player.as_ref()], bump )] pub receipt_account: Account<'info, TicketReceiptVault>,