deprecate: mark journal entry functions as deprecated

rakita · rakita · commit 3f86bfcbdd66 · 2026-01-28T19:19:22.000+01:00
Deprecate `nonce_bump_journal_entry` and `caller_accounting_journal_entry` functions in JournalTr trait and implementations. Closes #3365
diff --git a/crates/context/interface/src/journaled_state.rs b/crates/context/interface/src/journaled_state.rs
@@ -139,6 +139,7 @@ pub trait JournalTr {
     ) -> Option<TransferError>;
 
     /// Increments the balance of the account.
+    #[deprecated]
     fn caller_accounting_journal_entry(
         &mut self,
         address: Address,
@@ -154,6 +155,7 @@ pub trait JournalTr {
     ) -> Result<(), <Self::Database as Database>::Error>;
 
     /// Increments the nonce of the account.
+    #[deprecated]
     fn nonce_bump_journal_entry(&mut self, address: Address);
 
     /// Loads the account.
diff --git a/crates/context/src/journal.rs b/crates/context/src/journal.rs
@@ -225,6 +225,7 @@ impl<DB: Database, ENTRY: JournalEntryTr> JournalTr for Journal<DB, ENTRY> {
     }
 
     #[inline]
+    #[allow(deprecated)]
     fn caller_accounting_journal_entry(
         &mut self,
         address: Address,
@@ -248,6 +249,7 @@ impl<DB: Database, ENTRY: JournalEntryTr> JournalTr for Journal<DB, ENTRY> {
 
     /// Increments the nonce of the account.
     #[inline]
+    #[allow(deprecated)]
     fn nonce_bump_journal_entry(&mut self, address: Address) {
         self.inner.nonce_bump_journal_entry(address)
     }
diff --git a/crates/context/src/journal/inner.rs b/crates/context/src/journal/inner.rs
@@ -270,6 +270,7 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
 
     /// Add journal entry for caller accounting.
     #[inline]
+    #[deprecated]
     pub fn caller_accounting_journal_entry(
         &mut self,
         address: Address,
@@ -305,6 +306,7 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
 
     /// Increments the nonce of the account.
     #[inline]
+    #[deprecated]
     pub fn nonce_bump_journal_entry(&mut self, address: Address) {
         self.journal.push(ENTRY::nonce_bumped(address));
     }
diff --git a/examples/cheatcode_inspector/src/main.rs b/examples/cheatcode_inspector/src/main.rs
@@ -235,12 +235,14 @@ impl JournalTr for Backend {
         self.journaled_state.finalize()
     }
 
+    #[allow(deprecated)]
     fn caller_accounting_journal_entry(
         &mut self,
         address: Address,
         old_balance: U256,
         bump_nonce: bool,
     ) {
+        #[allow(deprecated)]
         self.journaled_state
             .caller_accounting_journal_entry(address, old_balance, bump_nonce)
     }
@@ -253,7 +255,9 @@ impl JournalTr for Backend {
         self.journaled_state.balance_incr(address, balance)
     }
 
+    #[allow(deprecated)]
     fn nonce_bump_journal_entry(&mut self, address: Address) {
+        #[allow(deprecated)]
         self.journaled_state.nonce_bump_journal_entry(address)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ impl<DB: Database, ENTRY: JournalEntryTr> JournalTr for Journal<DB, ENTRY> {`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`#[inline]`
	`228`	`+ #[allow(deprecated)]`
`228`	`229`	`fn caller_accounting_journal_entry(`
`229`	`230`	`&mut self,`
`230`	`231`	`address: Address,`
`@@ -248,6 +249,7 @@ impl<DB: Database, ENTRY: JournalEntryTr> JournalTr for Journal<DB, ENTRY> {`
`248`	`249`
`249`	`250`	`/// Increments the nonce of the account.`
`250`	`251`	`#[inline]`
	`252`	`+ #[allow(deprecated)]`
`251`	`253`	`fn nonce_bump_journal_entry(&mut self, address: Address) {`
`252`	`254`	`self.inner.nonce_bump_journal_entry(address)`
`253`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,12 +235,14 @@ impl JournalTr for Backend {`
`235`	`235`	`self.journaled_state.finalize()`
`236`	`236`	`}`
`237`	`237`
	`238`	`+ #[allow(deprecated)]`
`238`	`239`	`fn caller_accounting_journal_entry(`
`239`	`240`	`&mut self,`
`240`	`241`	`address: Address,`
`241`	`242`	`old_balance: U256,`
`242`	`243`	`bump_nonce: bool,`
`243`	`244`	`) {`
	`245`	`+ #[allow(deprecated)]`
`244`	`246`	`self.journaled_state`
`245`	`247`	`.caller_accounting_journal_entry(address, old_balance, bump_nonce)`
`246`	`248`	`}`
`@@ -253,7 +255,9 @@ impl JournalTr for Backend {`
`253`	`255`	`self.journaled_state.balance_incr(address, balance)`
`254`	`256`	`}`
`255`	`257`
	`258`	`+ #[allow(deprecated)]`
`256`	`259`	`fn nonce_bump_journal_entry(&mut self, address: Address) {`
	`260`	`+ #[allow(deprecated)]`
`257`	`261`	`self.journaled_state.nonce_bump_journal_entry(address)`
`258`	`262`	`}`
`259`	`263`