chore : resolve comments and refactor

Author: Nagaprasadvr

programs/token-2022/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pinocchio-token-2022"
-description = "Pinocchio helpers to invoke Token program 2022 instructions"
+description = "Pinocchio helpers to invoke Token-2022 program instructions"
 version = "0.1.0"
 edition = { workspace = true }
 license = { workspace = true }

programs/token-2022/README.md

@@ -11,10 +11,12 @@
 
 ## Overview
 
-This crate contains [`pinocchio`](https://crates.io/crates/pinocchio) helpers to perform cross-program invocations (CPIs) for SPL Token instructions.
+This crate contains [`pinocchio`](https://crates.io/crates/pinocchio) helpers to perform cross-program invocations (CPIs) for SPL Token-2022 instructions.
 
 Each instruction defines a `struct` with the accounts and parameters required. Once all values are set, you can call directly `invoke` or `invoke_signed` to perform the CPI.
 
+Instruction that are common to both SPL Token and SPL Token-2022 programs expect the program address, so they can be used to invoke either token program.
+
 This is a `no_std` crate.
 
 > **Note:** The API defined in this crate is subject to change.
@@ -26,14 +28,14 @@ Initializing a mint account:
 ```rust
 // This example assumes that the instruction receives a writable `mint`
 // account; `authority` is a `Pubkey`.
-// Token Program : Legacy Token Program
+// The SPL Token program is being invoked.
 InitializeMint {
     mint,
     rent_sysvar,
     decimals: 9,
     mint_authority: authority,
     freeze_authority: Some(authority),
-    program: Pubkey::from_str("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA")
+    token_program: Pubkey::from_str("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA")
 }.invoke()?;
 ```
 
@@ -42,13 +44,13 @@ Performing a transfer of tokens:
 ```rust
 // This example assumes that the instruction receives writable `from` and `to`
 // accounts, and a signer `authority` account.
-// Token Program : Token program 2022
+// The SPL Token-2022 is being invoked.
 Transfer {
     from,
     to,
     authority,
     amount: 10,
-    program: Pubkey::from_str("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb")
+    token_program: Pubkey::from_str("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb")
 }.invoke()?;
 ```
 

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

@@ -16,7 +16,7 @@ use crate::{write_bytes, UNINIT_BYTE};
 ///   0. `[WRITE]` The token account.
 ///   1. `[]` The delegate.
 ///   2. `[SIGNER]` The source account owner.
-pub struct Approve<'a> {
+pub struct Approve<'a, 'b> {
     /// Source Account.
     pub source: &'a AccountInfo,
     /// Delegate Account
@@ -26,10 +26,10 @@ pub struct Approve<'a> {
     /// Amount
     pub amount: u64,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl Approve<'_> {
+impl Approve<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

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

@@ -17,7 +17,7 @@ use crate::{write_bytes, UNINIT_BYTE};
 ///   1. `[]` The token mint.
 ///   2. `[]` The delegate.
 ///   3. `[SIGNER]` The source account owner.
-pub struct ApproveChecked<'a> {
+pub struct ApproveChecked<'a, 'b> {
     /// Source Account.
     pub source: &'a AccountInfo,
     /// Mint Account.
@@ -31,10 +31,10 @@ pub struct ApproveChecked<'a> {
     /// Decimals.
     pub decimals: u8,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl ApproveChecked<'_> {
+impl ApproveChecked<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

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

@@ -16,7 +16,7 @@ use crate::{write_bytes, UNINIT_BYTE};
 ///   0. `[WRITE]` The account to burn from.
 ///   1. `[WRITE]` The token mint.
 ///   2. `[SIGNER]` The account's owner/delegate.
-pub struct Burn<'a> {
+pub struct Burn<'a, 'b> {
     /// Source of the Burn Account
     pub account: &'a AccountInfo,
     /// Mint Account
@@ -26,10 +26,10 @@ pub struct Burn<'a> {
     /// Amount
     pub amount: u64,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl Burn<'_> {
+impl Burn<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

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

@@ -15,7 +15,7 @@ use pinocchio::{
 ///   0. `[WRITE]` The account to burn from.
 ///   1. `[WRITE]` The token mint.
 ///   2. `[SIGNER]` The account's owner/delegate.
-pub struct BurnChecked<'a> {
+pub struct BurnChecked<'a, 'b> {
     /// Source of the Burn Account
     pub account: &'a AccountInfo,
     /// Mint Account
@@ -27,10 +27,10 @@ pub struct BurnChecked<'a> {
     /// Decimals
     pub decimals: u8,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl BurnChecked<'_> {
+impl BurnChecked<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

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

@@ -12,18 +12,18 @@ use pinocchio::{
 ///   0. `[WRITE]` The account to close.
 ///   1. `[WRITE]` The destination account.
 ///   2. `[SIGNER]` The account's owner.
-pub struct CloseAccount<'a> {
+pub struct CloseAccount<'a, 'b> {
     /// Token Account.
     pub account: &'a AccountInfo,
     /// Destination Account
     pub destination: &'a AccountInfo,
     /// Owner Account
     pub authority: &'a AccountInfo,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl CloseAccount<'_> {
+impl CloseAccount<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

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

@@ -12,18 +12,18 @@ use pinocchio::{
 ///   0. `[WRITE]` The account to freeze.
 ///   1. `[]` The token mint.
 ///   2. `[SIGNER]` The mint freeze authority.
-pub struct FreezeAccount<'a> {
+pub struct FreezeAccount<'a, 'b> {
     /// Token Account to freeze.
     pub account: &'a AccountInfo,
     /// Mint Account.
     pub mint: &'a AccountInfo,
     /// Mint Freeze Authority Account
     pub freeze_authority: &'a AccountInfo,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl FreezeAccount<'_> {
+impl FreezeAccount<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

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

@@ -13,7 +13,7 @@ use pinocchio::{
 ///   1. `[]` The mint this account will be associated with.
 ///   2. `[]` The new account's owner/multisignature.
 ///   3. `[]` Rent sysvar
-pub struct InitializeAccount<'a> {
+pub struct InitializeAccount<'a, 'b> {
     /// New Account.
     pub account: &'a AccountInfo,
     /// Mint Account.
@@ -23,10 +23,10 @@ pub struct InitializeAccount<'a> {
     /// Rent Sysvar Account
     pub rent_sysvar: &'a AccountInfo,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl InitializeAccount<'_> {
+impl InitializeAccount<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])

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

@@ -16,7 +16,7 @@ use crate::{write_bytes, UNINIT_BYTE};
 ///   0. `[WRITE]`  The account to initialize.
 ///   1. `[]` The mint this account will be associated with.
 ///   3. `[]` Rent sysvar
-pub struct InitializeAccount2<'a> {
+pub struct InitializeAccount2<'a, 'b> {
     /// New Account.
     pub account: &'a AccountInfo,
     /// Mint Account.
@@ -26,10 +26,10 @@ pub struct InitializeAccount2<'a> {
     /// Owner of the new Account.
     pub owner: &'a Pubkey,
     /// Token Program
-    pub token_program: &'a Pubkey,
+    pub token_program: &'b Pubkey,
 }
 
-impl InitializeAccount2<'_> {
+impl InitializeAccount2<'_, '_> {
     #[inline(always)]
     pub fn invoke(&self) -> ProgramResult {
         self.invoke_signed(&[])