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

Remove original feature gating (#20334)

Browse Source
This commit is contained in:
Tyera Eulberg
2021-09-29 23:36:51 -05:00
committed by GitHub
parent 474f2bcdf4
commit 5bdb824267
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/src/accounts.rs
View File

@@ -247,8 +247,7 @@ impl Accounts {
.unwrap_or_default(); .unwrap_or_default();
if bpf_loader_upgradeable::check_id(account.owner()) { if bpf_loader_upgradeable::check_id(account.owner()) {
if demote_program_write_locks if message.is_writable(i, demote_program_write_locks)
&& message.is_writable(i, demote_program_write_locks)
&& !message.is_upgradeable_loader_present() && !message.is_upgradeable_loader_present()
{ {
error_counters.invalid_writable_account += 1; error_counters.invalid_writable_account += 1;
@@ -277,7 +276,6 @@ impl Accounts {
} }
} }
} else if account.executable() } else if account.executable()
&& demote_program_write_locks
&& message.is_writable(i, demote_program_write_locks) && message.is_writable(i, demote_program_write_locks)
{ {
error_counters.invalid_writable_account += 1; error_counters.invalid_writable_account += 1;

5
runtime/src/bank.rs
View File

@@ -6445,10 +6445,7 @@ pub(crate) mod tests {
assert_eq!( assert_eq!(
bank.process_transaction(&tx), bank.process_transaction(&tx),
Err(TransactionError::InstructionError( Err(TransactionError::InvalidWritableAccount)
0,
InstructionError::ExecutableLamportChange
))
); );
assert_eq!(bank.get_balance(&account_pubkey), account_balance); assert_eq!(bank.get_balance(&account_pubkey), account_balance);
} }

6
sdk/program/src/message.rs
View File

@@ -402,9 +402,6 @@ impl Message {
} }
pub fn is_writable(&self, i: usize, demote_program_write_locks: bool) -> bool { pub fn is_writable(&self, i: usize, demote_program_write_locks: bool) -> bool {
let demote_program_id = demote_program_write_locks
&& self.is_key_called_as_program(i)
&& !self.is_upgradeable_loader_present();
(i < (self.header.num_required_signatures - self.header.num_readonly_signed_accounts) (i < (self.header.num_required_signatures - self.header.num_readonly_signed_accounts)
as usize as usize
|| (i >= self.header.num_required_signatures as usize || (i >= self.header.num_required_signatures as usize
@@ -414,7 +411,8 @@ impl Message {
let key = self.account_keys[i]; let key = self.account_keys[i];
sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key) sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key)
} }
&& !demote_program_id && (!self.is_key_called_as_program(i)
|| (demote_program_write_locks && self.is_upgradeable_loader_present()))
} }
pub fn is_signer(&self, i: usize) -> bool { pub fn is_signer(&self, i: usize) -> bool {