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: Remove unnecessary State struct

Browse Source
This commit is contained in:
Paweł Bylica 2019-11-28 13:03:38 +01:00 committed by Alex Beregszaszi
parent 7a0f311032
commit eacc1753fd
3 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/EVMHost.cpp
View File

@ -113,8 +113,8 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
evmc_storage_status EVMHost::set_storage(const evmc::address& _addr, const evmc::bytes32& _key, const evmc::bytes32& _value) noexcept evmc_storage_status EVMHost::set_storage(const evmc::address& _addr, const evmc::bytes32& _key, const evmc::bytes32& _value) noexcept
{ {
evmc::bytes32 previousValue = m_state.accounts[_addr].storage[_key].value; evmc::bytes32 previousValue = accounts[_addr].storage[_key].value;
m_state.accounts[_addr].storage[_key].value = _value; accounts[_addr].storage[_key].value = _value;
// TODO EVMC_STORAGE_MODIFIED_AGAIN should be also used // TODO EVMC_STORAGE_MODIFIED_AGAIN should be also used
if (previousValue == _value) if (previousValue == _value)
@ -131,9 +131,9 @@ evmc_storage_status EVMHost::set_storage(const evmc::address& _addr, const evmc:
void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
{ {
// TODO actual selfdestruct is even more complicated. // TODO actual selfdestruct is even more complicated.
evmc::uint256be balance = m_state.accounts[_addr].balance; evmc::uint256be balance = accounts[_addr].balance;
m_state.accounts.erase(_addr); accounts.erase(_addr);
m_state.accounts[_beneficiary].balance = balance; accounts[_beneficiary].balance = balance;
} }
evmc::result EVMHost::call(evmc_message const& _message) noexcept evmc::result EVMHost::call(evmc_message const& _message) noexcept
@ -155,10 +155,10 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
else if (_message.destination == 0x0000000000000000000000000000000000000008_address && m_evmVersion >= langutil::EVMVersion::byzantium()) else if (_message.destination == 0x0000000000000000000000000000000000000008_address && m_evmVersion >= langutil::EVMVersion::byzantium())
return precompileALTBN128PairingProduct(_message); return precompileALTBN128PairingProduct(_message);
State stateBackup = m_state; auto const stateBackup = accounts;
u256 value{convertFromEVMC(_message.value)}; u256 value{convertFromEVMC(_message.value)};
auto& sender = m_state.accounts[_message.sender]; auto& sender = accounts[_message.sender];
evmc::bytes code; evmc::bytes code;
@ -172,7 +172,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
{ {
evmc::result result({}); evmc::result result({});
result.status_code = EVMC_OUT_OF_GAS; result.status_code = EVMC_OUT_OF_GAS;
m_state = stateBackup; accounts = stateBackup;
return result; return result;
} }
} }
@ -190,19 +190,19 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
} }
else if (message.kind == EVMC_DELEGATECALL) else if (message.kind == EVMC_DELEGATECALL)
{ {
code = m_state.accounts[message.destination].code; code = accounts[message.destination].code;
message.destination = m_currentAddress; message.destination = m_currentAddress;
} }
else if (message.kind == EVMC_CALLCODE) else if (message.kind == EVMC_CALLCODE)
{ {
code = m_state.accounts[message.destination].code; code = accounts[message.destination].code;
message.destination = m_currentAddress; message.destination = m_currentAddress;
} }
else else
code = m_state.accounts[message.destination].code; code = accounts[message.destination].code;
//TODO CREATE2 //TODO CREATE2
auto& destination = m_state.accounts[message.destination]; auto& destination = accounts[message.destination];
if (value != 0 && message.kind != EVMC_DELEGATECALL && message.kind != EVMC_CALLCODE) if (value != 0 && message.kind != EVMC_DELEGATECALL && message.kind != EVMC_CALLCODE)
{ {
@ -233,7 +233,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
} }
if (result.status_code != EVMC_SUCCESS) if (result.status_code != EVMC_SUCCESS)
m_state = stateBackup; accounts = stateBackup;
return result; return result;
} }

16
test/EVMHost.h
View File

@ -45,24 +45,19 @@ public:
explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm = getVM()); explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm = getVM());
struct State
{
std::map<evmc::address, evmc::MockedAccount> accounts;
};
evmc::MockedAccount const* account(evmc::address const& _address) const evmc::MockedAccount const* account(evmc::address const& _address) const
{ {
auto it = m_state.accounts.find(_address); auto it = accounts.find(_address);
return it == m_state.accounts.end() ? nullptr : &it->second; return it == accounts.end() ? nullptr : &it->second;
} }
evmc::MockedAccount* account(evmc::address const& _address) evmc::MockedAccount* account(evmc::address const& _address)
{ {
auto it = m_state.accounts.find(_address); auto it = accounts.find(_address);
return it == m_state.accounts.end() ? nullptr : &it->second; return it == accounts.end() ? nullptr : &it->second;
} }
void reset() { m_state = State{}; m_currentAddress = {}; } void reset() { accounts.clear(); m_currentAddress = {}; }
void newBlock() void newBlock()
{ {
tx_context.block_number++; tx_context.block_number++;
@ -139,7 +134,6 @@ public:
static evmc::bytes32 convertToEVMC(h256 const& _data); static evmc::bytes32 convertToEVMC(h256 const& _data);
State m_state;
evmc::address m_currentAddress = {}; evmc::address m_currentAddress = {};
private: private:

3
test/ExecutionFramework.cpp
View File

@ -25,7 +25,6 @@
#include <test/EVMHost.h> #include <test/EVMHost.h>
#include <test/evmc/evmc.hpp> #include <test/evmc/evmc.hpp>
#include <test/evmc/loader.h>
#include <libdevcore/CommonIO.h> #include <libdevcore/CommonIO.h>
@ -56,7 +55,7 @@ ExecutionFramework::ExecutionFramework(langutil::EVMVersion _evmVersion):
m_evmHost->reset(); m_evmHost->reset();
for (size_t i = 0; i < 10; i++) for (size_t i = 0; i < 10; i++)
m_evmHost->m_state.accounts[EVMHost::convertToEVMC(account(i))].balance = m_evmHost->accounts[EVMHost::convertToEVMC(account(i))].balance =
EVMHost::convertToEVMC(u256(1) << 100); EVMHost::convertToEVMC(u256(1) << 100);
} }