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

Jump to bottom

[1.0.5] Refactor EVMExecutor::call #202

Merged
merged 5 commits into from
Sep 13, 2024
Merged

[1.0.5] Refactor EVMExecutor::call #202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1295861
Refactor EVMExecutor::call
elmato Sep 4, 2024
1144f5c
Fix evm_executor tests
elmato Sep 5, 2024
abdbd05
EVMExecutor handle gas usage and refunds in the same way as the proce…
elmato Sep 10, 2024
497daf5
eth_call: perfom gas bailout in case from field is not specified
elmato Sep 10, 2024
aeaac37
Fix calculation of effective_gas_price
elmato Sep 12, 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
8 changes: 4 additions & 4 deletions silkworm/silkrpc/commands/eth_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,7 @@ awaitable<void> EthereumRpcApi::handle_eth_call(const nlohmann::json& request, s
const auto execution_result = co_await EVMExecutor::call(
*chain_config_ptr, workers_, block_with_hash->block, txn, [&](auto& io_executor, auto block_num) {
return tx->create_state(io_executor, db_reader, block_num);
}, {}, true, false, eos_evm_version, gas_params);
}, gas_params, eos_evm_version, {}, true, false);

if (execution_result.success()) {
make_glaze_json_content(reply, request["id"], execution_result.data);
Expand Down Expand Up @@ -1338,8 +1338,8 @@ awaitable<void> EthereumRpcApi::handle_eth_create_access_list(const nlohmann::js
const auto execution_result = co_await EVMExecutor::call(
*chain_config_ptr, workers_, block_with_hash->block, txn, [&](auto& io_executor, auto block_num) {
return tx->create_state(io_executor, db_reader, block_num);
},
std::move(tracers), /* refund */ true, /* gasBailout */ false, eos_evm_version, gas_params);
}, gas_params, eos_evm_version,
std::move(tracers), /* refund */ true, /* gasBailout */ false);

if (execution_result.pre_check_error) {
reply = make_json_error(request["id"], -32000, execution_result.pre_check_error.value());
Expand Down Expand Up @@ -1429,7 +1429,7 @@ awaitable<void> EthereumRpcApi::handle_eth_call_bundle(const nlohmann::json& req
const auto execution_result = co_await EVMExecutor::call(
*chain_config_ptr, workers_, block_with_hash->block, tx_with_block->transaction, [&](auto& io_executor, auto block_num) {
return tx->create_state(io_executor, db_reader, block_num);
}, {}, true, false, eos_evm_version, gas_params);
}, gas_params, eos_evm_version, {}, true, false);
if (execution_result.pre_check_error) {
reply = make_json_error(request["id"], -32000, execution_result.pre_check_error.value());
error = true;
Expand Down
3 changes: 2 additions & 1 deletion silkworm/silkrpc/commands/trace_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
#include <silkworm/silkrpc/json/types.hpp>
#include <silkworm/silkrpc/types/call.hpp>
#include <silkworm/silkrpc/commands/rpc_api_quirk.hpp>

#include <silkworm/silkrpc/core/rawdb/chain.hpp>
#include <silkworm/silkrpc/core/gas_parameters.hpp>
namespace silkworm::rpc::commands {

// https://eth.wiki/json-rpc/API#trace_call
Expand Down
13 changes: 8 additions & 5 deletions silkworm/silkrpc/core/call_many.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <silkworm/silkrpc/core/remote_state.hpp>
#include <silkworm/silkrpc/ethdb/kv/cached_database.hpp>
#include <silkworm/silkrpc/json/types.hpp>

#include <silkworm/silkrpc/core/gas_parameters.hpp>
namespace silkworm::rpc::call {

using boost::asio::awaitable;
Expand All @@ -53,7 +53,9 @@ CallManyResult CallExecutor::executes_all_bundles(const silkworm::ChainConfig* c
std::optional<std::uint64_t> opt_timeout,
const AccountsOverrides& accounts_overrides,
int32_t transaction_index,
boost::asio::any_io_executor& this_executor) {
boost::asio::any_io_executor& this_executor,
const evmone::gas_parameters& gas_params,
uint64_t eos_evm_version) {
CallManyResult result;
const auto& block = block_with_hash.block;
const auto& block_transactions = block.transactions;
Expand All @@ -70,7 +72,7 @@ CallManyResult CallExecutor::executes_all_bundles(const silkworm::ChainConfig* c
txn.recover_sender();
}

auto exec_result = executor.call(block, txn);
auto exec_result = executor.call(block, txn, gas_params, eos_evm_version);

if ((clock_time::since(start_time) / 1000000) > timeout) {
std::ostringstream oss;
Expand Down Expand Up @@ -110,7 +112,7 @@ CallManyResult CallExecutor::executes_all_bundles(const silkworm::ChainConfig* c
for (const auto& call : bundle.transactions) {
silkworm::Transaction txn{call.to_transaction()};

auto call_execution_result = executor.call(blockContext.block, txn);
auto call_execution_result = executor.call(blockContext.block, txn, gas_params, eos_evm_version);

if (call_execution_result.pre_check_error) {
result.error = call_execution_result.pre_check_error;
Expand Down Expand Up @@ -171,12 +173,13 @@ boost::asio::awaitable<CallManyResult> CallExecutor::execute(const Bundles& bund
if (transaction_index == -1) {
transaction_index = static_cast<std::int32_t>(block_with_hash->block.transactions.size());
}
const auto [eos_evm_version, gas_params] = co_await load_gas_parameters(tx_database, chain_config_ptr, block_with_hash->block);

auto this_executor = co_await boost::asio::this_coro::executor;
result = co_await boost::asio::async_compose<decltype(boost::asio::use_awaitable), void(CallManyResult)>(
[&](auto&& self) {
boost::asio::post(workers_, [&, self = std::move(self)]() mutable {
result = executes_all_bundles(chain_config_ptr, *block_with_hash, tx_database, bundles, opt_timeout, accounts_overrides, transaction_index, this_executor);
result = executes_all_bundles(chain_config_ptr, *block_with_hash, tx_database, bundles, opt_timeout, accounts_overrides, transaction_index, this_executor, gas_params, eos_evm_version);
boost::asio::post(this_executor, [result, self = std::move(self)]() mutable {
self.complete(result);
});
Expand Down
5 changes: 4 additions & 1 deletion silkworm/silkrpc/core/call_many.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include <silkworm/silkrpc/types/block.hpp>
#include <silkworm/silkrpc/types/call.hpp>
#include <silkworm/silkrpc/types/transaction.hpp>
#include <silkworm/silkrpc/core/gas_parameters.hpp>

namespace silkworm::rpc::call {

Expand Down Expand Up @@ -68,7 +69,9 @@ class CallExecutor {
std::optional<std::uint64_t> opt_timeout,
const AccountsOverrides& accounts_overrides,
int32_t transaction_index,
boost::asio::any_io_executor& executor);
boost::asio::any_io_executor& executor,
const evmone::gas_parameters& gas_params,
uint64_t eos_evm_version);

private:
ethdb::Transaction& transaction_;
Expand Down
2 changes: 1 addition & 1 deletion silkworm/silkrpc/core/estimate_gas_oracle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ boost::asio::awaitable<intx::uint256> EstimateGasOracle::estimate_gas(const Call

ExecutionResult EstimateGasOracle::try_execution(EVMExecutor& executor, const silkworm::Block& block, const silkworm::Transaction& transaction, uint64_t eos_evm_version, const evmone::gas_parameters& gas_params) {
executor.reset_all();
return executor.call(block, transaction, {}, true, false, eos_evm_version, gas_params);
return executor.call(block, transaction, gas_params, eos_evm_version, {}, true, false);
}

void EstimateGasOracle::throw_exception(ExecutionResult& result, uint64_t cap) {
Expand Down
15 changes: 9 additions & 6 deletions silkworm/silkrpc/core/evm_debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <silkworm/silkrpc/core/rawdb/chain.hpp>
#include <silkworm/silkrpc/ethdb/transaction_database.hpp>
#include <silkworm/silkrpc/json/types.hpp>

#include <silkworm/silkrpc/core/gas_parameters.hpp>
namespace silkworm::rpc::debug {

using boost::asio::awaitable;
Expand Down Expand Up @@ -347,6 +347,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream, const silkworm::Blo

const auto chain_id = co_await core::rawdb::read_chain_id(database_reader_);
const auto chain_config_ptr = lookup_chain_config(chain_id);
const auto [eos_evm_version, gas_params] = co_await load_gas_parameters(database_reader_, chain_config_ptr, block);
auto current_executor = co_await boost::asio::this_coro::executor;

co_await boost::asio::async_compose<decltype(boost::asio::use_awaitable), void(void)>(
Expand All @@ -371,7 +372,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream, const silkworm::Blo
stream.open_array();

Tracers tracers{debug_tracer};
const auto execution_result = executor.call(block, txn, std::move(tracers), /* refund */ false, /* gasBailout */ false);
const auto execution_result = executor.call(block, txn, gas_params, eos_evm_version, std::move(tracers), /* refund */ false, /* gasBailout */ false);

debug_tracer->flush_logs();
stream.close_array();
Expand Down Expand Up @@ -411,6 +412,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream, uint64_t block_numb

const auto chain_id = co_await core::rawdb::read_chain_id(database_reader_);
const auto chain_config_ptr = lookup_chain_config(chain_id);
const auto [eos_evm_version, gas_params] = co_await load_gas_parameters(database_reader_, chain_config_ptr, block);
auto current_executor = co_await boost::asio::this_coro::executor;

co_await boost::asio::async_compose<decltype(boost::asio::use_awaitable), void(void)>(
Expand All @@ -425,7 +427,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream, uint64_t block_numb
if (!txn.from) {
txn.recover_sender();
}
executor.call(block, txn);
executor.call(block, txn, gas_params, eos_evm_version);
}
executor.reset();

Expand All @@ -435,7 +437,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream, uint64_t block_numb
stream.open_array();

Tracers tracers{debug_tracer};
const auto execution_result = executor.call(block, transaction, std::move(tracers));
const auto execution_result = executor.call(block, transaction, gas_params, eos_evm_version, std::move(tracers));

debug_tracer->flush_logs();
stream.close_array();
Expand Down Expand Up @@ -473,6 +475,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream,

const auto chain_id = co_await core::rawdb::read_chain_id(database_reader_);
const auto chain_config_ptr = lookup_chain_config(chain_id);
const auto [eos_evm_version, gas_params] = co_await load_gas_parameters(database_reader_, chain_config_ptr, block);

auto current_executor = co_await boost::asio::this_coro::executor;
co_await boost::asio::async_compose<decltype(boost::asio::use_awaitable), void(void)>(
Expand All @@ -488,7 +491,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream,
txn.recover_sender();
}

executor.call(block, txn);
executor.call(block, txn, gas_params, eos_evm_version);
}
executor.reset();

Expand Down Expand Up @@ -527,7 +530,7 @@ awaitable<void> DebugExecutor::execute(json::Stream& stream,
auto debug_tracer = std::make_shared<debug::DebugTracer>(stream, config_);
Tracers tracers{debug_tracer};

const auto execution_result = executor.call(blockContext.block, txn, std::move(tracers), /* refund */ false, /* gasBailout */ false);
const auto execution_result = executor.call(blockContext.block, txn, gas_params, eos_evm_version, std::move(tracers), /* refund */ false, /* gasBailout */ false);

debug_tracer->flush_logs();
stream.close_array();
Expand Down
14 changes: 7 additions & 7 deletions silkworm/silkrpc/core/evm_executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ std::optional<std::string> EVMExecutor::pre_check(const EVM& evm, const silkworm
ExecutionResult EVMExecutor::call(
const silkworm::Block& block,
const silkworm::Transaction& txn,
const evmone::gas_parameters& gas_params,
uint64_t eos_evm_version,
Tracers tracers,
bool refund,
bool gas_bailout,
uint64_t eos_evm_version,
const evmone::gas_parameters& gas_params) {
bool gas_bailout) {
SILK_DEBUG << "EVMExecutor::call: " << block.header.number << " gasLimit: " << txn.gas_limit << " refund: " << refund << " gasBailout: " << gas_bailout;
SILK_DEBUG << "EVMExecutor::call: transaction: " << &txn;

Expand Down Expand Up @@ -334,18 +334,18 @@ awaitable<ExecutionResult> EVMExecutor::call(const silkworm::ChainConfig& config
const silkworm::Block& block,
const silkworm::Transaction& txn,
StateFactory state_factory,
const evmone::gas_parameters& gas_params,
uint64_t eos_evm_version,
Tracers tracers,
bool refund,
bool gas_bailout,
uint64_t eos_evm_version,
const evmone::gas_parameters& gas_params) {
bool gas_bailout) {
auto this_executor = co_await boost::asio::this_coro::executor;
const auto execution_result = co_await boost::asio::async_compose<decltype(boost::asio::use_awaitable), void(ExecutionResult)>(
[&](auto&& self) {
boost::asio::post(workers, [&, self = std::move(self)]() mutable {
auto state = state_factory(this_executor, block.header.number);
EVMExecutor executor{config, workers, state};
auto exec_result = executor.call(block, txn, tracers, refund, gas_bailout, eos_evm_version, gas_params);
auto exec_result = executor.call(block, txn, gas_params, eos_evm_version, tracers, refund, gas_bailout);
boost::asio::post(this_executor, [exec_result, self = std::move(self)]() mutable {
self.complete(exec_result);
});
Expand Down
8 changes: 4 additions & 4 deletions silkworm/silkrpc/core/evm_executor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ class EVMExecutor {
const silkworm::Block& block,
const silkworm::Transaction& txn,
StateFactory state_factory,
const evmone::gas_parameters& gas_params,
uint64_t eos_evm_version,
Tracers tracers = {},
bool refund = true,
bool gas_bailout = false,
uint64_t eos_evm_version = 0,
const evmone::gas_parameters& gas_params = {});
bool gas_bailout = false);
static std::string get_error_message(int64_t error_code, const Bytes& error_data, bool full_error = true);

EVMExecutor(const silkworm::ChainConfig& config, boost::asio::thread_pool& workers, std::shared_ptr<silkworm::State>& state)
Expand All @@ -107,7 +107,7 @@ class EVMExecutor {
EVMExecutor(const EVMExecutor&) = delete;
EVMExecutor& operator=(const EVMExecutor&) = delete;

ExecutionResult call(const silkworm::Block& block, const silkworm::Transaction& txn, Tracers tracers = {}, bool refund = true, bool gas_bailout = false, uint64_t eos_evm_version = 0, const evmone::gas_parameters& gas_params={});
ExecutionResult call(const silkworm::Block& block, const silkworm::Transaction& txn, const evmone::gas_parameters& gas_params, uint64_t eos_evm_version, Tracers tracers = {}, bool refund = true, bool gas_bailout = false);
void reset();
void reset_all();

Expand Down
Loading
Loading