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

Remove fee-payer guesswork from Message and Transaction (bp #10776) (#10785)

Browse Source 
* Remove fee-payer guesswork from Message and Transaction (#10776)

* Make Message::new_with_payer the default constructor

* Remove Transaction::new_[un]signed_instructions

These guess the fee-payer instead of stating it explicitly

(cherry picked from commit 1c498369b5)

# Conflicts:
#	cli/src/nonce.rs
#	core/src/rpc.rs
#	ledger/src/blockstore.rs
#	programs/bpf/tests/programs.rs

* Fix merge

Co-authored-by: Greg Fitzgerald <greg@solana.com>
This commit is contained in:
mergify[bot]
2020-06-25 01:10:23 +00:00
committed by GitHub
parent 835bacce4f
commit 55b92c16da
47 changed files with 520 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tokens/src/commands.rs
View File

@@ -158,7 +158,7 @@ fn distribute_tokens<T: Client>(
};
let fee_payer_pubkey = args.fee_payer.pubkey();
let message = Message::new_with_payer(&instructions, Some(&fee_payer_pubkey));
let message = Message::new(&instructions, Some(&fee_payer_pubkey));
match client.send_message(message, &signers) {
Ok((transaction, last_valid_slot)) => {
db::set_transaction_info(
@@ -511,7 +511,7 @@ pub fn test_process_distribute_stake_with_client<C: Client>(client: C, sender_ke
&lockup,
sol_to_lamports(3000.0),
);
let message = Message::new(&instructions);
let message = Message::new(&instructions, Some(&sender_keypair.pubkey()));
let signers = [&sender_keypair, &stake_account_keypair];
thin_client.send_message(message, &signers).unwrap();

2
tokens/src/thin_client.rs
View File

@@ -168,7 +168,7 @@ impl<C: Client> ThinClient<C> {
) -> Result<(Transaction, u64)> {
let create_instruction =
system_instruction::transfer(&sender_keypair.pubkey(), &to_pubkey, lamports);
let message = Message::new(&[create_instruction]);
let message = Message::new(&[create_instruction], Some(&sender_keypair.pubkey()));
self.send_message(message, &[sender_keypair])
}