refactor: JournalTr, JournalOutput, op only using revm crate

bins/revme/Cargo.toml

@@ -10,7 +10,7 @@ repository.workspace = true
 
 [dependencies]
 # revm
-revm = { workspace = true, features = ["std", "hashbrown", "c-kzg", "blst"] }
+revm = { workspace = true, features = ["std", "hashbrown", "c-kzg", "blst", "serde-json"] }
 primitives.workspace = true
 database.workspace = true
 database-interface.workspace = true

crates/context/interface/src/context.rs

@@ -1,5 +1,5 @@
 pub use crate::journaled_state::StateLoad;
-use crate::{Block, Cfg, Database, Journal, Transaction};
+use crate::{Block, Cfg, Database, JournalTr, Transaction};
 use auto_impl::auto_impl;
 use primitives::U256;
 
@@ -9,7 +9,7 @@ pub trait ContextTr {
     type Tx: Transaction;
     type Cfg: Cfg;
     type Db: Database;
-    type Journal: Journal<Database = Self::Db>;
+    type Journal: JournalTr<Database = Self::Db>;
     type Chain;
 
     fn tx(&self) -> &Self::Tx;

crates/context/interface/src/journaled_state.rs

@@ -8,7 +8,7 @@ use state::{
     Account, Bytecode,
 };
 
-pub trait Journal {
+pub trait JournalTr {
     type Database: Database;
     type FinalOutput;
 
@@ -177,7 +177,7 @@ pub trait Journal {
 
     /// Does cleanup and returns modified state.
     ///
-    /// This resets the [Journal] to its initial state.
+    /// This resets the [JournalTr] to its initial state.
     fn finalize(&mut self) -> Self::FinalOutput;
 }
 

crates/context/interface/src/lib.rs

@@ -16,5 +16,5 @@ pub use block::Block;
 pub use cfg::{Cfg, CreateScheme, TransactTo};
 pub use context::ContextTr;
 pub use database_interface::{DBErrorMarker, Database};
-pub use journaled_state::Journal;
+pub use journaled_state::JournalTr;
 pub use transaction::{Transaction, TransactionType};

crates/context/src/context.rs

@@ -1,5 +1,5 @@
-use crate::{block::BlockEnv, cfg::CfgEnv, journaled_state::JournaledState, tx::TxEnv};
-use context_interface::{Block, Cfg, ContextTr, Journal, Transaction};
+use crate::{block::BlockEnv, cfg::CfgEnv, journaled_state::Journal, tx::TxEnv};
+use context_interface::{Block, Cfg, ContextTr, JournalTr, Transaction};
 use database_interface::{Database, EmptyDB};
 use derive_where::derive_where;
 use specification::hardfork::SpecId;
@@ -11,7 +11,7 @@ pub struct Context<
     TX = TxEnv,
     CFG = CfgEnv,
     DB: Database = EmptyDB,
-    JOURNAL: Journal<Database = DB> = JournaledState<DB>,
+    JOURNAL: JournalTr<Database = DB> = Journal<DB>,
     CHAIN = (),
 > {
     /// Block information.
@@ -33,7 +33,7 @@ impl<
         TX: Transaction,
         DB: Database,
         CFG: Cfg,
-        JOURNAL: Journal<Database = DB>,
+        JOURNAL: JournalTr<Database = DB>,
         CHAIN,
     > ContextTr for Context<BLOCK, TX, CFG, DB, JOURNAL, CHAIN>
 {
@@ -91,7 +91,7 @@ impl<
         BLOCK: Block + Default,
         TX: Transaction + Default,
         DB: Database,
-        JOURNAL: Journal<Database = DB>,
+        JOURNAL: JournalTr<Database = DB>,
         CHAIN: Default,
     > Context<BLOCK, TX, CfgEnv, DB, JOURNAL, CHAIN>
 {
@@ -118,9 +118,9 @@ where
     TX: Transaction,
     CFG: Cfg,
     DB: Database,
-    JOURNAL: Journal<Database = DB>,
+    JOURNAL: JournalTr<Database = DB>,
 {
-    pub fn with_new_journal<OJOURNAL: Journal<Database = DB>>(
+    pub fn with_new_journal<OJOURNAL: JournalTr<Database = DB>>(
         self,
         mut journal: OJOURNAL,
     ) -> Context<BLOCK, TX, CFG, DB, OJOURNAL, CHAIN> {
@@ -139,9 +139,9 @@ where
     pub fn with_db<ODB: Database>(
         self,
         db: ODB,
-    ) -> Context<BLOCK, TX, CFG, ODB, JournaledState<ODB>, CHAIN> {
+    ) -> Context<BLOCK, TX, CFG, ODB, Journal<ODB>, CHAIN> {
         let spec = self.cfg.spec().into();
-        let mut journaled_state = JournaledState::new(spec, db);
+        let mut journaled_state = Journal::new(spec, db);
         journaled_state.set_spec_id(spec);
         Context {
             tx: self.tx,