Replace magic numbers with DISCRIMINATOR + INIT_SPACE

Author: Edward

basics/cross-program-invocation/anchor/programs/lever/src/lib.rs

@@ -27,7 +27,7 @@ pub mod lever {
 
 #[derive(Accounts)]
 pub struct InitializeLever<'info> {
-    #[account(init, payer = user, space = 8 + 8)]
+    #[account(init, payer = user, space = PowerStatus::DISCRIMINATOR.len() + PowerStatus::INIT_SPACE)]
     pub power: Account<'info, PowerStatus>,
     #[account(mut)]
     pub user: Signer<'info>,
@@ -41,6 +41,7 @@ pub struct SetPowerStatus<'info> {
 }
 
 #[account]
+#[derive(InitSpace)]
 pub struct PowerStatus {
     pub is_on: bool,
 }

tokens/token-2022/transfer-hook/account-data-as-seed/anchor/programs/transfer-hook/src/lib.rs

@@ -114,7 +114,7 @@ pub struct InitializeExtraAccountMetaList<'info> {
     )]
     pub extra_account_meta_list: UncheckedAccount<'info>,
     pub mint: InterfaceAccount<'info, Mint>,
-    #[account(init, seeds = [b"counter", payer.key().as_ref()], bump, payer = payer, space = 16)]
+    #[account(init, seeds = [b"counter", payer.key().as_ref()], bump, payer = payer, space = CounterAccount::DISCRIMINATOR.len() + CounterAccount::INIT_SPACE)]
     pub counter_account: Account<'info, CounterAccount>,
     pub token_program: Program<'info, Token2022>,
     pub associated_token_program: Program<'info, AssociatedToken>,
@@ -169,6 +169,7 @@ pub struct TransferHook<'info> {
 }
 
 #[account]
+#[derive(InitSpace)]
 pub struct CounterAccount {
     counter: u64,
 }

tokens/token-2022/transfer-hook/counter/anchor/programs/transfer-hook/src/lib.rs

@@ -110,7 +110,7 @@ pub struct InitializeExtraAccountMetaList<'info> {
     )]
     pub extra_account_meta_list: AccountInfo<'info>,
     pub mint: InterfaceAccount<'info, Mint>,
-    #[account(init, seeds = [b"counter"], bump, payer = payer, space = 16)]
+    #[account(init, seeds = [b"counter"], bump, payer = payer, space = CounterAccount::DISCRIMINATOR.len() + CounterAccount::INIT_SPACE)]
     pub counter_account: Account<'info, CounterAccount>,
     pub token_program: Program<'info, Token2022>,
     pub associated_token_program: Program<'info, AssociatedToken>,
@@ -158,6 +158,7 @@ pub struct TransferHook<'info> {
 }
 
 #[account]
+#[derive(InitSpace)]
 pub struct CounterAccount {
     counter: u64,
 }

tokens/token-2022/transfer-hook/transfer-cost/anchor/programs/transfer-hook/src/lib.rs

@@ -138,7 +138,7 @@ pub struct InitializeExtraAccountMetaList<'info> {
     )]
     pub extra_account_meta_list: UncheckedAccount<'info>,
     pub mint: InterfaceAccount<'info, Mint>,
-    #[account(init, seeds = [b"counter"], bump, payer = payer, space = 9)]
+    #[account(init, seeds = [b"counter"], bump, payer = payer, space = CounterAccount::DISCRIMINATOR.len() + CounterAccount::INIT_SPACE)]
     pub counter_account: Account<'info, CounterAccount>,
     pub system_program: Program<'info, System>,
 }
@@ -263,6 +263,7 @@ pub struct TransferHook<'info> {
 }
 
 #[account]
+#[derive(InitSpace)]
 pub struct CounterAccount {
     counter: u8,
 }

tokens/token-2022/transfer-hook/whitelist/anchor/programs/transfer-hook/src/lib.rs

@@ -127,7 +127,7 @@ pub struct InitializeExtraAccountMetaList<'info> {
     pub extra_account_meta_list: UncheckedAccount<'info>,
     pub mint: InterfaceAccount<'info, Mint>,
     pub system_program: Program<'info, System>,
-    #[account(init_if_needed, seeds = [b"white_list"], bump, payer = payer, space = 400)]
+    #[account(init_if_needed, seeds = [b"white_list"], bump, payer = payer, space = WhiteList::DISCRIMINATOR.len() + WhiteList::INIT_SPACE)]
     pub white_list: Account<'info, WhiteList>,
 }
 
@@ -187,7 +187,9 @@ pub struct AddToWhiteList<'info> {
 }
 
 #[account]
+#[derive(InitSpace)]
 pub struct WhiteList {
     pub authority: Pubkey,
+    #[max_len(11)]
     pub white_list: Vec<Pubkey>,
 }

tokens/token-swap/anchor/programs/token-swap/src/instructions/create_amm.rs

@@ -17,7 +17,7 @@ pub struct CreateAmm<'info> {
     #[account(
         init,
         payer = payer,
-        space = Amm::LEN,
+        space = Amm::DISCRIMINATOR.len() + Amm::INIT_SPACE,
         seeds = [
             id.as_ref()
         ],

tokens/token-swap/anchor/programs/token-swap/src/instructions/create_pool.rs

@@ -31,7 +31,7 @@ pub struct CreatePool<'info> {
     #[account(
         init,
         payer = payer,
-        space = Pool::LEN,
+        space = Pool::DISCRIMINATOR.len() + Pool::INIT_SPACE,
         seeds = [
             amm.key().as_ref(),
             mint_a.key().as_ref(),

tokens/token-swap/anchor/programs/token-swap/src/state.rs

@@ -1,7 +1,7 @@
 use anchor_lang::prelude::*;
 
 #[account]
-#[derive(Default)]
+#[derive(Default, InitSpace)]
 pub struct Amm {
     /// The primary key of the AMM
     pub id: Pubkey,
@@ -13,12 +13,8 @@ pub struct Amm {
     pub fee: u16,
 }
 
-impl Amm {
-    pub const LEN: usize = 8 + 32 + 32 + 2;
-}
-
 #[account]
-#[derive(Default)]
+#[derive(Default, InitSpace)]
 pub struct Pool {
     /// Primary key of the AMM
     pub amm: Pubkey,
@@ -29,7 +25,3 @@ pub struct Pool {
     /// Mint of token B
     pub mint_b: Pubkey,
 }
-
-impl Pool {
-    pub const LEN: usize = 8 + 32 + 32 + 32;
-}