Skip to content

Commit ed45362

Browse files
committed
fix tests
1 parent e9af0dc commit ed45362

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

crates/op-revm/src/handler.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,8 @@ where
439439

440440
let old_balance = acc.info.balance;
441441

442+
// decrement transaction id as it was incremented when we discarded the tx.
443+
acc.transaction_id -= acc.transaction_id;
442444
acc.info.nonce = acc.info.nonce.saturating_add(1);
443445
acc.info.balance = acc
444446
.info

crates/state/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl Account {
121121
self.status.contains(AccountStatus::SelfDestructedLocal)
122122
}
123123

124-
/// Selfdestruct the account by clearing its storage and reseting its account info
124+
/// Selfdestruct the account by clearing its storage and resetting its account info
125125
#[inline]
126126
pub fn selfdestruct(&mut self) {
127127
self.storage.clear();
@@ -261,13 +261,13 @@ bitflags! {
261261
/// Account status flags. Generated by bitflags crate.
262262
///
263263
/// With multi transaction feature there is a need to have both global and local fields.
264-
/// Global accross multiple transaction and local accross one transaction execution.
264+
/// Global across multiple transaction and local across one transaction execution.
265265
///
266266
/// Empty state without any flags set represent account that is loaded from db but not interacted with.
267267
///
268268
/// `Touched` flag is used by database to check if account is potentially changed in some way.
269-
/// Additionaly, after EIP-161 touch on empty-existing account would remove this account from state
270-
/// after transaction execution ends. Touch can span accross multiple transactions as it is needed
269+
/// Additionally, after EIP-161 touch on empty-existing account would remove this account from state
270+
/// after transaction execution ends. Touch can span across multiple transactions as it is needed
271271
/// to be marked only once so it is safe to have only one global flag.
272272
/// Only first touch have different behaviour from others, and touch in first transaction will invalidate
273273
/// touch functionality in next transactions.
@@ -286,7 +286,7 @@ bitflags! {
286286
/// Additionally if account is loaded in second tx, storage and account that was destroyed in first tx needs to be cleared.
287287
///
288288
/// `LoadedAsNotExisting` is used to mark account as loaded from database but with `balance == 0 && nonce == 0 && code = 0x`.
289-
/// This flag is fine to span accross multiple transactions as it interucts with `Touched` flag this is used in global scope.
289+
/// This flag is fine to span across multiple transactions as it interucts with `Touched` flag this is used in global scope.
290290
///
291291
/// `CreatedLocal`, `SelfdestructedLocal` and `Cold` flags are reset on first account loading of local scope.
292292
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -303,7 +303,7 @@ bitflags! {
303303
/// If account is marked for self destruction.
304304
const SelfDestructedLocal = 0b01000000;
305305
/// Only when account is marked as touched we will save it to database.
306-
/// Additionaly first touch on empty existing account (After EIP-161) will mark it
306+
/// Additionally first touch on empty existing account (After EIP-161) will mark it
307307
/// for removal from state after transaction execution.
308308
const Touched = 0b00000100;
309309
/// used only for pre spurious dragon hardforks where existing and empty were two separate states.

0 commit comments

Comments
 (0)