Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into elmato/discount-fac…
Browse files Browse the repository at this point in the history
…tor-and-refund
  • Loading branch information
elmato committed Dec 3, 2024
2 parents 836777c + c87ecea commit 7f0cfe5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if(NOT SILKWORM_HAS_PARENT)
endif()

project(silkworm)
set(PROJECT_VERSION 1.0.7)
set(PROJECT_VERSION 1.0.8)

# conan must be initiailzed after project definition to properly detect target architecture.
if(NOT SILKWORM_HAS_PARENT)
Expand Down
5 changes: 0 additions & 5 deletions silkworm/silkrpc/commands/eth_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1148,11 +1148,6 @@ awaitable<void> EthereumRpcApi::handle_eth_call(const nlohmann::json& request, s
silkworm::Transaction txn{call.to_transaction()};
if(!txn.from.has_value()) txn.from = evmc::address{0};

auto base_fee_per_gas = block_with_hash->block.header.base_fee_per_gas.value_or(0);
if(txn.max_fee_per_gas == 0 && base_fee_per_gas > 0) {
txn.max_fee_per_gas = base_fee_per_gas;
}

const auto [eos_evm_version, gas_params, gas_prices] = co_await load_gas_parameters(tx_database, chain_config_ptr, block_with_hash->block);

const core::rawdb::DatabaseReader& db_reader =
Expand Down

0 comments on commit 7f0cfe5

Please sign in to comment.