Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Permit paying oneself #10337

Merged
merged 3 commits into from
May 31, 2020
+75 −123
Merged

Permit paying oneself #10337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
901f7a4
Allow paying to oneself
garious May 30, 2020
7c4b6de
cargo fmt
garious May 30, 2020
2bc3d2d
Permit pay-to-self in CLI
garious May 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions cli/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,11 +1530,6 @@ fn process_transfer(
) -> ProcessResult {
let from = config.signers[from];

check_unique_pubkeys(
(&from.pubkey(), "cli keypair".to_string()),
(to, "to".to_string()),
)?;

Comment on lines -1533 to -1537
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove this check from process_pay as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

About time we rip out all things Budget. All that code can have a new home in the SPL. We can add a new solana-budget CLI as well.

let (recent_blockhash, fee_calculator) =
blockhash_query.get_blockhash_and_fee_calculator(rpc_client)?;

Expand Down
32 changes: 0 additions & 32 deletions runtime/src/accounts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,38 +1367,6 @@ mod tests {
}
}

#[test]
fn test_load_account_pay_to_self() {
let mut accounts: Vec<(Pubkey, Account)> = Vec::new();
let mut error_counters = ErrorCounters::default();

let keypair = Keypair::new();
let pubkey = keypair.pubkey();

let account = Account::new(10, 1, &Pubkey::default());
accounts.push((pubkey, account));

let instructions = vec![CompiledInstruction::new(0, &(), vec![0, 1])];
// Simulate pay-to-self transaction, which loads the same account twice
let tx = Transaction::new_with_compiled_instructions(
&[&keypair],
&[pubkey],
Hash::default(),
vec![native_loader::id()],
instructions,
);
let loaded_accounts = load_accounts(tx, &accounts, &mut error_counters);

assert_eq!(loaded_accounts.len(), 1);
assert_eq!(
loaded_accounts[0],
(
Err(TransactionError::InvalidAccountForFee),
garious marked this conversation as resolved.
Show resolved Hide resolved
Some(HashAgeKind::Extant)
)
);
}

#[test]
fn test_load_by_program_slot() {
let accounts = Accounts::new(Vec::new());
Expand Down
6 changes: 1 addition & 5 deletions runtime/src/bank.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4820,13 +4820,9 @@ mod tests {
let _res = bank.process_transaction(&tx);

assert_eq!(bank.get_balance(&key1.pubkey()), 1);

// TODO: Why do we convert errors to Oks?
//res[0].clone().unwrap_err();

bank.get_signature_status(&tx.signatures[0])
.unwrap()
.unwrap_err();
.unwrap();
}

fn new_from_parent(parent: &Arc<Bank>) -> Bank {
Expand Down
Loading