Rename interface crate

febo · febo · commit d8976b403adb · 2025-03-07T22:22:11.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/interface/Cargo.toml b/interface/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "token-interface"
+name = "spl-token-interface"
 version = "0.0.0"
-description = "Instructions and types for interacting with p-token"
+description = "Instructions and types for interacting with SPL Token program"
 authors = { workspace = true}
 repository = { workspace = true}
 license = { workspace = true}
diff --git a/p-token/Cargo.toml b/p-token/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "token-program"
+name = "pinocchio-token-program"
 version = "0.0.0"
 description = "A pinocchio-based Token program"
 authors = { workspace = true}
@@ -8,10 +8,6 @@ license = { workspace = true}
 edition = { workspace = true}
 readme = "./README.md"
 
-
-[package.metadata.solana]
-program-id = "PToken1111111111111111111111111111111111111"
-
 [lib]
 crate-type = ["cdylib"]
 
@@ -22,7 +18,7 @@ test-sbf = []
 [dependencies]
 pinocchio = { version = "0.7", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" }
 pinocchio-log = { version = "0.3", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" }
-token-interface = { version = "^0", path = "../interface" }
+spl-token-interface = { version = "^0", path = "../interface" }
 
 [dev-dependencies]
 assert_matches = "1.5.0"
diff --git a/p-token/src/processor/amount_to_ui_amount.rs b/p-token/src/processor/amount_to_ui_amount.rs
@@ -3,7 +3,7 @@ use pinocchio::{
     account_info::AccountInfo, program::set_return_data, program_error::ProgramError, ProgramResult,
 };
 use pinocchio_log::logger::{Argument, Logger};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{load, mint::Mint},
 };
diff --git a/p-token/src/processor/close_account.rs b/p-token/src/processor/close_account.rs
@@ -1,7 +1,7 @@
 use pinocchio::{
     account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey, ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load},
 };
diff --git a/p-token/src/processor/get_account_data_size.rs b/p-token/src/processor/get_account_data_size.rs
@@ -1,7 +1,7 @@
 use pinocchio::{
     account_info::AccountInfo, program::set_return_data, program_error::ProgramError, ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load, mint::Mint, RawType},
 };
diff --git a/p-token/src/processor/initialize_immutable_owner.rs b/p-token/src/processor/initialize_immutable_owner.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, msg, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load_unchecked, Initializable},
 };
diff --git a/p-token/src/processor/initialize_mint.rs b/p-token/src/processor/initialize_mint.rs
@@ -6,7 +6,7 @@ use pinocchio::{
     sysvars::{rent::Rent, Sysvar},
     ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{load_mut_unchecked, mint::Mint, Initializable},
 };
diff --git a/p-token/src/processor/mod.rs b/p-token/src/processor/mod.rs
@@ -8,7 +8,7 @@ use pinocchio::{
     account_info::AccountInfo, memory::sol_memcpy, program_error::ProgramError, pubkey::Pubkey,
     ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     program::ID as TOKEN_PROGRAM_ID,
     state::{
diff --git a/p-token/src/processor/revoke.rs b/p-token/src/processor/revoke.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load_mut},
 };
diff --git a/p-token/src/processor/set_authority.rs b/p-token/src/processor/set_authority.rs
@@ -3,7 +3,7 @@ use core::marker::PhantomData;
 use pinocchio::{
     account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey, ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     instruction::AuthorityType,
     state::{account::Account, load_mut, mint::Mint, RawType},
diff --git a/p-token/src/processor/shared/approve.rs b/p-token/src/processor/shared/approve.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load, load_mut, mint::Mint},
 };
diff --git a/p-token/src/processor/shared/burn.rs b/p-token/src/processor/shared/burn.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load_mut, mint::Mint},
 };
diff --git a/p-token/src/processor/shared/initialize_account.rs b/p-token/src/processor/shared/initialize_account.rs
@@ -5,7 +5,7 @@ use pinocchio::{
     sysvars::{rent::Rent, Sysvar},
     ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     native_mint::is_native_mint,
     state::{
diff --git a/p-token/src/processor/shared/initialize_multisig.rs b/p-token/src/processor/shared/initialize_multisig.rs
@@ -4,7 +4,7 @@ use pinocchio::{
     sysvars::{rent::Rent, Sysvar},
     ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{load_mut_unchecked, multisig::Multisig, Initializable},
 };
diff --git a/p-token/src/processor/shared/mint_to.rs b/p-token/src/processor/shared/mint_to.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load_mut, mint::Mint},
 };
diff --git a/p-token/src/processor/shared/toggle_account_state.rs b/p-token/src/processor/shared/toggle_account_state.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, account_state::AccountState, load, load_mut, mint::Mint},
 };
diff --git a/p-token/src/processor/shared/transfer.rs b/p-token/src/processor/shared/transfer.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load, load_mut, load_mut_unchecked, mint::Mint},
 };
diff --git a/p-token/src/processor/sync_native.rs b/p-token/src/processor/sync_native.rs
@@ -1,5 +1,5 @@
 use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult};
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{account::Account, load_mut},
 };
diff --git a/p-token/src/processor/ui_amount_to_amount.rs b/p-token/src/processor/ui_amount_to_amount.rs
@@ -2,7 +2,7 @@ use core::str::from_utf8;
 use pinocchio::{
     account_info::AccountInfo, program::set_return_data, program_error::ProgramError, ProgramResult,
 };
-use token_interface::{
+use spl_token_interface::{
     error::TokenError,
     state::{load, mint::Mint},
 };
diff --git a/p-token/tests/initialize_mint.rs b/p-token/tests/initialize_mint.rs
@@ -14,7 +14,7 @@ use solana_sdk::{
     system_instruction,
     transaction::Transaction,
 };
-use token_interface::state::mint::Mint;
+use spl_token_interface::state::mint::Mint;
 
 #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
diff --git a/p-token/tests/initialize_mint2.rs b/p-token/tests/initialize_mint2.rs
@@ -14,7 +14,7 @@ use solana_sdk::{
     system_instruction,
     transaction::Transaction,
 };
-use token_interface::state::mint::Mint;
+use spl_token_interface::state::mint::Mint;
 
 #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
diff --git a/p-token/tests/setup/mint.rs b/p-token/tests/setup/mint.rs
@@ -5,7 +5,7 @@ use solana_sdk::{
     program_error::ProgramError, pubkey::Pubkey, signature::Keypair, signer::Signer,
     system_instruction, transaction::Transaction,
 };
-use token_interface::state::mint::Mint;
+use spl_token_interface::state::mint::Mint;
 
 pub async fn initialize(
     context: &mut ProgramTestContext,
diff --git a/p-token/tests/setup/mod.rs b/p-token/tests/setup/mod.rs
@@ -5,4 +5,4 @@ pub mod account;
 #[allow(dead_code)]
 pub mod mint;
 
-pub const TOKEN_PROGRAM_ID: Pubkey = Pubkey::new_from_array(token_interface::program::ID);
+pub const TOKEN_PROGRAM_ID: Pubkey = Pubkey::new_from_array(spl_token_interface::program::ID);
