From b745747acdac17a83072cfe8e5f992a691ded0e4 Mon Sep 17 00:00:00 2001 From: Sewmina Dilshan Date: Fri, 4 Apr 2025 08:25:14 +0530 Subject: [PATCH] added uid to bets --- programs/bets/src/instructions/create_bet.rs | 3 ++- programs/bets/src/instructions/join_bet.rs | 4 ++-- programs/bets/src/lib.rs | 8 ++++---- programs/bets/src/state/bet_vault.rs | 4 ++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/programs/bets/src/instructions/create_bet.rs b/programs/bets/src/instructions/create_bet.rs index 1a1f59f..342d7d9 100644 --- a/programs/bets/src/instructions/create_bet.rs +++ b/programs/bets/src/instructions/create_bet.rs @@ -1,7 +1,7 @@ use anchor_lang::prelude::*; use crate::*; -pub fn create(ctx: Context, wager: u64, game_id:String, _nonce:u64) -> Result<()> { +pub fn create(ctx: Context, wager: u64, user_id:String, game_id:String, _nonce:u64) -> Result<()> { let bets_list = &mut ctx.accounts.bets_list; let bet_vault = &mut ctx.accounts.bet_vault; let payer = &ctx.accounts.payer; @@ -10,6 +10,7 @@ pub fn create(ctx: Context, wager: u64, game_id:String, _nonce:u64) - // Store bet details bet_vault.game_id = game_id; bet_vault.owner = payer.key(); + bet_vault.owner_id= user_id; bet_vault.wager = wager; // Transfer SOL from the payer to the bet vault diff --git a/programs/bets/src/instructions/join_bet.rs b/programs/bets/src/instructions/join_bet.rs index c1a67b4..48a8349 100644 --- a/programs/bets/src/instructions/join_bet.rs +++ b/programs/bets/src/instructions/join_bet.rs @@ -1,7 +1,7 @@ use anchor_lang::prelude::*; use crate::*; -pub fn join(ctx: Context, _game_id:String) ->Result<()>{ +pub fn join(ctx: Context,user_id:String, _game_id:String) ->Result<()>{ let bet_vault = &mut ctx.accounts.bet_vault; let payer= &ctx.accounts.payer; @@ -20,7 +20,7 @@ pub fn join(ctx: Context, _game_id:String) ->Result<()>{ )?; bet_vault.joiner = payer.key(); - + bet_vault.joiner_id = user_id; msg!("Joined bet {}!", bet_vault.key()); Ok(()) diff --git a/programs/bets/src/lib.rs b/programs/bets/src/lib.rs index a8b0a34..598e5a0 100644 --- a/programs/bets/src/lib.rs +++ b/programs/bets/src/lib.rs @@ -19,12 +19,12 @@ pub mod bets { initialize_bets_list::init(ctx) } - pub fn create_bet(ctx: Context, wager:u64, game_id:String, nonce:u64)-> Result<()>{ - create_bet::create(ctx, wager,game_id,nonce) + pub fn create_bet(ctx: Context, wager:u64,user_id:String, game_id:String, nonce:u64)-> Result<()>{ + create_bet::create(ctx, wager, user_id, game_id,nonce) } - pub fn join_bet(ctx: Context, game_id:String) -> Result<()>{ - join_bet::join(ctx, game_id) + pub fn join_bet(ctx: Context,user_id:String, game_id:String) -> Result<()>{ + join_bet::join(ctx,user_id, game_id) } pub fn close_bet(ctx:Context, winner:Pubkey)->Result<()> { diff --git a/programs/bets/src/state/bet_vault.rs b/programs/bets/src/state/bet_vault.rs index 38b1f89..8fa2db7 100644 --- a/programs/bets/src/state/bet_vault.rs +++ b/programs/bets/src/state/bet_vault.rs @@ -7,6 +7,10 @@ pub struct BetVault { #[max_len(10)] pub game_id: String, pub owner: Pubkey, + #[max_len(40)] + pub owner_id: String, pub joiner: Pubkey, + #[max_len(40)] + pub joiner_id: String, pub wager:u64 } \ No newline at end of file