Merge branch 'solana-foundation:master' into master

MicaiahReid · web-flow · commit 43d9918325b6 · 2025-10-27T13:59:45.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -617,7 +617,7 @@ See the [Anchor 0.29 release notes](https://www.anchor-lang.com/release-notes/0.
 - spl: Re-export the `spl_token` crate ([#1665](https://github.com/coral-xyz/anchor/pull/1665)).
 - lang, cli, spl: Update solana toolchain to v1.9.13 ([#1653](https://github.com/coral-xyz/anchor/pull/1653) and [#1751](https://github.com/coral-xyz/anchor/pull/1751)).
 - lang: `Program` type now deserializes `programdata_address` only on demand ([#1723](https://github.com/coral-xyz/anchor/pull/1723)).
-- ts: Make `Provider` an interface and adjust its signatures and add `AnchorProvider` implementor class ([#1707](https://github.com/coral-xyz/anchor/pull/1707)).
+- ts: Make `Provider` an interface and adjust its signatures and add `AnchorProvider` implementer class ([#1707](https://github.com/coral-xyz/anchor/pull/1707)).
 - spl: Change "to" to "from" in `token::burn` ([#1080](https://github.com/coral-xyz/anchor/pull/1080)).
 
 ## [0.23.0] - 2022-03-20
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ To jump straight to examples, go [here](https://github.com/coral-xyz/anchor/tree
 | `anchor-spl`            | CPI clients for SPL programs on Solana                   | [![crates](https://img.shields.io/crates/v/anchor-spl?color=blue)](https://crates.io/crates/anchor-spl)                          | [![Docs.rs](https://docs.rs/anchor-spl/badge.svg)](https://docs.rs/anchor-spl)                                  |
 | `anchor-client`         | Rust client for Anchor programs                          | [![crates](https://img.shields.io/crates/v/anchor-client?color=blue)](https://crates.io/crates/anchor-client)                    | [![Docs.rs](https://docs.rs/anchor-client/badge.svg)](https://docs.rs/anchor-client)                            |
 | `@coral-xyz/anchor`     | TypeScript client for Anchor programs                    | [![npm](https://img.shields.io/npm/v/@coral-xyz/anchor.svg?color=blue)](https://www.npmjs.com/package/@coral-xyz/anchor)         | [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://coral-xyz.github.io/anchor/ts/index.html)     |
-| `@coral-xyz/anchor-cli` | CLI to support building and managing an Anchor workspace | [![npm](https://img.shields.io/npm/v/@coral-xyz/anchor-cli.svg?color=blue)](https://www.npmjs.com/package/@coral-xyz/anchor-cli) | [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://coral-xyz.github.io/anchor/cli/commands.html) |
+| `@coral-xyz/anchor-cli` | CLI to support building and managing an Anchor workspace | [![npm](https://img.shields.io/npm/v/@coral-xyz/anchor-cli.svg?color=blue)](https://www.npmjs.com/package/@coral-xyz/anchor-cli) | [![Docs](https://img.shields.io/badge/docs-typedoc-blue)](https://www.anchor-lang.com/docs/references/cli) |
 
 ## Note
 
diff --git a/avm/src/lib.rs b/avm/src/lib.rs
@@ -753,7 +753,7 @@ mod tests {
         let expected = vec![version];
         assert_eq!(read_installed_versions().unwrap(), expected);
 
-        // Should ignore this file because its not anchor- prefixed
+        // Should ignore this file because it's not anchor- prefixed
         fs::File::create(AVM_HOME.join("bin").join("garbage").as_path()).unwrap();
         assert_eq!(read_installed_versions().unwrap(), expected);
     }
diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 //! An RPC client to interact with Solana programs written in [`anchor_lang`].
 //!
diff --git a/docs/content/docs/basics/cpi.mdx b/docs/content/docs/basics/cpi.mdx
@@ -6,7 +6,7 @@ description:
 ---
 
 Cross Program Invocations (CPI) refer to the process of one program invoking
-instructions of another program, which enables the composibility of Solana
+instructions of another program, which enables the composability of Solana
 programs.
 
 This section will cover the basics of implementing CPIs in an Anchor program,
@@ -98,7 +98,7 @@ resulting in a successful SOL transfer.
 
 Cross Program Invocations (CPIs) allow one program to invoke instructions on
 another program. The process of implementing a CPI is the same as that of
-creating a instruction where you must specify:
+creating an instruction where you must specify:
 
 1. The program ID of the program being called
 2. The accounts required by the instruction
diff --git a/docs/content/docs/installation.mdx b/docs/content/docs/installation.mdx
@@ -468,7 +468,7 @@ To verify that the installation was successful, check the Yarn version:
 yarn --version
 ```
 
-You should the following output:
+You should see the following output:
 
 ```
 1.22.1
@@ -567,7 +567,7 @@ Keypair Path: /Users/test/.config/solana/id.json
 Commitment: confirmed
 ```
 
-The RPC URL and Websocket URL specific the Solana cluster the CLI will make
+The RPC URL and Websocket URL specify the Solana cluster the CLI will make
 requests to. By default this will be mainnet-beta.
 
 You can update the Solana CLI cluster using the following commands:
diff --git a/docs/content/docs/tokens/basics/transfer-tokens.mdx b/docs/content/docs/tokens/basics/transfer-tokens.mdx
@@ -303,7 +303,7 @@ describe("token-example", () => {
     console.log("Mint Account", mintAccount);
   });
 
-  it("Mint Tokens", async () => {
+  it("Transfer Tokens", async () => {
     const tx = await program.methods
       .transferTokens()
       .accounts({
diff --git a/docs/content/docs/updates/release-notes/0-31-0.mdx b/docs/content/docs/updates/release-notes/0-31-0.mdx
@@ -102,7 +102,7 @@ Program name: `my-program`
 ### Pass `cargo` args to IDL build
 
 Both `anchor build` and `anchor idl build` commands pass the `cargo` arguments
-to the underyling IDL build command. For example:
+to the underlying IDL build command. For example:
 
 ```
 anchor build -- --features my-feature
@@ -274,7 +274,7 @@ still allows empty discriminators because some non-Anchor programs, e.g. the SPL
 Token program, don't have account discriminators. In that case, safety checks
 should never depend on the discriminator.
 
-Additionally, the IDL generation step also checks whether you have ambigious
+Additionally, the IDL generation step also checks whether you have ambiguous
 discriminators i.e. discriminators that can be used for multiple types. However,
 you should still consider future possibilities, especially when working with
 1-byte discriminators. For example, having an account with discriminator `[1]`
@@ -440,7 +440,7 @@ Building the IDL via the
 [`build_idl`](https://github.com/coral-xyz/anchor/blob/v0.31.0/idl/src/build.rs#L119)
 function made it impossible to extend its functionality e.g. add new parameters
 without a breaking change. To solve this problem, there is a new way to build
-IDLs programatically:
+IDLs programmatically:
 
 ```rs
 let idl = IdlBuilder::new().program_path(path).skip_lint(true).build()?;
diff --git a/lang/attribute/account/src/lazy.rs b/lang/attribute/account/src/lazy.rs
@@ -21,7 +21,7 @@ pub fn gen_lazy(strct: &syn::ItemStruct) -> syn::Result<TokenStream> {
     let load_panic_docs = quote! {
         /// # Panics
         ///
-        /// If there is an existing mutable reference crated by any of the `load_mut` methods.
+        /// If there is an existing mutable reference created by any of the `load_mut` methods.
     };
     let load_mut_panic_docs = quote! {
         /// # Panics
diff --git a/lang/attribute/program/src/declare_program/mods/internal.rs b/lang/attribute/program/src/declare_program/mods/internal.rs
@@ -83,7 +83,7 @@ fn gen_internal_args_mod(idl: &Idl) -> proc_macro2::TokenStream {
         /// An Anchor generated module containing the program's set of instructions, where each
         /// method handler in the `#[program]` mod is associated with a struct defining the input
         /// arguments to the method. These should be used directly, when one wants to serialize
-        /// Anchor instruction data, for example, when specifying instructions instructions on a
+        /// Anchor instruction data, for example, when specifying instructions on a
         /// client.
         pub mod args {
             use super::*;
diff --git a/lang/src/accounts/program.rs b/lang/src/accounts/program.rs
@@ -17,7 +17,7 @@ use std::ops::Deref;
 ///
 /// The type has a `programdata_address` function that will return `Option::Some`
 /// if the program is owned by the [`BPFUpgradeableLoader`](https://docs.rs/solana-program/latest/solana_program/bpf_loader_upgradeable/index.html)
-/// which will contain the `programdata_address` property of the `Program` variant of the [`UpgradeableLoaderState`](https://docs.rs/solana-program/latest/solana_program/bpf_loader_upgradeable/enum.UpgradeableLoaderState.html) enum.
+/// which will contain the `programdata_address` property of the `Program` variant of the [`UpgradeableLoaderState`](https://docs.rs/solana-loader-v3-interface/latest/solana_loader_v3_interface/state/enum.UpgradeableLoaderState.html) enum.
 ///
 /// # Table of Contents
 /// - [Basic Functionality](#basic-functionality)
diff --git a/lang/src/lib.rs b/lang/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 //! Anchor ⚓ is a framework for Solana's Sealevel runtime providing several
 //! convenient developer tools.
diff --git a/lang/syn/src/codegen/accounts/constraints.rs b/lang/syn/src/codegen/accounts/constraints.rs
@@ -1660,7 +1660,7 @@ fn generate_get_token_account_space(mint: &Expr) -> proc_macro2::TokenStream {
     }
 }
 
-// Generated code to create an account with with system program with the
+// Generated code to create an account with system program with the
 // given `space` amount of data, owned by `owner`.
 //
 // `seeds_with_nonce` should be given for creating PDAs. Otherwise it's an
@@ -1729,7 +1729,7 @@ pub fn generate_constraint_executable(
     let name_str = f.ident.to_string();
     let account_ref = generate_account_ref(f);
 
-    // because we are only acting on the field, we know it isnt optional at this point
+    // because we are only acting on the field, we know it isn't optional at this point
     // as it was unwrapped in `generate_constraint`
     quote! {
         if !#account_ref.executable {
diff --git a/lang/syn/src/lib.rs b/lang/syn/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 pub mod codegen;
 pub mod parser;
diff --git a/lang/syn/src/parser/context.rs b/lang/syn/src/parser/context.rs
@@ -72,7 +72,7 @@ impl CrateContext {
         Please add a `/// CHECK:` doc comment explaining why no checks through types are necessary.
         Alternatively, for reasons like quick prototyping, you may disable the safety checks
         by using the `skip-lint` option.
-        See https://www.anchor-lang.com/docs/the-accounts-struct#safety-checks for more information.
+        See https://www.anchor-lang.com/docs/basics/program-structure#account-validation for more information.
                     "#,
                         ctx.file.canonicalize().unwrap().display(),
                         span.start().line,
diff --git a/spl/src/lib.rs b/spl/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 //! Anchor CPI wrappers for popular programs in the Solana ecosystem.
 
diff --git a/tests/auction-house/programs/auction-house/src/lib.rs b/tests/auction-house/programs/auction-house/src/lib.rs
@@ -297,7 +297,7 @@ pub mod auction_house {
                 &treasury_mint.key(),
             )?;
 
-            // make sure you cant get rugged
+            // make sure you can't get rugged
             if rec_acct.delegate.is_some() {
                 return err!(ErrorCode::BuyerATACannotHaveDelegate);
             }
@@ -773,7 +773,7 @@ pub mod auction_house {
             &[auction_house.bump],
         ];
 
-        // with the native account, the escrow is it's own owner,
+        // with the native account, the escrow is its own owner,
         // whereas with token, it is the auction house that is owner.
         let signer_seeds_for_royalties = if is_native {
             escrow_signer_seeds
@@ -832,7 +832,7 @@ pub mod auction_house {
                 &treasury_mint.key(),
             )?;
 
-            // make sure you cant get rugged
+            // make sure you can't get rugged
             if seller_rec_acct.delegate.is_some() {
                 return err!(ErrorCode::SellerATACannotHaveDelegate);
             }
diff --git a/tests/idl/tests/new-idl.ts b/tests/idl/tests/new-idl.ts
@@ -211,14 +211,14 @@ describe("New IDL", () => {
       const pointX = new anchor.BN(1);
       const pointY = new anchor.BN(2);
       const named = await testAccountEnum({ named: { pointX, pointY } });
-      if (!named.fullEnum.named) throw new Error("Named not crated");
+      if (!named.fullEnum.named) throw new Error("Named not created");
       assert(named.fullEnum.named.pointX.eq(pointX));
       assert(named.fullEnum.named.pointY.eq(pointY));
 
       // Unnamed
       const tupleArg = [1, 2, 3, 4] as const;
       const unnamed = await testAccountEnum({ unnamed: tupleArg });
-      if (!unnamed.fullEnum.unnamed) throw new Error("Unnamed not crated");
+      if (!unnamed.fullEnum.unnamed) throw new Error("Unnamed not created");
       assert(
         Object.entries(unnamed.fullEnum.unnamed).every(
           ([key, value]) => value === tupleArg[key as keyof typeof tupleArg]
@@ -233,7 +233,7 @@ describe("New IDL", () => {
         unnamedStruct: tupleStructArg,
       });
       if (!unnamedStruct.fullEnum.unnamedStruct) {
-        throw new Error("Unnamed struct not crated");
+        throw new Error("Unnamed struct not created");
       }
       assert.strictEqual(
         unnamedStruct.fullEnum.unnamedStruct[0].u8,
diff --git a/tests/lockup/docs/lockups.md b/tests/lockup/docs/lockups.md
@@ -91,7 +91,7 @@ if any at all.
 
 To create a whitelisted program that receives withdrawals/deposits from/to the Lockup program,
 one needs to implement the whitelist transfer interface, which assumes nothing about the
-`instruction_data` but requires accounts to be provided in a specific [order](https://github.com/project-serum/serum-dex/blob/master/registry/program/src/deposit.rs#L18).
+`instruction_data` but requires accounts to be provided in a specific order.
 
 Take staking locked tokens as a working example.
 
diff --git a/tests/lockup/docs/staking.md b/tests/lockup/docs/staking.md
@@ -31,7 +31,7 @@ to understand, contribute to, or modify the code.
 Accounts are the pieces of state owned by a Solana program. For reference while reading, here are all
 accounts used by the **Registry** program.
 
-* `Registrar` - Analogous to an SPL token `Mint`, the `Registrar` defines a staking instance. It has its own pool, and it's own set of rewards distributed amongst its own set of stakers.
+* `Registrar` - Analogous to an SPL token `Mint`, the `Registrar` defines a staking instance. It has its own pool, and its own set of rewards distributed amongst its own set of stakers.
 * `Member` - Analogous to an SPL token `Account`, `Member` accounts represent a **beneficiary**'s (i.e. a wallet's) stake state. This account has several vaults, all of which represent the funds belonging to an individual user.
 * `PendingWithdrawal` - A transfer out of the staking pool (poorly named since it's not a withdrawal out of the program. But a withdrawal out of the staking pool and into a `Member`'s freely available balances).
 * `RewardVendor` - A reward that has been dropped onto stakers and is distributed pro rata to staked `Member` beneficiaries.
@@ -89,7 +89,7 @@ from the stake pool is complete, and the funds are ready to be used again.
 Feel free to skip this section and jump to the **Reward Vendors** section if you want to
 just see how rewards work.
 
-One could imagine several ways to drop rewards onto a staking pool, each with there own downsides.
+One could imagine several ways to drop rewards onto a staking pool, each with their own downsides.
 Of course what you want is, for a given reward amount, to atomically snapshot the state
 of the staking pool and to distribute it proportionally to all stake holders. Effectively,
 an on chain program such as
@@ -116,7 +116,7 @@ This is not auditable or verifiable. And if you want to answer these questions,
 complex off-chain protocols that require either fancy cryptography or effectively
 recreating a BFT system off chain.
 
-Another solution considerered was to use a uniswap-style AMM pool (without the swapping).
+Another solution considered was to use a uniswap-style AMM pool (without the swapping).
 This has a lot of advantages. First it's easy to reason about and implement in a single transaction.
 To drop rewards globally onto the pool, one can deposit funds directly into the pool, in which case
 the reward is automatically received by owners of the staking pool token upon redemption, a process
diff --git a/tests/lockup/programs/lockup/src/lib.rs b/tests/lockup/programs/lockup/src/lib.rs
@@ -126,7 +126,7 @@ pub mod lockup {
         let cpi_ctx = CpiContext::from(&*ctx.accounts).with_signer(signer);
         token::transfer(cpi_ctx, amount)?;
 
-        // Bookeeping.
+        // Bookkeeping.
         let vesting = &mut ctx.accounts.vesting;
         vesting.outstanding -= amount;
 
diff --git a/tests/optional/tests/optional.ts b/tests/optional/tests/optional.ts
@@ -765,7 +765,7 @@ describe("Optional", () => {
           .signers([dataAccountKeypair3])
           .rpc();
         assert.fail(
-          "Unexpected success in creating a transaction that should have failed with `ConstraintRaw` error"
+          "Unexpected success in creating a transaction that should have failed with `ConstraintAccountIsNone` error"
         );
       } catch (e) {
         // @ts-ignore
diff --git a/tests/zero-copy/programs/zero-copy/src/lib.rs b/tests/zero-copy/programs/zero-copy/src/lib.rs
@@ -170,7 +170,7 @@ pub struct Event {
 //    traits, so any types in method signatures must as well.
 // 2. All types for zero copy deserialization are `#[repr(packed)]`. However,
 //    the implementation of AnchorSerialize (i.e. borsh), uses references
-//    to the fields it serializes. So if we were to just throw tehse derives
+//    to the fields it serializes. So if we were to just throw these derives
 //    onto the other `Event` struct, we would have references to
 //    `#[repr(packed)]` fields, which is unsafe. To avoid the unsafeness, we
 //    just use a separate type.
diff --git a/ts/packages/anchor/tests/events.spec.ts b/ts/packages/anchor/tests/events.spec.ts
@@ -151,12 +151,12 @@ describe("Events", () => {
     const logs = [
       "Program J2XMGdW2qQLx7rAdwWtSZpTXDgAQ988BLP9QTgUZvm54 invoke [1]",
       "Program log: Instruction: CancelListing",
-      "Program log: TRANSFERED SOME TOKENS",
+      "Program log: TRANSFERRED SOME TOKENS",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]",
       "Program log: Instruction: Transfer",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 2549 of 182795 compute units",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success",
-      "Program log: TRANSFERED SOME TOKENS",
+      "Program log: TRANSFERRED SOME TOKENS",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]",
       "Program log: Instruction: CloseAccount",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 1745 of 176782 compute units",
@@ -252,12 +252,12 @@ describe("Events", () => {
     const logs = [
       "Program 5VcVB7jEjdWJBkriXxayCrUUkwfhrPK3rXtnkxxUvMFP invoke [1]",
       "Program log: Instruction: CancelListing",
-      "Program log: TRANSFERED SOME TOKENS",
+      "Program log: TRANSFERRED SOME TOKENS",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]",
       "Program log: Instruction: Transfer",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 2549 of 182795 compute units",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success",
-      "Program log: TRANSFERED SOME TOKENS",
+      "Program log: TRANSFERRED SOME TOKENS",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]",
       "Program log: Instruction: CloseAccount",
       "Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 1745 of 176782 compute units",
diff --git a/ts/packages/spl-governance/program/lib.rs b/ts/packages/spl-governance/program/lib.rs
@@ -1275,7 +1275,7 @@ pub enum ProposalState {
 #[derive(AnchorSerialize, AnchorDeserialize)]
 pub enum VoteType {
     /// Single choice vote with mutually exclusive choices
-    /// In the SingeChoice mode there can ever be a single winner
+    /// In the SingleChoice mode there can ever be a single winner
     /// If multiple options score the same highest vote then the Proposal is not resolved and considered as Failed
     /// Note: Yes/No vote is a single choice (Yes) vote with the deny option (No)
     SingleChoice,
diff --git a/ts/packages/spl-token/program/lib.rs b/ts/packages/spl-token/program/lib.rs
@@ -438,7 +438,7 @@ pub enum TokenError {
     #[msg("Invalid number of required signers")]
     InvalidNumberOfRequiredSigners,
     /// State is uninitialized.
-    #[msg("State is unititialized")]
+    #[msg("State is uninitialized")]
     UninitializedState,
 
     // 10

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ mod tests {`
`753`	`753`	`let expected = vec![version];`
`754`	`754`	`assert_eq!(read_installed_versions().unwrap(), expected);`
`755`	`755`
`756`		`- // Should ignore this file because its not anchor- prefixed`
	`756`	`+ // Should ignore this file because it's not anchor- prefixed`
`757`	`757`	`fs::File::create(AVM_HOME.join("bin").join("garbage").as_path()).unwrap();`
`758`	`758`	`assert_eq!(read_installed_versions().unwrap(), expected);`
`759`	`759`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![cfg_attr(docsrs, feature(doc_auto_cfg))]`
	`1`	`+#![cfg_attr(docsrs, feature(doc_cfg))]`
`2`	`2`
`3`	`3`	//! An RPC client to interact with Solana programs written in [`anchor_lang`].
`4`	`4`	`//!`