update anchor basics examples

ZYJLiu · ZYJLiu · commit 1f38abb062d8 · 2023-09-12T16:05:44.000-05:00
diff --git a/.github/workflows/anchor.yml b/.github/workflows/anchor.yml
@@ -30,6 +30,7 @@ jobs:
             "basics/pda-rent-payer/anchor"
             "basics/processing-instructions/anchor"
             "basics/program-derived-addresses/anchor"
+            "basics/realloc/anchor"
             "basics/rent/anchor"
             "basics/repository-layout/anchor"
             "basics/transfer-sol/anchor"
diff --git a/basics/account-data/anchor/tests/test.ts b/basics/account-data/anchor/tests/test.ts
@@ -1,6 +1,6 @@
 import * as anchor from "@coral-xyz/anchor"
 import { AnchorProgramExample } from "../target/types/anchor_program_example"
-import { Keypair, SystemProgram } from "@solana/web3.js"
+import { Keypair } from "@solana/web3.js"
 
 describe("Account Data!", () => {
   const provider = anchor.AnchorProvider.env()
@@ -34,7 +34,6 @@ describe("Account Data!", () => {
       .accounts({
         addressInfo: addressInfoAccount.publicKey,
         payer: payer.publicKey,
-        systemProgram: SystemProgram.programId,
       })
       .signers([addressInfoAccount])
       .rpc()
diff --git a/basics/checking-accounts/anchor/programs/anchor-program-example/src/lib.rs b/basics/checking-accounts/anchor/programs/anchor-program-example/src/lib.rs
@@ -8,20 +8,25 @@ declare_id!("ECWPhR3rJbaPfyNFgphnjxSEexbTArc7vxD8fnW6tgKw");
 pub mod anchor_program_example {
     use super::*;
 
-    #[allow(clippy::result_large_err)]
     pub fn check_accounts(_ctx: Context<CheckingAccounts>) -> Result<()> {
         Ok(())
     }
 }
 
+// Account validation in Anchor is done using the types and constraints specified in the #[derive(Accounts)] structs
+// This is a simple example and does not include all possible constraints and types
 #[derive(Accounts)]
 pub struct CheckingAccounts<'info> {
-    payer: Signer<'info>,
-    #[account(mut)]
-    /// CHECK: This account's data is empty
-    account_to_create: AccountInfo<'info>,
+    payer: Signer<'info>, // checks account is signer
+
+    /// CHECK: No checks performed, example of an unchecked account
     #[account(mut)]
-    /// CHECK: This account's data is empty
-    account_to_change: AccountInfo<'info>,
-    system_program: Program<'info, System>,
+    account_to_create: UncheckedAccount<'info>,
+    /// CHECK: Perform owner check using constraint
+    #[account(
+        mut,
+        owner = id()
+    )]
+    account_to_change: UncheckedAccount<'info>,
+    system_program: Program<'info, System>, // checks account is executable, and is the system program
 }
diff --git a/basics/checking-accounts/anchor/tests/test.ts b/basics/checking-accounts/anchor/tests/test.ts
@@ -1,45 +1,50 @@
-import * as anchor from "@coral-xyz/anchor";
-import { AnchorProgramExample } from "../target/types/anchor_program_example";
+import * as anchor from "@coral-xyz/anchor"
+import { AnchorProgramExample } from "../target/types/anchor_program_example"
+import {
+  Keypair,
+  SystemProgram,
+  Transaction,
+  sendAndConfirmTransaction,
+} from "@solana/web3.js"
 
 describe("Anchor example", () => {
-  const provider = anchor.AnchorProvider.env();
-  anchor.setProvider(provider);
+  const provider = anchor.AnchorProvider.env()
+  anchor.setProvider(provider)
   const program = anchor.workspace
-    .AnchorProgramExample as anchor.Program<AnchorProgramExample>;
-  const payer = provider.wallet as anchor.Wallet;
+    .AnchorProgramExample as anchor.Program<AnchorProgramExample>
+  const wallet = provider.wallet as anchor.Wallet
 
   // We'll create this ahead of time.
   // Our program will try to modify it.
-  const accountToChange = anchor.web3.Keypair.generate();
+  const accountToChange = new Keypair()
   // Our program will create this.
-  const accountToCreate = anchor.web3.Keypair.generate();
+  const accountToCreate = new Keypair()
 
   it("Create an account owned by our program", async () => {
-    let ix = anchor.web3.SystemProgram.createAccount({
+    let instruction = SystemProgram.createAccount({
       fromPubkey: provider.wallet.publicKey,
       newAccountPubkey: accountToChange.publicKey,
       lamports: await provider.connection.getMinimumBalanceForRentExemption(0),
       space: 0,
       programId: program.programId, // Our program
-    });
+    })
 
-    await anchor.web3.sendAndConfirmTransaction(
-      provider.connection,
-      new anchor.web3.Transaction().add(ix),
-      [payer.payer, accountToChange]
-    );
-  });
+    const transaction = new Transaction().add(instruction)
+
+    await sendAndConfirmTransaction(provider.connection, transaction, [
+      wallet.payer,
+      accountToChange,
+    ])
+  })
 
   it("Check accounts", async () => {
     await program.methods
       .checkAccounts()
       .accounts({
-        payer: provider.wallet.publicKey,
+        payer: wallet.publicKey,
         accountToCreate: accountToCreate.publicKey,
         accountToChange: accountToChange.publicKey,
-        systemProgram: anchor.web3.SystemProgram.programId,
       })
-      .signers([payer.payer])
-      .rpc();
-  });
-});
+      .rpc()
+  })
+})
diff --git a/basics/close-account/anchor/programs/close-account/src/instructions/create_user.rs b/basics/close-account/anchor/programs/close-account/src/instructions/create_user.rs
@@ -21,11 +21,10 @@ pub struct CreateUserContext<'info> {
 }
 
 pub fn create_user(ctx: Context<CreateUserContext>, name: String) -> Result<()> {
-    let user_account = &mut ctx.accounts.user_account;
-
-    user_account.bump = *ctx.bumps.get("user_account").unwrap();
-    user_account.user = ctx.accounts.user.key();
-    user_account.name = name;
-
+    *ctx.accounts.user_account = UserState {
+        bump: *ctx.bumps.get("user_account").unwrap(),
+        user: ctx.accounts.user.key(),
+        name,
+    };
     Ok(())
 }
diff --git a/basics/create-account/anchor/tests/test.ts b/basics/create-account/anchor/tests/test.ts
@@ -20,7 +20,6 @@ describe("Create a system account", () => {
       .accounts({
         payer: wallet.publicKey,
         newAccount: newKeypair.publicKey,
-        systemProgram: SystemProgram.programId,
       })
       .signers([newKeypair])
       .rpc()
diff --git a/basics/cross-program-invocation/anchor/tests/test.ts b/basics/cross-program-invocation/anchor/tests/test.ts
@@ -1,26 +1,27 @@
-import * as anchor from "@coral-xyz/anchor";
-import { Hand } from "../target/types/hand";
-import { Lever } from "../target/types/lever";
+import * as anchor from "@coral-xyz/anchor"
+import { Hand } from "../target/types/hand"
+import { Lever } from "../target/types/lever"
+import { Keypair } from "@solana/web3.js"
 
 describe("CPI Example", () => {
-  const provider = anchor.AnchorProvider.env();
-  anchor.setProvider(provider);
-  const hand = anchor.workspace.Hand as anchor.Program<Hand>;
-  const lever = anchor.workspace.Lever as anchor.Program<Lever>;
+  const provider = anchor.AnchorProvider.env()
+  anchor.setProvider(provider)
+  const hand = anchor.workspace.Hand as anchor.Program<Hand>
+  const lever = anchor.workspace.Lever as anchor.Program<Lever>
 
-  const powerAccount = anchor.web3.Keypair.generate();
+  // Generate a new keypair for the power account
+  const powerAccount = new Keypair()
 
   it("Initialize the lever!", async () => {
     await lever.methods
       .initialize()
       .accounts({
         power: powerAccount.publicKey,
         user: provider.wallet.publicKey,
-        systemProgram: anchor.web3.SystemProgram.programId,
       })
       .signers([powerAccount])
-      .rpc();
-  });
+      .rpc()
+  })
 
   it("Pull the lever!", async () => {
     await hand.methods
@@ -29,8 +30,8 @@ describe("CPI Example", () => {
         power: powerAccount.publicKey,
         leverProgram: lever.programId,
       })
-      .rpc();
-  });
+      .rpc()
+  })
 
   it("Pull it again!", async () => {
     await hand.methods
@@ -39,6 +40,6 @@ describe("CPI Example", () => {
         power: powerAccount.publicKey,
         leverProgram: lever.programId,
       })
-      .rpc();
-  });
-});
+      .rpc()
+  })
+})
diff --git a/basics/pda-rent-payer/anchor/programs/anchor-program-example/src/instructions/create_new_account.rs b/basics/pda-rent-payer/anchor/programs/anchor-program-example/src/instructions/create_new_account.rs
@@ -24,7 +24,7 @@ pub fn create_new_account(ctx: Context<CreateNewAccount>) -> Result<()> {
     // The minimum lamports for rent exemption
     let lamports = (Rent::get()?).minimum_balance(0);
 
-    // Create the new account using the PDA signer seeds
+    // Create the new account, transferring lamports from the rent vault to the new account
     create_account(
         CpiContext::new(
             ctx.accounts.system_program.to_account_info(),
diff --git a/basics/pda-rent-payer/anchor/programs/anchor-program-example/src/instructions/init_rent_vault.rs b/basics/pda-rent-payer/anchor/programs/anchor-program-example/src/instructions/init_rent_vault.rs
@@ -17,6 +17,8 @@ pub struct InitRentVault<'info> {
     system_program: Program<'info, System>,
 }
 
+// When lamports are transferred to a new address (without and existing account),
+// An account owned by the system program is created by default
 pub fn init_rent_vault(ctx: Context<InitRentVault>, fund_lamports: u64) -> Result<()> {
     transfer(
         CpiContext::new(
diff --git a/basics/pda-rent-payer/anchor/tests/test.ts b/basics/pda-rent-payer/anchor/tests/test.ts
@@ -1,6 +1,6 @@
 import * as anchor from "@coral-xyz/anchor"
 import { PdaRentPayer } from "../target/types/pda_rent_payer"
-import { LAMPORTS_PER_SOL, Keypair } from "@solana/web3.js"
+import { LAMPORTS_PER_SOL, PublicKey, Keypair } from "@solana/web3.js"
 import { assert } from "chai"
 
 describe("PDA Rent-Payer", () => {
@@ -11,7 +11,7 @@ describe("PDA Rent-Payer", () => {
   const program = anchor.workspace.PdaRentPayer as anchor.Program<PdaRentPayer>
 
   // PDA for the Rent Vault
-  const [rentVaultPDA] = anchor.web3.PublicKey.findProgramAddressSync(
+  const [rentVaultPDA] = PublicKey.findProgramAddressSync(
     [Buffer.from("rent_vault")],
     program.programId
   )
diff --git a/basics/realloc/anchor/.gitignore b/basics/realloc/anchor/.gitignore
@@ -0,0 +1,8 @@
+
+.anchor
+.DS_Store
+target
+**/*.rs.bk
+node_modules
+test-ledger
+.yarn
diff --git a/basics/realloc/anchor/.prettierignore b/basics/realloc/anchor/.prettierignore
@@ -0,0 +1,8 @@
+
+.anchor
+.DS_Store
+target
+node_modules
+dist
+build
+test-ledger
diff --git a/basics/realloc/anchor/Anchor.toml b/basics/realloc/anchor/Anchor.toml
@@ -0,0 +1,16 @@
+[features]
+seeds = false
+skip-lint = false
+
+[programs.localnet]
+anchor_realloc = "Fod47xKXjdHVQDzkFPBvfdWLm8gEAV4iMSXkfUzCHiSD"
+
+[registry]
+url = "https://api.apr.dev"
+
+[provider]
+cluster = "Localnet"
+wallet = "~/.config/solana/id.json"
+
+[scripts]
+test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"
diff --git a/basics/realloc/anchor/Cargo.toml b/basics/realloc/anchor/Cargo.toml
@@ -0,0 +1,13 @@
+[workspace]
+members = [
+    "programs/*"
+]
+
+[profile.release]
+overflow-checks = true
+lto = "fat"
+codegen-units = 1
+[profile.release.build-override]
+opt-level = 3
+incremental = false
+codegen-units = 1
diff --git a/basics/realloc/anchor/migrations/deploy.ts b/basics/realloc/anchor/migrations/deploy.ts
@@ -0,0 +1,12 @@
+// Migrations are an early feature. Currently, they're nothing more than this
+// single deploy script that's invoked from the CLI, injecting a provider
+// configured from the workspace's Anchor.toml.
+
+const anchor = require("@coral-xyz/anchor");
+
+module.exports = async function (provider) {
+  // Configure client to use the provider.
+  anchor.setProvider(provider);
+
+  // Add your deploy script here.
+};
diff --git a/basics/realloc/anchor/package.json b/basics/realloc/anchor/package.json
@@ -0,0 +1,19 @@
+{
+    "scripts": {
+        "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
+        "lint": "prettier */*.js \"*/**/*{.js,.ts}\" --check"
+    },
+    "dependencies": {
+        "@coral-xyz/anchor": "^0.28.0"
+    },
+    "devDependencies": {
+        "chai": "^4.3.4",
+        "mocha": "^9.0.3",
+        "ts-mocha": "^10.0.0",
+        "@types/bn.js": "^5.1.0",
+        "@types/chai": "^4.3.0",
+        "@types/mocha": "^9.0.0",
+        "typescript": "^4.3.5",
+        "prettier": "^2.6.2"
+    }
+}
diff --git a/basics/realloc/anchor/programs/anchor-realloc/Cargo.toml b/basics/realloc/anchor/programs/anchor-realloc/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "anchor-realloc"
+version = "0.1.0"
+description = "Created with Anchor"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "anchor_realloc"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+default = []
+
+[dependencies]
+anchor-lang = "0.28.0"
diff --git a/basics/realloc/anchor/programs/anchor-realloc/Xargo.toml b/basics/realloc/anchor/programs/anchor-realloc/Xargo.toml
@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []
diff --git a/basics/realloc/anchor/programs/anchor-realloc/src/lib.rs b/basics/realloc/anchor/programs/anchor-realloc/src/lib.rs
diff --git a/basics/realloc/anchor/tests/anchor-realloc.ts b/basics/realloc/anchor/tests/anchor-realloc.ts
diff --git a/basics/realloc/anchor/tsconfig.json b/basics/realloc/anchor/tsconfig.json
diff --git a/basics/transfer-sol/anchor/programs/transfer-sol/src/lib.rs b/basics/transfer-sol/anchor/programs/transfer-sol/src/lib.rs
diff --git a/basics/transfer-sol/anchor/tests/test.ts b/basics/transfer-sol/anchor/tests/test.ts

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ pub struct InitRentVault<'info> {`
`17`	`17`	`system_program: Program<'info, System>,`
`18`	`18`	`}`
`19`	`19`
	`20`	`+// When lamports are transferred to a new address (without and existing account),`
	`21`	`+// An account owned by the system program is created by default`
`20`	`22`	`pub fn init_rent_vault(ctx: Context<InitRentVault>, fund_lamports: u64) -> Result<()> {`
`21`	`23`	`transfer(`
`22`	`24`	`CpiContext::new(`