gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move Budget out of the SDK

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-02 14:23:22 -07:00
committed by Michael Vines
parent d22a13257e
commit e6486b2824
22 changed files with 128 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wallet/Cargo.toml
View File

@@ -17,6 +17,7 @@ dirs = "1.0.5"
log = "0.4.2"
serde_json = "1.0.39"
solana = { path = "../core", version = "0.12.0" }
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-sdk = { path = "../sdk", version = "0.12.0" }

8
wallet/src/wallet.rs
View File

@@ -12,12 +12,12 @@ use solana::rpc_request::RpcClient;
use solana::rpc_request::{get_rpc_request_str, RpcRequest};
use solana::rpc_service::RPC_PORT;
use solana::rpc_status::RpcSignatureStatus;
use solana_budget_api;
use solana_budget_api::budget_transaction::BudgetTransaction;
#[cfg(not(test))]
use solana_drone::drone::request_airdrop_transaction;
use solana_drone::drone::DRONE_PORT;
use solana_sdk::bpf_loader;
use solana_sdk::budget_program;
use solana_sdk::budget_transaction::BudgetTransaction;
use solana_sdk::hash::Hash;
use solana_sdk::loader_transaction::LoaderTransaction;
use solana_sdk::pubkey::Pubkey;
@@ -483,7 +483,7 @@ fn process_pay(
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();
// Create account for contract funds
let mut tx = SystemTransaction::new_program_account(
@@ -540,7 +540,7 @@ fn process_pay(
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();
// Create account for contract funds
let mut tx = SystemTransaction::new_program_account(