Skip to content

chore: remove State bound from JournalTr in Handler::Evm #2715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rakita merged 1 commit into from
Jul 15, 2025
Merged

chore: remove State bound from JournalTr in Handler::Evm #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions crates/handler/src/handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use context_interface::{
use interpreter::interpreter_action::FrameInit;
use interpreter::{Gas, InitialAndFloorGas, SharedMemory};
use primitives::U256;
use state::EvmState;

/// Trait for errors that can occur during EVM execution.
///
Expand Down Expand Up @@ -68,7 +67,7 @@ impl<
pub trait Handler {
/// The EVM type containing Context, Instruction, and Precompiles implementations.
type Evm: EvmTr<
Context: ContextTr<Journal: JournalTr<State = EvmState>, Local: LocalContextTr>,
Context: ContextTr<Journal: JournalTr, Local: LocalContextTr>,
Frame: FrameTr<FrameInit = FrameInit, FrameResult = FrameResult>,
>;
/// The error type returned by this handler.
Expand Down
3 changes: 1 addition & 2 deletions crates/handler/src/post_execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use context_interface::{
};
use interpreter::{Gas, InitialAndFloorGas, SuccessOrHalt};
use primitives::{hardfork::SpecId, U256};
use state::EvmState;

/// Ensures minimum gas floor is spent according to EIP-7623.
pub fn eip7623_check_gas_floor(gas: &mut Gas, init_and_floor_gas: InitialAndFloorGas) {
Expand Down Expand Up @@ -80,7 +79,7 @@ pub fn reward_beneficiary<CTX: ContextTr>(
/// Calculate last gas spent and transform internal reason to external.
///
/// TODO make Journal FinalOutput more generic.
pub fn output<CTX: ContextTr<Journal: JournalTr<State = EvmState>>, HALTREASON: HaltReasonTr>(
pub fn output<CTX: ContextTr<Journal: JournalTr>, HALTREASON: HaltReasonTr>(
context: &mut CTX,
// TODO, make this more generic and nice.
// FrameResult should be a generic that returns gas and interpreter result.
Expand Down
Loading