fix token-2022 errors

Author: Perelyn-sama

Cargo.lock

@@ -43,12 +43,25 @@ resolver = "2"
 overflow-checks = true
 
 [workspace.dependencies]
+
+# misc
 borsh = "1.5.7"
 borsh-derive = "1.5.7"
+mpl-token-metadata = { version = "5.1.1", features = [ "no-entrypoint" ] }
+
+
+# spl
 solana-program = "3.0"
 spl-token = { version = "8.0.0", features = [ "no-entrypoint" ] }
+spl-token-2022 = {version = "9.0.0" , features = [ "no-entrypoint" ] }
 spl-associated-token-account = { version = "7.0.0", features = [ "no-entrypoint" ] }
+
+# interface
 solana-system-interface = {version = "2.0.0", features = ["bincode"]}
+spl-token-interface = "2.0.0"
+spl-associated-token-account-interface = "2.0.0"
+spl-token-2022-interface = "2.0.0"
+
+# pinocchio
 pinocchio = "=0.8.1"
 pinocchio-log = "0.4.0"
-mpl-token-metadata = { version = "5.1.1", features = [ "no-entrypoint" ] }

Cargo.toml

@@ -4,11 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-borsh = "0.9.3"
-borsh-derive = "0.9.1"
-solana-program = "1.18.17"
-spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
-spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
+borsh.workspace  = true
+borsh-derive.workspace = true
+solana-program.workspace = true
+solana-system-interface.workspace = true
+spl-token-interface.workspace = true
+spl-associated-token-account-interface.workspace = true
+spl-token-2022-interface.workspace = true
 
 [lib]
 crate-type = ["cdylib", "lib"]

tokens/token-2022/default-account-state/native/program/Cargo.toml

@@ -1,3 +1,5 @@
+#![allow(unexpected_cfgs)]
+use solana_system_interface::instruction as system_instruction;
 use {
     borsh::{BorshDeserialize, BorshSerialize},
     solana_program::{
@@ -8,10 +10,9 @@ use {
         program::invoke,
         pubkey::Pubkey,
         rent::Rent,
-        system_instruction,
         sysvar::Sysvar,
     },
-    spl_token_2022::{
+    spl_token_2022_interface::{
         extension::{
             default_account_state::instruction::{
                 initialize_default_account_state, update_default_account_state,
@@ -48,7 +49,8 @@ fn process_instruction(
     let token_program = next_account_info(accounts_iter)?;
 
     // Find the size for the account with the Extension
-    let space = ExtensionType::get_account_len::<Mint>(&[ExtensionType::DefaultAccountState]);
+    let space =
+        ExtensionType::try_calculate_account_len::<Mint>(&[ExtensionType::DefaultAccountState])?;
 
     // Get the required rent exemption amount for the account
     let rent_required = Rent::get()?.minimum_balance(space);

tokens/token-2022/default-account-state/native/program/src/lib.rs

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-borsh = "0.9.3"
-borsh-derive = "0.9.1"
-solana-program = "2.0"
-spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
-spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
+borsh.workspace  = true
+borsh-derive.workspace = true
+solana-program.workspace = true
+solana-system-interface.workspace = true
+spl-token-2022-interface.workspace = true
 
 [lib]
 crate-type = ["cdylib", "lib"]

tokens/token-2022/mint-close-authority/native/program/Cargo.toml

@@ -1,3 +1,4 @@
+#![allow(unexpected_cfgs)]
 use {
     borsh::{BorshDeserialize, BorshSerialize},
     solana_program::{
@@ -8,10 +9,12 @@ use {
         program::invoke,
         pubkey::Pubkey,
         rent::Rent,
-        system_instruction,
         sysvar::Sysvar,
     },
-    spl_token_2022::{extension::ExtensionType, instruction as token_instruction, state::Mint},
+    solana_system_interface::instruction as system_instruction,
+    spl_token_2022_interface::{
+        extension::ExtensionType, instruction as token_instruction, state::Mint,
+    },
 };
 
 #[derive(BorshSerialize, BorshDeserialize, Debug)]
@@ -39,7 +42,8 @@ fn process_instruction(
     let token_program = next_account_info(accounts_iter)?;
 
     // Find the size for the account with the Extension
-    let space = ExtensionType::get_account_len::<Mint>(&[ExtensionType::MintCloseAuthority]);
+    let space =
+        ExtensionType::try_calculate_account_len::<Mint>(&[ExtensionType::MintCloseAuthority])?;
 
     // Get the required rent exemption amount for the account
     let rent_required = Rent::get()?.minimum_balance(space);

tokens/token-2022/mint-close-authority/native/program/src/lib.rs

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-borsh = "0.9.3"
-borsh-derive = "0.9.1"
-solana-program = "1.18.17"
-spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
-spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
+borsh.workspace  = true
+borsh-derive.workspace = true
+solana-program.workspace = true
+solana-system-interface.workspace = true
+spl-token-2022-interface.workspace = true
 
 [lib]
 crate-type = ["cdylib", "lib"]

tokens/token-2022/multiple-extensions/native/program/Cargo.toml

@@ -1,3 +1,4 @@
+#![allow(unexpected_cfgs)]
 use {
     borsh::{BorshDeserialize, BorshSerialize},
     solana_program::{
@@ -8,10 +9,12 @@ use {
         program::invoke,
         pubkey::Pubkey,
         rent::Rent,
-        system_instruction,
         sysvar::Sysvar,
     },
-    spl_token_2022::{extension::ExtensionType, instruction as token_instruction, state::Mint},
+    solana_system_interface::instruction as system_instruction,
+    spl_token_2022_interface::{
+        extension::ExtensionType, instruction as token_instruction, state::Mint,
+    },
 };
 
 #[derive(BorshSerialize, BorshDeserialize, Debug)]
@@ -39,10 +42,10 @@ fn process_instruction(
     let token_program = next_account_info(accounts_iter)?;
 
     // Find the size for the Mint account with the the number of extensions we want to use.
-    let space = ExtensionType::get_account_len::<Mint>(&[
+    let space = ExtensionType::try_calculate_account_len::<Mint>(&[
         ExtensionType::MintCloseAuthority,
         ExtensionType::NonTransferable,
-    ]);
+    ])?;
 
     // Get the required rent exemption amount for the account
     let rent_required = Rent::get()?.minimum_balance(space);

tokens/token-2022/multiple-extensions/native/program/src/lib.rs

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-borsh = "0.9.3"
-borsh-derive = "0.9.1"
-solana-program = "2.0"
-spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
-spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
+borsh.workspace  = true
+borsh-derive.workspace = true
+solana-program.workspace = true
+solana-system-interface.workspace = true
+spl-token-2022-interface.workspace = true
 
 [lib]
 crate-type = ["cdylib", "lib"]

tokens/token-2022/non-transferable/native/program/Cargo.toml

@@ -1,3 +1,4 @@
+#![allow(unexpected_cfgs)]
 use {
     borsh::{BorshDeserialize, BorshSerialize},
     solana_program::{
@@ -8,10 +9,12 @@ use {
         program::invoke,
         pubkey::Pubkey,
         rent::Rent,
-        system_instruction,
         sysvar::Sysvar,
     },
-    spl_token_2022::{extension::ExtensionType, instruction as token_instruction, state::Mint},
+    solana_system_interface::instruction as system_instruction,
+    spl_token_2022_interface::{
+        extension::ExtensionType, instruction as token_instruction, state::Mint,
+    },
 };
 
 #[derive(BorshSerialize, BorshDeserialize, Debug)]
@@ -38,7 +41,8 @@ fn process_instruction(
     let token_program = next_account_info(accounts_iter)?;
 
     // Find the size for the account with the Extension
-    let space = ExtensionType::get_account_len::<Mint>(&[ExtensionType::NonTransferable]);
+    let space =
+        ExtensionType::try_calculate_account_len::<Mint>(&[ExtensionType::NonTransferable])?;
 
     // Get the required rent exemption amount for the account
     let rent_required = Rent::get()?.minimum_balance(space);