Move Budget out of the SDK

core/Cargo.toml

@@ -46,6 +46,7 @@ rocksdb = "0.11.0"
 serde = "1.0.89"
 serde_derive = "1.0.88"
 serde_json = "1.0.39"
+solana-budget-api = { path = "../programs/native/budget_api", version = "0.12.0" }
 solana-drone = { path = "../drone", version = "0.12.0" }
 solana-logger = { path = "../logger", version = "0.12.0" }
 solana-metrics = { path = "../metrics", version = "0.12.0" }

core/src/chacha.rs

@@ -95,7 +95,7 @@ mod tests {
     use crate::chacha::chacha_cbc_encrypt_ledger;
     use crate::entry::Entry;
     use ring::signature::Ed25519KeyPair;
-    use solana_sdk::budget_transaction::BudgetTransaction;
+    use solana_budget_api::budget_transaction::BudgetTransaction;
     use solana_sdk::hash::{hash, Hash, Hasher};
     use solana_sdk::signature::KeypairUtil;
     use std::fs::remove_file;

core/src/entry.rs

@@ -8,7 +8,7 @@ use crate::result::Result;
 use bincode::{deserialize, serialize_into, serialized_size};
 use chrono::prelude::Utc;
 use rayon::prelude::*;
-use solana_sdk::budget_transaction::BudgetTransaction;
+use solana_budget_api::budget_transaction::BudgetTransaction;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};

core/src/rpc_pubsub.rs

@@ -164,9 +164,9 @@ mod tests {
     use jsonrpc_core::futures::sync::mpsc;
     use jsonrpc_core::Response;
     use jsonrpc_pubsub::{PubSubHandler, Session};
+    use solana_budget_api;
+    use solana_budget_api::budget_transaction::BudgetTransaction;
     use solana_runtime::bank::{self, Bank};
-    use solana_sdk::budget_program;
-    use solana_sdk::budget_transaction::BudgetTransaction;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::pubkey::Pubkey;
     use solana_sdk::signature::{Keypair, KeypairUtil};
@@ -275,7 +275,7 @@ mod tests {
         let witness = Keypair::new();
         let contract_funds = Keypair::new();
         let contract_state = Keypair::new();
-        let budget_program_id = budget_program::id();
+        let budget_program_id = solana_budget_api::id();
         let executable = false; // TODO
         let bank = Bank::new(&genesis_block);
         let arc_bank = Arc::new(bank);

core/src/rpc_subscriptions.rs

@@ -145,7 +145,7 @@ impl RpcSubscriptions {
 mod tests {
     use super::*;
     use jsonrpc_pubsub::typed::Subscriber;
-    use solana_sdk::budget_program;
+    use solana_budget_api;
     use solana_sdk::genesis_block::GenesisBlock;
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::system_transaction::SystemTransaction;
@@ -163,7 +163,7 @@ mod tests {
             blockhash,
             1,
             16,
-            budget_program::id(),
+            solana_budget_api::id(),
             0,
         );
         bank.process_transaction(&tx).unwrap();

core/src/sigverify.rs

@@ -335,7 +335,7 @@ mod tests {
     use crate::sigverify;
     use crate::test_tx::test_tx;
     use bincode::{deserialize, serialize};
-    use solana_sdk::budget_program;
+    use solana_budget_api;
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::system_instruction::SystemInstruction;
@@ -501,7 +501,7 @@ mod tests {
 
         let system_instruction = SystemInstruction::Move { tokens };
 
-        let program_ids = vec![system_program::id(), budget_program::id()];
+        let program_ids = vec![system_program::id(), solana_budget_api::id()];
 
         let instructions = vec![Instruction::new(0, &system_instruction, vec![0, 1])];