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

Abandon Builder pattern

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-15 10:54:56 -06:00
parent aca739b800
commit 24d9138067
10 changed files with 108 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
programs/budget_api/src/budget_transaction.rs
View File

@@ -11,7 +11,6 @@ use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction; use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::transaction::Transaction; use solana_sdk::transaction::Transaction;
use solana_sdk::transaction_builder::TransactionBuilder;
pub struct BudgetTransaction {} pub struct BudgetTransaction {}
@@ -31,7 +30,7 @@ impl BudgetTransaction {
let create_ix = let create_ix =
SystemInstruction::new_program_account(&from, contract, lamports, space, &id()); SystemInstruction::new_program_account(&from, contract, lamports, space, &id());
let init_ix = BudgetInstruction::new_initialize_account(contract, expr); let init_ix = BudgetInstruction::new_initialize_account(contract, expr);
let mut tx = TransactionBuilder::new(vec![create_ix, init_ix]).compile(); let mut tx = Transaction::new(vec![create_ix, init_ix]);
tx.fee = fee; tx.fee = fee;
tx.sign(&[from_keypair], recent_blockhash); tx.sign(&[from_keypair], recent_blockhash);
tx tx
@@ -67,7 +66,7 @@ impl BudgetTransaction {
) -> Transaction { ) -> Transaction {
let from = from_keypair.pubkey(); let from = from_keypair.pubkey();
let ix = BudgetInstruction::new_apply_timestamp(&from, contract, to, dt); let ix = BudgetInstruction::new_apply_timestamp(&from, contract, to, dt);
let mut tx = TransactionBuilder::new(vec![ix]).compile(); let mut tx = Transaction::new(vec![ix]);
tx.sign(&[from_keypair], recent_blockhash); tx.sign(&[from_keypair], recent_blockhash);
tx tx
} }
@@ -81,7 +80,7 @@ impl BudgetTransaction {
) -> Transaction { ) -> Transaction {
let from = from_keypair.pubkey(); let from = from_keypair.pubkey();
let ix = BudgetInstruction::new_apply_signature(&from, contract, to); let ix = BudgetInstruction::new_apply_signature(&from, contract, to);
let mut tx = TransactionBuilder::new(vec![ix]).compile(); let mut tx = Transaction::new(vec![ix]);
tx.sign(&[from_keypair], recent_blockhash); tx.sign(&[from_keypair], recent_blockhash);
tx tx
} }

3
programs/rewards_api/src/rewards_transaction.rs
View File

@@ -9,7 +9,6 @@ use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_transaction::SystemTransaction; use solana_sdk::system_transaction::SystemTransaction;
use solana_sdk::transaction::Transaction; use solana_sdk::transaction::Transaction;
use solana_sdk::transaction_builder::TransactionBuilder;
use solana_vote_api::vote_instruction::VoteInstruction; use solana_vote_api::vote_instruction::VoteInstruction;
pub struct RewardsTransaction {} pub struct RewardsTransaction {}
@@ -42,7 +41,7 @@ impl RewardsTransaction {
let vote_id = vote_keypair.pubkey(); let vote_id = vote_keypair.pubkey();
let redeem_ix = RewardsInstruction::new_redeem_vote_credits(&vote_id, rewards_id); let redeem_ix = RewardsInstruction::new_redeem_vote_credits(&vote_id, rewards_id);
let clear_ix = VoteInstruction::new_clear_credits(&vote_id); let clear_ix = VoteInstruction::new_clear_credits(&vote_id);
let mut tx = TransactionBuilder::new(vec![redeem_ix, clear_ix]).compile(); let mut tx = Transaction::new(vec![redeem_ix, clear_ix]);
tx.fee = fee; tx.fee = fee;
tx.sign(&[vote_keypair], blockhash); tx.sign(&[vote_keypair], blockhash);
tx tx

9
programs/vote/tests/vote.rs
View File

@@ -5,8 +5,7 @@ use solana_sdk::native_program::ProgramError;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction; use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::transaction::{Instruction, InstructionError, TransactionError}; use solana_sdk::transaction::{Instruction, InstructionError, Transaction, TransactionError};
use solana_sdk::transaction_builder::TransactionBuilder;
use solana_vote_api::vote_instruction::{Vote, VoteInstruction}; use solana_vote_api::vote_instruction::{Vote, VoteInstruction};
use solana_vote_api::vote_state::VoteState; use solana_vote_api::vote_state::VoteState;
use solana_vote_api::vote_transaction::VoteTransaction; use solana_vote_api::vote_transaction::VoteTransaction;
@@ -120,10 +119,8 @@ fn test_vote_via_bank_with_no_signature() {
// Sneak in an instruction so that the transaction is signed but // Sneak in an instruction so that the transaction is signed but
// the 0th account in the second instruction is not! The program // the 0th account in the second instruction is not! The program
// needs to check that it's signed. // needs to check that it's signed.
let mut tx = TransactionBuilder::default() let move_ix = SystemInstruction::new_move(&mallory_id, &vote_id, 1);
.push(SystemInstruction::new_move(&mallory_id, &vote_id, 1)) let mut tx = Transaction::new(vec![move_ix, vote_ix]);
.push(vote_ix)
.compile();
tx.sign(&[&mallory_keypair], blockhash); tx.sign(&[&mallory_keypair], blockhash);
let result = bank.process_transaction(&tx); let result = bank.process_transaction(&tx);

11
programs/vote_api/src/vote_transaction.rs
View File

@@ -9,7 +9,6 @@ use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction; use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::transaction::Transaction; use solana_sdk::transaction::Transaction;
use solana_sdk::transaction_builder::TransactionBuilder;
pub struct VoteTransaction {} pub struct VoteTransaction {}
@@ -23,7 +22,7 @@ impl VoteTransaction {
) -> Transaction { ) -> Transaction {
let vote = Vote { slot }; let vote = Vote { slot };
let ix = VoteInstruction::new_vote(staking_account, vote); let ix = VoteInstruction::new_vote(staking_account, vote);
let mut tx = TransactionBuilder::new(vec![ix]).compile(); let mut tx = Transaction::new(vec![ix]);
tx.fee = fee; tx.fee = fee;
tx.sign(&[authorized_voter_keypair], recent_blockhash); tx.sign(&[authorized_voter_keypair], recent_blockhash);
tx tx
@@ -42,7 +41,7 @@ impl VoteTransaction {
let create_ix = let create_ix =
SystemInstruction::new_program_account(&from_id, staker_id, lamports, space, &id()); SystemInstruction::new_program_account(&from_id, staker_id, lamports, space, &id());
let init_ix = VoteInstruction::new_initialize_account(staker_id); let init_ix = VoteInstruction::new_initialize_account(staker_id);
let mut tx = TransactionBuilder::new(vec![create_ix, init_ix]).compile(); let mut tx = Transaction::new(vec![create_ix, init_ix]);
tx.fee = fee; tx.fee = fee;
tx.sign(&[from_keypair], recent_blockhash); tx.sign(&[from_keypair], recent_blockhash);
tx tx
@@ -64,7 +63,7 @@ impl VoteTransaction {
SystemInstruction::new_program_account(&from_id, &voter_id, lamports, space, &id()); SystemInstruction::new_program_account(&from_id, &voter_id, lamports, space, &id());
let init_ix = VoteInstruction::new_initialize_account(&voter_id); let init_ix = VoteInstruction::new_initialize_account(&voter_id);
let delegate_ix = VoteInstruction::new_delegate_stake(&voter_id, &delegate_id); let delegate_ix = VoteInstruction::new_delegate_stake(&voter_id, &delegate_id);
let mut tx = TransactionBuilder::new(vec![create_ix, init_ix, delegate_ix]).compile(); let mut tx = Transaction::new(vec![create_ix, init_ix, delegate_ix]);
tx.fee = fee; tx.fee = fee;
tx.sign(&[from_keypair, voter_keypair], recent_blockhash); tx.sign(&[from_keypair, voter_keypair], recent_blockhash);
tx tx
@@ -78,7 +77,7 @@ impl VoteTransaction {
fee: u64, fee: u64,
) -> Transaction { ) -> Transaction {
let ix = VoteInstruction::new_authorize_voter(&vote_keypair.pubkey(), authorized_voter_id); let ix = VoteInstruction::new_authorize_voter(&vote_keypair.pubkey(), authorized_voter_id);
let mut tx = TransactionBuilder::new(vec![ix]).compile(); let mut tx = Transaction::new(vec![ix]);
tx.fee = fee; tx.fee = fee;
tx.sign(&[vote_keypair], recent_blockhash); tx.sign(&[vote_keypair], recent_blockhash);
tx tx
@@ -92,7 +91,7 @@ impl VoteTransaction {
fee: u64, fee: u64,
) -> Transaction { ) -> Transaction {
let ix = VoteInstruction::new_delegate_stake(&vote_keypair.pubkey(), node_id); let ix = VoteInstruction::new_delegate_stake(&vote_keypair.pubkey(), node_id);
let mut tx = TransactionBuilder::new(vec![ix]).compile(); let mut tx = Transaction::new(vec![ix]);
tx.fee = fee; tx.fee = fee;
tx.sign(&[vote_keypair], recent_blockhash); tx.sign(&[vote_keypair], recent_blockhash);
tx tx

2
runtime/src/bank.rs
View File

@@ -1484,7 +1484,7 @@ mod tests {
let move_lamports = SystemInstruction::Move { lamports: 1 }; let move_lamports = SystemInstruction::Move { lamports: 1 };
let mut tx = Transaction::new_unsigned( let mut tx = Transaction::new_with_blockhash_and_fee(
&mint_keypair.pubkey(), &mint_keypair.pubkey(),
&[key.pubkey()], &[key.pubkey()],
&system_program::id(), &system_program::id(),

7
runtime/tests/system.rs
View File

@@ -5,8 +5,7 @@ use solana_sdk::native_program::ProgramError;
use solana_sdk::signature::{Keypair, KeypairUtil}; use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::system_instruction::SystemInstruction; use solana_sdk::system_instruction::SystemInstruction;
use solana_sdk::system_program; use solana_sdk::system_program;
use solana_sdk::transaction::{Instruction, InstructionError, TransactionError}; use solana_sdk::transaction::{Instruction, InstructionError, Transaction, TransactionError};
use solana_sdk::transaction_builder::TransactionBuilder;
#[test] #[test]
fn test_system_unsigned_transaction() { fn test_system_unsigned_transaction() {
@@ -21,7 +20,7 @@ fn test_system_unsigned_transaction() {
// Fund to account to bypass AccountNotFound error // Fund to account to bypass AccountNotFound error
let ix = SystemInstruction::new_move(&from_pubkey, &to_pubkey, 50); let ix = SystemInstruction::new_move(&from_pubkey, &to_pubkey, 50);
let mut tx = TransactionBuilder::new(vec![ix]).compile(); let mut tx = Transaction::new(vec![ix]);
alice_client.process_transaction(&mut tx).unwrap(); alice_client.process_transaction(&mut tx).unwrap();
// Erroneously sign transaction with recipient account key // Erroneously sign transaction with recipient account key
@@ -31,7 +30,7 @@ fn test_system_unsigned_transaction() {
&SystemInstruction::Move { lamports: 10 }, &SystemInstruction::Move { lamports: 10 },
vec![(from_pubkey, false), (to_pubkey, true)], vec![(from_pubkey, false), (to_pubkey, true)],
); );
let mut tx = TransactionBuilder::new(vec![ix]).compile(); let mut tx = Transaction::new(vec![ix]);
assert_eq!( assert_eq!(
mallory_client.process_transaction(&mut tx), mallory_client.process_transaction(&mut tx),
Err(TransactionError::InstructionError( Err(TransactionError::InstructionError(

2
sdk/src/lib.rs
View File

@@ -15,7 +15,7 @@ pub mod system_program;
pub mod system_transaction; pub mod system_transaction;
pub mod timing; pub mod timing;
pub mod transaction; pub mod transaction;
pub mod transaction_builder; mod transaction_builder;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;

65
sdk/src/transaction.rs
View File

@@ -167,26 +167,11 @@ pub struct Transaction {
} }
impl Transaction { impl Transaction {
pub fn new_signed<S: Serialize, T: KeypairUtil>( pub fn new(instructions: Vec<Instruction>) -> Self {
from_keypair: &T, TransactionBuilder::new(instructions).compile()
transaction_keys: &[Pubkey],
program_id: &Pubkey,
data: &S,
recent_blockhash: Hash,
fee: u64,
) -> Self {
let mut transaction = Self::new_unsigned(
&from_keypair.pubkey(),
transaction_keys,
program_id,
data,
Hash::default(),
fee,
);
transaction.sign(&[from_keypair], recent_blockhash);
transaction
} }
pub fn new_unsigned<T: Serialize>(
pub fn new_with_blockhash_and_fee<T: Serialize>(
from_pubkey: &Pubkey, from_pubkey: &Pubkey,
transaction_keys: &[Pubkey], transaction_keys: &[Pubkey],
program_id: &Pubkey, program_id: &Pubkey,
@@ -199,12 +184,32 @@ impl Transaction {
account_keys.push((*pubkey, false)); account_keys.push((*pubkey, false));
} }
let instruction = Instruction::new(*program_id, data, account_keys); let instruction = Instruction::new(*program_id, data, account_keys);
let mut transaction = TransactionBuilder::new(vec![instruction]).compile(); let mut transaction = Self::new(vec![instruction]);
transaction.fee = fee; transaction.fee = fee;
transaction.recent_blockhash = recent_blockhash; transaction.recent_blockhash = recent_blockhash;
transaction transaction
} }
pub fn new_signed<S: Serialize, T: KeypairUtil>(
from_keypair: &T,
transaction_keys: &[Pubkey],
program_id: &Pubkey,
data: &S,
recent_blockhash: Hash,
fee: u64,
) -> Self {
let mut transaction = Self::new_with_blockhash_and_fee(
&from_keypair.pubkey(),
transaction_keys,
program_id,
data,
Hash::default(),
fee,
);
transaction.sign(&[from_keypair], recent_blockhash);
transaction
}
/// Create a signed transaction /// Create a signed transaction
/// * `from_keypairs` - The keys used to sign the transaction. /// * `from_keypairs` - The keys used to sign the transaction.
/// * `account_keys` - The keys for the transaction. These are the program state /// * `account_keys` - The keys for the transaction. These are the program state
@@ -661,9 +666,7 @@ mod tests {
#[should_panic] #[should_panic]
fn test_transaction_missing_key() { fn test_transaction_missing_key() {
let keypair = Keypair::new(); let keypair = Keypair::new();
TransactionBuilder::default() Transaction::new(vec![]).sign(&[&keypair], Hash::default());
.compile()
.sign(&[&keypair], Hash::default());
} }
#[test] #[test]
@@ -672,9 +675,7 @@ mod tests {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let keypair0 = Keypair::new(); let keypair0 = Keypair::new();
let id0 = keypair0.pubkey(); let id0 = keypair0.pubkey();
TransactionBuilder::default() Transaction::new(vec![Instruction::new(program_id, &0, vec![(id0, true)])])
.push(Instruction::new(program_id, &0, vec![(id0, true)]))
.compile()
.sign(&Vec::<&Keypair>::new(), Hash::default()); .sign(&Vec::<&Keypair>::new(), Hash::default());
} }
@@ -684,9 +685,11 @@ mod tests {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let keypair0 = Keypair::new(); let keypair0 = Keypair::new();
let wrong_id = Pubkey::default(); let wrong_id = Pubkey::default();
TransactionBuilder::default() Transaction::new(vec![Instruction::new(
.push(Instruction::new(program_id, &0, vec![(wrong_id, true)])) program_id,
.compile() &0,
vec![(wrong_id, true)],
)])
.sign(&[&keypair0], Hash::default()); .sign(&[&keypair0], Hash::default());
} }
@@ -695,9 +698,7 @@ mod tests {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let keypair0 = Keypair::new(); let keypair0 = Keypair::new();
let id0 = keypair0.pubkey(); let id0 = keypair0.pubkey();
let mut tx = TransactionBuilder::default() let mut tx = Transaction::new(vec![Instruction::new(program_id, &0, vec![(id0, true)])]);
.push(Instruction::new(program_id, &0, vec![(id0, true)]))
.compile();
tx.sign(&[&keypair0], Hash::default()); tx.sign(&[&keypair0], Hash::default());
assert_eq!(tx.instructions[0], CompiledInstruction::new(0, &0, vec![0])); assert_eq!(tx.instructions[0], CompiledInstruction::new(0, &0, vec![0]));
} }

85
sdk/src/transaction_builder.rs
View File

@@ -33,7 +33,6 @@ fn compile_instructions(
} }
/// A utility for constructing transactions /// A utility for constructing transactions
#[derive(Default)]
pub struct TransactionBuilder { pub struct TransactionBuilder {
instructions: Vec<Instruction>, instructions: Vec<Instruction>,
} }
@@ -44,12 +43,6 @@ impl TransactionBuilder {
Self { instructions } Self { instructions }
} }
/// Add an instruction.
pub fn push(&mut self, instruction: Instruction) -> &mut Self {
self.instructions.push(instruction);
self
}
/// Return pubkeys referenced by all instructions, with the ones needing signatures first. /// Return pubkeys referenced by all instructions, with the ones needing signatures first.
/// No duplicates and order is preserved. /// No duplicates and order is preserved.
fn keys(&self) -> (Vec<Pubkey>, Vec<Pubkey>) { fn keys(&self) -> (Vec<Pubkey>, Vec<Pubkey>) {
@@ -107,9 +100,10 @@ mod tests {
#[test] #[test]
fn test_transaction_builder_unique_program_ids() { fn test_transaction_builder_unique_program_ids() {
let program_id0 = Pubkey::default(); let program_id0 = Pubkey::default();
let program_ids = TransactionBuilder::default() let program_ids = TransactionBuilder::new(vec![
.push(Instruction::new(program_id0, &0, vec![])) Instruction::new(program_id0, &0, vec![]),
.push(Instruction::new(program_id0, &0, vec![])) Instruction::new(program_id0, &0, vec![]),
])
.program_ids(); .program_ids();
assert_eq!(program_ids, vec![program_id0]); assert_eq!(program_ids, vec![program_id0]);
} }
@@ -118,10 +112,11 @@ mod tests {
fn test_transaction_builder_unique_program_ids_not_adjacent() { fn test_transaction_builder_unique_program_ids_not_adjacent() {
let program_id0 = Pubkey::default(); let program_id0 = Pubkey::default();
let program_id1 = Keypair::new().pubkey(); let program_id1 = Keypair::new().pubkey();
let program_ids = TransactionBuilder::default() let program_ids = TransactionBuilder::new(vec![
.push(Instruction::new(program_id0, &0, vec![])) Instruction::new(program_id0, &0, vec![]),
.push(Instruction::new(program_id1, &0, vec![])) Instruction::new(program_id1, &0, vec![]),
.push(Instruction::new(program_id0, &0, vec![])) Instruction::new(program_id0, &0, vec![]),
])
.program_ids(); .program_ids();
assert_eq!(program_ids, vec![program_id0, program_id1]); assert_eq!(program_ids, vec![program_id0, program_id1]);
} }
@@ -130,10 +125,11 @@ mod tests {
fn test_transaction_builder_unique_program_ids_order_preserved() { fn test_transaction_builder_unique_program_ids_order_preserved() {
let program_id0 = Keypair::new().pubkey(); let program_id0 = Keypair::new().pubkey();
let program_id1 = Pubkey::default(); // Key less than program_id0 let program_id1 = Pubkey::default(); // Key less than program_id0
let program_ids = TransactionBuilder::default() let program_ids = TransactionBuilder::new(vec![
.push(Instruction::new(program_id0, &0, vec![])) Instruction::new(program_id0, &0, vec![]),
.push(Instruction::new(program_id1, &0, vec![])) Instruction::new(program_id1, &0, vec![]),
.push(Instruction::new(program_id0, &0, vec![])) Instruction::new(program_id0, &0, vec![]),
])
.program_ids(); .program_ids();
assert_eq!(program_ids, vec![program_id0, program_id1]); assert_eq!(program_ids, vec![program_id0, program_id1]);
} }
@@ -142,9 +138,10 @@ mod tests {
fn test_transaction_builder_unique_keys_both_signed() { fn test_transaction_builder_unique_keys_both_signed() {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let id0 = Pubkey::default(); let id0 = Pubkey::default();
let keys = TransactionBuilder::default() let keys = TransactionBuilder::new(vec![
.push(Instruction::new(program_id, &0, vec![(id0, true)])) Instruction::new(program_id, &0, vec![(id0, true)]),
.push(Instruction::new(program_id, &0, vec![(id0, true)])) Instruction::new(program_id, &0, vec![(id0, true)]),
])
.keys(); .keys();
assert_eq!(keys, (vec![id0], vec![])); assert_eq!(keys, (vec![id0], vec![]));
} }
@@ -153,9 +150,10 @@ mod tests {
fn test_transaction_builder_unique_keys_one_signed() { fn test_transaction_builder_unique_keys_one_signed() {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let id0 = Pubkey::default(); let id0 = Pubkey::default();
let keys = TransactionBuilder::default() let keys = TransactionBuilder::new(vec![
.push(Instruction::new(program_id, &0, vec![(id0, false)])) Instruction::new(program_id, &0, vec![(id0, false)]),
.push(Instruction::new(program_id, &0, vec![(id0, true)])) Instruction::new(program_id, &0, vec![(id0, true)]),
])
.keys(); .keys();
assert_eq!(keys, (vec![id0], vec![])); assert_eq!(keys, (vec![id0], vec![]));
} }
@@ -165,9 +163,10 @@ mod tests {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let id0 = Keypair::new().pubkey(); let id0 = Keypair::new().pubkey();
let id1 = Pubkey::default(); // Key less than id0 let id1 = Pubkey::default(); // Key less than id0
let keys = TransactionBuilder::default() let keys = TransactionBuilder::new(vec![
.push(Instruction::new(program_id, &0, vec![(id0, false)])) Instruction::new(program_id, &0, vec![(id0, false)]),
.push(Instruction::new(program_id, &0, vec![(id1, false)])) Instruction::new(program_id, &0, vec![(id1, false)]),
])
.keys(); .keys();
assert_eq!(keys, (vec![], vec![id0, id1])); assert_eq!(keys, (vec![], vec![id0, id1]));
} }
@@ -177,10 +176,11 @@ mod tests {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let id0 = Pubkey::default(); let id0 = Pubkey::default();
let id1 = Keypair::new().pubkey(); let id1 = Keypair::new().pubkey();
let keys = TransactionBuilder::default() let keys = TransactionBuilder::new(vec![
.push(Instruction::new(program_id, &0, vec![(id0, false)])) Instruction::new(program_id, &0, vec![(id0, false)]),
.push(Instruction::new(program_id, &0, vec![(id1, false)])) Instruction::new(program_id, &0, vec![(id1, false)]),
.push(Instruction::new(program_id, &0, vec![(id0, true)])) Instruction::new(program_id, &0, vec![(id0, true)]),
])
.keys(); .keys();
assert_eq!(keys, (vec![id0], vec![id1])); assert_eq!(keys, (vec![id0], vec![id1]));
} }
@@ -190,9 +190,10 @@ mod tests {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let id0 = Pubkey::default(); let id0 = Pubkey::default();
let id1 = Keypair::new().pubkey(); let id1 = Keypair::new().pubkey();
let keys = TransactionBuilder::default() let keys = TransactionBuilder::new(vec![
.push(Instruction::new(program_id, &0, vec![(id0, false)])) Instruction::new(program_id, &0, vec![(id0, false)]),
.push(Instruction::new(program_id, &0, vec![(id1, true)])) Instruction::new(program_id, &0, vec![(id1, true)]),
])
.keys(); .keys();
assert_eq!(keys, (vec![id1], vec![id0])); assert_eq!(keys, (vec![id1], vec![id0]));
} }
@@ -202,13 +203,12 @@ mod tests {
fn test_transaction_builder_signed_keys_len() { fn test_transaction_builder_signed_keys_len() {
let program_id = Pubkey::default(); let program_id = Pubkey::default();
let id0 = Pubkey::default(); let id0 = Pubkey::default();
let tx = TransactionBuilder::default() let tx =
.push(Instruction::new(program_id, &0, vec![(id0, false)])) TransactionBuilder::new(vec![Instruction::new(program_id, &0, vec![(id0, false)])])
.compile(); .compile();
assert_eq!(tx.signatures.capacity(), 0); assert_eq!(tx.signatures.capacity(), 0);
let tx = TransactionBuilder::default() let tx = TransactionBuilder::new(vec![Instruction::new(program_id, &0, vec![(id0, true)])])
.push(Instruction::new(program_id, &0, vec![(id0, true)]))
.compile(); .compile();
assert_eq!(tx.signatures.capacity(), 1); assert_eq!(tx.signatures.capacity(), 1);
} }
@@ -220,10 +220,11 @@ mod tests {
let id0 = Pubkey::default(); let id0 = Pubkey::default();
let keypair1 = Keypair::new(); let keypair1 = Keypair::new();
let id1 = keypair1.pubkey(); let id1 = keypair1.pubkey();
let tx = TransactionBuilder::default() let tx = TransactionBuilder::new(vec![
.push(Instruction::new(program_id0, &0, vec![(id0, false)])) Instruction::new(program_id0, &0, vec![(id0, false)]),
.push(Instruction::new(program_id1, &0, vec![(id1, true)])) Instruction::new(program_id1, &0, vec![(id1, true)]),
.push(Instruction::new(program_id0, &0, vec![(id1, false)])) Instruction::new(program_id0, &0, vec![(id1, false)]),
])
.compile(); .compile();
assert_eq!(tx.instructions[0], CompiledInstruction::new(0, &0, vec![1])); assert_eq!(tx.instructions[0], CompiledInstruction::new(0, &0, vec![1]));
assert_eq!(tx.instructions[1], CompiledInstruction::new(1, &0, vec![0])); assert_eq!(tx.instructions[1], CompiledInstruction::new(1, &0, vec![0]));

9
wallet/src/wallet.rs
View File

@@ -25,7 +25,6 @@ use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
use solana_sdk::system_transaction::SystemTransaction; use solana_sdk::system_transaction::SystemTransaction;
use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND}; use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND};
use solana_sdk::transaction::Transaction; use solana_sdk::transaction::Transaction;
use solana_sdk::transaction_builder::TransactionBuilder;
use solana_vote_api::vote_instruction::VoteInstruction; use solana_vote_api::vote_instruction::VoteInstruction;
use solana_vote_api::vote_transaction::VoteTransaction; use solana_vote_api::vote_transaction::VoteTransaction;
use std::fs::File; use std::fs::File;
@@ -442,20 +441,20 @@ fn process_configure_staking(
authorized_voter_option: Option<Pubkey>, authorized_voter_option: Option<Pubkey>,
) -> ProcessResult { ) -> ProcessResult {
let recent_blockhash = get_recent_blockhash(&rpc_client)?; let recent_blockhash = get_recent_blockhash(&rpc_client)?;
let mut tx = TransactionBuilder::default(); let mut ixs = vec![];
if let Some(delegate_id) = delegate_option { if let Some(delegate_id) = delegate_option {
tx.push(VoteInstruction::new_delegate_stake( ixs.push(VoteInstruction::new_delegate_stake(
&config.id.pubkey(), &config.id.pubkey(),
&delegate_id, &delegate_id,
)); ));
} }
if let Some(authorized_voter_id) = authorized_voter_option { if let Some(authorized_voter_id) = authorized_voter_option {
tx.push(VoteInstruction::new_authorize_voter( ixs.push(VoteInstruction::new_authorize_voter(
&config.id.pubkey(), &config.id.pubkey(),
&authorized_voter_id, &authorized_voter_id,
)); ));
} }
let mut tx = tx.compile(); let mut tx = Transaction::new(ixs);
tx.sign(&[&config.id], recent_blockhash); tx.sign(&[&config.id], recent_blockhash);
let signature_str = send_and_confirm_transaction(&rpc_client, &mut tx, &config.id)?; let signature_str = send_and_confirm_transaction(&rpc_client, &mut tx, &config.id)?;
Ok(signature_str.to_string()) Ok(signature_str.to_string())