Skip to content

Commit

Permalink
Remove temporary solution for supporting +EIP**** network
Browse files Browse the repository at this point in the history
  • Loading branch information
rodiazet authored and axic committed Feb 19, 2023
1 parent a6955f8 commit ef67a30
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 48 deletions.
1 change: 0 additions & 1 deletion lib/evmone/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ add_library(evmone
instructions_traits.hpp
instructions_xmacro.hpp
opcodes_helpers.h
eips.hpp
tracing.cpp
tracing.hpp
vm.cpp
Expand Down
2 changes: 0 additions & 2 deletions lib/evmone/advanced_instructions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// SPDX-License-Identifier: Apache-2.0

#include "advanced_analysis.hpp"
#include "eips.hpp"
#include "instructions.hpp"
#include "instructions_traits.hpp"

Expand Down Expand Up @@ -260,7 +259,6 @@ constexpr std::array<instruction_exec_fn, 256> instruction_implementations = [](

EVMC_EXPORT const OpTable& get_op_table(evmc_revision rev) noexcept
{
rev = clear_eips(rev);
static constexpr auto op_tables = []() noexcept {
std::array<OpTable, EVMC_MAX_REVISION + 1> tables{};
for (size_t r = EVMC_FRONTIER; r <= EVMC_MAX_REVISION; ++r)
Expand Down
2 changes: 0 additions & 2 deletions lib/evmone/baseline_instruction_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// SPDX-License-Identifier: Apache-2.0

#include "baseline_instruction_table.hpp"
#include "eips.hpp"
#include "instructions_traits.hpp"

namespace evmone::baseline
Expand Down Expand Up @@ -44,7 +43,6 @@ constexpr auto eof_cost_tables = []() noexcept {

const CostTable& get_baseline_cost_table(evmc_revision rev, uint8_t eof_version) noexcept
{
rev = clear_eips(rev);
const auto& tables = (eof_version == 0) ? legacy_cost_tables : eof_cost_tables;
return tables[rev];
}
Expand Down
38 changes: 0 additions & 38 deletions lib/evmone/eips.hpp

This file was deleted.

1 change: 0 additions & 1 deletion lib/evmone/instructions_calls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Copyright 2019 The evmone Authors.
// SPDX-License-Identifier: Apache-2.0

#include "eips.hpp"
#include "eof.hpp"
#include "instructions.hpp"

Expand Down
3 changes: 1 addition & 2 deletions lib/evmone/instructions_storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Copyright 2019 The evmone Authors.
// SPDX-License-Identifier: Apache-2.0

#include "eips.hpp"
#include "instructions.hpp"

namespace evmone::instr::core
Expand Down Expand Up @@ -131,7 +130,7 @@ evmc_status_code sstore(StackTop stack, ExecutionState& state) noexcept
0;
const auto status = state.host.set_storage(state.msg->recipient, key, value);

const auto [gas_cost_warm, gas_refund] = sstore_costs[clear_eips(state.rev)][status];
const auto [gas_cost_warm, gas_refund] = sstore_costs[state.rev][status];
const auto gas_cost = gas_cost_warm + gas_cost_cold;
if ((state.gas_left -= gas_cost) < 0)
return EVMC_OUT_OF_GAS;
Expand Down
1 change: 0 additions & 1 deletion test/state/state.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "state.hpp"
#include "errors.hpp"
#include "host.hpp"
#include <evmone/eips.hpp>
#include <evmone/eof.hpp>
#include <evmone/evmone.h>
#include <evmone/execution_state.hpp>
Expand Down
1 change: 0 additions & 1 deletion test/statetest/statetest_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// SPDX-License-Identifier: Apache-2.0

#include "statetest.hpp"
#include <evmone/eips.hpp>
#include <nlohmann/json.hpp>
#include <cassert>
#include <fstream>
Expand Down

0 comments on commit ef67a30

Please sign in to comment.