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

Use single feature (#20289)

Browse Source
This commit is contained in:
Tyera Eulberg
2021-09-28 05:30:11 -05:00
committed by GitHub
parent 9b6ec0b6d5
commit c5d174c170
10 changed files with 94 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli-output/src/display.rs
View File

@ -140,7 +140,7 @@ fn format_account_mode(message: &Message, index: usize) -> String {
} else { } else {
"-" "-"
}, },
if message.is_writable(index, /* restore_write_lock_when_upgradeable=*/ true) { if message.is_writable(index, /* demote_program_write_locks=*/ true) {
"w" // comment for consistent rust fmt (no joking; lol) "w" // comment for consistent rust fmt (no joking; lol)
} else { } else {
"-" "-"

7
core/src/transaction_status_service.rs
View File

@ -109,10 +109,9 @@ impl TransactionStatusService {
}) })
.expect("FeeCalculator must exist"); .expect("FeeCalculator must exist");
let fee = fee_calculator.calculate_fee(transaction.message()); let fee = fee_calculator.calculate_fee(transaction.message());
let (writable_keys, readonly_keys) = let (writable_keys, readonly_keys) = transaction
transaction.message.get_account_keys_by_lock_type( .message
bank.restore_write_lock_when_upgradeable(), .get_account_keys_by_lock_type(bank.demote_program_write_locks());
);
let inner_instructions = inner_instructions.map(|inner_instructions| { let inner_instructions = inner_instructions.map(|inner_instructions| {
inner_instructions inner_instructions

10
program-test/src/lib.rs
View File

@ -19,7 +19,7 @@ use {
clock::{Clock, Slot}, clock::{Clock, Slot},
entrypoint::{ProgramResult, SUCCESS}, entrypoint::{ProgramResult, SUCCESS},
epoch_schedule::EpochSchedule, epoch_schedule::EpochSchedule,
feature_set::restore_write_lock_when_upgradeable, feature_set::demote_program_write_locks,
fee_calculator::{FeeCalculator, FeeRateGovernor}, fee_calculator::{FeeCalculator, FeeRateGovernor},
genesis_config::{ClusterType, GenesisConfig}, genesis_config::{ClusterType, GenesisConfig},
hash::Hash, hash::Hash,
@ -256,14 +256,14 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
} }
panic!("Program id {} wasn't found in account_infos", program_id); panic!("Program id {} wasn't found in account_infos", program_id);
}; };
let restore_write_lock_when_upgradeable = let demote_program_write_locks =
invoke_context.is_feature_active(&restore_write_lock_when_upgradeable::id()); invoke_context.is_feature_active(&demote_program_write_locks::id());
// TODO don't have the caller's keyed_accounts so can't validate writer or signer escalation or deescalation yet // TODO don't have the caller's keyed_accounts so can't validate writer or signer escalation or deescalation yet
let caller_privileges = message let caller_privileges = message
.account_keys .account_keys
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, _)| message.is_writable(i, restore_write_lock_when_upgradeable)) .map(|(i, _)| message.is_writable(i, demote_program_write_locks))
.collect::<Vec<bool>>(); .collect::<Vec<bool>>();
stable_log::program_invoke(&logger, &program_id, invoke_context.invoke_depth()); stable_log::program_invoke(&logger, &program_id, invoke_context.invoke_depth());
@ -334,7 +334,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
// Copy writeable account modifications back into the caller's AccountInfos // Copy writeable account modifications back into the caller's AccountInfos
for (i, account_pubkey) in message.account_keys.iter().enumerate() { for (i, account_pubkey) in message.account_keys.iter().enumerate() {
if !message.is_writable(i, restore_write_lock_when_upgradeable) { if !message.is_writable(i, demote_program_write_locks) {
continue; continue;
} }

12
programs/bpf_loader/src/syscalls.rs
View File

@ -19,8 +19,8 @@ use solana_sdk::{
entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS}, entrypoint::{MAX_PERMITTED_DATA_INCREASE, SUCCESS},
epoch_schedule::EpochSchedule, epoch_schedule::EpochSchedule,
feature_set::{ feature_set::{
cpi_data_cost, cpi_share_ro_and_exec_accounts, enforce_aligned_host_addrs, cpi_data_cost, cpi_share_ro_and_exec_accounts, demote_program_write_locks,
keccak256_syscall_enabled, memory_ops_syscalls, restore_write_lock_when_upgradeable, enforce_aligned_host_addrs, keccak256_syscall_enabled, memory_ops_syscalls,
set_upgrade_authority_via_cpi_enabled, sysvar_via_syscall, update_data_on_realloc, set_upgrade_authority_via_cpi_enabled, sysvar_via_syscall, update_data_on_realloc,
}, },
hash::{Hasher, HASH_BYTES}, hash::{Hasher, HASH_BYTES},
@ -2146,7 +2146,7 @@ fn call<'a>(
accounts, accounts,
account_refs, account_refs,
caller_write_privileges, caller_write_privileges,
restore_write_lock_when_upgradeable, demote_program_write_locks,
) = { ) = {
let invoke_context = syscall.get_context()?; let invoke_context = syscall.get_context()?;
@ -2237,7 +2237,7 @@ fn call<'a>(
accounts, accounts,
account_refs, account_refs,
caller_write_privileges, caller_write_privileges,
invoke_context.is_feature_active(&restore_write_lock_when_upgradeable::id()), invoke_context.is_feature_active(&demote_program_write_locks::id()),
) )
}; };
@ -2263,9 +2263,7 @@ fn call<'a>(
for (i, (account, account_ref)) in accounts.iter().zip(account_refs).enumerate() { for (i, (account, account_ref)) in accounts.iter().zip(account_refs).enumerate() {
let account = account.borrow(); let account = account.borrow();
if let Some(mut account_ref) = account_ref { if let Some(mut account_ref) = account_ref {
if message.is_writable(i, restore_write_lock_when_upgradeable) if message.is_writable(i, demote_program_write_locks) && !account.executable() {
&& !account.executable()
{
*account_ref.lamports = account.lamports(); *account_ref.lamports = account.lamports();
*account_ref.owner = *account.owner(); *account_ref.owner = *account.owner();
if account_ref.data.len() != account.data().len() { if account_ref.data.len() != account.data().len() {

76
runtime/src/accounts.rs
View File

@ -172,9 +172,9 @@ impl Accounts {
fn construct_instructions_account( fn construct_instructions_account(
message: &Message, message: &Message,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) -> AccountSharedData { ) -> AccountSharedData {
let mut data = message.serialize_instructions(restore_write_lock_when_upgradeable); let mut data = message.serialize_instructions(demote_program_write_locks);
// add room for current instruction index. // add room for current instruction index.
data.resize(data.len() + 2, 0); data.resize(data.len() + 2, 0);
AccountSharedData::from(Account { AccountSharedData::from(Account {
@ -204,8 +204,8 @@ impl Accounts {
let mut accounts = Vec::with_capacity(message.account_keys.len()); let mut accounts = Vec::with_capacity(message.account_keys.len());
let mut account_deps = Vec::with_capacity(message.account_keys.len()); let mut account_deps = Vec::with_capacity(message.account_keys.len());
let mut rent_debits = RentDebits::default(); let mut rent_debits = RentDebits::default();
let restore_write_lock_when_upgradeable = let demote_program_write_locks =
feature_set.is_active(&feature_set::restore_write_lock_when_upgradeable::id()); feature_set.is_active(&feature_set::demote_program_write_locks::id());
for (i, key) in message.account_keys.iter().enumerate() { for (i, key) in message.account_keys.iter().enumerate() {
let account = if message.is_non_loader_key(key, i) { let account = if message.is_non_loader_key(key, i) {
@ -216,16 +216,13 @@ impl Accounts {
if solana_sdk::sysvar::instructions::check_id(key) if solana_sdk::sysvar::instructions::check_id(key)
&& feature_set.is_active(&feature_set::instructions_sysvar_enabled::id()) && feature_set.is_active(&feature_set::instructions_sysvar_enabled::id())
{ {
Self::construct_instructions_account( Self::construct_instructions_account(message, demote_program_write_locks)
message,
restore_write_lock_when_upgradeable,
)
} else { } else {
let (account, rent) = self let (account, rent) = self
.accounts_db .accounts_db
.load(ancestors, key) .load(ancestors, key)
.map(|(mut account, _)| { .map(|(mut account, _)| {
if message.is_writable(i, restore_write_lock_when_upgradeable) { if message.is_writable(i, demote_program_write_locks) {
let rent_due = rent_collector let rent_due = rent_collector
.collect_from_existing_account(&key, &mut account); .collect_from_existing_account(&key, &mut account);
(account, rent_due) (account, rent_due)
@ -236,7 +233,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 message.is_writable(i, restore_write_lock_when_upgradeable) if 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;
@ -265,7 +262,7 @@ impl Accounts {
} }
} }
} else if account.executable } else if account.executable
&& message.is_writable(i, restore_write_lock_when_upgradeable) && message.is_writable(i, demote_program_write_locks)
{ {
error_counters.invalid_writable_account += 1; error_counters.invalid_writable_account += 1;
return Err(TransactionError::InvalidWritableAccount); return Err(TransactionError::InvalidWritableAccount);
@ -790,7 +787,7 @@ impl Accounts {
tx: &Transaction, tx: &Transaction,
result: &Result<()>, result: &Result<()>,
locks: &mut AccountLocks, locks: &mut AccountLocks,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) { ) {
match result { match result {
Err(TransactionError::AccountInUse) => (), Err(TransactionError::AccountInUse) => (),
@ -799,7 +796,7 @@ impl Accounts {
_ => { _ => {
let (writable_keys, readonly_keys) = &tx let (writable_keys, readonly_keys) = &tx
.message() .message()
.get_account_keys_by_lock_type(restore_write_lock_when_upgradeable); .get_account_keys_by_lock_type(demote_program_write_locks);
for k in writable_keys { for k in writable_keys {
locks.unlock_write(k); locks.unlock_write(k);
} }
@ -831,7 +828,7 @@ impl Accounts {
pub fn lock_accounts<'a>( pub fn lock_accounts<'a>(
&self, &self,
txs: impl Iterator<Item = &'a Transaction>, txs: impl Iterator<Item = &'a Transaction>,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) -> Vec<Result<()>> { ) -> Vec<Result<()>> {
use solana_sdk::sanitize::Sanitize; use solana_sdk::sanitize::Sanitize;
let keys: Vec<Result<_>> = txs let keys: Vec<Result<_>> = txs
@ -844,7 +841,7 @@ impl Accounts {
Ok(tx Ok(tx
.message() .message()
.get_account_keys_by_lock_type(restore_write_lock_when_upgradeable)) .get_account_keys_by_lock_type(demote_program_write_locks))
}) })
.collect(); .collect();
let mut account_locks = &mut self.account_locks.lock().unwrap(); let mut account_locks = &mut self.account_locks.lock().unwrap();
@ -863,7 +860,7 @@ impl Accounts {
&self, &self,
txs: impl Iterator<Item = &'a Transaction>, txs: impl Iterator<Item = &'a Transaction>,
results: &[Result<()>], results: &[Result<()>],
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) { ) {
let mut account_locks = self.account_locks.lock().unwrap(); let mut account_locks = self.account_locks.lock().unwrap();
debug!("bank unlock accounts"); debug!("bank unlock accounts");
@ -872,7 +869,7 @@ impl Accounts {
tx, tx,
lock_result, lock_result,
&mut account_locks, &mut account_locks,
restore_write_lock_when_upgradeable, demote_program_write_locks,
); );
} }
} }
@ -890,7 +887,7 @@ impl Accounts {
last_blockhash_with_fee_calculator: &(Hash, FeeCalculator), last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
fix_recent_blockhashes_sysvar_delay: bool, fix_recent_blockhashes_sysvar_delay: bool,
merge_nonce_error_into_system_error: bool, merge_nonce_error_into_system_error: bool,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) { ) {
let accounts_to_store = self.collect_accounts_to_store( let accounts_to_store = self.collect_accounts_to_store(
txs, txs,
@ -900,7 +897,7 @@ impl Accounts {
last_blockhash_with_fee_calculator, last_blockhash_with_fee_calculator,
fix_recent_blockhashes_sysvar_delay, fix_recent_blockhashes_sysvar_delay,
merge_nonce_error_into_system_error, merge_nonce_error_into_system_error,
restore_write_lock_when_upgradeable, demote_program_write_locks,
); );
self.accounts_db.store_cached(slot, &accounts_to_store); self.accounts_db.store_cached(slot, &accounts_to_store);
} }
@ -926,7 +923,7 @@ impl Accounts {
last_blockhash_with_fee_calculator: &(Hash, FeeCalculator), last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
fix_recent_blockhashes_sysvar_delay: bool, fix_recent_blockhashes_sysvar_delay: bool,
merge_nonce_error_into_system_error: bool, merge_nonce_error_into_system_error: bool,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) -> Vec<(&'a Pubkey, &'a AccountSharedData)> { ) -> Vec<(&'a Pubkey, &'a AccountSharedData)> {
let mut accounts = Vec::with_capacity(loaded.len()); let mut accounts = Vec::with_capacity(loaded.len());
for (i, ((raccs, _nonce_rollback), tx)) in loaded.iter_mut().zip(txs).enumerate() { for (i, ((raccs, _nonce_rollback), tx)) in loaded.iter_mut().zip(txs).enumerate() {
@ -979,7 +976,7 @@ impl Accounts {
fee_payer_index = Some(i); fee_payer_index = Some(i);
} }
let is_fee_payer = Some(i) == fee_payer_index; let is_fee_payer = Some(i) == fee_payer_index;
if message.is_writable(i, restore_write_lock_when_upgradeable) if message.is_writable(i, demote_program_write_locks)
&& (res.is_ok() && (res.is_ok()
|| (maybe_nonce_rollback.is_some() && (is_nonce_account || is_fee_payer))) || (maybe_nonce_rollback.is_some() && (is_nonce_account || is_fee_payer)))
{ {
@ -2015,7 +2012,7 @@ mod tests {
accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2); accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2);
accounts.store_slow_uncached(0, &keypair3.pubkey(), &account3); accounts.store_slow_uncached(0, &keypair3.pubkey(), &account3);
let restore_write_lock_when_upgradeable = true; let demote_program_write_locks = true;
let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])]; let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])];
let message = Message::new_with_compiled_instructions( let message = Message::new_with_compiled_instructions(
@ -2027,8 +2024,7 @@ mod tests {
instructions, instructions,
); );
let tx = Transaction::new(&[&keypair0], message, Hash::default()); let tx = Transaction::new(&[&keypair0], message, Hash::default());
let results0 = let results0 = accounts.lock_accounts([tx.clone()].iter(), demote_program_write_locks);
accounts.lock_accounts([tx.clone()].iter(), restore_write_lock_when_upgradeable);
assert!(results0[0].is_ok()); assert!(results0[0].is_ok());
assert_eq!( assert_eq!(
@ -2063,7 +2059,7 @@ mod tests {
); );
let tx1 = Transaction::new(&[&keypair1], message, Hash::default()); let tx1 = Transaction::new(&[&keypair1], message, Hash::default());
let txs = vec![tx0, tx1]; let txs = vec![tx0, tx1];
let results1 = accounts.lock_accounts(txs.iter(), restore_write_lock_when_upgradeable); let results1 = accounts.lock_accounts(txs.iter(), demote_program_write_locks);
assert!(results1[0].is_ok()); // Read-only account (keypair1) can be referenced multiple times assert!(results1[0].is_ok()); // Read-only account (keypair1) can be referenced multiple times
assert!(results1[1].is_err()); // Read-only account (keypair1) cannot also be locked as writable assert!(results1[1].is_err()); // Read-only account (keypair1) cannot also be locked as writable
@ -2078,8 +2074,8 @@ mod tests {
2 2
); );
accounts.unlock_accounts([tx].iter(), &results0, restore_write_lock_when_upgradeable); accounts.unlock_accounts([tx].iter(), &results0, demote_program_write_locks);
accounts.unlock_accounts(txs.iter(), &results1, restore_write_lock_when_upgradeable); accounts.unlock_accounts(txs.iter(), &results1, demote_program_write_locks);
let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])]; let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])];
let message = Message::new_with_compiled_instructions( let message = Message::new_with_compiled_instructions(
1, 1,
@ -2090,7 +2086,7 @@ mod tests {
instructions, instructions,
); );
let tx = Transaction::new(&[&keypair1], message, Hash::default()); let tx = Transaction::new(&[&keypair1], message, Hash::default());
let results2 = accounts.lock_accounts([tx].iter(), restore_write_lock_when_upgradeable); let results2 = accounts.lock_accounts([tx].iter(), demote_program_write_locks);
assert!(results2[0].is_ok()); // Now keypair1 account can be locked as writable assert!(results2[0].is_ok()); // Now keypair1 account can be locked as writable
// Check that read-only lock with zero references is deleted // Check that read-only lock with zero references is deleted
@ -2126,7 +2122,7 @@ mod tests {
accounts.store_slow_uncached(0, &keypair1.pubkey(), &account1); accounts.store_slow_uncached(0, &keypair1.pubkey(), &account1);
accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2); accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2);
let restore_write_lock_when_upgradeable = true; let demote_program_write_locks = true;
let accounts_arc = Arc::new(accounts); let accounts_arc = Arc::new(accounts);
@ -2162,17 +2158,13 @@ mod tests {
let txs = vec![writable_tx.clone()]; let txs = vec![writable_tx.clone()];
let results = accounts_clone let results = accounts_clone
.clone() .clone()
.lock_accounts(txs.iter(), restore_write_lock_when_upgradeable); .lock_accounts(txs.iter(), demote_program_write_locks);
for result in results.iter() { for result in results.iter() {
if result.is_ok() { if result.is_ok() {
counter_clone.clone().fetch_add(1, Ordering::SeqCst); counter_clone.clone().fetch_add(1, Ordering::SeqCst);
} }
} }
accounts_clone.unlock_accounts( accounts_clone.unlock_accounts(txs.iter(), &results, demote_program_write_locks);
txs.iter(),
&results,
restore_write_lock_when_upgradeable,
);
if exit_clone.clone().load(Ordering::Relaxed) { if exit_clone.clone().load(Ordering::Relaxed) {
break; break;
} }
@ -2183,13 +2175,13 @@ mod tests {
let txs = vec![readonly_tx.clone()]; let txs = vec![readonly_tx.clone()];
let results = accounts_arc let results = accounts_arc
.clone() .clone()
.lock_accounts(txs.iter(), restore_write_lock_when_upgradeable); .lock_accounts(txs.iter(), demote_program_write_locks);
if results[0].is_ok() { if results[0].is_ok() {
let counter_value = counter_clone.clone().load(Ordering::SeqCst); let counter_value = counter_clone.clone().load(Ordering::SeqCst);
thread::sleep(time::Duration::from_millis(50)); thread::sleep(time::Duration::from_millis(50));
assert_eq!(counter_value, counter_clone.clone().load(Ordering::SeqCst)); assert_eq!(counter_value, counter_clone.clone().load(Ordering::SeqCst));
} }
accounts_arc.unlock_accounts(txs.iter(), &results, restore_write_lock_when_upgradeable); accounts_arc.unlock_accounts(txs.iter(), &results, demote_program_write_locks);
thread::sleep(time::Duration::from_millis(50)); thread::sleep(time::Duration::from_millis(50));
} }
exit.store(true, Ordering::Relaxed); exit.store(true, Ordering::Relaxed);
@ -2218,7 +2210,7 @@ mod tests {
accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2); accounts.store_slow_uncached(0, &keypair2.pubkey(), &account2);
accounts.store_slow_uncached(0, &keypair3.pubkey(), &account3); accounts.store_slow_uncached(0, &keypair3.pubkey(), &account3);
let restore_write_lock_when_upgradeable = true; let demote_program_write_locks = true;
let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])]; let instructions = vec![CompiledInstruction::new(2, &(), vec![0, 1])];
let message = Message::new_with_compiled_instructions( let message = Message::new_with_compiled_instructions(
@ -2230,7 +2222,7 @@ mod tests {
instructions, instructions,
); );
let tx = Transaction::new(&[&keypair0], message, Hash::default()); let tx = Transaction::new(&[&keypair0], message, Hash::default());
let results0 = accounts.lock_accounts([tx].iter(), restore_write_lock_when_upgradeable); let results0 = accounts.lock_accounts([tx].iter(), demote_program_write_locks);
assert!(results0[0].is_ok()); assert!(results0[0].is_ok());
// Instruction program-id account demoted to readonly // Instruction program-id account demoted to readonly
@ -2347,7 +2339,7 @@ mod tests {
&(Hash::default(), FeeCalculator::default()), &(Hash::default(), FeeCalculator::default()),
true, true,
true, // merge_nonce_error_into_system_error true, // merge_nonce_error_into_system_error
true, // restore_write_lock_when_upgradeable true, // demote_program_write_locks
); );
assert_eq!(collected_accounts.len(), 2); assert_eq!(collected_accounts.len(), 2);
assert!(collected_accounts assert!(collected_accounts
@ -2733,7 +2725,7 @@ mod tests {
&(next_blockhash, FeeCalculator::default()), &(next_blockhash, FeeCalculator::default()),
true, true,
true, // merge_nonce_error_into_system_error true, // merge_nonce_error_into_system_error
true, // restore_write_lock_when_upgradeable true, // demote_program_write_locks
); );
assert_eq!(collected_accounts.len(), 2); assert_eq!(collected_accounts.len(), 2);
assert_eq!( assert_eq!(
@ -2850,7 +2842,7 @@ mod tests {
&(next_blockhash, FeeCalculator::default()), &(next_blockhash, FeeCalculator::default()),
true, true,
true, // merge_nonce_error_into_system_error true, // merge_nonce_error_into_system_error
true, // restore_write_lock_when_upgradeable true, // demote_program_write_locks
); );
assert_eq!(collected_accounts.len(), 1); assert_eq!(collected_accounts.len(), 1);
let collected_nonce_account = collected_accounts let collected_nonce_account = collected_accounts

12
runtime/src/bank.rs
View File

@ -2505,7 +2505,7 @@ impl Bank {
let hashed_txs: Vec<HashedTransaction> = txs.map(HashedTransaction::from).collect(); let hashed_txs: Vec<HashedTransaction> = txs.map(HashedTransaction::from).collect();
let lock_results = self.rc.accounts.lock_accounts( let lock_results = self.rc.accounts.lock_accounts(
hashed_txs.as_transactions_iter(), hashed_txs.as_transactions_iter(),
self.restore_write_lock_when_upgradeable(), self.demote_program_write_locks(),
); );
TransactionBatch::new(lock_results, self, Cow::Owned(hashed_txs)) TransactionBatch::new(lock_results, self, Cow::Owned(hashed_txs))
} }
@ -2516,7 +2516,7 @@ impl Bank {
) -> TransactionBatch<'a, 'b> { ) -> TransactionBatch<'a, 'b> {
let lock_results = self.rc.accounts.lock_accounts( let lock_results = self.rc.accounts.lock_accounts(
hashed_txs.as_transactions_iter(), hashed_txs.as_transactions_iter(),
self.restore_write_lock_when_upgradeable(), self.demote_program_write_locks(),
); );
TransactionBatch::new(lock_results, self, Cow::Borrowed(hashed_txs)) TransactionBatch::new(lock_results, self, Cow::Borrowed(hashed_txs))
} }
@ -2588,7 +2588,7 @@ impl Bank {
self.rc.accounts.unlock_accounts( self.rc.accounts.unlock_accounts(
batch.transactions_iter(), batch.transactions_iter(),
batch.lock_results(), batch.lock_results(),
self.restore_write_lock_when_upgradeable(), self.demote_program_write_locks(),
) )
} }
} }
@ -3335,7 +3335,7 @@ impl Bank {
&self.last_blockhash_with_fee_calculator(), &self.last_blockhash_with_fee_calculator(),
self.fix_recent_blockhashes_sysvar_delay(), self.fix_recent_blockhashes_sysvar_delay(),
self.merge_nonce_error_into_system_error(), self.merge_nonce_error_into_system_error(),
self.restore_write_lock_when_upgradeable(), self.demote_program_write_locks(),
); );
let rent_debits = self.collect_rent(executed, loaded_accounts); let rent_debits = self.collect_rent(executed, loaded_accounts);
@ -4891,9 +4891,9 @@ impl Bank {
.is_active(&feature_set::stakes_remove_delegation_if_inactive::id()) .is_active(&feature_set::stakes_remove_delegation_if_inactive::id())
} }
pub fn restore_write_lock_when_upgradeable(&self) -> bool { pub fn demote_program_write_locks(&self) -> bool {
self.feature_set self.feature_set
.is_active(&feature_set::restore_write_lock_when_upgradeable::id()) .is_active(&feature_set::demote_program_write_locks::id())
} }
// Check if the wallclock time from bank creation to now has exceeded the allotted // Check if the wallclock time from bank creation to now has exceeded the allotted

47
runtime/src/message_processor.rs
View File

@ -9,8 +9,8 @@ use solana_sdk::{
account_utils::StateMut, account_utils::StateMut,
bpf_loader_upgradeable::{self, UpgradeableLoaderState}, bpf_loader_upgradeable::{self, UpgradeableLoaderState},
feature_set::{ feature_set::{
cpi_share_ro_and_exec_accounts, instructions_sysvar_enabled, cpi_share_ro_and_exec_accounts, demote_program_write_locks, instructions_sysvar_enabled,
restore_write_lock_when_upgradeable, updated_verify_policy, FeatureSet, updated_verify_policy, FeatureSet,
}, },
ic_msg, ic_msg,
instruction::{CompiledInstruction, Instruction, InstructionError}, instruction::{CompiledInstruction, Instruction, InstructionError},
@ -361,7 +361,7 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
&mut self.timings, &mut self.timings,
self.feature_set.is_active(&updated_verify_policy::id()), self.feature_set.is_active(&updated_verify_policy::id()),
self.feature_set self.feature_set
.is_active(&restore_write_lock_when_upgradeable::id()), .is_active(&demote_program_write_locks::id()),
), ),
None => Err(InstructionError::GenericError), // Should never happen None => Err(InstructionError::GenericError), // Should never happen
} }
@ -574,7 +574,7 @@ impl MessageProcessor {
instruction: &'a CompiledInstruction, instruction: &'a CompiledInstruction,
executable_accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)], executable_accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
accounts: &'a [Rc<RefCell<AccountSharedData>>], accounts: &'a [Rc<RefCell<AccountSharedData>>],
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) -> Vec<KeyedAccount<'a>> { ) -> Vec<KeyedAccount<'a>> {
let mut keyed_accounts = create_keyed_readonly_accounts(&executable_accounts); let mut keyed_accounts = create_keyed_readonly_accounts(&executable_accounts);
let mut keyed_accounts2: Vec<_> = instruction let mut keyed_accounts2: Vec<_> = instruction
@ -585,7 +585,7 @@ impl MessageProcessor {
let index = index as usize; let index = index as usize;
let key = &message.account_keys[index]; let key = &message.account_keys[index];
let account = &accounts[index]; let account = &accounts[index];
if message.is_writable(index, restore_write_lock_when_upgradeable) { if message.is_writable(index, demote_program_write_locks) {
KeyedAccount::new(key, is_signer, account) KeyedAccount::new(key, is_signer, account)
} else { } else {
KeyedAccount::new_readonly(key, is_signer, account) KeyedAccount::new_readonly(key, is_signer, account)
@ -736,7 +736,7 @@ impl MessageProcessor {
accounts, accounts,
account_refs, account_refs,
caller_write_privileges, caller_write_privileges,
restore_write_lock_when_upgradeable, demote_program_write_locks,
) = { ) = {
let invoke_context = invoke_context.borrow(); let invoke_context = invoke_context.borrow();
@ -829,7 +829,7 @@ impl MessageProcessor {
accounts, accounts,
account_refs, account_refs,
caller_write_privileges, caller_write_privileges,
invoke_context.is_feature_active(&restore_write_lock_when_upgradeable::id()), invoke_context.is_feature_active(&demote_program_write_locks::id()),
) )
}; };
@ -848,9 +848,7 @@ impl MessageProcessor {
let invoke_context = invoke_context.borrow(); let invoke_context = invoke_context.borrow();
for (i, (account, account_ref)) in accounts.iter().zip(account_refs).enumerate() { for (i, (account, account_ref)) in accounts.iter().zip(account_refs).enumerate() {
let account = account.borrow(); let account = account.borrow();
if message.is_writable(i, restore_write_lock_when_upgradeable) if message.is_writable(i, demote_program_write_locks) && !account.executable {
&& !account.executable
{
account_ref.try_account_ref_mut()?.lamports = account.lamports; account_ref.try_account_ref_mut()?.lamports = account.lamports;
account_ref.try_account_ref_mut()?.owner = account.owner; account_ref.try_account_ref_mut()?.owner = account.owner;
if account_ref.data_len()? != account.data().len() if account_ref.data_len()? != account.data().len()
@ -894,14 +892,14 @@ impl MessageProcessor {
Some(caller_write_privileges), Some(caller_write_privileges),
)?; )?;
// Construct keyed accounts // Construct keyed accounts
let restore_write_lock_when_upgradeable = let demote_program_write_locks =
invoke_context.is_feature_active(&restore_write_lock_when_upgradeable::id()); invoke_context.is_feature_active(&demote_program_write_locks::id());
let keyed_accounts = Self::create_keyed_accounts( let keyed_accounts = Self::create_keyed_accounts(
message, message,
instruction, instruction,
executable_accounts, executable_accounts,
accounts, accounts,
restore_write_lock_when_upgradeable, demote_program_write_locks,
); );
// Invoke callee // Invoke callee
@ -974,7 +972,7 @@ impl MessageProcessor {
rent: &Rent, rent: &Rent,
timings: &mut ExecuteDetailsTimings, timings: &mut ExecuteDetailsTimings,
updated_verify_policy: bool, updated_verify_policy: bool,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
// Verify all executable accounts have zero outstanding refs // Verify all executable accounts have zero outstanding refs
Self::verify_account_references(executable_accounts)?; Self::verify_account_references(executable_accounts)?;
@ -993,7 +991,7 @@ impl MessageProcessor {
let account = accounts[account_index].borrow(); let account = accounts[account_index].borrow();
pre_accounts[unique_index].verify( pre_accounts[unique_index].verify(
&program_id, &program_id,
message.is_writable(account_index, restore_write_lock_when_upgradeable), message.is_writable(account_index, demote_program_write_locks),
rent, rent,
&account, &account,
timings, timings,
@ -1025,7 +1023,7 @@ impl MessageProcessor {
caller_write_privileges: Option<&[bool]>, caller_write_privileges: Option<&[bool]>,
timings: &mut ExecuteDetailsTimings, timings: &mut ExecuteDetailsTimings,
updated_verify_policy: bool, updated_verify_policy: bool,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
// Verify the per-account instruction results // Verify the per-account instruction results
let (mut pre_sum, mut post_sum) = (0_u128, 0_u128); let (mut pre_sum, mut post_sum) = (0_u128, 0_u128);
@ -1036,7 +1034,7 @@ impl MessageProcessor {
let is_writable = if let Some(caller_write_privileges) = caller_write_privileges { let is_writable = if let Some(caller_write_privileges) = caller_write_privileges {
caller_write_privileges[account_index] caller_write_privileges[account_index]
} else { } else {
message.is_writable(account_index, restore_write_lock_when_upgradeable) message.is_writable(account_index, demote_program_write_locks)
}; };
// Find the matching PreAccount // Find the matching PreAccount
for pre_account in pre_accounts.iter_mut() { for pre_account in pre_accounts.iter_mut() {
@ -1132,14 +1130,14 @@ impl MessageProcessor {
account_db, account_db,
ancestors, ancestors,
); );
let restore_write_lock_when_upgradeable = let demote_program_write_locks =
invoke_context.is_feature_active(&restore_write_lock_when_upgradeable::id()); invoke_context.is_feature_active(&demote_program_write_locks::id());
let keyed_accounts = Self::create_keyed_accounts( let keyed_accounts = Self::create_keyed_accounts(
message, message,
instruction, instruction,
executable_accounts, executable_accounts,
accounts, accounts,
restore_write_lock_when_upgradeable, demote_program_write_locks,
); );
self.process_instruction( self.process_instruction(
program_id, program_id,
@ -1156,7 +1154,7 @@ impl MessageProcessor {
&rent_collector.rent, &rent_collector.rent,
timings, timings,
invoke_context.is_feature_active(&updated_verify_policy::id()), invoke_context.is_feature_active(&updated_verify_policy::id()),
restore_write_lock_when_upgradeable, demote_program_write_locks,
)?; )?;
timings.accumulate(&invoke_context.timings); timings.accumulate(&invoke_context.timings);
@ -2172,8 +2170,7 @@ mod tests {
let programs: Vec<(_, ProcessInstructionWithContext)> = let programs: Vec<(_, ProcessInstructionWithContext)> =
vec![(callee_program_id, mock_process_instruction)]; vec![(callee_program_id, mock_process_instruction)];
let feature_set = FeatureSet::all_enabled(); let feature_set = FeatureSet::all_enabled();
let restore_write_lock_when_upgradeable = let demote_program_write_locks = feature_set.is_active(&demote_program_write_locks::id());
feature_set.is_active(&restore_write_lock_when_upgradeable::id());
let ancestors = Ancestors::default(); let ancestors = Ancestors::default();
let mut invoke_context = ThisInvokeContext::new( let mut invoke_context = ThisInvokeContext::new(
@ -2212,7 +2209,7 @@ mod tests {
.account_keys .account_keys
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, _)| message.is_writable(i, restore_write_lock_when_upgradeable)) .map(|(i, _)| message.is_writable(i, demote_program_write_locks))
.collect::<Vec<bool>>(); .collect::<Vec<bool>>();
assert_eq!( assert_eq!(
MessageProcessor::process_cross_program_instruction( MessageProcessor::process_cross_program_instruction(
@ -2247,7 +2244,7 @@ mod tests {
.account_keys .account_keys
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, _)| message.is_writable(i, restore_write_lock_when_upgradeable)) .map(|(i, _)| message.is_writable(i, demote_program_write_locks))
.collect::<Vec<bool>>(); .collect::<Vec<bool>>();
assert_eq!( assert_eq!(
MessageProcessor::process_cross_program_instruction( MessageProcessor::process_cross_program_instruction(

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

@ -373,7 +373,7 @@ impl Message {
self.program_position(i).is_some() self.program_position(i).is_some()
} }
pub fn is_writable(&self, i: usize, restore_write_lock_when_upgradeable: bool) -> bool { pub fn is_writable(&self, i: usize, demote_program_write_locks: bool) -> bool {
(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
@ -384,7 +384,7 @@ impl Message {
sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key) sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key)
} }
&& (!self.is_key_called_as_program(i) && (!self.is_key_called_as_program(i)
|| (restore_write_lock_when_upgradeable && self.is_upgradeable_loader_present())) || (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 {
@ -393,12 +393,12 @@ impl Message {
pub fn get_account_keys_by_lock_type( pub fn get_account_keys_by_lock_type(
&self, &self,
restore_write_lock_when_upgradeable: bool, demote_program_write_locks: bool,
) -> (Vec<&Pubkey>, Vec<&Pubkey>) { ) -> (Vec<&Pubkey>, Vec<&Pubkey>) {
let mut writable_keys = vec![]; let mut writable_keys = vec![];
let mut readonly_keys = vec![]; let mut readonly_keys = vec![];
for (i, key) in self.account_keys.iter().enumerate() { for (i, key) in self.account_keys.iter().enumerate() {
if self.is_writable(i, restore_write_lock_when_upgradeable) { if self.is_writable(i, demote_program_write_locks) {
writable_keys.push(key); writable_keys.push(key);
} else { } else {
readonly_keys.push(key); readonly_keys.push(key);
@ -420,7 +420,7 @@ impl Message {
// 35..67 - program_id // 35..67 - program_id
// 67..69 - data len - u16 // 67..69 - data len - u16
// 69..data_len - data // 69..data_len - data
pub fn serialize_instructions(&self, restore_write_lock_when_upgradeable: bool) -> Vec<u8> { pub fn serialize_instructions(&self, demote_program_write_locks: bool) -> Vec<u8> {
// 64 bytes is a reasonable guess, calculating exactly is slower in benchmarks // 64 bytes is a reasonable guess, calculating exactly is slower in benchmarks
let mut data = Vec::with_capacity(self.instructions.len() * (32 * 2)); let mut data = Vec::with_capacity(self.instructions.len() * (32 * 2));
append_u16(&mut data, self.instructions.len() as u16); append_u16(&mut data, self.instructions.len() as u16);
@ -435,8 +435,7 @@ impl Message {
for account_index in &instruction.accounts { for account_index in &instruction.accounts {
let account_index = *account_index as usize; let account_index = *account_index as usize;
let is_signer = self.is_signer(account_index); let is_signer = self.is_signer(account_index);
let is_writable = let is_writable = self.is_writable(account_index, demote_program_write_locks);
self.is_writable(account_index, restore_write_lock_when_upgradeable);
let mut meta_byte = 0; let mut meta_byte = 0;
if is_signer { if is_signer {
meta_byte |= 1 << Self::IS_SIGNER_BIT; meta_byte |= 1 << Self::IS_SIGNER_BIT;
@ -881,13 +880,13 @@ mod tests {
recent_blockhash: Hash::default(), recent_blockhash: Hash::default(),
instructions: vec![], instructions: vec![],
}; };
let restore_write_lock_when_upgradeable = true; let demote_program_write_locks = true;
assert!(message.is_writable(0, restore_write_lock_when_upgradeable)); assert!(message.is_writable(0, demote_program_write_locks));
assert!(!message.is_writable(1, restore_write_lock_when_upgradeable)); assert!(!message.is_writable(1, demote_program_write_locks));
assert!(!message.is_writable(2, restore_write_lock_when_upgradeable)); assert!(!message.is_writable(2, demote_program_write_locks));
assert!(message.is_writable(3, restore_write_lock_when_upgradeable)); assert!(message.is_writable(3, demote_program_write_locks));
assert!(message.is_writable(4, restore_write_lock_when_upgradeable)); assert!(message.is_writable(4, demote_program_write_locks));
assert!(!message.is_writable(5, restore_write_lock_when_upgradeable)); assert!(!message.is_writable(5, demote_program_write_locks));
} }
#[test] #[test]
@ -915,7 +914,7 @@ mod tests {
Some(&id1), Some(&id1),
); );
assert_eq!( assert_eq!(
message.get_account_keys_by_lock_type(/*restore_write_lock_when_upgradeable=*/ true), message.get_account_keys_by_lock_type(/*demote_program_write_locks=*/ true),
(vec![&id1, &id0], vec![&id3, &id2, &program_id]) (vec![&id1, &id0], vec![&id3, &id2, &program_id])
); );
} }
@ -945,8 +944,7 @@ mod tests {
]; ];
let message = Message::new(&instructions, Some(&id1)); let message = Message::new(&instructions, Some(&id1));
let serialized = let serialized = message.serialize_instructions(/*demote_program_write_locks=*/ true);
message.serialize_instructions(/*restore_write_lock_when_upgradeable=*/ true);
for (i, instruction) in instructions.iter().enumerate() { for (i, instruction) in instructions.iter().enumerate() {
assert_eq!( assert_eq!(
Message::deserialize_instruction(i, &serialized).unwrap(), Message::deserialize_instruction(i, &serialized).unwrap(),
@ -967,8 +965,7 @@ mod tests {
]; ];
let message = Message::new(&instructions, Some(&id1)); let message = Message::new(&instructions, Some(&id1));
let serialized = let serialized = message.serialize_instructions(/*demote_program_write_locks=*/ true);
message.serialize_instructions(/*restore_write_lock_when_upgradeable=*/ true);
assert_eq!( assert_eq!(
Message::deserialize_instruction(instructions.len(), &serialized).unwrap_err(), Message::deserialize_instruction(instructions.len(), &serialized).unwrap_err(),
SanitizeError::IndexOutOfBounds, SanitizeError::IndexOutOfBounds,

7
sdk/src/feature_set.rs
View File

@ -174,10 +174,6 @@ pub mod stakes_remove_delegation_if_inactive {
solana_sdk::declare_id!("HFpdDDNQjvcXnXKec697HDDsyk6tFoWS2o8fkxuhQZpL"); solana_sdk::declare_id!("HFpdDDNQjvcXnXKec697HDDsyk6tFoWS2o8fkxuhQZpL");
} }
pub mod restore_write_lock_when_upgradeable {
solana_sdk::declare_id!("3Tye2iVqQTxprFSJNpyz5W6SjKNQVfRUDR2s3oVYS6h6");
}
lazy_static! { lazy_static! {
/// Map of feature identifiers to user-visible description /// Map of feature identifiers to user-visible description
pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [ pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@ -218,9 +214,8 @@ lazy_static! {
(libsecp256k1_0_5_upgrade_enabled::id(), "upgrade libsecp256k1 to v0.5.0"), (libsecp256k1_0_5_upgrade_enabled::id(), "upgrade libsecp256k1 to v0.5.0"),
(merge_nonce_error_into_system_error::id(), "merge NonceError into SystemError"), (merge_nonce_error_into_system_error::id(), "merge NonceError into SystemError"),
(spl_token_v2_set_authority_fix::id(), "spl-token set_authority fix"), (spl_token_v2_set_authority_fix::id(), "spl-token set_authority fix"),
(demote_program_write_locks::id(), "demote program write locks to readonly #19593"), (demote_program_write_locks::id(), "demote program write locks to readonly, except when upgradeable loader present #19593 #20263"),
(stakes_remove_delegation_if_inactive::id(), "remove delegations from stakes cache when inactive"), (stakes_remove_delegation_if_inactive::id(), "remove delegations from stakes cache when inactive"),
(restore_write_lock_when_upgradeable::id(), "restore program-id write lock when upgradeable loader present"),
/*************** ADD NEW FEATURES HERE ***************/ /*************** ADD NEW FEATURES HERE ***************/
] ]
.iter() .iter()

2
transaction-status/src/parse_accounts.rs
View File

@ -13,7 +13,7 @@ pub fn parse_accounts(message: &Message) -> Vec<ParsedAccount> {
for (i, account_key) in message.account_keys.iter().enumerate() { for (i, account_key) in message.account_keys.iter().enumerate() {
accounts.push(ParsedAccount { accounts.push(ParsedAccount {
pubkey: account_key.to_string(), pubkey: account_key.to_string(),
writable: message.is_writable(i, /*restore_write_lock_when_upgradeable=*/ true), writable: message.is_writable(i, /*demote_program_write_locks=*/ true),
signer: message.is_signer(i), signer: message.is_signer(i),
}); });
} }