program: Remove solana-program / sdk (#264)

* program: Remove solana-program / sdk

#### Problem

The token-2022 program still uses solana-program and solana-sdk, which
are heavy dependencies.

#### Summary of changes

The component crates exist to do everything needed in token-2022, so we
can remove solana-program usage entirely.

NOTE: since some spl-token-2022's dependencies still use solana-program,
there is no huge gain just yet. That will happen when we upgrade the
upstream dependencies and then upgrade token-2022 to use those.

Also NOTE: this is a breaking change since we've removed the re-export
of the sdk types. Considering we're now respecting semver, this
shouldn't be a problem, but we did add a version of re-exports in
solana-program/token#26, so maybe we should do
the same thing here. Let me know!

* Fixup tests to run program in bpf mode

Author: joncinque

Cargo.lock

@@ -281,12 +281,12 @@ fn process_instruction(
 async fn amount_conversions() {
     let rate_authority = Keypair::new();
     let mut program_test = ProgramTest::default();
-    program_test.prefer_bpf(false);
     program_test.add_program(
         "spl_token_2022",
         spl_token_2022::id(),
         processor!(Processor::process),
     );
+    program_test.prefer_bpf(false);
     let program_id = Pubkey::new_unique();
     program_test.add_program(
         "ui_amount_to_amount",

clients/rust-legacy/tests/interest_bearing_mint.rs

@@ -322,12 +322,12 @@ fn process_instruction(
 async fn amount_conversions() {
     let authority = Keypair::new();
     let mut program_test = ProgramTest::default();
-    program_test.prefer_bpf(false);
     program_test.add_program(
         "spl_token_2022",
         spl_token_2022::id(),
         processor!(Processor::process),
     );
+    program_test.prefer_bpf(false);
     let program_id = Pubkey::new_unique();
     program_test.add_program(
         "ui_amount_to_amount",

clients/rust-legacy/tests/scaled_ui_amount.rs

@@ -24,8 +24,24 @@ bytemuck = { version = "1.22.0", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
 num_enum = "0.7.3"
-solana-program = "2.2.1"
+solana-account-info = "2.2.1"
+solana-clock = "2.2.1"
+solana-cpi = "2.2.1"
+solana-decode-error = "2.2.1"
+solana-instruction = "2.2.1"
+solana-msg = "2.2.1"
+solana-native-token = "2.2.1"
+solana-program-entrypoint = "2.2.1"
+solana-program-error = "2.2.1"
+solana-program-memory = "2.2.1"
+solana-program-option = "2.2.1"
+solana-program-pack = "2.2.1"
+solana-pubkey = "2.2.1"
+solana-rent = "2.2.1"
+solana-sdk-ids = "2.2.1"
 solana-security-txt = "1.1.1"
+solana-sysvar = "2.2.1"
+solana-system-interface = "1.0.0"
 solana-zk-sdk = "2.2.0"
 spl-elgamal-registry = { version = "0.1.1", path = "../confidential-transfer/elgamal-registry", features = ["no-entrypoint"] }
 spl-memo = { version = "6.0", features = ["no-entrypoint"] }
@@ -49,8 +65,13 @@ spl-token-confidential-transfer-proof-generation = { version = "0.3.0", path = "
 lazy_static = "1.5.0"
 proptest = "1.6"
 serial_test = "3.2.0"
+solana-account = "2.2.1"
+solana-hash = "2.2.1"
+solana-keypair = "2.2.1"
 solana-program-test = "2.2.0"
-solana-sdk = "2.2.1"
+solana-signer = "2.2.1"
+solana-transaction = "2.2.1"
+solana-transaction-error = "2.2.1"
 spl-tlv-account-resolution = { version = "0.9.0" }
 serde_json = "1.0.140"
 test-case = "3.3.1"

program/Cargo.toml

@@ -2,14 +2,13 @@
 
 use {
     crate::{error::TokenError, processor::Processor},
-    solana_program::{
-        account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError,
-        pubkey::Pubkey,
-    },
+    solana_account_info::AccountInfo,
+    solana_program_error::{PrintProgramError, ProgramResult},
+    solana_pubkey::Pubkey,
     solana_security_txt::security_txt,
 };
 
-solana_program::entrypoint!(process_instruction);
+solana_program_entrypoint::entrypoint!(process_instruction);
 fn process_instruction(
     program_id: &Pubkey,
     accounts: &[AccountInfo],

program/src/entrypoint.rs

@@ -4,11 +4,9 @@
 use spl_token_confidential_transfer_proof_generation::errors::TokenProofGenerationError;
 use {
     num_derive::FromPrimitive,
-    solana_program::{
-        decode_error::DecodeError,
-        msg,
-        program_error::{PrintProgramError, ProgramError},
-    },
+    solana_decode_error::DecodeError,
+    solana_msg::msg,
+    solana_program_error::{PrintProgramError, ProgramError},
     spl_token_confidential_transfer_proof_extraction::errors::TokenProofExtractionError,
     thiserror::Error,
 };

program/src/error.rs

@@ -13,11 +13,9 @@ use {
     },
     bytemuck::{Pod, Zeroable},
     num_enum::{IntoPrimitive, TryFromPrimitive},
-    solana_program::{
-        instruction::{AccountMeta, Instruction},
-        program_error::ProgramError,
-        pubkey::Pubkey,
-    },
+    solana_instruction::{AccountMeta, Instruction},
+    solana_program_error::ProgramError,
+    solana_pubkey::Pubkey,
     solana_zk_sdk::encryption::pod::{
         auth_encryption::PodAeCiphertext,
         elgamal::{PodElGamalCiphertext, PodElGamalPubkey},

program/src/extension/confidential_mint_burn/instruction.rs

@@ -22,13 +22,10 @@ use {
         pod::{PodAccount, PodMint},
         processor::Processor,
     },
-    solana_program::{
-        account_info::{next_account_info, AccountInfo},
-        entrypoint::ProgramResult,
-        msg,
-        program_error::ProgramError,
-        pubkey::Pubkey,
-    },
+    solana_account_info::{next_account_info, AccountInfo},
+    solana_msg::msg,
+    solana_program_error::{ProgramError, ProgramResult},
+    solana_pubkey::Pubkey,
     solana_zk_sdk::{
         encryption::pod::{
             auth_encryption::PodAeCiphertext,

program/src/extension/confidential_mint_burn/processor.rs

@@ -1,10 +1,8 @@
 use crate::error::TokenError;
 #[cfg(feature = "zk-ops")]
 use {
-    solana_program::{
-        account_info::{next_account_info, AccountInfo},
-        program_error::ProgramError,
-    },
+    solana_account_info::{next_account_info, AccountInfo},
+    solana_program_error::ProgramError,
     solana_zk_sdk::zk_elgamal_proof_program::proof_data::{
         BatchedGroupedCiphertext3HandlesValidityProofContext,
         BatchedGroupedCiphertext3HandlesValidityProofData, BatchedRangeProofContext,

program/src/extension/confidential_mint_burn/verify_proof.rs

@@ -14,12 +14,10 @@ use {
     },
     bytemuck::Zeroable,
     num_enum::{IntoPrimitive, TryFromPrimitive},
-    solana_program::{
-        instruction::{AccountMeta, Instruction},
-        program_error::ProgramError,
-        pubkey::Pubkey,
-        system_program, sysvar,
-    },
+    solana_instruction::{AccountMeta, Instruction},
+    solana_program_error::ProgramError,
+    solana_pubkey::Pubkey,
+    solana_sdk_ids::{system_program, sysvar},
     spl_token_confidential_transfer_proof_extraction::instruction::{ProofData, ProofLocation},
 };