cerc-io/solidity
15
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

Update EVMHost to EVMC 7.1.0

Browse Source 
Co-authored-by: Paweł Bylica <chfast@gmail.com>
This commit is contained in:
Alex Beregszaszi 2019-11-29 15:08:53 +01:00
parent aba2ee0f68
commit c4012eee33
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/EVMHost.cpp
View File

@ -229,7 +229,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
return result; return result;
} }
evmc_tx_context EVMHost::get_tx_context() noexcept evmc_tx_context EVMHost::get_tx_context() const noexcept
{ {
evmc_tx_context ctx = {}; evmc_tx_context ctx = {};
ctx.block_timestamp = m_state.timestamp; ctx.block_timestamp = m_state.timestamp;
@ -245,7 +245,7 @@ evmc_tx_context EVMHost::get_tx_context() noexcept
return ctx; return ctx;
} }
evmc::bytes32 EVMHost::get_block_hash(int64_t _number) noexcept evmc::bytes32 EVMHost::get_block_hash(int64_t _number) const noexcept
{ {
return convertToEVMC(u256("0x3737373737373737373737373737373737373737373737373737373737373737") + _number); return convertToEVMC(u256("0x3737373737373737373737373737373737373737373737373737373737373737") + _number);
} }

30
test/EVMHost.h
View File

@ -68,6 +68,12 @@ public:
std::vector<LogEntry> logs; std::vector<LogEntry> logs;
}; };
Account const* account(evmc::address const& _address) const
{
auto it = m_state.accounts.find(_address);
return it == m_state.accounts.end() ? nullptr : &it->second;
}
Account* account(evmc::address const& _address) Account* account(evmc::address const& _address)
{ {
auto it = m_state.accounts.find(_address); auto it = m_state.accounts.find(_address);
@ -82,15 +88,19 @@ public:
m_state.logs.clear(); m_state.logs.clear();
} }
bool account_exists(evmc::address const& _addr) noexcept final bool account_exists(evmc::address const& _addr) const noexcept final
{ {
return account(_addr) != nullptr; return account(_addr) != nullptr;
} }
evmc::bytes32 get_storage(evmc::address const& _addr, evmc::bytes32 const& _key) noexcept final evmc::bytes32 get_storage(evmc::address const& _addr, evmc::bytes32 const& _key) const noexcept final
{ {
if (Account* acc = account(_addr)) if (auto* acc = account(_addr))
return acc->storage[_key]; {
auto it = acc->storage.find(_key);
if (it != acc->storage.end())
return it->second;
}
return {}; return {};
} }
@ -100,21 +110,21 @@ public:
evmc::bytes32 const& _value evmc::bytes32 const& _value
) noexcept; ) noexcept;
evmc::uint256be get_balance(evmc::address const& _addr) noexcept final evmc::uint256be get_balance(evmc::address const& _addr) const noexcept final
{ {
if (Account const* acc = account(_addr)) if (Account const* acc = account(_addr))
return acc->balance; return acc->balance;
return {}; return {};
} }
size_t get_code_size(evmc::address const& _addr) noexcept final size_t get_code_size(evmc::address const& _addr) const noexcept final
{ {
if (Account const* acc = account(_addr)) if (Account const* acc = account(_addr))
return acc->code.size(); return acc->code.size();
return 0; return 0;
} }
evmc::bytes32 get_code_hash(evmc::address const& _addr) noexcept final evmc::bytes32 get_code_hash(evmc::address const& _addr) const noexcept final
{ {
if (Account const* acc = account(_addr)) if (Account const* acc = account(_addr))
return acc->codeHash; return acc->codeHash;
@ -126,7 +136,7 @@ public:
size_t _codeOffset, size_t _codeOffset,
uint8_t* _bufferData, uint8_t* _bufferData,
size_t _bufferSize size_t _bufferSize
) noexcept final ) const noexcept final
{ {
size_t i = 0; size_t i = 0;
if (Account const* acc = account(_addr)) if (Account const* acc = account(_addr))
@ -139,9 +149,9 @@ public:
evmc::result call(evmc_message const& _message) noexcept; evmc::result call(evmc_message const& _message) noexcept;
evmc_tx_context get_tx_context() noexcept; evmc_tx_context get_tx_context() const noexcept;
evmc::bytes32 get_block_hash(int64_t number) noexcept; evmc::bytes32 get_block_hash(int64_t number) const noexcept;
void emit_log( void emit_log(
evmc::address const& _addr, evmc::address const& _addr,