use 3.0 in spl-transfer-hook-interface (#78)

Use up-to-date 3.0.0 crates for the spl-transfer-hook-interface crate.

Cargo.toml

@@ -21,7 +21,7 @@ check-cfg = [
 ]
 
 [workspace.metadata.cli]
-solana = "2.3.4"
+solana = "3.0.0"
 
 # Specify Rust toolchains for rustfmt, clippy, and build.
 # Any unprovided toolchains default to stable.

clients/cli/Cargo.toml

@@ -21,7 +21,7 @@ solana-sdk = "2.2.1"
 solana-sdk-ids = "2.2.1"
 solana-system-interface = "1"
 spl-tlv-account-resolution = { version = "0.10.0", features = ["serde-traits"] }
-spl-transfer-hook-interface = { version = "0.10.0", path = "../../interface" }
+spl-transfer-hook-interface = "0.10.0"
 strum = "0.27"
 strum_macros = "0.27"
 tokio = { version = "1", features = ["full"] }

interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spl-transfer-hook-interface"
-version = "0.10.0"
+version = "1.0.0"
 description = "Solana Program Library Transfer Hook Interface"
 documentation = "https://docs.rs/spl-transfer-hook-interface"
 authors = { workspace = true }
@@ -14,19 +14,19 @@ arrayref = "0.3.9"
 bytemuck = { version = "1.23.2", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
-solana-account-info = "2.3.0"
-solana-cpi = "2.2.1"
-solana-decode-error = "2.2.1"
-solana-instruction = { version = "2.2.1", features = ["std"] }
+solana-account-info = "3.0.0"
+solana-cpi = "3.0.0"
+solana-instruction = { version = "3.0.0", features = ["std"] }
 solana-msg = "3.0.0"
-solana-program-error = "2.2.1"
-solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
-solana-sdk-ids = "2.2.1"
-spl-discriminator = "0.4.0"
+solana-program-error = "3.0.0"
+solana-pubkey = { version = "3.0.0", features = ["curve25519"] }
+solana-sdk-ids = "3.0.0"
+solana-system-interface = "2.0.0"
+spl-discriminator = "0.5.1"
 spl-program-error = "0.8.0"
-spl-tlv-account-resolution = "0.10.0"
+spl-tlv-account-resolution = "0.11.0"
 spl-type-length-value = "0.8.0"
-spl-pod = "0.5.0"
+spl-pod = "0.7.1"
 thiserror = "2.0"
 
 [lib]

interface/src/error.rs

@@ -1,10 +1,6 @@
 //! Error types
 
-use {
-    solana_decode_error::DecodeError,
-    solana_msg::msg,
-    solana_program_error::{PrintProgramError, ProgramError},
-};
+use solana_program_error::{ProgramError, ToStr};
 
 /// Errors that may be returned by the interface.
 #[repr(u32)]
@@ -30,33 +26,16 @@ impl From<TransferHookError> for ProgramError {
     }
 }
 
-impl<T> DecodeError<T> for TransferHookError {
-    fn type_of() -> &'static str {
-        "TransferHookError"
-    }
-}
-
-impl PrintProgramError for TransferHookError {
-    fn print<E>(&self)
-    where
-        E: 'static
-            + std::error::Error
-            + DecodeError<E>
-            + PrintProgramError
-            + num_traits::FromPrimitive,
-    {
+impl ToStr for TransferHookError {
+    fn to_str(&self) -> &'static str {
         match self {
-            TransferHookError::IncorrectAccount => {
-                msg!("Incorrect account provided")
-            }
-            TransferHookError::MintHasNoMintAuthority => {
-                msg!("Mint has no mint authority")
-            }
+            TransferHookError::IncorrectAccount => "Incorrect account provided",
+            TransferHookError::MintHasNoMintAuthority => "Mint has no mint authority",
             TransferHookError::IncorrectMintAuthority => {
-                msg!("Incorrect mint authority has signed the instruction")
+                "Incorrect mint authority has signed the instruction"
             }
             TransferHookError::ProgramCalledOutsideOfTransfer => {
-                msg!("Program called outside of a token transfer")
+                "Program called outside of a token transfer"
             }
         }
     }

interface/src/instruction.rs

@@ -5,7 +5,7 @@ use {
     solana_program_error::ProgramError,
     solana_pubkey::Pubkey,
     spl_discriminator::{ArrayDiscriminator, SplDiscriminate},
-    spl_pod::{bytemuck::pod_slice_to_bytes, slice::PodSlice},
+    spl_pod::{bytemuck::pod_slice_to_bytes, list::ListView},
     spl_tlv_account_resolution::account::ExtraAccountMeta,
     std::convert::TryInto,
 };
@@ -96,15 +96,15 @@ impl TransferHookInstruction {
                 Self::Execute { amount }
             }
             InitializeExtraAccountMetaListInstruction::SPL_DISCRIMINATOR_SLICE => {
-                let pod_slice = PodSlice::<ExtraAccountMeta>::unpack(rest)?;
-                let extra_account_metas = pod_slice.data().to_vec();
+                let list_view = ListView::<ExtraAccountMeta>::unpack(rest)?;
+                let extra_account_metas = list_view.to_vec();
                 Self::InitializeExtraAccountMetaList {
                     extra_account_metas,
                 }
             }
             UpdateExtraAccountMetaListInstruction::SPL_DISCRIMINATOR_SLICE => {
-                let pod_slice = PodSlice::<ExtraAccountMeta>::unpack(rest)?;
-                let extra_account_metas = pod_slice.data().to_vec();
+                let list_view = ListView::<ExtraAccountMeta>::unpack(rest)?;
+                let extra_account_metas = list_view.to_vec();
                 Self::UpdateExtraAccountMetaList {
                     extra_account_metas,
                 }
@@ -256,7 +256,7 @@ mod test {
 
     #[test]
     fn system_program_id() {
-        assert_eq!(solana_program::system_program::id(), SYSTEM_PROGRAM_ID);
+        assert_eq!(solana_system_interface::program::id(), SYSTEM_PROGRAM_ID);
     }
 
     #[test]

interface/src/lib.rs

@@ -16,8 +16,8 @@ pub mod onchain;
 // version
 use solana_pubkey::Pubkey;
 pub use {
-    solana_account_info, solana_cpi, solana_decode_error, solana_instruction, solana_msg,
-    solana_program_error, solana_pubkey,
+    solana_account_info, solana_cpi, solana_instruction, solana_msg, solana_program_error,
+    solana_pubkey,
 };
 
 /// Namespace for all programs implementing transfer-hook

interface/src/onchain.rs

@@ -201,7 +201,6 @@ mod tests {
             &mut source_data,
             &spl_token_2022_program_id,
             false,
-            0,
         );
 
         let mint_pubkey = Pubkey::new_unique();
@@ -215,7 +214,6 @@ mod tests {
             &mut mint_data,
             &spl_token_2022_program_id,
             false,
-            0,
         );
 
         let destination_pubkey = Pubkey::new_unique();
@@ -229,7 +227,6 @@ mod tests {
             &mut destination_data,
             &spl_token_2022_program_id,
             false,
-            0,
         );
 
         let authority_pubkey = Pubkey::new_unique();
@@ -243,7 +240,6 @@ mod tests {
             &mut authority_data,
             &system_program::ID,
             false,
-            0,
         );
 
         let validate_state_pubkey =
@@ -260,7 +256,6 @@ mod tests {
             &mut extra_meta_1_data,
             &system_program::ID,
             false,
-            0,
         );
 
         let extra_meta_2_pubkey = EXTRA_META_2;
@@ -274,7 +269,6 @@ mod tests {
             &mut extra_meta_2_data,
             &system_program::ID,
             false,
-            0,
         );
 
         let extra_meta_3_pubkey = Pubkey::find_program_address(
@@ -296,7 +290,6 @@ mod tests {
             &mut extra_meta_3_data,
             &transfer_hook_program_id,
             false,
-            0,
         );
 
         let extra_meta_4_pubkey = Pubkey::find_program_address(
@@ -319,7 +312,6 @@ mod tests {
             &mut extra_meta_4_data,
             &transfer_hook_program_id,
             false,
-            0,
         );
 
         let mut validate_state_data = setup_validation_data();
@@ -332,7 +324,6 @@ mod tests {
             &mut validate_state_data,
             &transfer_hook_program_id,
             false,
-            0,
         );
 
         let mut transfer_hook_program_data = vec![]; // Mock
@@ -345,7 +336,6 @@ mod tests {
             &mut transfer_hook_program_data,
             &bpf_loader_upgradeable::ID,
             false,
-            0,
         );
 
         let mut cpi_instruction = Instruction::new_with_bytes(

program/Cargo.toml

@@ -21,7 +21,7 @@ solana-program = "2.3.0"
 solana-system-interface = "1"
 spl-tlv-account-resolution = "0.10.0"
 spl-token-2022 = { version = "9.0.0", features = ["no-entrypoint"] }
-spl-transfer-hook-interface = { version = "0.10.0", path = "../interface" }
+spl-transfer-hook-interface = "0.10.0"
 spl-type-length-value = "0.8.0"
 
 [dev-dependencies]