program: Use broken up crates instead of solana-program

program/Cargo.toml

@@ -15,11 +15,17 @@ test-sbf = []
 borsh = "1.5.7"
 num-derive = "0.4"
 num-traits = "0.2"
-solana-decode-error = "2.3.0"
-solana-program = "3.0"
+solana-account-info = "3.0"
+solana-cpi = "3.0"
+solana-instruction = "3.0"
+solana-msg = "3.0"
+solana-program-entrypoint = "3.0"
+solana-program-error = "3.0"
 solana-pubkey = "3.0"
 solana-rent = "3.0"
+solana-sdk-ids = "3.0"
 solana-system-interface = { version = "2.0", features = ["bincode"] }
+solana-sysvar = "3.0"
 spl-associated-token-account-interface = { version = "2.0.0", features = ["borsh"] }
 spl-token-interface = "2.0.0"
 spl-token-2022-interface = "2.0.0"
@@ -28,11 +34,8 @@ thiserror = "2.0"
 [dev-dependencies]
 ata-mollusk-harness = { version = "1.0.0", path = "../test_harness" }
 mollusk-svm = { version = "0.6.3" }
-solana-instruction = "3.0"
 solana-keypair = "3.0"
-solana-program-error = "3.0"
 solana-signer = "3.0"
-solana-sysvar = "3.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

program/src/entrypoint.rs

@@ -2,9 +2,11 @@
 
 #![cfg(not(feature = "no-entrypoint"))]
 
-use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
+use {
+    solana_account_info::AccountInfo, solana_program_error::ProgramResult, solana_pubkey::Pubkey,
+};
 
-solana_program::entrypoint!(process_instruction);
+solana_program_entrypoint::entrypoint!(process_instruction);
 fn process_instruction(
     program_id: &Pubkey,
     accounts: &[AccountInfo],

program/src/error.rs

@@ -1,8 +1,6 @@
 //! Error types
 
-#[allow(deprecated)]
-use solana_decode_error::DecodeError;
-use {num_derive::FromPrimitive, solana_program::program_error::ProgramError, thiserror::Error};
+use {num_derive::FromPrimitive, solana_program_error::ProgramError, thiserror::Error};
 
 /// Errors that may be returned by the program.
 #[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq)]
@@ -17,9 +15,3 @@ impl From<AssociatedTokenAccountError> for ProgramError {
         ProgramError::Custom(e as u32)
     }
 }
-#[allow(deprecated)]
-impl<T> DecodeError<T> for AssociatedTokenAccountError {
-    fn type_of() -> &'static str {
-        "AssociatedTokenAccountError"
-    }
-}

program/src/lib.rs

@@ -8,21 +8,17 @@ pub mod instruction;
 pub mod processor;
 pub mod tools;
 
-// Export current SDK types for downstream users building with a different SDK
-// version
-pub use solana_program;
-use solana_program::{
-    instruction::{AccountMeta, Instruction},
-    pubkey::Pubkey,
-    sysvar,
-};
 #[deprecated(
     since = "4.1.0",
     note = "Use `spl_associated_token_account_interface::address` instead and remove `spl_associated_token_account` as a dependency"
 )]
 pub use spl_associated_token_account_interface::address::{
     get_associated_token_address, get_associated_token_address_with_program_id,
 };
+use {
+    solana_instruction::{AccountMeta, Instruction},
+    solana_pubkey::Pubkey,
+};
 // Export current SDK types for downstream users building with a different SDK
 // version
 pub use spl_associated_token_account_interface::program::{check_id, id, ID};
@@ -59,7 +55,7 @@ pub fn create_associated_token_account(
             AccountMeta::new_readonly(*token_mint_address, false),
             AccountMeta::new_readonly(solana_system_interface::program::id(), false),
             AccountMeta::new_readonly(spl_token_interface::id(), false),
-            AccountMeta::new_readonly(sysvar::rent::id(), false),
+            AccountMeta::new_readonly(solana_sdk_ids::sysvar::rent::id(), false),
         ],
         data: vec![],
     }

program/src/processor.rs

@@ -6,17 +6,14 @@ use {
         tools::account::{create_pda_account, get_account_len},
     },
     borsh::BorshDeserialize,
-    solana_program::{
-        account_info::{next_account_info, AccountInfo},
-        entrypoint::ProgramResult,
-        msg,
-        program::{invoke, invoke_signed},
-        program_error::ProgramError,
-        pubkey::Pubkey,
-        rent::Rent,
-        sysvar::Sysvar,
-    },
+    solana_account_info::{next_account_info, AccountInfo},
+    solana_cpi::{invoke, invoke_signed},
+    solana_msg::msg,
+    solana_program_error::{ProgramError, ProgramResult},
+    solana_pubkey::Pubkey,
+    solana_rent::Rent,
     solana_system_interface::program as system_program,
+    solana_sysvar::Sysvar,
     spl_associated_token_account_interface::{
         address::get_associated_token_address_and_bump_seed_internal,
         instruction::AssociatedTokenAccountInstruction,