diff --git a/src/close.ts b/src/close.ts index 06fc427..1467187 100644 --- a/src/close.ts +++ b/src/close.ts @@ -32,42 +32,11 @@ async function close(){ for (const bet of bet_list.bets) { try { const betAcc = await program.account.betVault.fetch(bet); - - const [betVaultPda] = await PublicKey.findProgramAddress( - [ - Buffer.from("bet_vault"), - keypair.publicKey.toBuffer(), - Buffer.from(betAcc.gameId), - ], - program.programId - ); const ownerRefferer = new PublicKey("BaTgUMPsk8fZoEMwig81Pw1KHmPpoYt31oiR5Qr2c8XR"); const joinerRefferer = feeWallet; - const betVaultTokenAccount = await getAssociatedTokenAddress( - betAcc.tokenMint, - betVaultPda, - true - ); - - const feeWalletTokenAccount = await getAssociatedTokenAddress( - betAcc.tokenMint, - feeWallet, - true - ); - - const ownerReferrerTokenAccount = await getAssociatedTokenAddress( - betAcc.tokenMint, - ownerRefferer, - true - ); - - const joinerReferrerTokenAccount = await getAssociatedTokenAddress( - betAcc.tokenMint, - joinerRefferer, - true - ); + const winner = betAcc.owner; console.log(`Closing ${bet}`); @@ -79,10 +48,6 @@ async function close(){ feeWallet: feeWallet, ownerReferrer: ownerRefferer, joinerReferrer: joinerRefferer, - betVaultTokenAccount: betAcc.isNativeSol ? null : betVaultTokenAccount, - feeWalletTokenAccount: betAcc.isNativeSol ? null : feeWalletTokenAccount, - ownerReferrerTokenAccount: betAcc.isNativeSol ? null : ownerReferrerTokenAccount, - joinerReferrerTokenAccount: betAcc.isNativeSol ? null : joinerReferrerTokenAccount, }).rpc({ skipPreflight: false, maxRetries: 3 diff --git a/src/create.ts b/src/create.ts index ac5226e..5a08dd5 100644 --- a/src/create.ts +++ b/src/create.ts @@ -2,7 +2,7 @@ import { Connection, PublicKey, Keypair, clusterApiUrl, LAMPORTS_PER_SOL, System import { Bets } from "./bets"; import { AnchorProvider, BN, Program, Wallet } from "@coral-xyz/anchor"; import { clusterUrl, cocSk, getRandomInt, testerSk } from "./shared"; -import { createAssociatedTokenAccountInstruction, getAccount, getAssociatedTokenAddress, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID } from "@solana/spl-token"; +// import { createAssociatedTokenAccountInstruction, getAccount, getAssociatedTokenAddress } from "@solana/spl-token"; const IDL = require('./bets.json'); async function create() { @@ -45,59 +45,17 @@ async function create() { program.programId ); - // For native SOL bet - const isNativeSol = false; - const tokenMint = new PublicKey("8iFREvVdmLKxVeibpC5VLRr1S6X5dm7gYR3VCU1wpump"); - // Create the bet vault token account if it doesn't exist - let betVaultTokenAccount; - if (!isNativeSol) { - // For SPL tokens, create the token account - betVaultTokenAccount = await getAssociatedTokenAddress( - tokenMint, - bet_vault_pda, - true // allowOwnerOffCurve = true because it's a PDA - ); - - // Create the token account if it doesn't exist - try { - await getAccount(connection, betVaultTokenAccount); - } catch { - const createAtaIx = createAssociatedTokenAccountInstruction( - keypair.publicKey, // payer - betVaultTokenAccount, // ata - bet_vault_pda, // owner - tokenMint // mint - ); - - const tx = await connection.sendTransaction( - new Transaction().add(createAtaIx), - [keypair] - ); - await connection.confirmTransaction(tx); - } - } - - // Get payer's token account - const payerTokenAccount = await getAssociatedTokenAddress( - tokenMint, - keypair.publicKey - ); // Create the bet const tx = await program.methods.createBet( new BN(100000000), "tester", "tetris", - new BN(nonce), - isNativeSol, - tokenMint, - 9 // decimals for SOL + new BN(nonce) ).accounts({ betsList: bet_list_pda, payer: keypair.publicKey, - payerTokenAccount: isNativeSol ? null : payerTokenAccount, - betVaultTokenAccount: isNativeSol ? null : betVaultTokenAccount, }).rpc(); console.log(`create tx : ${tx}`); diff --git a/src/get.ts b/src/get.ts index c15658f..bd52af3 100644 --- a/src/get.ts +++ b/src/get.ts @@ -25,10 +25,7 @@ async function get(){ owner: betAcc.owner + " : " + betAcc.ownerId, joiner: betAcc.joiner + " : " + betAcc.joinerId, wager: betAcc.wager.toNumber() + `: ${betAcc.wager.toNumber() / LAMPORTS_PER_SOL}SOL`, - balance: solBalance, - is_native_sol: betAcc.isNativeSol, - token_mint: betAcc.tokenMint, - token_decimals: betAcc.tokenDecimals, + balance: solBalance + " SOL", }); }) }