Clean up `leave_nonce_on_success` feature (#26447)
Clean up leave_nonce_on_success feature
This commit is contained in:
parent
ff1e6fcbed
commit
f4718be22f
|
@ -1191,7 +1191,6 @@ impl Accounts {
|
||||||
rent_collector: &RentCollector,
|
rent_collector: &RentCollector,
|
||||||
durable_nonce: &DurableNonce,
|
durable_nonce: &DurableNonce,
|
||||||
lamports_per_signature: u64,
|
lamports_per_signature: u64,
|
||||||
leave_nonce_on_success: bool,
|
|
||||||
) {
|
) {
|
||||||
let (accounts_to_store, txn_signatures) = self.collect_accounts_to_store(
|
let (accounts_to_store, txn_signatures) = self.collect_accounts_to_store(
|
||||||
txs,
|
txs,
|
||||||
|
@ -1200,7 +1199,6 @@ impl Accounts {
|
||||||
rent_collector,
|
rent_collector,
|
||||||
durable_nonce,
|
durable_nonce,
|
||||||
lamports_per_signature,
|
lamports_per_signature,
|
||||||
leave_nonce_on_success,
|
|
||||||
);
|
);
|
||||||
self.accounts_db
|
self.accounts_db
|
||||||
.store_cached((slot, &accounts_to_store[..]), Some(&txn_signatures));
|
.store_cached((slot, &accounts_to_store[..]), Some(&txn_signatures));
|
||||||
|
@ -1227,7 +1225,6 @@ impl Accounts {
|
||||||
rent_collector: &RentCollector,
|
rent_collector: &RentCollector,
|
||||||
durable_nonce: &DurableNonce,
|
durable_nonce: &DurableNonce,
|
||||||
lamports_per_signature: u64,
|
lamports_per_signature: u64,
|
||||||
leave_nonce_on_success: bool,
|
|
||||||
) -> (
|
) -> (
|
||||||
Vec<(&'a Pubkey, &'a AccountSharedData)>,
|
Vec<(&'a Pubkey, &'a AccountSharedData)>,
|
||||||
Vec<Option<&'a Signature>>,
|
Vec<Option<&'a Signature>>,
|
||||||
|
@ -1247,17 +1244,10 @@ impl Accounts {
|
||||||
};
|
};
|
||||||
|
|
||||||
let maybe_nonce = match (execution_status, &*nonce) {
|
let maybe_nonce = match (execution_status, &*nonce) {
|
||||||
(Ok(()), Some(nonce)) => {
|
(Ok(_), _) => None, // Success, don't do any additional nonce processing
|
||||||
if leave_nonce_on_success {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some((nonce, false /* rollback */))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
(Err(_), Some(nonce)) => {
|
(Err(_), Some(nonce)) => {
|
||||||
Some((nonce, true /* rollback */))
|
Some((nonce, true /* rollback */))
|
||||||
}
|
}
|
||||||
(Ok(_), None) => None, // Success, don't do any additional nonce processing
|
|
||||||
(Err(_), None) => {
|
(Err(_), None) => {
|
||||||
// Fees for failed transactions which don't use durable nonces are
|
// Fees for failed transactions which don't use durable nonces are
|
||||||
// deducted in Bank::filter_program_errors_and_collect_fee
|
// deducted in Bank::filter_program_errors_and_collect_fee
|
||||||
|
@ -3005,7 +2995,6 @@ mod tests {
|
||||||
&rent_collector,
|
&rent_collector,
|
||||||
&DurableNonce::default(),
|
&DurableNonce::default(),
|
||||||
0,
|
0,
|
||||||
true, // leave_nonce_on_success
|
|
||||||
);
|
);
|
||||||
assert_eq!(collected_accounts.len(), 2);
|
assert_eq!(collected_accounts.len(), 2);
|
||||||
assert!(collected_accounts
|
assert!(collected_accounts
|
||||||
|
@ -3489,7 +3478,6 @@ mod tests {
|
||||||
&rent_collector,
|
&rent_collector,
|
||||||
&durable_nonce,
|
&durable_nonce,
|
||||||
0,
|
0,
|
||||||
true, // leave_nonce_on_success
|
|
||||||
);
|
);
|
||||||
assert_eq!(collected_accounts.len(), 2);
|
assert_eq!(collected_accounts.len(), 2);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
@ -3604,7 +3592,6 @@ mod tests {
|
||||||
&rent_collector,
|
&rent_collector,
|
||||||
&durable_nonce,
|
&durable_nonce,
|
||||||
0,
|
0,
|
||||||
true, // leave_nonce_on_success
|
|
||||||
);
|
);
|
||||||
assert_eq!(collected_accounts.len(), 1);
|
assert_eq!(collected_accounts.len(), 1);
|
||||||
let collected_nonce_account = collected_accounts
|
let collected_nonce_account = collected_accounts
|
||||||
|
|
|
@ -4929,7 +4929,6 @@ impl Bank {
|
||||||
&self.rent_collector,
|
&self.rent_collector,
|
||||||
&durable_nonce,
|
&durable_nonce,
|
||||||
lamports_per_signature,
|
lamports_per_signature,
|
||||||
self.leave_nonce_on_success(),
|
|
||||||
);
|
);
|
||||||
let rent_debits = self.collect_rent(&execution_results, loaded_txs);
|
let rent_debits = self.collect_rent(&execution_results, loaded_txs);
|
||||||
|
|
||||||
|
@ -7267,11 +7266,6 @@ impl Bank {
|
||||||
.is_active(&feature_set::credits_auto_rewind::id())
|
.is_active(&feature_set::credits_auto_rewind::id())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn leave_nonce_on_success(&self) -> bool {
|
|
||||||
self.feature_set
|
|
||||||
.is_active(&feature_set::leave_nonce_on_success::id())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn send_to_tpu_vote_port_enabled(&self) -> bool {
|
pub fn send_to_tpu_vote_port_enabled(&self) -> bool {
|
||||||
self.feature_set
|
self.feature_set
|
||||||
.is_active(&feature_set::send_to_tpu_vote_port::id())
|
.is_active(&feature_set::send_to_tpu_vote_port::id())
|
||||||
|
|
Loading…
Reference in New Issue