Move most of program into program-core

Cargo.toml

@@ -109,6 +109,7 @@ members = [
     "sdk/msg",
     "sdk/package-metadata-macro",
     "sdk/program",
+    "sdk/program-core",
     "sdk/program-memory",
     "send-transaction-service",
     "short-vec",
@@ -226,6 +227,7 @@ env_logger = "0.9.3"
 etcd-client = "0.11.1"
 fast-math = "0.1"
 fd-lock = "3.0.13"
+five8_const = "0.1.3"
 flate2 = "1.0.30"
 fnv = "1.0.7"
 fs_extra = "1.3.0"
@@ -394,6 +396,7 @@ solana-perf = { path = "perf", version = "=2.1.0" }
 solana-poh = { path = "poh", version = "=2.1.0" }
 solana-poseidon = { path = "poseidon", version = "=2.1.0" }
 solana-program = { path = "sdk/program", version = "=2.1.0", default-features = false }
+solana-program-core = { path = "sdk/program-core", version = "=2.1.0", default-features = false }
 solana-program-memory = { path = "sdk/program-memory", version = "=2.1.0" }
 solana-program-runtime = { path = "program-runtime", version = "=2.1.0" }
 solana-program-test = { path = "program-test", version = "=2.1.0" }

accounts-db/benches/accounts_index.rs

@@ -2,6 +2,8 @@
 
 extern crate test;
 
+#[allow(deprecated)]
+use solana_sdk::pubkey;
 use {
     rand::{thread_rng, Rng},
     solana_accounts_db::{
@@ -11,7 +13,7 @@ use {
             ACCOUNTS_INDEX_CONFIG_FOR_BENCHMARKS,
         },
     },
-    solana_sdk::{account::AccountSharedData, pubkey},
+    solana_sdk::account::AccountSharedData,
     std::sync::Arc,
     test::Bencher,
 };

ci/nits.sh

@@ -29,8 +29,8 @@ declare print_free_tree=(
   ':sdk/**.rs'
   ':^sdk/cargo-build-sbf/**.rs'
   ':^sdk/msg/src/lib.rs'
-  ':^sdk/program/src/program_option.rs'
-  ':^sdk/program/src/program_stubs.rs'
+  ':^sdk/program-core/src/program_option.rs'
+  ':^sdk/program-core/src/program_stubs.rs'
   ':programs/**.rs'
   ':^**bin**.rs'
   ':^**bench**.rs'

core/benches/banking_stage.rs

@@ -8,6 +8,8 @@ use {
 
 extern crate test;
 
+#[allow(deprecated)]
+use solana_sdk::pubkey;
 use {
     crossbeam_channel::{unbounded, Receiver},
     log::*,
@@ -46,7 +48,6 @@ use {
         genesis_config::GenesisConfig,
         hash::Hash,
         message::Message,
-        pubkey,
         signature::{Keypair, Signature, Signer},
         system_instruction, system_transaction,
         timing::{duration_as_us, timestamp},

keygen/src/keygen.rs

@@ -50,8 +50,10 @@ use {
 };
 
 mod smallest_length_44_public_key {
+    #[allow(deprecated)]
     use solana_sdk::{pubkey, pubkey::Pubkey};
 
+    #[allow(deprecated)]
     pub(super) static PUBKEY: Pubkey = pubkey!("21111111111111111111111111111111111111111111");
 
     #[test]

ledger/benches/protobuf.rs

@@ -2,6 +2,8 @@
 #![feature(test)]
 extern crate test;
 
+#[allow(deprecated)]
+use solana_sdk::pubkey;
 use {
     bincode::{deserialize, serialize},
     solana_ledger::{
@@ -10,7 +12,7 @@ use {
         get_tmp_ledger_path_auto_delete,
     },
     solana_runtime::bank::RewardType,
-    solana_sdk::{clock::Slot, pubkey},
+    solana_sdk::clock::Slot,
     solana_transaction_status::{Reward, Rewards},
     std::path::Path,
     test::Bencher,

program-runtime/src/sysvar_cache.rs

@@ -50,7 +50,9 @@ pub struct SysvarCache {
 
 // declare_deprecated_sysvar_id doesn't support const.
 // These sysvars are going away anyway.
+#[allow(deprecated)]
 const FEES_ID: Pubkey = solana_sdk::pubkey!("SysvarFees111111111111111111111111111111111");
+#[allow(deprecated)]
 const RECENT_BLOCKHASHES_ID: Pubkey =
     solana_sdk::pubkey!("SysvarRecentB1ockHashes11111111111111111111");
 

runtime/src/bank/fee_distribution.rs

@@ -352,15 +352,17 @@ impl Bank {
 
 #[cfg(test)]
 pub mod tests {
+    #[allow(deprecated)]
+    use solana_sdk::pubkey;
     use {
         super::*,
         crate::genesis_utils::{
             create_genesis_config, create_genesis_config_with_leader,
             create_genesis_config_with_vote_accounts, ValidatorVoteKeypairs,
         },
         solana_sdk::{
-            account::AccountSharedData, feature_set, native_token::sol_to_lamports, pubkey,
-            rent::Rent, signature::Signer,
+            account::AccountSharedData, feature_set, native_token::sol_to_lamports, rent::Rent,
+            signature::Signer,
         },
         std::sync::RwLock,
     };

sdk/Cargo.toml

@@ -86,6 +86,7 @@ solana-decode-error = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-program = { workspace = true }
+solana-program-core = { workspace = true }
 solana-program-memory = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk-macro = { workspace = true }

sdk/decode-error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-decode-error"
-description = "Solana DecodeError Trait"
+description = "Solana DecodeError Trait. Obsolete."
 documentation = "https://docs.rs/solana-decode-error"
 version = { workspace = true }
 authors = { workspace = true }
@@ -11,6 +11,3 @@ edition = { workspace = true }
 
 [dependencies]
 num-traits = { workspace = true }
-
-[dev-dependencies]
-num-derive = { workspace = true }