fix:ran pnpm fix

Author: adpthegreat

basics/pda-rent-payer/poseidon/pda_rent_payer/tests/bankrun.test.ts

@@ -1,6 +1,6 @@
 import { describe, it } from 'node:test';
 import * as anchor from '@coral-xyz/anchor';
-import { clusterApiUrl, Connection, Keypair, LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js';
+import { Connection, Keypair, LAMPORTS_PER_SOL, PublicKey, clusterApiUrl } from '@solana/web3.js';
 import { BankrunProvider } from 'anchor-bankrun';
 import { assert } from 'chai';
 import { startAnchor } from 'solana-bankrun';
@@ -18,35 +18,24 @@ describe('PDA Rent-Payer', async () => {
   const connection = provider.connection;
 
   // PDA for the Rent Vault
-  const auth = new Keypair()
+  const auth = new Keypair();
 
-  const [authPDA, authBump] = PublicKey.findProgramAddressSync(
-      [Buffer.from("auth")],
-      PROGRAM_ID
-    );
+  const [authPDA, authBump] = PublicKey.findProgramAddressSync([Buffer.from('auth')], PROGRAM_ID);
 
-const [rentVaultPDA, vaultBump] = PublicKey.findProgramAddressSync(
-      [Buffer.from("vault"),auth.publicKey.toBuffer()],
-      PROGRAM_ID
-);
-
- const [newAccountPDA, newAccountBump] = PublicKey.findProgramAddressSync(
-   [Buffer.from("new_account"),],
-   PROGRAM_ID
- );
-//   const [statePDA, stateBump] = PublicKey.findProgramAddressSync(
-//     [Buffer.from("state"), wallet.publicKey.toBuffer()],
-//     PROGRAM_ID
-//   );
+  const [rentVaultPDA, vaultBump] = PublicKey.findProgramAddressSync([Buffer.from('vault'), auth.publicKey.toBuffer()], PROGRAM_ID);
 
+  const [newAccountPDA, newAccountBump] = PublicKey.findProgramAddressSync([Buffer.from('new_account')], PROGRAM_ID);
+  //   const [statePDA, stateBump] = PublicKey.findProgramAddressSync(
+  //     [Buffer.from("state"), wallet.publicKey.toBuffer()],
+  //     PROGRAM_ID
+  //   );
 
   console.log(rentVaultPDA, 'this is the rent vault pda');
-  console.log(authPDA, 'this is the auth pda')
- console.log(newAccountPDA, 'this is the new account pda')
+  console.log(authPDA, 'this is the auth pda');
+  console.log(newAccountPDA, 'this is the new account pda');
 
   it('Initialize the Rent Vault', async () => {
-
-   const tx = await program.methods
+    const tx = await program.methods
       .initRentVault()
       .accounts({
         owner: wallet.publicKey,
@@ -57,14 +46,13 @@ const [rentVaultPDA, vaultBump] = PublicKey.findProgramAddressSync(
 
     const accountInfo = await program.provider.connection.getAccountInfo(rentVaultPDA);
 
-    console.log(accountInfo, "this is the account info")
+    console.log(accountInfo, 'this is the account info');
 
     const lamports = await connection.getMinimumBalanceForRentExemption(8);
 
     assert(accountInfo !== null, 'Rent vault account does not exist');
 
     assert(accountInfo.lamports === lamports, 'Incorrect rent vault balance');
-
   });
 
   it('Deposit to the Rent Vault', async () => {
@@ -103,23 +91,20 @@ const [rentVaultPDA, vaultBump] = PublicKey.findProgramAddressSync(
 
     // Check that the account was created
     const accountInfo = await connection.getAccountInfo(newAccountPDA);
-    
+
     // 9 is the space the newAccount occupies, poseidon automatically generates space for you when you initialize a pda
     const lamports = await connection.getMinimumBalanceForRentExemption(41);
-    
+
     console.log(lamports);
     console.log(accountInfo.lamports);
 
-    assert(accountInfo !== null, "Rent vault account does not exist");
+    assert(accountInfo !== null, 'Rent vault account does not exist');
 
-    assert(
-      accountInfo.lamports === fundAmount.toNumber() + lamports,
-      "Incorrect rent vault balance"
-    );
+    assert(accountInfo.lamports === fundAmount.toNumber() + lamports, 'Incorrect rent vault balance');
   });
 });
 
 //
-//owner == payer, use payer 
+//owner == payer, use payer
 
-//payer --> rentvault --> newAccount
+//payer --> rentvault --> newAccount

basics/pda-rent-payer/poseidon/pda_rent_payer/ts-programs/src/pda_rent_payer.ts

@@ -1,33 +1,15 @@
-import {
-  Account,
-  Mint,
-  Pubkey,
-  Result,
-  Signer,
-  SystemAccount,
-  SystemProgram,
-  u8,
-  u64,
-  UncheckedAccount,
-} from "@solanaturbine/poseidon";
+import { Account, Mint, Pubkey, Result, Signer, SystemAccount, SystemProgram, UncheckedAccount, u8, u64 } from '@solanaturbine/poseidon';
 
 export default class PdaRentPayer {
-  static PROGRAM_ID = new Pubkey(
-    "BYj8GpV9hpv9PAVdwoWFCTMkysJkk5jstYjuCrw4pxem"
-  );
+  static PROGRAM_ID = new Pubkey('BYj8GpV9hpv9PAVdwoWFCTMkysJkk5jstYjuCrw4pxem');
 
   // When lamports are transferred to a new address (without and existing account),
   // An account owned by the system program is created by default
-  initRentVault(
-    owner: Signer,
-    vault: RentVault,
-    state: RentAccountState,
-    auth: UncheckedAccount,
-  ) {
+  initRentVault(owner: Signer, vault: RentVault, state: RentAccountState, auth: UncheckedAccount) {
     //Derive the accounts with bump and seeds
-    vault.derive(["vault", auth.key]).init();
-    state.derive(["state", owner.key]).init()
-    auth.derive(["auth", state.key]);
+    vault.derive(['vault', auth.key]).init();
+    state.derive(['state', owner.key]).init();
+    auth.derive(['auth', state.key]);
 
     state.owner = owner.key;
 
@@ -37,24 +19,17 @@ export default class PdaRentPayer {
     state.vaultBump = vault.getBump();
   }
 
-
-  depositToRentVault(
-    owner: Signer,
-    state: RentAccountState,
-    auth: UncheckedAccount,
-    vault: RentVault,
-    amount: u64
-  ) {
+  depositToRentVault(owner: Signer, state: RentAccountState, auth: UncheckedAccount, vault: RentVault, amount: u64) {
     //Since we have stored bumps in the RentAccountState we can derive PDAs with stored bumps by passing that as the second argument
-    state.deriveWithBump(["state", owner.key], state.stateBump);
-    auth.deriveWithBump(["auth", state.key], state.authBump);
-    vault.deriveWithBump(["vault", auth.key], state.vaultBump);
+    state.deriveWithBump(['state', owner.key], state.stateBump);
+    auth.deriveWithBump(['auth', state.key], state.authBump);
+    vault.deriveWithBump(['vault', auth.key], state.vaultBump);
 
     // Transfer specified lamports from owner to the rent vault
     SystemProgram.transfer(
       owner, //from
       vault, //to
-      amount //amount to be sent
+      amount, //amount to be sent
     );
   }
 
@@ -65,23 +40,20 @@ export default class PdaRentPayer {
     auth: UncheckedAccount,
     vault: SystemAccount,
     new_account_state: NewAccountState,
-    amount: u64
+    amount: u64,
   ): Result {
-    new_account_state.derive(["new_account", owner.key]).init();
+    new_account_state.derive(['new_account', owner.key]).init();
 
-    state.deriveWithBump(["state", owner.key], state.stateBump);
-    auth.deriveWithBump(["auth", state.key], state.authBump);
-    vault.deriveWithBump(["vault", auth.key], state.vaultBump);
+    state.deriveWithBump(['state', owner.key], state.stateBump);
+    auth.deriveWithBump(['auth', state.key], state.authBump);
+    vault.deriveWithBump(['vault', auth.key], state.vaultBump);
 
     // state.newAccountBump = new_account.getBump(); // we don't need the new_account bump
 
     new_account_state.owner = owner.key;
 
     // We now transfer the lamports from the rent_vault to the new account
-    SystemProgram.transfer(vault, new_account_state, amount, [
-      "vault",
-      auth.key,
-    ]);
+    SystemProgram.transfer(vault, new_account_state, amount, ['vault', auth.key]);
   }
 }
 
@@ -96,6 +68,6 @@ export interface RentAccountState extends Account {
 export interface RentVault extends Account {}
 
 export interface NewAccountState extends Account {
-    owner:Pubkey,
+  owner: Pubkey;
   newAccountBump: u8; // Bump for the newly created account
 }