Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove create_account bandaid now that to's signature is required #7776

Merged
merged 2 commits into from
Jan 15, 2020
Merged

Remove create_account bandaid now that to's signature is required #7776

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad7d9c9
Remove create account bandaid now that requires signature
rob-solana Jan 13, 2020
f4b4842
shrink scope of this PR to bandaid
rob-solana Jan 15, 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
27 changes: 20 additions & 7 deletions runtime/src/system_instruction_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ fn finish_create_account(
}

// if it looks like the `to` account is already in use, bail
if to.account.lamports != 0
|| !to.account.data.is_empty()
|| !system_program::check_id(&to.account.owner)
{
// (note that the id check is also enforced by message_processor)
if !to.account.data.is_empty() || !system_program::check_id(&to.account.owner) {
debug!(
"CreateAccount: invalid argument; account {} already in use",
to.unsigned_key()
Expand Down Expand Up @@ -116,7 +114,7 @@ fn finish_create_account(
return Err(SystemError::InvalidAccountDataLength.into());
}

// guard against sysvars being assigned
// guard against sysvars being made
rob-solana marked this conversation as resolved.
Show resolved Hide resolved
if sysvar::check_id(&program_id) {
debug!("Assign: program id {} invalid", program_id);
return Err(SystemError::InvalidProgramId.into());
Expand All @@ -141,7 +139,7 @@ fn assign_account_to_program(
return Err(InstructionError::MissingRequiredSignature);
}

// guard against sysvars being assigned
// guard against sysvars being made
if sysvar::check_id(&program_id) {
debug!("Assign: program id {} invalid", program_id);
return Err(SystemError::InvalidProgramId.into());
Expand Down Expand Up @@ -515,6 +513,7 @@ mod tests {

#[test]
fn test_create_already_in_use() {
solana_logger::setup();
// Attempt to create system account in account already owned by another program
let new_program_owner = Pubkey::new(&[9; 32]);
let from = Pubkey::new_rand();
Expand All @@ -538,7 +537,8 @@ mod tests {
assert_eq!(from_lamports, 100);
assert_eq!(owned_account, unchanged_account);

let mut owned_account = Account::new(10, 0, &Pubkey::default());
// Attempt to create system account in account that already has data
let mut owned_account = Account::new(0, 1, &Pubkey::default());
let unchanged_account = owned_account.clone();
let result = create_account(
&mut KeyedAccount::new(&from, true, &mut from_account),
Expand All @@ -551,6 +551,19 @@ mod tests {
let from_lamports = from_account.lamports;
assert_eq!(from_lamports, 100);
assert_eq!(owned_account, unchanged_account);

// Verify that create_account works even if `to` has a non-zero balance
let mut owned_account = Account::new(1, 0, &Pubkey::default());
let result = create_account(
&mut KeyedAccount::new(&from, true, &mut from_account),
&mut KeyedAccount::new(&owned_key, true, &mut owned_account),
50,
2,
&new_program_owner,
);
assert_eq!(result, Ok(()));
assert_eq!(from_account.lamports, from_lamports - 50);
assert_eq!(owned_account.lamports, 1 + 50);
}

#[test]
Expand Down