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

Revert "Add simulation detection countermeasure (backport #22880) (#23143)" (#23262)

Browse Source 
This reverts commit 0fdbec9735.
This commit is contained in:
Tyera Eulberg
2022-02-21 13:38:40 -07:00
committed by GitHub
parent 08d6b9850d
commit 68d846c7a9
11 changed files with 195 additions and 2904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/src/accounts.rs
View File

@ -198,16 +198,9 @@ impl Accounts {
}
}
pub fn new_from_parent(
parent: &Accounts,
slot: Slot,
parent_slot: Slot,
simulation_bank: bool,
) -> Self {
pub fn new_from_parent(parent: &Accounts, slot: Slot, parent_slot: Slot) -> Self {
let accounts_db = parent.accounts_db.clone();
if !simulation_bank {
accounts_db.set_hash(slot, parent_slot);
}
accounts_db.set_hash(slot, parent_slot);
Self {
accounts_db,
account_locks: Mutex::new(AccountLocks::default()),

61
runtime/src/bank.rs
View File

@ -1021,18 +1021,6 @@ pub trait DropCallback: fmt::Debug {
fn clone_box(&self) -> Box<dyn DropCallback + Send + Sync>;
}
/// Noop callback on dropping banks is useful for simulation banks, which are
/// new banks created from a frozen bank, but should not be purged in the same
/// way.
#[derive(Debug, Clone)]
struct NoopDropCallback;
impl DropCallback for NoopDropCallback {
fn callback(&self, _b: &Bank) {}
fn clone_box(&self) -> Box<dyn DropCallback + Send + Sync> {
Box::new(self.clone())
}
}
#[derive(Debug, PartialEq, Serialize, Deserialize, AbiExample, Clone, Copy)]
pub struct RewardInfo {
pub reward_type: RewardType,
@ -1251,7 +1239,6 @@ struct LoadVoteAndStakeAccountsResult {
#[derive(Debug, Default)]
pub struct NewBankOptions {
pub vote_only_bank: bool,
pub simulation_bank: bool,
}
impl Bank {
@ -1522,10 +1509,7 @@ impl Bank {
new_bank_options: NewBankOptions,
) -> Self {
let mut time = Measure::start("bank::new_from_parent");
let NewBankOptions {
vote_only_bank,
simulation_bank,
} = new_bank_options;
let NewBankOptions { vote_only_bank } = new_bank_options;
parent.freeze();
assert_ne!(slot, parent.slot());
@ -1539,7 +1523,6 @@ impl Bank {
&parent.rc.accounts,
slot,
parent.slot(),
simulation_bank,
)),
parent: RwLock::new(Some(parent.clone())),
slot,
@ -1629,20 +1612,6 @@ impl Bank {
let (feature_set, feature_set_time) =
Measure::this(|_| parent.feature_set.clone(), (), "feature_set_creation");
let drop_callback = if simulation_bank {
RwLock::new(OptionalDropCallback(Some(Box::new(NoopDropCallback))))
} else {
RwLock::new(OptionalDropCallback(
parent
.drop_callback
.read()
.unwrap()
.0
.as_ref()
.map(|drop_callback| drop_callback.clone_box()),
))
};
let mut new = Bank {
rc,
src,
@ -1696,7 +1665,15 @@ impl Bank {
transaction_log_collector_config,
transaction_log_collector: Arc::new(RwLock::new(TransactionLogCollector::default())),
feature_set,
drop_callback,
drop_callback: RwLock::new(OptionalDropCallback(
parent
.drop_callback
.read()
.unwrap()
.0
.as_ref()
.map(|drop_callback| drop_callback.clone_box()),
)),
freeze_started: AtomicBool::new(false),
cost_tracker: RwLock::new(CostTracker::default()),
sysvar_cache: RwLock::new(SysvarCache::default()),
@ -3503,26 +3480,12 @@ impl Bank {
/// Run transactions against a frozen bank without committing the results
pub fn simulate_transaction(
self: &Arc<Bank>,
&self,
transaction: SanitizedTransaction,
) -> TransactionSimulationResult {
assert!(self.is_frozen(), "simulation bank must be frozen");
// Simulation detection countermeasure 1: Create a new child bank for the simulation. This
// ensures comparing the slot values between the Clock and SlotHistory sysvars does not
// reveal that the program is running in simulation.
//
// Reference: https://opcodes.fr/en/publications/2022-01/detecting-transaction-simulation/
let bank = Bank::new_from_parent_with_options(
self,
&Pubkey::default(),
self.slot().saturating_add(1),
NewBankOptions {
simulation_bank: true,
..NewBankOptions::default()
},
);
bank.simulate_transaction_unchecked(transaction)
self.simulate_transaction_unchecked(transaction)
}
/// Run transactions against a bank without committing the results; does not check if the bank