updated tests, updated code to use newly added String<Number> type from poseidon

Author: adpthegreat

basics/close-account/poseidon/close_account_program/Anchor.toml

@@ -5,7 +5,7 @@ resolution = true
 skip-lint = false
 
 [programs.localnet]
-close_account_program = "2q4uoWExFAbZjeDe4n3miipsT9bX9vLnkSetCfZYF2VT"
+close_account_program = "DDhy3V9AQE4wrJ3DXC5Yop2p56J6TiBRaz4zjnYnK8ao"
 
 [registry]
 url = "https://api.apr.dev"

basics/close-account/poseidon/close_account_program/package.json

@@ -8,7 +8,8 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
     "anchor-bankrun": "^0.5.0",
-    "solana-bankrun": "^0.4.0"
+    "solana-bankrun": "^0.4.0",
+    "@solana/web3.js": "^1.95.4"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",

basics/close-account/poseidon/close_account_program/pnpm-lock.yaml

@@ -1,12 +1,12 @@
 use anchor_lang::prelude::*;
-declare_id!("2q4uoWExFAbZjeDe4n3miipsT9bX9vLnkSetCfZYF2VT");
+declare_id!("DDhy3V9AQE4wrJ3DXC5Yop2p56J6TiBRaz4zjnYnK8ao");
 #[program]
 pub mod close_account {
     use super::*;
-    pub fn create_user(ctx: Context<CreateUserContext>, name: u32) -> Result<()> {
-        ctx.accounts.user_account.user_bump = ctx.bumps.user_account;
-        ctx.accounts.user_account.user = ctx.accounts.user.key();
-        ctx.accounts.user_account.name = name;
+    pub fn create_user(ctx: Context<CreateUserContext>, name: String) -> Result<()> {
+        ctx.accounts.user_state.user_bump = ctx.bumps.user_state;
+        ctx.accounts.user_state.user = ctx.accounts.user.key();
+        ctx.accounts.user_state.name = name;
         Ok(())
     }
     pub fn close_user(ctx: Context<CloseUserContext>) -> Result<()> {
@@ -20,25 +20,25 @@ pub struct CreateUserContext<'info> {
     #[account(
         init,
         payer = user,
-        space = 42,
+        space = 95,
         seeds = [b"USER",
         user.key().as_ref()],
         bump,
     )]
-    pub user_account: Account<'info, UserAccount>,
+    pub user_state: Account<'info, UserState>,
     pub system_program: Program<'info, System>,
 }
 #[derive(Accounts)]
 pub struct CloseUserContext<'info> {
+    #[account(mut, seeds = [b"USER", user.key().as_ref()], bump, close = user)]
+    pub user_account: Account<'info, UserState>,
     #[account(mut)]
     pub user: Signer<'info>,
-    #[account(mut, seeds = [b"USER", user.key().as_ref()], bump, close = user)]
-    pub user_account: Account<'info, UserAccount>,
     pub system_program: Program<'info, System>,
 }
 #[account]
-pub struct UserAccount {
+pub struct UserState {
     pub user_bump: u8,
-    pub name: u32,
+    pub name: String,
     pub user: Pubkey,
 }

basics/close-account/poseidon/close_account_program/programs/close_account_program/src/lib.rs

@@ -1,53 +1,96 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import * as anchor from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
+import {
+  Keypair,
+  LAMPORTS_PER_SOL,
+  PublicKey,
+  SystemProgram,
+  Transaction,
+  TransactionInstruction,
+  TransactionMessage,
+  VersionedTransaction,
+  sendAndConfirmTransaction,
+} from '@solana/web3.js';
 import { BankrunProvider } from 'anchor-bankrun';
-import { startAnchor } from 'solana-bankrun';
-import type { CloseAccountProgram } from '../target/types/close_account_program';
+import { BanksClient, BanksTransactionResultWithMeta, startAnchor } from 'solana-bankrun';
+import type { CloseAccount } from '../target/types/close_account';
 
-const IDL = require('../target/idl/close_account_program.json');
+const IDL = require('../target/idl/close_account');
 const PROGRAM_ID = new PublicKey(IDL.address);
 
+async function createAndProcessTransaction(
+  client: BanksClient,
+  payer: Keypair,
+  instruction: TransactionInstruction,
+  additionalSigners: Keypair[] = [],
+): Promise<BanksTransactionResultWithMeta> {
+  const tx = new Transaction();
+  // Get the latest blockhash and minimum rent-exempt balance
+  const [latestBlockhash] = await client.getLatestBlockhash();
+  tx.recentBlockhash = latestBlockhash;
+  // Add transaction instructions
+  tx.add(instruction);
+  tx.feePayer = payer.publicKey;
+  //Add signers
+  tx.sign(payer, ...additionalSigners);
+  const result = await client.tryProcessTransaction(tx);
+  return result;
+}
+
 describe('Close an account', async () => {
   // Configure the client to use the local cluster.
-  const context = await startAnchor('', [{ name: 'close_account', programId: PROGRAM_ID }], []);
+  const context = await startAnchor('', [{ name: 'close_account_program', programId: PROGRAM_ID }], []);
   const provider = new BankrunProvider(context);
 
   const payer = provider.wallet as anchor.Wallet;
-  const program = new anchor.Program<CloseAccountProgram>(IDL, provider);
+  const program = new anchor.Program<CloseAccount>(IDL, provider);
   // Derive the PDA for the user's account.
-  const [userAccountAddress] = PublicKey.findProgramAddressSync([Buffer.from('USER'), payer.publicKey.toBuffer()], program.programId);
+  const user = Keypair.generate(); // Generate a new user keypair
+
+  //Transfer SOL to the user account to cover rent
+  const transferInstruction = SystemProgram.transfer({
+    fromPubkey: payer.publicKey,
+    toPubkey: user.publicKey,
+    lamports: 2 * LAMPORTS_PER_SOL,
+  });
+
+  await createAndProcessTransaction(context.banksClient, payer.payer, transferInstruction, [payer.payer]);
+
+  const [userAccount, userAccountBump] = PublicKey.findProgramAddressSync([Buffer.from('USER'), user.publicKey.toBuffer()], program.programId);
 
   it('Can create an account', async () => {
-    const userId = anchor.BN(76362);
     await program.methods
-      .createUser(userId)
+      .createUser('Jacob')
       .accounts({
-        user: payer.publicKey,
+        user: user.publicKey,
       })
+      .signers([user])
       .rpc();
 
     // Fetch the account data
-    const userAccount = await program.account.userAccount.fetch(userAccountAddress);
-    assert.notEqual(userAccount, null);
+    const userAccountData = await program.account.userState.fetch(userAccount);
+    assert.equal(userAccountData.name, 'Jacob');
+    assert.equal(userAccountData.user.toBase58(), user.publicKey.toBase58());
+    assert.notEqual(userAccountData, null);
   });
 
   it('Can close an Account', async () => {
     await program.methods
       .closeUser()
       .accounts({
-        user: payer.publicKey,
+        user: user.publicKey,
       })
+      .signers([user])
       .rpc();
 
     // The account should no longer exist, returning null.
     try {
-      const userAccount = await program.account.userAccount.fetchNullable(userAccountAddress);
-      assert.equal(userAccount, null);
+      const userAccountData = await program.account.userState.fetchNullable(userAccount);
+      assert.equal(userAccountData, null);
     } catch (err) {
       // Won't return null and will throw an error in anchor-bankrun'
-      assert.equal(err.message, `Could not find ${userAccountAddress}`);
+      assert.equal(err.message, `Could not find ${userAccount}`);
     }
   });
 });

basics/close-account/poseidon/close_account_program/tests/bankrun.test.ts

@@ -1,45 +1,45 @@
-import assert from 'node:assert';
-import * as anchor from '@coral-xyz/anchor';
-import type { Program } from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
-import type { CloseAccountProgram } from '../target/types/close_account_program';
-
-describe('Close an account', () => {
-  // Configure the client to use the local cluster.
-  const provider = anchor.AnchorProvider.env();
-  anchor.setProvider(provider);
-
-  const program = anchor.workspace.CloseAccountProgram as Program<CloseAccountProgram>;
-  const payer = provider.wallet as anchor.Wallet;
-
-  // Derive the PDA for the user's account.
-  const [userAccountAddress] = PublicKey.findProgramAddressSync([Buffer.from('USER'), payer.publicKey.toBuffer()], program.programId);
-
-  it('can create an account', async () => {
-    const userId = anchor.BN(76362);
-
-    await program.methods
-      .createUser(userId)
-      .accounts({
-        user: payer.publicKey,
-      })
-      .rpc();
-
-    // Fetch the account data
-    const userAccount = await program.account.userAccount.fetch(userAccountAddress);
-    assert.notEqual(userAccount, null);
-  });
-
-  it('can close an account', async () => {
-    await program.methods
-      .closeUser()
-      .accounts({
-        user: payer.publicKey,
-      })
-      .rpc();
-
-    // The account should no longer exist, returning null.
-    const userAccount = await program.account.userAccount.fetchNullable(userAccountAddress);
-    assert.equal(userAccount, null);
-  });
-});
+// import assert from 'node:assert';
+// import * as anchor from '@coral-xyz/anchor';
+// import type { Program } from '@coral-xyz/anchor';
+// import { PublicKey } from '@solana/web3.js';
+// import type { CloseAccount } from '../target/types/close_account';
+
+// describe('Close an account', () => {
+//   // Configure the client to use the local cluster.
+//   const provider = anchor.AnchorProvider.env();
+//   anchor.setProvider(provider);
+
+//   const program = anchor.workspace.CloseAccountProgram as Program<CloseAccount>;
+//   const payer = provider.wallet as anchor.Wallet;
+
+//   // Derive the PDA for the user's account.
+//   const [userAccountAddress] = PublicKey.findProgramAddressSync([Buffer.from('USER'), payer.publicKey.toBuffer()], program.programId);
+
+//   it('can create an account', async () => {
+//     const userId = anchor.BN(76362);
+
+//     await program.methods
+//       .createUser(userId)
+//       .accounts({
+//         user: payer.publicKey,
+//       })
+//       .rpc();
+
+//     // Fetch the account data
+//     const userAccount = await program.account.userAccount.fetch(userAccountAddress);
+//     assert.notEqual(userAccount, null);
+//   });
+
+//   it('can close an account', async () => {
+//     await program.methods
+//       .closeUser()
+//       .accounts({
+//         user: payer.publicKey,
+//       })
+//       .rpc();
+
+//     // The account should no longer exist, returning null.
+//     const userAccount = await program.account.userAccount.fetchNullable(userAccountAddress);
+//     assert.equal(userAccount, null);
+//   });
+// });

basics/close-account/poseidon/close_account_program/tests/close_account_program.ts

@@ -10,6 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@solanaturbine/poseidon": "^0.0.4"
+    "@solanaturbine/poseidon": "^0.0.8"
   }
 }

basics/close-account/poseidon/close_account_program/ts-programs/package.json

@@ -1,24 +1,24 @@
-import { Account, Pubkey, Result, Signer, u8, u32 } from '@solanaturbine/poseidon';
+import { Account, String as PoseidonString, Pubkey, Result, Signer, u8 } from '@solanaturbine/poseidon';
 
 export default class CloseAccount {
-  static PROGRAM_ID = new Pubkey('2q4uoWExFAbZjeDe4n3miipsT9bX9vLnkSetCfZYF2VT');
+  static PROGRAM_ID = new Pubkey('DDhy3V9AQE4wrJ3DXC5Yop2p56J6TiBRaz4zjnYnK8ao');
 
-  createUser(user: Signer, userAccount: UserAccount, userId: u32): Result {
-    userAccount.derive(['USER', user.key]).init();
+  createUser(user: Signer, userState: UserState, name: PoseidonString<50>): Result {
+    userState.derive(['USER', user.key]).init();
 
-    userAccount.userBump = userAccount.getBump();
+    userState.userBump = userState.getBump();
 
-    userAccount.user = user.key;
+    userState.user = user.key;
 
-    userAccount.userId = userId;
+    userState.name = name;
   }
-  closeUser(userAccount: UserAccount, user: Signer): Result {
+  closeUser(userAccount: UserState, user: Signer): Result {
     userAccount.derive(['USER', user.key]).close(user);
   }
 }
 
-export interface UserAccount extends Account {
+export interface UserState extends Account {
   userBump: u8;
-  userId: u32;
+  name: PoseidonString<50>;
   user: Pubkey;
 }