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

Remove feature switch for demoting sysvar write locks (#18373)

Browse Source
This commit is contained in:
Justin Starry
2021-07-06 16:22:22 -05:00
committed by GitHub
parent 5dd399dafa
commit 100fabf469
12 changed files with 71 additions and 186 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, /*demote_sysvar_write_locks=*/ true) { if message.is_writable(index) {
"w" // comment for consistent rust fmt (no joking; lol) "w" // comment for consistent rust fmt (no joking; lol)
} else { } else {
"-" "-"

3
core/src/cost_model.rs
View File

@ -27,7 +27,6 @@ pub const ACCOUNT_MAX_COST: u64 = 100_000_000;
pub const BLOCK_MAX_COST: u64 = 2_500_000_000; pub const BLOCK_MAX_COST: u64 = 2_500_000_000;
const MAX_WRITABLE_ACCOUNTS: usize = 256; const MAX_WRITABLE_ACCOUNTS: usize = 256;
const DEMOTE_SYSVAR_WRITE_LOCKS: bool = true;
// cost of transaction is made of account_access_cost and instruction execution_cost // cost of transaction is made of account_access_cost and instruction execution_cost
// where // where
@ -97,7 +96,7 @@ impl CostModel {
let message = transaction.message(); let message = transaction.message();
message.account_keys.iter().enumerate().for_each(|(i, k)| { message.account_keys.iter().enumerate().for_each(|(i, k)| {
let is_signer = message.is_signer(i); let is_signer = message.is_signer(i);
let is_writable = message.is_writable(i, DEMOTE_SYSVAR_WRITE_LOCKS); let is_writable = message.is_writable(i);
if is_signer && is_writable { if is_signer && is_writable {
self.transaction_cost.writable_accounts.push(*k); self.transaction_cost.writable_accounts.push(*k);

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

@ -19,7 +19,6 @@ use {
clock::{Clock, Slot}, clock::{Clock, Slot},
entrypoint::{ProgramResult, SUCCESS}, entrypoint::{ProgramResult, SUCCESS},
epoch_schedule::EpochSchedule, epoch_schedule::EpochSchedule,
feature_set::demote_sysvar_write_locks,
fee_calculator::{FeeCalculator, FeeRateGovernor}, fee_calculator::{FeeCalculator, FeeRateGovernor},
genesis_config::{ClusterType, GenesisConfig}, genesis_config::{ClusterType, GenesisConfig},
hash::Hash, hash::Hash,
@ -259,14 +258,12 @@ 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 demote_sysvar_write_locks =
invoke_context.is_feature_active(&demote_sysvar_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, demote_sysvar_write_locks)) .map(|(i, _)| message.is_writable(i))
.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());
@ -337,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, (pubkey, account)) in accounts.iter().enumerate().take(message.account_keys.len()) { for (i, (pubkey, account)) in accounts.iter().enumerate().take(message.account_keys.len()) {
if !message.is_writable(i, true) { if !message.is_writable(i) {
continue; continue;
} }
for account_info in account_infos { for account_info in account_infos {

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

@ -19,9 +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::{
blake3_syscall_enabled, cpi_data_cost, demote_sysvar_write_locks, blake3_syscall_enabled, cpi_data_cost, enforce_aligned_host_addrs,
enforce_aligned_host_addrs, keccak256_syscall_enabled, memory_ops_syscalls, keccak256_syscall_enabled, memory_ops_syscalls, sysvar_via_syscall, update_data_on_realloc,
sysvar_via_syscall, update_data_on_realloc,
}, },
hash::{Hasher, HASH_BYTES}, hash::{Hasher, HASH_BYTES},
ic_msg, ic_msg,
@ -2187,14 +2186,7 @@ fn call<'a>(
signers_seeds_len: u64, signers_seeds_len: u64,
memory_mapping: &MemoryMapping, memory_mapping: &MemoryMapping,
) -> Result<u64, EbpfError<BpfError>> { ) -> Result<u64, EbpfError<BpfError>> {
let ( let (message, executables, accounts, account_refs, caller_write_privileges) = {
message,
executables,
accounts,
account_refs,
caller_write_privileges,
demote_sysvar_write_locks,
) = {
let invoke_context = syscall.get_context()?; let invoke_context = syscall.get_context()?;
invoke_context invoke_context
@ -2285,7 +2277,6 @@ fn call<'a>(
accounts, accounts,
account_refs, account_refs,
caller_write_privileges, caller_write_privileges,
invoke_context.is_feature_active(&demote_sysvar_write_locks::id()),
) )
}; };
@ -2311,7 +2302,7 @@ fn call<'a>(
for (i, ((_key, account), account_ref)) in accounts.iter().zip(account_refs).enumerate() { for (i, ((_key, 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, demote_sysvar_write_locks) && !account.executable() { if message.is_writable(i) && !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() {

5
rpc/src/transaction_status_service.rs
View File

@ -110,9 +110,8 @@ 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) = transaction let (writable_keys, readonly_keys) =
.message transaction.message.get_account_keys_by_lock_type();
.get_account_keys_by_lock_type(bank.demote_sysvar_write_locks());
let inner_instructions = inner_instructions.map(|inner_instructions| { let inner_instructions = inner_instructions.map(|inner_instructions| {
inner_instructions inner_instructions

88
runtime/src/accounts.rs
View File

@ -178,11 +178,8 @@ impl Accounts {
false false
} }
fn construct_instructions_account( fn construct_instructions_account(message: &Message) -> AccountSharedData {
message: &Message, let mut data = message.serialize_instructions();
demote_sysvar_write_locks: bool,
) -> AccountSharedData {
let mut data = message.serialize_instructions(demote_sysvar_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 {
@ -211,8 +208,6 @@ impl Accounts {
let mut tx_rent: TransactionRent = 0; let mut tx_rent: TransactionRent = 0;
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 demote_sysvar_write_locks =
feature_set.is_active(&feature_set::demote_sysvar_write_locks::id());
let mut key_check = MessageProgramIdsCache::new(message); let mut key_check = MessageProgramIdsCache::new(message);
let mut rent_debits = RentDebits::default(); let mut rent_debits = RentDebits::default();
for (i, key) in message.account_keys.iter().enumerate() { for (i, key) in message.account_keys.iter().enumerate() {
@ -224,16 +219,16 @@ 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())
{ {
if message.is_writable(i, demote_sysvar_write_locks) { if message.is_writable(i) {
return Err(TransactionError::InvalidAccountIndex); return Err(TransactionError::InvalidAccountIndex);
} }
Self::construct_instructions_account(message, demote_sysvar_write_locks) Self::construct_instructions_account(message)
} else { } else {
let (account, rent) = self let (account, rent) = self
.accounts_db .accounts_db
.load_with_fixed_root(ancestors, key) .load_with_fixed_root(ancestors, key)
.map(|(mut account, _)| { .map(|(mut account, _)| {
if message.is_writable(i, demote_sysvar_write_locks) { if message.is_writable(i) {
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)
@ -862,11 +857,7 @@ impl Accounts {
/// same time /// same time
#[must_use] #[must_use]
#[allow(clippy::needless_collect)] #[allow(clippy::needless_collect)]
pub fn lock_accounts<'a>( pub fn lock_accounts<'a>(&self, txs: impl Iterator<Item = &'a Transaction>) -> Vec<Result<()>> {
&self,
txs: impl Iterator<Item = &'a Transaction>,
demote_sysvar_write_locks: bool,
) -> Vec<Result<()>> {
use solana_sdk::sanitize::Sanitize; use solana_sdk::sanitize::Sanitize;
let keys: Vec<Result<_>> = txs let keys: Vec<Result<_>> = txs
.map(|tx| { .map(|tx| {
@ -876,9 +867,7 @@ impl Accounts {
return Err(TransactionError::AccountLoadedTwice); return Err(TransactionError::AccountLoadedTwice);
} }
Ok(tx Ok(tx.message().get_account_keys_by_lock_type())
.message()
.get_account_keys_by_lock_type(demote_sysvar_write_locks))
}) })
.collect(); .collect();
let mut account_locks = &mut self.account_locks.lock().unwrap(); let mut account_locks = &mut self.account_locks.lock().unwrap();
@ -898,7 +887,6 @@ impl Accounts {
&self, &self,
txs: impl Iterator<Item = &'a Transaction>, txs: impl Iterator<Item = &'a Transaction>,
results: &[Result<()>], results: &[Result<()>],
demote_sysvar_write_locks: bool,
) { ) {
let keys: Vec<_> = txs let keys: Vec<_> = txs
.zip(results) .zip(results)
@ -906,10 +894,7 @@ impl Accounts {
Err(TransactionError::AccountInUse) => None, Err(TransactionError::AccountInUse) => None,
Err(TransactionError::SanitizeFailure) => None, Err(TransactionError::SanitizeFailure) => None,
Err(TransactionError::AccountLoadedTwice) => None, Err(TransactionError::AccountLoadedTwice) => None,
_ => Some( _ => Some(tx.message.get_account_keys_by_lock_type()),
tx.message
.get_account_keys_by_lock_type(demote_sysvar_write_locks),
),
}) })
.collect(); .collect();
let mut account_locks = self.account_locks.lock().unwrap(); let mut account_locks = self.account_locks.lock().unwrap();
@ -931,7 +916,6 @@ impl Accounts {
rent_collector: &RentCollector, rent_collector: &RentCollector,
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,
demote_sysvar_write_locks: bool,
) { ) {
let accounts_to_store = self.collect_accounts_to_store( let accounts_to_store = self.collect_accounts_to_store(
txs, txs,
@ -940,7 +924,6 @@ impl Accounts {
rent_collector, rent_collector,
last_blockhash_with_fee_calculator, last_blockhash_with_fee_calculator,
fix_recent_blockhashes_sysvar_delay, fix_recent_blockhashes_sysvar_delay,
demote_sysvar_write_locks,
); );
self.accounts_db.store_cached(slot, &accounts_to_store); self.accounts_db.store_cached(slot, &accounts_to_store);
} }
@ -965,7 +948,6 @@ impl Accounts {
rent_collector: &RentCollector, rent_collector: &RentCollector,
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,
demote_sysvar_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() {
@ -1009,7 +991,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, demote_sysvar_write_locks) if message.is_writable(i)
&& (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)))
{ {
@ -1774,10 +1756,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( let results0 = accounts.lock_accounts([tx.clone()].iter());
[tx.clone()].iter(),
true, // demote_sysvar_write_locks
);
assert!(results0[0].is_ok()); assert!(results0[0].is_ok());
assert_eq!( assert_eq!(
@ -1812,10 +1791,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( let results1 = accounts.lock_accounts(txs.iter());
txs.iter(),
true, // demote_sysvar_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
@ -1830,16 +1806,8 @@ mod tests {
2 2
); );
accounts.unlock_accounts( accounts.unlock_accounts([tx].iter(), &results0);
[tx].iter(), accounts.unlock_accounts(txs.iter(), &results1);
&results0,
true, // demote_sysvar_write_locks
);
accounts.unlock_accounts(
txs.iter(),
&results1,
true, // demote_sysvar_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,
@ -1850,10 +1818,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( let results2 = accounts.lock_accounts([tx].iter());
[tx].iter(),
true, // demote_sysvar_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
@ -1922,20 +1887,13 @@ mod tests {
let exit_clone = exit_clone.clone(); let exit_clone = exit_clone.clone();
loop { loop {
let txs = vec![writable_tx.clone()]; let txs = vec![writable_tx.clone()];
let results = accounts_clone.clone().lock_accounts( let results = accounts_clone.clone().lock_accounts(txs.iter());
txs.iter(),
true, // demote_sysvar_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);
txs.iter(),
&results,
true, // demote_sysvar_write_locks
);
if exit_clone.clone().load(Ordering::Relaxed) { if exit_clone.clone().load(Ordering::Relaxed) {
break; break;
} }
@ -1944,20 +1902,13 @@ mod tests {
let counter_clone = counter; let counter_clone = counter;
for _ in 0..5 { for _ in 0..5 {
let txs = vec![readonly_tx.clone()]; let txs = vec![readonly_tx.clone()];
let results = accounts_arc.clone().lock_accounts( let results = accounts_arc.clone().lock_accounts(txs.iter());
txs.iter(),
true, // demote_sysvar_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( accounts_arc.unlock_accounts(txs.iter(), &results);
txs.iter(),
&results,
true, // demote_sysvar_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);
@ -2054,7 +2005,6 @@ mod tests {
&rent_collector, &rent_collector,
&(Hash::default(), FeeCalculator::default()), &(Hash::default(), FeeCalculator::default()),
true, true,
true, // demote_sysvar_write_locks
); );
assert_eq!(collected_accounts.len(), 2); assert_eq!(collected_accounts.len(), 2);
assert!(collected_accounts assert!(collected_accounts
@ -2431,7 +2381,6 @@ mod tests {
&rent_collector, &rent_collector,
&(next_blockhash, FeeCalculator::default()), &(next_blockhash, FeeCalculator::default()),
true, true,
true, // demote_sysvar_write_locks
); );
assert_eq!(collected_accounts.len(), 2); assert_eq!(collected_accounts.len(), 2);
assert_eq!( assert_eq!(
@ -2548,7 +2497,6 @@ mod tests {
&rent_collector, &rent_collector,
&(next_blockhash, FeeCalculator::default()), &(next_blockhash, FeeCalculator::default()),
true, true,
true, // demote_sysvar_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

37
runtime/src/bank.rs
View File

@ -2590,20 +2590,15 @@ impl Bank {
tick_height % self.ticks_per_slot == 0 tick_height % self.ticks_per_slot == 0
} }
pub fn demote_sysvar_write_locks(&self) -> bool {
self.feature_set
.is_active(&feature_set::demote_sysvar_write_locks::id())
}
pub fn prepare_batch<'a, 'b>( pub fn prepare_batch<'a, 'b>(
&'a self, &'a self,
txs: impl Iterator<Item = &'b Transaction>, txs: impl Iterator<Item = &'b Transaction>,
) -> TransactionBatch<'a, 'b> { ) -> TransactionBatch<'a, 'b> {
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
hashed_txs.as_transactions_iter(), .rc
self.demote_sysvar_write_locks(), .accounts
); .lock_accounts(hashed_txs.as_transactions_iter());
TransactionBatch::new(lock_results, self, Cow::Owned(hashed_txs)) TransactionBatch::new(lock_results, self, Cow::Owned(hashed_txs))
} }
@ -2611,10 +2606,10 @@ impl Bank {
&'a self, &'a self,
hashed_txs: &'b [HashedTransaction], hashed_txs: &'b [HashedTransaction],
) -> TransactionBatch<'a, 'b> { ) -> TransactionBatch<'a, 'b> {
let lock_results = self.rc.accounts.lock_accounts( let lock_results = self
hashed_txs.as_transactions_iter(), .rc
self.demote_sysvar_write_locks(), .accounts
); .lock_accounts(hashed_txs.as_transactions_iter());
TransactionBatch::new(lock_results, self, Cow::Borrowed(hashed_txs)) TransactionBatch::new(lock_results, self, Cow::Borrowed(hashed_txs))
} }
@ -2693,11 +2688,9 @@ impl Bank {
pub fn unlock_accounts(&self, batch: &mut TransactionBatch) { pub fn unlock_accounts(&self, batch: &mut TransactionBatch) {
if batch.needs_unlock { if batch.needs_unlock {
batch.needs_unlock = false; batch.needs_unlock = false;
self.rc.accounts.unlock_accounts( self.rc
batch.transactions_iter(), .accounts
batch.lock_results(), .unlock_accounts(batch.transactions_iter(), batch.lock_results())
self.demote_sysvar_write_locks(),
)
} }
} }
@ -3417,7 +3410,6 @@ impl Bank {
&self.rent_collector, &self.rent_collector,
&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.demote_sysvar_write_locks(),
); );
let rent_debits = self.collect_rent(executed, loaded_txs); let rent_debits = self.collect_rent(executed, loaded_txs);
@ -7714,13 +7706,14 @@ pub(crate) mod tests {
assert_eq!(bank.get_balance(&sysvar_pubkey), 1); assert_eq!(bank.get_balance(&sysvar_pubkey), 1);
bank.transfer(500, &mint_keypair, &normal_pubkey).unwrap(); bank.transfer(500, &mint_keypair, &normal_pubkey).unwrap();
bank.transfer(500, &mint_keypair, &sysvar_pubkey).unwrap(); bank.transfer(500, &mint_keypair, &sysvar_pubkey)
.unwrap_err();
assert_eq!(bank.get_balance(&normal_pubkey), 500); assert_eq!(bank.get_balance(&normal_pubkey), 500);
assert_eq!(bank.get_balance(&sysvar_pubkey), 501); assert_eq!(bank.get_balance(&sysvar_pubkey), 1);
let bank = Arc::new(new_from_parent(&bank)); let bank = Arc::new(new_from_parent(&bank));
assert_eq!(bank.get_balance(&normal_pubkey), 500); assert_eq!(bank.get_balance(&normal_pubkey), 500);
assert_eq!(bank.get_balance(&sysvar_pubkey), 501); assert_eq!(bank.get_balance(&sysvar_pubkey), 1);
} }
#[test] #[test]

38
runtime/src/message_processor.rs
View File

@ -9,7 +9,7 @@ use solana_sdk::{
account::{AccountSharedData, ReadableAccount, WritableAccount}, account::{AccountSharedData, ReadableAccount, WritableAccount},
account_utils::StateMut, account_utils::StateMut,
bpf_loader_upgradeable::{self, UpgradeableLoaderState}, bpf_loader_upgradeable::{self, UpgradeableLoaderState},
feature_set::{demote_sysvar_write_locks, instructions_sysvar_enabled, FeatureSet}, feature_set::{instructions_sysvar_enabled, FeatureSet},
ic_logger_msg, ic_msg, ic_logger_msg, ic_msg,
instruction::{CompiledInstruction, Instruction, InstructionError}, instruction::{CompiledInstruction, Instruction, InstructionError},
keyed_account::{create_keyed_accounts_unified, keyed_account_at_index, KeyedAccount}, keyed_account::{create_keyed_accounts_unified, keyed_account_at_index, KeyedAccount},
@ -299,7 +299,6 @@ impl<'a> ThisInvokeContext<'a> {
instruction, instruction,
executable_accounts, executable_accounts,
accounts, accounts,
feature_set.is_active(&demote_sysvar_write_locks::id()),
); );
let mut invoke_context = Self { let mut invoke_context = Self {
invoke_stack: Vec::with_capacity(bpf_compute_budget.max_invoke_depth), invoke_stack: Vec::with_capacity(bpf_compute_budget.max_invoke_depth),
@ -410,7 +409,6 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
&self.rent, &self.rent,
caller_write_privileges, caller_write_privileges,
&mut self.timings, &mut self.timings,
self.feature_set.is_active(&demote_sysvar_write_locks::id()),
logger, logger,
) )
} }
@ -613,7 +611,6 @@ impl MessageProcessor {
instruction: &'a CompiledInstruction, instruction: &'a CompiledInstruction,
executable_accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)], executable_accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)], accounts: &'a [(Pubkey, Rc<RefCell<AccountSharedData>>)],
demote_sysvar_write_locks: bool,
) -> Vec<(bool, bool, &'a Pubkey, &'a RefCell<AccountSharedData>)> { ) -> Vec<(bool, bool, &'a Pubkey, &'a RefCell<AccountSharedData>)> {
executable_accounts executable_accounts
.iter() .iter()
@ -622,7 +619,7 @@ impl MessageProcessor {
let index = *index as usize; let index = *index as usize;
( (
message.is_signer(index), message.is_signer(index),
message.is_writable(index, demote_sysvar_write_locks), message.is_writable(index),
&accounts[index].0, &accounts[index].0,
&accounts[index].1 as &RefCell<AccountSharedData>, &accounts[index].1 as &RefCell<AccountSharedData>,
) )
@ -759,7 +756,6 @@ impl MessageProcessor {
accounts, accounts,
keyed_account_indices_reordered, keyed_account_indices_reordered,
caller_write_privileges, caller_write_privileges,
demote_sysvar_write_locks,
) = { ) = {
let invoke_context = invoke_context.borrow(); let invoke_context = invoke_context.borrow();
@ -852,7 +848,6 @@ impl MessageProcessor {
accounts, accounts,
keyed_account_indices_reordered, keyed_account_indices_reordered,
caller_write_privileges, caller_write_privileges,
invoke_context.is_feature_active(&demote_sysvar_write_locks::id()),
) )
}; };
@ -877,9 +872,7 @@ impl MessageProcessor {
{ {
let dst_keyed_account = &keyed_accounts[dst_keyed_account_index]; let dst_keyed_account = &keyed_accounts[dst_keyed_account_index];
let src_keyed_account = account.borrow(); let src_keyed_account = account.borrow();
if message.is_writable(src_keyed_account_index, demote_sysvar_write_locks) if message.is_writable(src_keyed_account_index) && !src_keyed_account.executable() {
&& !src_keyed_account.executable()
{
if dst_keyed_account.data_len()? != src_keyed_account.data().len() if dst_keyed_account.data_len()? != src_keyed_account.data().len()
&& dst_keyed_account.data_len()? != 0 && dst_keyed_account.data_len()? != 0
{ {
@ -928,13 +921,8 @@ impl MessageProcessor {
)?; )?;
// Construct keyed accounts // Construct keyed accounts
let keyed_accounts = Self::create_keyed_accounts( let keyed_accounts =
message, Self::create_keyed_accounts(message, instruction, executable_accounts, accounts);
instruction,
executable_accounts,
accounts,
invoke_context.is_feature_active(&demote_sysvar_write_locks::id()),
);
// Invoke callee // Invoke callee
invoke_context.push(program_id, &keyed_accounts)?; invoke_context.push(program_id, &keyed_accounts)?;
@ -1006,7 +994,6 @@ impl MessageProcessor {
accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)], accounts: &[(Pubkey, Rc<RefCell<AccountSharedData>>)],
rent: &Rent, rent: &Rent,
timings: &mut ExecuteDetailsTimings, timings: &mut ExecuteDetailsTimings,
demote_sysvar_write_locks: bool,
logger: Rc<RefCell<dyn Logger>>, logger: Rc<RefCell<dyn Logger>>,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
// Verify all executable accounts have zero outstanding refs // Verify all executable accounts have zero outstanding refs
@ -1028,7 +1015,7 @@ impl MessageProcessor {
pre_accounts[unique_index] pre_accounts[unique_index]
.verify( .verify(
program_id, program_id,
message.is_writable(account_index, demote_sysvar_write_locks), message.is_writable(account_index),
rent, rent,
&account, &account,
timings, timings,
@ -1068,7 +1055,6 @@ impl MessageProcessor {
rent: &Rent, rent: &Rent,
caller_write_privileges: Option<&[bool]>, caller_write_privileges: Option<&[bool]>,
timings: &mut ExecuteDetailsTimings, timings: &mut ExecuteDetailsTimings,
demote_sysvar_write_locks: bool,
logger: Rc<RefCell<dyn Logger>>, logger: Rc<RefCell<dyn Logger>>,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
// Verify the per-account instruction results // Verify the per-account instruction results
@ -1079,7 +1065,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, demote_sysvar_write_locks) message.is_writable(account_index)
}; };
// Find the matching PreAccount // Find the matching PreAccount
for pre_account in pre_accounts.iter_mut() { for pre_account in pre_accounts.iter_mut() {
@ -1137,7 +1123,6 @@ impl MessageProcessor {
feature_set: Arc<FeatureSet>, feature_set: Arc<FeatureSet>,
bpf_compute_budget: BpfComputeBudget, bpf_compute_budget: BpfComputeBudget,
timings: &mut ExecuteDetailsTimings, timings: &mut ExecuteDetailsTimings,
demote_sysvar_write_locks: bool,
account_db: Arc<Accounts>, account_db: Arc<Accounts>,
ancestors: &Ancestors, ancestors: &Ancestors,
) -> Result<(), InstructionError> { ) -> Result<(), InstructionError> {
@ -1182,7 +1167,6 @@ impl MessageProcessor {
accounts, accounts,
&rent_collector.rent, &rent_collector.rent,
timings, timings,
demote_sysvar_write_locks,
invoke_context.get_logger(), invoke_context.get_logger(),
)?; )?;
@ -1211,7 +1195,6 @@ impl MessageProcessor {
account_db: Arc<Accounts>, account_db: Arc<Accounts>,
ancestors: &Ancestors, ancestors: &Ancestors,
) -> Result<(), TransactionError> { ) -> Result<(), TransactionError> {
let demote_sysvar_write_locks = feature_set.is_active(&demote_sysvar_write_locks::id());
for (instruction_index, instruction) in message.instructions.iter().enumerate() { for (instruction_index, instruction) in message.instructions.iter().enumerate() {
let mut time = Measure::start("execute_instruction"); let mut time = Measure::start("execute_instruction");
let instruction_recorder = instruction_recorders let instruction_recorder = instruction_recorders
@ -1231,7 +1214,6 @@ impl MessageProcessor {
feature_set.clone(), feature_set.clone(),
bpf_compute_budget, bpf_compute_budget,
timings, timings,
demote_sysvar_write_locks,
account_db.clone(), account_db.clone(),
ancestors, ancestors,
) )
@ -2249,13 +2231,11 @@ mod tests {
); );
// not owned account modified by the caller (before the invoke) // not owned account modified by the caller (before the invoke)
let demote_sysvar_write_locks =
invoke_context.is_feature_active(&demote_sysvar_write_locks::id());
let caller_write_privileges = message let caller_write_privileges = message
.account_keys .account_keys
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, _)| message.is_writable(i, demote_sysvar_write_locks)) .map(|(i, _)| message.is_writable(i))
.collect::<Vec<bool>>(); .collect::<Vec<bool>>();
accounts[0].1.borrow_mut().data_as_mut_slice()[0] = 1; accounts[0].1.borrow_mut().data_as_mut_slice()[0] = 1;
assert_eq!( assert_eq!(
@ -2310,7 +2290,7 @@ mod tests {
.account_keys .account_keys
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, _)| message.is_writable(i, demote_sysvar_write_locks)) .map(|(i, _)| message.is_writable(i))
.collect::<Vec<bool>>(); .collect::<Vec<bool>>();
assert_eq!( assert_eq!(
MessageProcessor::process_cross_program_instruction( MessageProcessor::process_cross_program_instruction(

12
sdk/benches/serialize_instructions.rs
View File

@ -27,9 +27,7 @@ fn bench_manual_instruction_serialize(b: &mut Bencher) {
let instructions = make_instructions(); let instructions = make_instructions();
let message = Message::new(&instructions, None); let message = Message::new(&instructions, None);
b.iter(|| { b.iter(|| {
test::black_box(message.serialize_instructions( test::black_box(message.serialize_instructions());
true, // demote_sysvar_write_locks
));
}); });
} }
@ -46,9 +44,7 @@ fn bench_bincode_instruction_deserialize(b: &mut Bencher) {
fn bench_manual_instruction_deserialize(b: &mut Bencher) { fn bench_manual_instruction_deserialize(b: &mut Bencher) {
let instructions = make_instructions(); let instructions = make_instructions();
let message = Message::new(&instructions, None); let message = Message::new(&instructions, None);
let serialized = message.serialize_instructions( let serialized = message.serialize_instructions();
true, // demote_sysvar_write_locks
);
b.iter(|| { b.iter(|| {
for i in 0..instructions.len() { for i in 0..instructions.len() {
test::black_box(instructions::load_instruction_at(i, &serialized).unwrap()); test::black_box(instructions::load_instruction_at(i, &serialized).unwrap());
@ -60,9 +56,7 @@ fn bench_manual_instruction_deserialize(b: &mut Bencher) {
fn bench_manual_instruction_deserialize_single(b: &mut Bencher) { fn bench_manual_instruction_deserialize_single(b: &mut Bencher) {
let instructions = make_instructions(); let instructions = make_instructions();
let message = Message::new(&instructions, None); let message = Message::new(&instructions, None);
let serialized = message.serialize_instructions( let serialized = message.serialize_instructions();
true, // demote_sysvar_write_locks
);
b.iter(|| { b.iter(|| {
test::black_box(instructions::load_instruction_at(3, &serialized).unwrap()); test::black_box(instructions::load_instruction_at(3, &serialized).unwrap());
}); });

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

@ -391,7 +391,7 @@ impl Message {
self.program_position(i).is_some() self.program_position(i).is_some()
} }
pub fn is_writable(&self, i: usize, demote_sysvar_write_locks: bool) -> bool { pub fn is_writable(&self, i: usize) -> 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
@ -399,8 +399,7 @@ impl Message {
- self.header.num_readonly_unsigned_accounts as usize)) - self.header.num_readonly_unsigned_accounts as usize))
&& !{ && !{
let key = self.account_keys[i]; let key = self.account_keys[i];
demote_sysvar_write_locks sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key)
&& (sysvar::is_sysvar_id(&key) || BUILTIN_PROGRAMS_KEYS.contains(&key))
} }
} }
@ -408,14 +407,11 @@ impl Message {
i < self.header.num_required_signatures as usize i < self.header.num_required_signatures as usize
} }
pub fn get_account_keys_by_lock_type( pub fn get_account_keys_by_lock_type(&self) -> (Vec<&Pubkey>, Vec<&Pubkey>) {
&self,
demote_sysvar_write_locks: bool,
) -> (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, demote_sysvar_write_locks) { if self.is_writable(i) {
writable_keys.push(key); writable_keys.push(key);
} else { } else {
readonly_keys.push(key); readonly_keys.push(key);
@ -437,7 +433,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, demote_sysvar_write_locks: bool) -> Vec<u8> { pub fn serialize_instructions(&self) -> 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);
@ -452,7 +448,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 = self.is_writable(account_index, demote_sysvar_write_locks); let is_writable = self.is_writable(account_index);
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;
@ -891,13 +887,12 @@ mod tests {
recent_blockhash: Hash::default(), recent_blockhash: Hash::default(),
instructions: vec![], instructions: vec![],
}; };
let demote_sysvar_write_locks = true; assert!(message.is_writable(0));
assert!(message.is_writable(0, demote_sysvar_write_locks)); assert!(!message.is_writable(1));
assert!(!message.is_writable(1, demote_sysvar_write_locks)); assert!(!message.is_writable(2));
assert!(!message.is_writable(2, demote_sysvar_write_locks)); assert!(message.is_writable(3));
assert!(message.is_writable(3, demote_sysvar_write_locks)); assert!(message.is_writable(4));
assert!(message.is_writable(4, demote_sysvar_write_locks)); assert!(!message.is_writable(5));
assert!(!message.is_writable(5, demote_sysvar_write_locks));
} }
#[test] #[test]
@ -925,9 +920,7 @@ mod tests {
Some(&id1), Some(&id1),
); );
assert_eq!( assert_eq!(
message.get_account_keys_by_lock_type( message.get_account_keys_by_lock_type(),
true, // demote_sysvar_write_locks
),
(vec![&id1, &id0], vec![&id3, &id2, &program_id]) (vec![&id1, &id0], vec![&id3, &id2, &program_id])
); );
} }
@ -957,9 +950,7 @@ mod tests {
]; ];
let message = Message::new(&instructions, Some(&id1)); let message = Message::new(&instructions, Some(&id1));
let serialized = message.serialize_instructions( let serialized = message.serialize_instructions();
true, // demote_sysvar_write_locks
);
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(),
@ -980,9 +971,7 @@ mod tests {
]; ];
let message = Message::new(&instructions, Some(&id1)); let message = Message::new(&instructions, Some(&id1));
let serialized = message.serialize_instructions( let serialized = message.serialize_instructions();
true, // demote_sysvar_write_locks
);
assert_eq!( assert_eq!(
Message::deserialize_instruction(instructions.len(), &serialized).unwrap_err(), Message::deserialize_instruction(instructions.len(), &serialized).unwrap_err(),
SanitizeError::IndexOutOfBounds, SanitizeError::IndexOutOfBounds,

5
sdk/src/feature_set.rs
View File

@ -103,10 +103,6 @@ pub mod upgradeable_close_instruction {
solana_sdk::declare_id!("FsPaByos3gA9bUEhp3EimQpQPCoSvCEigHod496NmABQ"); solana_sdk::declare_id!("FsPaByos3gA9bUEhp3EimQpQPCoSvCEigHod496NmABQ");
} }
pub mod demote_sysvar_write_locks {
solana_sdk::declare_id!("86LJYRuq2zgtHuL3FccR6hqFJQMQkFoun4knAxcPiF1P");
}
pub mod sysvar_via_syscall { pub mod sysvar_via_syscall {
solana_sdk::declare_id!("7411E6gFQLDhQkdRjmpXwM1hzHMMoYQUjHicmvGPC1Nf"); solana_sdk::declare_id!("7411E6gFQLDhQkdRjmpXwM1hzHMMoYQUjHicmvGPC1Nf");
} }
@ -177,7 +173,6 @@ lazy_static! {
(require_stake_for_gossip::id(), "require stakes for propagating crds values through gossip #15561"), (require_stake_for_gossip::id(), "require stakes for propagating crds values through gossip #15561"),
(cpi_data_cost::id(), "charge the compute budget for data passed via CPI"), (cpi_data_cost::id(), "charge the compute budget for data passed via CPI"),
(upgradeable_close_instruction::id(), "close upgradeable buffer accounts"), (upgradeable_close_instruction::id(), "close upgradeable buffer accounts"),
(demote_sysvar_write_locks::id(), "demote builtins and sysvar write locks to readonly #15497"),
(sysvar_via_syscall::id(), "provide sysvars via syscalls"), (sysvar_via_syscall::id(), "provide sysvars via syscalls"),
(enforce_aligned_host_addrs::id(), "enforce aligned host addresses"), (enforce_aligned_host_addrs::id(), "enforce aligned host addresses"),
(update_data_on_realloc::id(), "Retain updated data values modified after realloc via CPI"), (update_data_on_realloc::id(), "Retain updated data values modified after realloc via CPI"),

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, /*demote_sysvar_write_locks=*/ true), writable: message.is_writable(i),
signer: message.is_signer(i), signer: message.is_signer(i),
}); });
} }