cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

EVMHost: Simplify some code and dcoument functions

Browse Source
This commit is contained in:
Alex Beregszaszi 2022-09-16 12:57:29 +02:00
parent 3ddf5db755
commit e3c7369413
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/EVMHost.cpp
View File

@ -37,8 +37,6 @@ using namespace solidity::util;
using namespace solidity::test; using namespace solidity::test;
using namespace evmc::literals; using namespace evmc::literals;
using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
evmc::VM& EVMHost::getVM(string const& _path) evmc::VM& EVMHost::getVM(string const& _path)
{ {
static evmc::VM NullVM{nullptr}; static evmc::VM NullVM{nullptr};
@ -205,6 +203,8 @@ void EVMHost::recordCalls(evmc_message const& _message) noexcept
recorded_calls.emplace_back(_message); recorded_calls.emplace_back(_message);
} }
// NOTE: this is used for both internal and external calls.
// External calls are triggered from ExecutionFramework and contain only EVMC_CREATE or EVMC_CALL.
evmc::result EVMHost::call(evmc_message const& _message) noexcept evmc::result EVMHost::call(evmc_message const& _message) noexcept
{ {
recordCalls(_message); recordCalls(_message);
@ -408,6 +408,7 @@ evmc::result EVMHost::precompileSha256(evmc_message const& _message) noexcept
)); ));
evmc::result result({}); evmc::result result({});
result.status_code = EVMC_SUCCESS;
result.gas_left = _message.gas; result.gas_left = _message.gas;
result.output_data = hash.data(); result.output_data = hash.data();
result.output_size = hash.size(); result.output_size = hash.size();
@ -485,7 +486,9 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
// static data so that we do not need a release routine... // static data so that we do not need a release routine...
bytes static data; bytes static data;
data = bytes(_message.input_data, _message.input_data + _message.input_size); data = bytes(_message.input_data, _message.input_data + _message.input_size);
evmc::result result({}); evmc::result result({});
result.status_code = EVMC_SUCCESS;
result.gas_left = _message.gas; result.gas_left = _message.gas;
result.output_data = data.data(); result.output_data = data.data();
result.output_size = data.size(); result.output_size = data.size();

16
test/EVMHost.h
View File

@ -35,6 +35,7 @@
namespace solidity::test namespace solidity::test
{ {
using Address = util::h160; using Address = util::h160;
using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
class EVMHost: public evmc::MockedHost class EVMHost: public evmc::MockedHost
{ {
@ -55,9 +56,10 @@ public:
explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm); explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm);
/// Reset entire state (including accounts).
void reset(); void reset();
/// Clears EIP-2929 account and storage access indicator
void resetWarmAccess(); /// Start new block.
void newBlock() void newBlock()
{ {
tx_context.block_number++; tx_context.block_number++;
@ -67,7 +69,7 @@ public:
} }
/// @returns contents of storage at @param _addr. /// @returns contents of storage at @param _addr.
std::map<evmc::bytes32, evmc::storage_value> const& get_address_storage(evmc::address const& _addr); StorageMap const& get_address_storage(evmc::address const& _addr);
bool account_exists(evmc::address const& _addr) const noexcept final bool account_exists(evmc::address const& _addr) const noexcept final
{ {
@ -94,8 +96,12 @@ public:
private: private:
evmc::address m_currentAddress = {}; evmc::address m_currentAddress = {};
/// Transfer value between accounts. Checks for sufficient balance.
void transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept; void transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept;
/// Clears EIP-2929 account and storage access indicator
void resetWarmAccess();
/// Records calls made via @param _message. /// Records calls made via @param _message.
void recordCalls(evmc_message const& _message) noexcept; void recordCalls(evmc_message const& _message) noexcept;
@ -113,9 +119,9 @@ private:
static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept; static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept;
evmc::VM& m_vm; evmc::VM& m_vm;
// EVM version requested by the testing tool /// EVM version requested by the testing tool
langutil::EVMVersion m_evmVersion; langutil::EVMVersion m_evmVersion;
// EVM version requested from EVMC (matches the above) /// EVM version requested from EVMC (matches the above)
evmc_revision m_evmRevision; evmc_revision m_evmRevision;
}; };