Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions category/execution/ethereum/dispatch_transaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ Result<Receipt> dispatch_transaction(
BlockHeader const &header, BlockHashBuffer const &block_hash_buffer,
BlockState &block_state, BlockMetrics &block_metrics,
boost::fibers::promise<void> &prev, CallTracerBase &call_tracer,
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx)
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx,
bool const trace_transfers)
{
return ExecuteTransaction<traits>{
chain,
Expand All @@ -42,7 +43,8 @@ Result<Receipt> dispatch_transaction(
prev,
call_tracer,
state_tracer,
chain_ctx}();
chain_ctx,
trace_transfers}();
}

EXPLICIT_EVM_TRAITS(dispatch_transaction)
Expand Down
3 changes: 2 additions & 1 deletion category/execution/ethereum/dispatch_transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Result<Receipt> dispatch_transaction(
BlockHeader const &header, BlockHashBuffer const &block_hash_buffer,
BlockState &block_state, BlockMetrics &block_metrics,
boost::fibers::promise<void> &prev, CallTracerBase &call_tracer,
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx);
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx,
bool trace_transfers = false);

MONAD_NAMESPACE_END
13 changes: 8 additions & 5 deletions category/execution/ethereum/execute_block.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ Result<std::vector<Receipt>> execute_block_transactions(
fiber::FiberGroup &priority_pool, BlockMetrics &block_metrics,
std::span<std::unique_ptr<CallTracerBase>> const call_tracers,
std::span<std::unique_ptr<trace::StateTracer>> const state_tracers,
ChainContext<traits> const &chain_ctx)
ChainContext<traits> const &chain_ctx, bool const trace_transfers)
{
MONAD_ASSERT(senders.size() == transactions.size());
MONAD_ASSERT(senders.size() == call_tracers.size());
Expand Down Expand Up @@ -234,7 +234,8 @@ Result<std::vector<Receipt>> execute_block_transactions(
&block_metrics,
&call_tracer = *call_tracers[i],
&state_tracer = *state_tracers[i],
&chain_ctx = chain_ctx] {
&chain_ctx = chain_ctx,
trace_transfers = trace_transfers] {
record_txn_marker_event(MONAD_EXEC_TXN_PERF_EVM_ENTER, i);
try {
results[i] = dispatch_transaction<traits>(
Expand All @@ -250,7 +251,8 @@ Result<std::vector<Receipt>> execute_block_transactions(
promises[i],
call_tracer,
state_tracer,
chain_ctx);
chain_ctx,
trace_transfers);
if (results[i]->has_error()) {
record_txn_error_event(i, results[i]->error());
}
Expand Down Expand Up @@ -304,7 +306,7 @@ Result<std::vector<Receipt>> execute_block(
fiber::FiberGroup &priority_pool, BlockMetrics &block_metrics,
std::span<std::unique_ptr<CallTracerBase>> const call_tracers,
std::span<std::unique_ptr<trace::StateTracer>> const state_tracers,
ChainContext<traits> const &chain_ctx)
ChainContext<traits> const &chain_ctx, bool const trace_transfers)
{
TRACE_BLOCK_EVENT(StartBlock);

Expand All @@ -328,7 +330,8 @@ Result<std::vector<Receipt>> execute_block(
block_metrics,
call_tracers,
state_tracers,
chain_ctx));
chain_ctx,
trace_transfers));

State state{
block_state, Incarnation{block.header.number, Incarnation::LAST_TX}};
Expand Down
4 changes: 2 additions & 2 deletions category/execution/ethereum/execute_block.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Result<std::vector<Receipt>> execute_block_transactions(
BlockState &, BlockHashBuffer const &, fiber::FiberGroup &, BlockMetrics &,
std::span<std::unique_ptr<CallTracerBase>>,
std::span<std::unique_ptr<trace::StateTracer>> state_tracers,
ChainContext<traits> const &chain_ctx);
ChainContext<traits> const &chain_ctx, bool trace_transfers = false);

template <Traits traits>
Result<std::vector<Receipt>> execute_block(
Expand All @@ -66,7 +66,7 @@ Result<std::vector<Receipt>> execute_block(
BlockState &, BlockHashBuffer const &, fiber::FiberGroup &, BlockMetrics &,
std::span<std::unique_ptr<CallTracerBase>>,
std::span<std::unique_ptr<trace::StateTracer>> state_tracers,
ChainContext<traits> const &chain_ctx);
ChainContext<traits> const &chain_ctx, bool trace_transfers = false);

std::vector<std::optional<Address>>
recover_senders(std::span<Transaction const>, fiber::PriorityPool &);
Expand Down
7 changes: 5 additions & 2 deletions category/execution/ethereum/execute_transaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@ ExecuteTransaction<traits>::ExecuteTransaction(
BlockHeader const &header, BlockHashBuffer const &block_hash_buffer,
BlockState &block_state, BlockMetrics &block_metrics,
boost::fibers::promise<void> &prev, CallTracerBase &call_tracer,
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx)
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx,
bool const trace_transfers)
: ExecuteTransactionNoValidation<
traits>{chain, tx, sender, authorities, header}
, i_{i}
Expand All @@ -302,6 +303,7 @@ ExecuteTransaction<traits>::ExecuteTransaction(
, prev_{prev}
, call_tracer_{call_tracer}
, state_tracer_{state_tracer}
, trace_transfers_{trace_transfers}
{
record_txn_header_events(static_cast<uint32_t>(i), tx, sender, authorities);
}
Expand Down Expand Up @@ -336,7 +338,8 @@ Result<evmc::Result> ExecuteTransaction<traits>::execute_impl2(State &state)
tx_,
header_.base_fee_per_gas,
i_,
chain_ctx_};
chain_ctx_,
trace_transfers_};

return ExecuteTransactionNoValidation<traits>::operator()(state, host);
}
Expand Down
4 changes: 3 additions & 1 deletion category/execution/ethereum/execute_transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class ExecuteTransaction : public ExecuteTransactionNoValidation<traits>
boost::fibers::promise<void> &prev_;
CallTracerBase &call_tracer_;
trace::StateTracer &state_tracer_;
bool trace_transfers_;

Result<evmc::Result> execute_impl2(State &);
Receipt execute_final(State &, evmc::Result const &);
Expand All @@ -92,7 +93,8 @@ class ExecuteTransaction : public ExecuteTransactionNoValidation<traits>
std::span<std::optional<Address> const>, BlockHeader const &,
BlockHashBuffer const &, BlockState &, BlockMetrics &,
boost::fibers::promise<void> &prev, CallTracerBase &,
trace::StateTracer &, ChainContext<traits> const &chain_ctx);
trace::StateTracer &, ChainContext<traits> const &chain_ctx,
bool trace_transfers = false);
~ExecuteTransaction() = default;

Result<Receipt> operator()();
Expand Down
6 changes: 4 additions & 2 deletions category/execution/monad/dispatch_transaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ Result<Receipt> dispatch_transaction(
BlockHeader const &header, BlockHashBuffer const &block_hash_buffer,
BlockState &block_state, BlockMetrics &block_metrics,
boost::fibers::promise<void> &prev, CallTracerBase &call_tracer,
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx)
trace::StateTracer &state_tracer, ChainContext<traits> const &chain_ctx,
bool const trace_transfers)
{
if (traits::monad_rev() >= MONAD_FOUR && sender == SYSTEM_SENDER) {
// System transactions is a concept used in Monad for consensus to
Expand Down Expand Up @@ -61,7 +62,8 @@ Result<Receipt> dispatch_transaction(
prev,
call_tracer,
state_tracer,
chain_ctx}();
chain_ctx,
trace_transfers}();
}
}

Expand Down
3 changes: 2 additions & 1 deletion category/execution/monad/dispatch_transaction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Result<Receipt> dispatch_transaction(
BlockHeader const &header, BlockHashBuffer const &block_hash_buffer,
BlockState &block_state, BlockMetrics &block_metrics,
boost::fibers::promise<void> &prev, CallTracerBase &call_tracer,
trace::StateTracer &, ChainContext<traits> const &chain_ctx);
trace::StateTracer &, ChainContext<traits> const &chain_ctx,
bool trace_transfers);

MONAD_NAMESPACE_END
Loading
Loading