Seller monopoly
This commit is contained in:
@@ -1,81 +0,0 @@
|
||||
use anchor_lang::prelude::*;
|
||||
use anchor_spl::{
|
||||
associated_token::AssociatedToken, token_interface::{Mint, TokenAccount, TokenInterface, close_account, transfer_checked, CloseAccount, TransferChecked}
|
||||
};
|
||||
|
||||
use crate::{Sales, DataRegistry, DATA_REGISTRY_SEED};
|
||||
|
||||
use super::transfer_tokens;
|
||||
|
||||
#[derive(Accounts)]
|
||||
pub struct AddSeller <'info>{
|
||||
#[account(mut)]
|
||||
pub seller: Signer<'info>,
|
||||
|
||||
// #[account(
|
||||
// mut,
|
||||
// associated_token::mint=mint,
|
||||
// associated_token::authority = seller,
|
||||
// associated_token::token_program= token_program,
|
||||
// )]
|
||||
// pub seller_token_account: InterfaceAccount<'info, TokenAccount>,
|
||||
|
||||
#[account(
|
||||
init,
|
||||
payer = seller,
|
||||
space = 8 + Sales::INIT_SPACE,
|
||||
seeds= [b"sales", seller.key().as_ref()],
|
||||
bump
|
||||
)]
|
||||
pub sales: Account<'info, Sales>,
|
||||
|
||||
#[account(mint::token_program = token_program)]
|
||||
pub mint: InterfaceAccount<'info, Mint>,
|
||||
|
||||
#[account(
|
||||
init,
|
||||
payer =seller,
|
||||
associated_token::mint=mint,
|
||||
associated_token::authority = sales,
|
||||
associated_token::token_program= token_program,
|
||||
)]
|
||||
pub vault: InterfaceAccount<'info, TokenAccount>,
|
||||
|
||||
#[account(
|
||||
mut,
|
||||
seeds=[DATA_REGISTRY_SEED],
|
||||
bump
|
||||
)]
|
||||
pub data_registry: Account<'info, DataRegistry>,
|
||||
|
||||
pub system_program: Program<'info, System>,
|
||||
pub token_program: Interface<'info, TokenInterface>,
|
||||
pub associated_token_program: Program<'info, AssociatedToken>
|
||||
|
||||
}
|
||||
|
||||
// pub fn send_tickets_to_vault(ctx: &Context<AddSeller>, tickets_count: u64) -> Result<()>{
|
||||
// transfer_tokens(
|
||||
// &ctx.accounts.seller_token_account,
|
||||
// &ctx.accounts.vault,
|
||||
// &tickets_count,
|
||||
// &ctx.accounts.mint,
|
||||
// &ctx.accounts.seller,
|
||||
// &ctx.accounts.token_program
|
||||
// )
|
||||
// }
|
||||
|
||||
pub fn save_sales_account(ctx: Context<AddSeller>) -> Result<()> {
|
||||
ctx.accounts.sales.set_inner(
|
||||
Sales{
|
||||
seller: ctx.accounts.seller.key(),
|
||||
vault: ctx.accounts.vault.key(),
|
||||
mint: ctx.accounts.mint.key(),
|
||||
bump: ctx.bumps.sales
|
||||
}
|
||||
);
|
||||
|
||||
ctx.accounts.data_registry.sales_pdas.push(ctx.accounts.sales.key());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
use anchor_lang::prelude::*;
|
||||
use anchor_spl:: token::{Mint, Token, TokenAccount};
|
||||
use anchor_spl::{
|
||||
associated_token::AssociatedToken, token_interface::{Mint, TokenAccount, TokenInterface, close_account, transfer_checked, CloseAccount, TransferChecked}
|
||||
};
|
||||
|
||||
|
||||
use crate::{Sales, DataRegistry, DATA_REGISTRY_SEED};
|
||||
use crate::{ DataRegistry, DATA_REGISTRY_SEED};
|
||||
|
||||
#[derive(Accounts)]
|
||||
pub struct Initialize <'info>{
|
||||
@@ -18,12 +19,26 @@ pub struct Initialize <'info>{
|
||||
)]
|
||||
pub data_registry: Account<'info, DataRegistry>,
|
||||
|
||||
#[account(mint::token_program = token_program)]
|
||||
pub mint: InterfaceAccount<'info, Mint>,
|
||||
#[account(
|
||||
init,
|
||||
payer =signer,
|
||||
associated_token::mint=mint,
|
||||
associated_token::authority = data_registry,
|
||||
associated_token::token_program= token_program,
|
||||
)]
|
||||
pub vault: InterfaceAccount<'info, TokenAccount>,
|
||||
|
||||
pub system_program: Program<'info, System>,
|
||||
pub token_program: Interface<'info, TokenInterface>,
|
||||
pub associated_token_program: Program<'info, AssociatedToken>
|
||||
}
|
||||
|
||||
pub fn handler(ctx: Context<Initialize>) -> Result<()> {
|
||||
let reg_acc = &mut ctx.accounts.data_registry;
|
||||
reg_acc.authority = ctx.accounts.signer.key();
|
||||
reg_acc.sales_pda = ctx.accounts.vault.key();
|
||||
msg!("Initiated Ticket store");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use anchor_lang::prelude::*;
|
||||
use crate::{DataRegistry, Sales, Tournament, DATA_REGISTRY_SEED};
|
||||
use crate::{DataRegistry,Tournament, DATA_REGISTRY_SEED};
|
||||
use anchor_spl::{associated_token::AssociatedToken, token_interface::{transfer_checked, Mint, TokenAccount, TokenInterface, TransferChecked}};
|
||||
|
||||
|
||||
@@ -56,22 +56,13 @@ pub struct JoinTorunament<'info>{
|
||||
)]
|
||||
pub data_registry: Account<'info, DataRegistry>,
|
||||
|
||||
#[account(mut)]
|
||||
pub seller:SystemAccount<'info>,
|
||||
|
||||
#[account(mint::token_program = token_program)]
|
||||
pub mint: InterfaceAccount<'info, Mint>,
|
||||
|
||||
#[account(
|
||||
mut,
|
||||
seeds= [b"sales", seller.key().as_ref()],
|
||||
bump = sales.bump
|
||||
)]
|
||||
pub sales: Account<'info, Sales>,
|
||||
#[account(
|
||||
mut,
|
||||
associated_token::mint= mint,
|
||||
associated_token::authority = sales,
|
||||
associated_token::authority = data_registry,
|
||||
associated_token::token_program = token_program
|
||||
)]
|
||||
vault: InterfaceAccount<'info, TokenAccount>,
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
pub mod initialize;
|
||||
pub use initialize::*;
|
||||
|
||||
pub mod add_seller;
|
||||
pub use add_seller::*;
|
||||
|
||||
pub mod add_tournament;
|
||||
pub use add_tournament::*;
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
|
||||
use anchor_lang::{prelude::*, solana_program::{native_token::LAMPORTS_PER_SOL, system_instruction}};
|
||||
use anchor_spl::{
|
||||
associated_token::AssociatedToken, token_interface::{Mint, TokenAccount, TokenInterface, close_account, transfer_checked, CloseAccount, TransferChecked}
|
||||
associated_token::AssociatedToken,token_interface::{transfer_checked, Mint, TokenAccount, TokenInterface, TransferChecked}
|
||||
};
|
||||
|
||||
use crate::{error::CustomErrors, Sales};
|
||||
use crate::{error::CustomErrors, DataRegistry, DATA_REGISTRY_SEED};
|
||||
|
||||
use super::transfer_tokens;
|
||||
|
||||
pub fn pay_seller(ctx:&Context<PurchaseTickets>, amount:u64)->Result<()>{
|
||||
let from_account = &ctx.accounts.buyer;
|
||||
let to_account = &ctx.accounts.seller;
|
||||
let to_account = &ctx.accounts.author;
|
||||
|
||||
let transfer_instruction = system_instruction::transfer(
|
||||
from_account.key,
|
||||
@@ -31,28 +31,27 @@ pub fn pay_seller(ctx:&Context<PurchaseTickets>, amount:u64)->Result<()>{
|
||||
}
|
||||
|
||||
pub fn handover_tickets(ctx:Context<PurchaseTickets>, amount:u64)->Result<()>{
|
||||
let seeds = &[
|
||||
b"sales",
|
||||
ctx.accounts.seller.to_account_info().key.as_ref(),
|
||||
&[ctx.accounts.sales.bump]
|
||||
];
|
||||
|
||||
let signer_seeds = [&seeds[..]];
|
||||
|
||||
let accounts = TransferChecked{
|
||||
let accounts = TransferChecked {
|
||||
from: ctx.accounts.vault.to_account_info(),
|
||||
to: ctx.accounts.buyer_token_account.to_account_info(),
|
||||
mint: ctx.accounts.mint.to_account_info(),
|
||||
authority: ctx.accounts.sales.to_account_info()
|
||||
authority: ctx.accounts.data_registry.to_account_info(),
|
||||
mint: ctx.accounts.mint.to_account_info()
|
||||
};
|
||||
let bump = ctx.bumps.data_registry;
|
||||
let seeds = &[
|
||||
&DATA_REGISTRY_SEED[..],
|
||||
&[bump]
|
||||
];
|
||||
|
||||
let cpi_context = CpiContext::new_with_signer(
|
||||
ctx.accounts.token_program.to_account_info(),
|
||||
accounts,
|
||||
&signer_seeds
|
||||
let signer_seeds = &[&seeds[..]];
|
||||
|
||||
let ctx = CpiContext::new_with_signer(
|
||||
ctx.accounts.token_program.to_account_info(),
|
||||
accounts,
|
||||
signer_seeds
|
||||
);
|
||||
|
||||
transfer_checked(cpi_context, amount*LAMPORTS_PER_SOL, ctx.accounts.mint.decimals)
|
||||
transfer_checked(ctx, amount *LAMPORTS_PER_SOL, 9)
|
||||
}
|
||||
|
||||
|
||||
@@ -62,12 +61,15 @@ pub struct PurchaseTickets<'info>{
|
||||
#[account(mut)]
|
||||
pub buyer:Signer<'info>,
|
||||
|
||||
#[account(mut)]
|
||||
pub seller:SystemAccount<'info>,
|
||||
|
||||
#[account(mint::token_program = token_program)]
|
||||
pub mint: InterfaceAccount<'info, Mint>,
|
||||
|
||||
#[account(
|
||||
mut,
|
||||
address = data_registry.authority
|
||||
)]
|
||||
pub author: SystemAccount<'info>,
|
||||
|
||||
#[account(
|
||||
init_if_needed,
|
||||
payer= buyer,
|
||||
@@ -76,16 +78,18 @@ pub struct PurchaseTickets<'info>{
|
||||
associated_token::token_program = token_program
|
||||
)]
|
||||
pub buyer_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
|
||||
|
||||
#[account(
|
||||
mut,
|
||||
seeds= [b"sales", seller.key().as_ref()],
|
||||
bump = sales.bump
|
||||
seeds = [DATA_REGISTRY_SEED],
|
||||
bump
|
||||
)]
|
||||
pub sales: Account<'info, Sales>,
|
||||
pub data_registry: Account<'info, DataRegistry>,
|
||||
|
||||
#[account(
|
||||
mut,
|
||||
associated_token::mint= mint,
|
||||
associated_token::authority = sales,
|
||||
associated_token::authority = data_registry,
|
||||
associated_token::token_program = token_program
|
||||
)]
|
||||
vault: InterfaceAccount<'info, TokenAccount>,
|
||||
|
||||
@@ -2,7 +2,7 @@ use anchor_lang::prelude::*;
|
||||
use anchor_spl:: token::{Mint, Token, TokenAccount};
|
||||
|
||||
|
||||
use crate::{error::CustomErrors, DataRegistry, Sales, DATA_REGISTRY_SEED};
|
||||
use crate::{error::CustomErrors, DataRegistry, DATA_REGISTRY_SEED};
|
||||
|
||||
pub fn handler(ctx: Context<SetData>, new_auth:Pubkey)->Result<()>{
|
||||
require!(ctx.accounts.signer.key() == ctx.accounts.data_registry.authority, CustomErrors::Unauthorized);
|
||||
|
||||
@@ -9,7 +9,7 @@ pub use constants::*;
|
||||
pub use instructions::*;
|
||||
pub use state::*;
|
||||
|
||||
declare_id!("88dRZraTvmpqMs8GqtgCc321Foo5bWtDAsXJ1kqoc6nC");
|
||||
declare_id!("3owEKMMjFuuYN2HjT2J2GiVauDivNBeYqaUymyX7Q8Lw");
|
||||
#[program]
|
||||
pub mod tournaments {
|
||||
use super::*;
|
||||
@@ -18,12 +18,6 @@ pub mod tournaments {
|
||||
initialize::handler(ctx)
|
||||
}
|
||||
|
||||
pub fn add_seller(ctx: Context<AddSeller>, tickets_count:u64) -> Result<()> {
|
||||
// msg!("seller ata: {}", ctx.accounts.seller_token_account.key());
|
||||
// add_seller::send_tickets_to_vault(&ctx, tickets_count)?;
|
||||
add_seller::save_sales_account(ctx)
|
||||
}
|
||||
|
||||
pub fn purchase_tickets(ctx:Context<PurchaseTickets>, amount:u64)->Result<()>{
|
||||
let ticket_price: u64 =( LAMPORTS_PER_SOL / 100) * 3;
|
||||
purchase::pay_seller(&ctx, ticket_price)?;
|
||||
@@ -35,7 +29,7 @@ pub mod tournaments {
|
||||
}
|
||||
|
||||
pub fn join_tournament(ctx:Context<JoinTorunament>, id:u64)-> Result<()>{
|
||||
join_tournament::transfer_ticket_to_vault(&ctx, id);
|
||||
// join_tournament::transfer_ticket_to_vault(&ctx, id);
|
||||
join_tournament::add_to_participants_list(ctx, id)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
use anchor_lang::prelude::*;
|
||||
use anchor_lang::{prelude::*, Bump};
|
||||
|
||||
#[account]
|
||||
#[derive(InitSpace)]
|
||||
pub struct DataRegistry{
|
||||
#[max_len(100)]
|
||||
pub sales_pdas: Vec<Pubkey>,
|
||||
pub sales_pda: Pubkey,
|
||||
pub authority: Pubkey
|
||||
}
|
||||
@@ -1,6 +1,3 @@
|
||||
pub mod sales;
|
||||
pub use sales::Sales;
|
||||
|
||||
pub mod data_registry;
|
||||
pub use data_registry::DataRegistry;
|
||||
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
use anchor_lang::prelude::*;
|
||||
|
||||
#[account]
|
||||
#[derive(InitSpace)]
|
||||
pub struct Sales{
|
||||
pub seller: Pubkey,
|
||||
pub vault: Pubkey,
|
||||
pub mint : Pubkey,
|
||||
pub bump:u8
|
||||
}
|
||||
Reference in New Issue
Block a user