Skip to content
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

rpcdaemon: fix ots_traceTransaction #2043

Merged
merged 17 commits into from
May 29, 2024
Merged

rpcdaemon: fix ots_traceTransaction #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3bca2db
update rpc-test tag to 0.22.0
lupin012 May 24, 2024
b1a1339
update rpc-test tag to 0.22.1
lupin012 May 24, 2024
8886fb7
update rpc-test tag to 0.23.0
lupin012 May 24, 2024
6884e7e
fix_ots_getInternalOperation
lupin012 May 25, 2024
8975ce9
add output field, insert entry for any depth,..
lupin012 May 28, 2024
3284bd2
add stack and refactory to run previous transactions
lupin012 May 28, 2024
97d0322
fix on pre-compile
lupin012 May 28, 2024
69e991e
add empty input
lupin012 May 28, 2024
21f17c9
make fmt
web-flow May 28, 2024
af8bf0b
input set to 0x
lupin012 May 28, 2024
7bc5a56
CREATE with input code, output null in self destruct
lupin012 May 28, 2024
0f2bdeb
make fmt
web-flow May 28, 2024
aec47d1
Merge branch 'master' into fix_on_ots_traceTransaction
lupin012 May 28, 2024
d35742d
remove unused variable
lupin012 May 28, 2024
36c4df5
.
lupin012 May 28, 2024
5fc668e
add current_depth var
lupin012 May 28, 2024
5feb477
make fmt
web-flow May 28, 2024
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
168 changes: 99 additions & 69 deletions silkworm/rpc/core/evm_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,16 @@ void to_json(nlohmann::json& json, const TraceEntry& trace_entry) {
} else {
json["value"] = trace_entry.value;
}
json["input"] = trace_entry.input;
if (!trace_entry.input) {
json["input"] = nullptr;
} else {
json["input"] = *trace_entry.input;
}
if (!trace_entry.output) {
json["output"] = nullptr;
} else {
json["output"] = *trace_entry.output;
}
}

void to_json(nlohmann::json& json, const InternalOperation& trace_operation) {
Expand Down Expand Up @@ -471,7 +480,7 @@ void copy_memory(const evmone::Memory& memory, std::optional<TraceMemory>& trace
tm.data = "0x";
const auto data = memory.data();
const auto start = tm.offset;
for (uint64_t idx{0}; idx < tm.len; idx++) {
for (size_t idx{0}; idx < tm.len; idx++) {
std::string entry{evmc::hex({data + start + idx, 1})};
tm.data.append(entry);
}
Expand Down Expand Up @@ -1154,7 +1163,7 @@ Task<std::vector<Trace>> TraceCallExecutor::trace_block(const BlockWithHash& blo
.state_diff = false,
};
const auto trace_call_results = co_await trace_block_transactions(block_with_hash.block, trace_block_config);
for (std::uint64_t pos = 0; pos < trace_call_results.size(); pos++) {
for (size_t pos = 0; pos < trace_call_results.size(); pos++) {
rpc::Transaction transaction{block_with_hash.block.transactions[pos]};
const auto tnx_hash = transaction.hash();

Expand Down Expand Up @@ -1282,7 +1291,7 @@ Task<std::vector<TraceCallResult>> TraceCallExecutor::trace_block_transactions(c
EVMExecutor executor{*chain_config_ptr, workers_, curr_state};

std::vector<TraceCallResult> trace_call_result(transactions.size());
for (std::uint64_t index = 0; index < transactions.size(); index++) {
for (size_t index = 0; index < transactions.size(); index++) {
const silkworm::Transaction& transaction{block.transactions[index]};

auto& result = trace_call_result.at(index);
Expand Down Expand Up @@ -1349,7 +1358,7 @@ Task<TraceManyCallResult> TraceCallExecutor::trace_calls(const silkworm::Block&
std::shared_ptr<silkworm::EvmTracer> ibs_tracer = std::make_shared<trace::IntraBlockStateTracer>(state_addresses);

TraceManyCallResult result;
for (std::size_t index{0}; index < calls.size(); index++) {
for (size_t index{0}; index < calls.size(); index++) {
const auto& config = calls[index].trace_config;

silkworm::Transaction transaction{calls[index].call.to_transaction()};
Expand Down Expand Up @@ -1412,7 +1421,7 @@ Task<TraceDeployResult> TraceCallExecutor::trace_deploy_transaction(const silkwo

auto create_tracer = std::make_shared<trace::CreateTracer>(contract_address, initial_ibs);
Tracers tracers{create_tracer};
for (std::uint64_t index = 0; index < transactions.size(); index++) {
for (size_t index = 0; index < transactions.size(); index++) {
const silkworm::Transaction& transaction{block.transactions[index]};
executor.call(block, transaction, tracers, /*refund=*/true, /*gas_bailout=*/true);
executor.reset();
Expand Down Expand Up @@ -1451,8 +1460,24 @@ Task<std::vector<Trace>> TraceCallExecutor::trace_transaction(const BlockWithHas
co_return traces;
}

bool TraceCallExecutor::run_previous_transactions(EVMExecutor& executor, const silkworm::Block& block, uint64_t tx_id) {
if (tx_id == 0) {
return true;
}
for (size_t idx = 0; idx < block.transactions.size(); idx++) {
const auto& txn = block.transactions.at(idx);

if (tx_id == idx) {
return true;
}
executor.call(block, txn, {}, /*refund=*/true, /*gas_bailout=*/false);
}
return false;
}

Task<TraceEntriesResult> TraceCallExecutor::trace_transaction_entries(const TransactionWithBlock& transaction_with_block) {
auto block_number = transaction_with_block.block_with_hash->block.header.number;
const auto& block = transaction_with_block.block_with_hash->block;
const auto block_number = block.header.number;

const auto chain_config_ptr = co_await chain_storage_.read_chain_config();
ensure(chain_config_ptr.has_value(), "cannot read chain config");
Expand All @@ -1464,10 +1489,16 @@ Task<TraceEntriesResult> TraceCallExecutor::trace_transaction_entries(const Tran
auto curr_state = tx_.create_state(current_executor, database_reader_, chain_storage_, block_number - 1);
EVMExecutor executor{*chain_config_ptr, workers_, curr_state};

auto entry_tracer = std::make_shared<trace::EntryTracer>(initial_ibs);
if (!run_previous_transactions(executor, block, transaction_with_block.transaction.transaction_index)) {
SILK_ERROR << "trace_operations: transaction idx: " << transaction_with_block.transaction.transaction_index << " not found";
return {};
}

const auto entry_tracer = std::make_shared<trace::EntryTracer>(initial_ibs);
Tracers tracers{entry_tracer};
const auto& txn = block.transactions.at(transaction_with_block.transaction.transaction_index);
executor.call(block, txn, tracers, /*refund=*/true, /*gas_bailout=*/false);

executor.call(transaction_with_block.block_with_hash->block, transaction_with_block.transaction, tracers, /*refund=*/true, /*gas_bailout=*/true);
return entry_tracer->result();
});

Expand All @@ -1488,26 +1519,18 @@ Task<std::string> TraceCallExecutor::trace_transaction_error(const TransactionWi

auto curr_state = tx_.create_state(current_executor, database_reader_, chain_storage_, block_number - 1);
EVMExecutor executor{*chain_config_ptr, workers_, curr_state};
Tracers tracers{};
bool found = false;
ExecutionResult execution_result{};

for (size_t idx = 0; idx < block.transactions.size(); idx++) {
const auto& txn = block.transactions.at(idx);
execution_result = executor.call(block, txn, tracers, /*refund=*/true, /*gas_bailout=*/false);
if (transaction_with_block.transaction.transaction_index == idx) {
found = true;
break;
}

if (!run_previous_transactions(executor, block, transaction_with_block.transaction.transaction_index)) {
SILK_ERROR << "trace_transaction_error: transaction idx: " << transaction_with_block.transaction.transaction_index << " not found";
return {};
}

const auto& txn = block.transactions.at(transaction_with_block.transaction.transaction_index);
auto execution_result = executor.call(block, txn, {}, /*refund=*/true, /*gas_bailout=*/false);

std::string result = "0x";
if (found) {
if (execution_result.error_code != evmc_status_code::EVMC_SUCCESS) {
result = "0x" + silkworm::to_hex(execution_result.data);
}
return result;
} else {
SILK_ERROR << "trace_transaction_error: transaction idx: " << transaction_with_block.transaction.transaction_index << " not found";
if (execution_result.error_code != evmc_status_code::EVMC_SUCCESS) {
result = "0x" + silkworm::to_hex(execution_result.data);
}
return result;
});
Expand All @@ -1529,28 +1552,17 @@ Task<TraceOperationsResult> TraceCallExecutor::trace_operations(const Transactio

auto curr_state = tx_.create_state(current_executor, database_reader_, chain_storage_, block_number - 1);
EVMExecutor executor{*chain_config_ptr, workers_, curr_state};
bool found = false;

std::shared_ptr<trace::OperationTracer> entry_tracer = nullptr;
for (size_t idx = 0; idx < block.transactions.size(); idx++) {
const auto& txn = block.transactions.at(idx);

if (transaction_with_block.transaction.transaction_index == idx) {
entry_tracer = std::make_shared<trace::OperationTracer>(initial_ibs);
Tracers tracers{entry_tracer};
executor.call(block, txn, tracers, /*refund=*/true, /*gas_bailout=*/false);
found = true;
break;
} else {
executor.call(block, txn, {}, /*refund=*/true, /*gas_bailout=*/false);
}
}
if (found) {
return entry_tracer->result();
} else {
if (!run_previous_transactions(executor, block, transaction_with_block.transaction.transaction_index)) {
SILK_ERROR << "trace_operations: transaction idx: " << transaction_with_block.transaction.transaction_index << " not found";
return {};
}

auto entry_tracer = std::make_shared<trace::OperationTracer>(initial_ibs);
Tracers tracers{entry_tracer};
const auto& txn = block.transactions.at(transaction_with_block.transaction.transaction_index);
executor.call(block, txn, tracers, /*refund=*/true, /*gas_bailout=*/false);
return entry_tracer->result();
});

co_return trace_op_result;
Expand Down Expand Up @@ -1747,31 +1759,47 @@ void CreateTracer::on_execution_start(evmc_revision, const evmc_message& msg, ev
<< ", code: " << silkworm::to_hex(code);
}

void EntryTracer::on_execution_start(evmc_revision, const evmc_message& msg, evmone::bytes_view code) noexcept {
auto sender = evmc::address{msg.sender};
auto recipient = evmc::address{msg.recipient};
auto code_address = evmc::address{msg.code_address};
bool create = (!initial_ibs_.exists(recipient) && recipient != code_address);
auto input = silkworm::ByteView{msg.input_data, msg.input_size};
void EntryTracer::on_execution_end(const evmc_result& result, const silkworm::IntraBlockState& /* intra_block_state */) noexcept {
current_depth_--;
if (traces_stack_idx_.empty())
return;
auto& trace_idx = traces_stack_idx_.top();
traces_stack_idx_.pop();

auto str_value = "0x" + intx::hex(intx::be::load<intx::uint256>(msg.value));
if (trace_idx != std::numeric_limits<uint64_t>::max()) {
result_[trace_idx].output = "0x" + silkworm::to_hex(silkworm::ByteView{result.output_data, result.output_size});
}
}

void EntryTracer::on_self_destruct(const evmc::address& address, const evmc::address& beneficiary) noexcept {
auto balance = initial_ibs_.get_balance(address);
result_.push_back(TraceEntry{"SELFDESTRUCT", current_depth_ + 1, address, beneficiary, "0x" + intx::to_string(balance, 16), "0x", "0x"});
}

void EntryTracer::on_execution_start(evmc_revision rev, const evmc_message& msg, evmone::bytes_view code) noexcept {
const auto& sender = evmc::address{msg.sender};
const auto& recipient = evmc::address{msg.recipient};
const auto& code_address = evmc::address{msg.code_address};
const auto& input = silkworm::ByteView{msg.input_data, msg.input_size};

const auto str_value = "0x" + intx::hex(intx::be::load<intx::uint256>(msg.value));
auto str_input = "0x" + silkworm::to_hex(input);
if (str_input == "0x") {
str_input = "0x" + silkworm::to_hex(code);

// Ignore precompiles in the returned trace (maybe we shouldn't?)
if (precompile::is_precompile(msg.code_address, rev)) {
// writes special value for index
traces_stack_idx_.emplace(std::numeric_limits<uint64_t>::max());
return;
}

if (create) {
if (msg.depth > 0) {
if (msg.kind == evmc_call_kind::EVMC_CREATE) {
result_.push_back(TraceEntry{"CREATE", msg.depth, sender, recipient, str_value, str_input});
} else if (msg.kind == evmc_call_kind::EVMC_CREATE2) {
result_.push_back(TraceEntry{"CREATE2", msg.depth, sender, recipient, str_value, str_input});
}
} else {
result_.push_back(TraceEntry{"CALL", msg.depth, sender, recipient, str_value, str_input});
}
if (msg.kind == evmc_call_kind::EVMC_CREATE) {
str_input = "0x" + silkworm::to_hex(code);
result_.push_back(TraceEntry{"CREATE", msg.depth, sender, recipient, str_value, str_input});
} else if (msg.kind == evmc_call_kind::EVMC_CREATE2) {
str_input = "0x" + silkworm::to_hex(code);
result_.push_back(TraceEntry{"CREATE2", msg.depth, sender, recipient, str_value, str_input});
} else {
bool in_static_mode = (msg.flags & evmc_flags::EVMC_STATIC) != 0;
const bool in_static_mode = (msg.flags & evmc_flags::EVMC_STATIC) != 0;
switch (msg.kind) {
case evmc_call_kind::EVMC_CALL:
in_static_mode ? result_.push_back(TraceEntry{"STATICCALL", msg.depth, sender, recipient, "", str_input}) : result_.push_back(TraceEntry{"CALL", msg.depth, sender, recipient, str_value, str_input});
Expand All @@ -1782,18 +1810,20 @@ void EntryTracer::on_execution_start(evmc_revision, const evmc_message& msg, evm
case evmc_call_kind::EVMC_CALLCODE:
result_.push_back(TraceEntry{"CALLCODE", msg.depth, sender, recipient, str_value, str_input});
break;
case evmc_call_kind::EVMC_CREATE:
case evmc_call_kind::EVMC_CREATE2:
default:
// safeguard in case new CALL-like opcodes are introduced but not handled,
result_.push_back(TraceEntry{"UNKNWON", msg.depth, sender, recipient, str_value, str_input});
break;
}
}
traces_stack_idx_.emplace(result_.size() - 1);
current_depth_ = msg.depth;

SILK_DEBUG << "EntryTracer::on_execution_start: gas: " << std::dec << msg.gas
<< " create: " << create
<< ", msg.depth: " << msg.depth
<< ", msg.kind: " << msg.kind
<< ", sender: " << sender
<< ", recipient: " << recipient << " (created: " << create << ")"
<< ", recipient: " << recipient
<< ", code_address: " << code_address
<< ", msg.value: " << intx::hex(intx::be::load<intx::uint256>(msg.value))
<< ", code: " << silkworm::to_hex(code)
Expand Down
9 changes: 8 additions & 1 deletion silkworm/rpc/core/evm_trace.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ struct TraceEntry {
evmc::address from;
evmc::address to;
std::string value;
std::string input;
std::optional<std::string> input;
std::optional<std::string> output;
};

enum OperationType : int {
Expand Down Expand Up @@ -399,12 +400,16 @@ class EntryTracer : public silkworm::EvmTracer {
EntryTracer& operator=(const EntryTracer&) = delete;

void on_execution_start(evmc_revision rev, const evmc_message& msg, evmone::bytes_view code) noexcept override;
void on_execution_end(const evmc_result& result, const silkworm::IntraBlockState& intra_block_state) noexcept override;
void on_self_destruct(const evmc::address& address, const evmc::address& beneficiary) noexcept override;

TraceEntriesResult result() const { return result_; }

private:
const silkworm::IntraBlockState& initial_ibs_;
TraceEntriesResult result_;
std::stack<uint64_t> traces_stack_idx_;
int32_t current_depth_{-1};
};

class OperationTracer : public silkworm::EvmTracer {
Expand Down Expand Up @@ -489,6 +494,8 @@ class TraceCallExecutor {
std::int32_t index,
const TraceConfig& config);

bool run_previous_transactions(EVMExecutor& executor, const silkworm::Block& block, uint64_t tx_id);

silkworm::BlockCache& block_cache_;
const core::rawdb::DatabaseReader& database_reader_;
const ChainStorage& chain_storage_;
Expand Down
Loading