Update references to pubkey

Author: febo

programs/token-2022/README.md

@@ -27,15 +27,15 @@ Initializing a mint account:
 
 ```rust
 // This example assumes that the instruction receives a writable `mint`
-// account; `authority` is a `Pubkey`.
+// account; `authority` is an `Address`.
 // The SPL Token program is being invoked.
 InitializeMint {
     mint,
     rent_sysvar,
     decimals: 9,
     mint_authority: authority,
     freeze_authority: Some(authority),
-    token_program: Pubkey::from_str("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA")
+    token_program: Address::from_str_const("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA")
 }.invoke()?;
 ```
 
@@ -50,7 +50,7 @@ Transfer {
     to,
     authority,
     amount: 10,
-    token_program: Pubkey::from_str("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb")
+    token_program: Address::from_str_const("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb")
 }.invoke()?;
 ```
 

programs/token-2022/src/instructions/initialize_account_2.rs

@@ -41,7 +41,7 @@ impl InitializeAccount2<'_, '_> {
 
         // instruction data
         // -  [0]: instruction discriminator (1 byte, u8)
-        // -  [1..33]: owner (32 bytes, Pubkey)
+        // -  [1..33]: owner (32 bytes, Address)
         let mut instruction_data = [UNINIT_BYTE; 33];
 
         // Set discriminator as u8 at offset [0]

programs/token-2022/src/instructions/initialize_account_3.rs

@@ -37,7 +37,7 @@ impl InitializeAccount3<'_, '_> {
 
         // instruction data
         // -  [0]: instruction discriminator (1 byte, u8)
-        // -  [1..33]: owner (32 bytes, Pubkey)
+        // -  [1..33]: owner (32 bytes, Address)
         let mut instruction_data = [UNINIT_BYTE; 33];
 
         // Set discriminator as u8 at offset [0]

programs/token-2022/src/instructions/initialize_mint.rs

@@ -42,9 +42,9 @@ impl InitializeMint<'_, '_> {
         // Instruction data layout:
         // -  [0]: instruction discriminator (1 byte, u8)
         // -  [1]: decimals (1 byte, u8)
-        // -  [2..34]: mint_authority (32 bytes, Pubkey)
+        // -  [2..34]: mint_authority (32 bytes, Address)
         // -  [34]: freeze_authority presence flag (1 byte, u8)
-        // -  [35..67]: freeze_authority (optional, 32 bytes, Pubkey)
+        // -  [35..67]: freeze_authority (optional, 32 bytes, Address)
         let mut instruction_data = [UNINIT_BYTE; 67];
         let mut length = instruction_data.len();
 

programs/token-2022/src/instructions/initialize_mint_2.rs

@@ -36,17 +36,17 @@ impl InitializeMint2<'_, '_> {
         // Instruction data layout:
         // -  [0]: instruction discriminator (1 byte, u8)
         // -  [1]: decimals (1 byte, u8)
-        // -  [2..34]: mint_authority (32 bytes, Pubkey)
+        // -  [2..34]: mint_authority (32 bytes, Address)
         // -  [34]: freeze_authority presence flag (1 byte, u8)
-        // -  [35..67]: freeze_authority (optional, 32 bytes, Pubkey)
+        // -  [35..67]: freeze_authority (optional, 32 bytes, Address)
         let mut instruction_data = [UNINIT_BYTE; 67];
         let mut length = instruction_data.len();
 
         // Set discriminator as u8 at offset [0]
         write_bytes(&mut instruction_data, &[20]);
         // Set decimals as u8 at offset [1]
         write_bytes(&mut instruction_data[1..2], &[self.decimals]);
-        // Set mint_authority as Pubkey at offset [2..34]
+        // Set mint_authority at offset [2..34]
         write_bytes(&mut instruction_data[2..34], self.mint_authority.as_array());
 
         if let Some(freeze_auth) = self.freeze_authority {

programs/token-2022/src/instructions/set_authority.rs

@@ -55,7 +55,7 @@ impl SetAuthority<'_, '_> {
         // -  [0]: instruction discriminator (1 byte, u8)
         // -  [1]: authority_type (1 byte, u8)
         // -  [2]: new_authority presence flag (1 byte, AuthorityType)
-        // -  [3..35] new_authority (optional, 32 bytes, Pubkey)
+        // -  [3..35] new_authority (optional, 32 bytes, Address)
         let mut instruction_data = [UNINIT_BYTE; 35];
         let mut length = instruction_data.len();
 

programs/token/src/state/multisig.rs

@@ -91,7 +91,7 @@ impl Multisig {
     /// Return the signer addresses of the `Multisig`.
     #[inline(always)]
     pub fn signers(&self) -> &[Address] {
-        // SAFETY: `self.signers` is an array of `Pubkey` with a fixed size of
+        // SAFETY: `self.signers` is an array of `Address` with a fixed size of
         // `MAX_MULTISIG_SIGNERS`; `self.signers_len` is always `<= MAX_MULTISIG_SIGNERS`
         // and indicates how many of these signers are valid.
         unsafe { self.signers.get_unchecked(..self.signers_len()) }

sdk/log/README.md

@@ -28,14 +28,14 @@ This crate defines a lightweight `Logger` type to format log messages and a comp
 
 Below is a sample of the improvements observed when formatting log messages, measured in terms of compute units (CU):
 | Output message                      | `log!` | `msg!`          | Improvement (%) |
-|------------------------------------|--------|-----------------|-----------------|
-| `"Hello world!"`                   | 104    | 104             | -               |
-| `"lamports={}"` + `u64`            | 286    | 625 (+339)      | 55%             |
-| `"{}"` + `[&str; 2]`               | 119    | 1610 (+1491)    | 93%             |
-| `"{}"` + `[u64; 2]`                | 483    | 1154 (+671)     | 49%             |
-| `"lamports={}"` + `i64`            | 299    | 659 (+360)      | 55%             |
-| `"{}"` + `[u8; 32]` (pubkey bytes) | 2783   | 8397 (+5614)    | 67%             |
-| `"lamports={:.9}"` + `u64`         | 438    | 2656 (+2218)`*` | 84%             |
+|-------------------------------------|--------|-----------------|-----------------|
+| `"Hello world!"`                    | 104    | 104             | -               |
+| `"lamports={}"` + `u64`             | 286    | 625 (+339)      | 55%             |
+| `"{}"` + `[&str; 2]`                | 119    | 1610 (+1491)    | 93%             |
+| `"{}"` + `[u64; 2]`                 | 483    | 1154 (+671)     | 49%             |
+| `"lamports={}"` + `i64`             | 299    | 659 (+360)      | 55%             |
+| `"{}"` + `[u8; 32]` (address bytes) | 2783   | 8397 (+5614)    | 67%             |
+| `"lamports={:.9}"` + `u64`          | 438    | 2656 (+2218)`*` | 84%             |
 
 `*` For `msg!`, the value is logged as a `f64` otherwise the precision formatting is ignored.
 

sdk/pinocchio/src/cpi.rs

@@ -101,7 +101,7 @@ pub fn slice_invoke(instruction: &Instruction, account_infos: &[&AccountInfo]) -
 ///   1. It has at least as many accounts as the number of accounts expected by
 ///      the instruction.
 ///   2. The accounts match the expected accounts in the instruction, i.e., their
-///      `Pubkey` matches the `pubkey` in the `AccountMeta`.
+///      `Address` matches the address in the `AccountMeta`.
 ///   3. The borrow state of the accounts is compatible with the mutability of the
 ///      accounts in the instruction.
 ///
@@ -144,7 +144,7 @@ pub fn invoke_signed<const ACCOUNTS: usize>(
 ///   1. It has at least as many accounts as the number of accounts expected by
 ///      the instruction.
 ///   2. The accounts match the expected accounts in the instruction, i.e., their
-///      `Pubkey` matches the `pubkey` in the `AccountMeta`.
+///      `Address` matches the address in the `AccountMeta`.
 ///   3. The borrow state of the accounts is compatible with the mutability of the
 ///      accounts in the instruction.
 ///
@@ -203,7 +203,7 @@ pub fn invoke_signed_with_bounds<const MAX_ACCOUNTS: usize>(
 ///   1. It has at least as many accounts as the number of accounts expected by
 ///      the instruction.
 ///   2. The accounts match the expected accounts in the instruction, i.e., their
-///      `Pubkey` matches the `pubkey` in the `AccountMeta`.
+///      `Address` matches the address in the `AccountMeta`.
 ///   3. The borrow state of the accounts is compatible with the mutability of the
 ///      accounts in the instruction.
 ///
@@ -258,7 +258,7 @@ pub fn slice_invoke_signed(
 ///   1. It has at least as many accounts as the number of accounts expected by
 ///      the instruction.
 ///   2. The accounts match the expected accounts in the instruction, i.e., their
-///      `Pubkey` matches the `pubkey` in the `AccountMeta`.
+///      `Address` matches the address in the `AccountMeta`.
 ///   3. The borrow state of the accounts is compatible with the mutability of the
 ///      accounts in the instruction.
 ///
@@ -395,8 +395,8 @@ pub unsafe fn invoke_signed_unchecked(
         /// discarded immediately after.
         #[repr(C)]
         struct CInstruction<'a> {
-            /// Public key of the program.
-            program_id: *const Pubkey,
+            /// Address of the program.
+            program_id: *const Address,
 
             /// Accounts expected by the program instruction.
             accounts: *const AccountMeta<'a>,

sdk/pinocchio/src/entrypoint/mod.rs

@@ -149,7 +149,7 @@ macro_rules! entrypoint {
 ///
 /// ```ignore
 /// fn process_instruction(
-///     program_id: &Pubkey,      // Public key of the account the program was loaded into
+///     program_id: &Address,     // Address of the account the program was loaded into
 ///     accounts: &[AccountInfo], // All accounts required to process the instruction
 ///     instruction_data: &[u8],  // Serialized instruction-specific data
 /// ) -> ProgramResult;