Skip to content

Commit

Permalink
cpp: Use new address and bytes32 wrappers in HostInterface
Browse files Browse the repository at this point in the history
  • Loading branch information
@chfast
chfast committed Aug 7, 2019
1 parent 3877584 commit 2caa00b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 44 deletions.
26 changes: 13 additions & 13 deletions examples/example_host.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,22 @@ class ExampleHost : public evmc::Host
std::map<evmc::address, account> accounts;

public:
bool account_exists(const evmc_address& addr) noexcept final
bool account_exists(const evmc::address& addr) noexcept final
{
return accounts.find(addr) != accounts.end();
}

evmc_bytes32 get_storage(const evmc_address& addr, const evmc_bytes32& key) noexcept final
evmc::bytes32 get_storage(const evmc::address& addr, const evmc::bytes32& key) noexcept final
{
auto it = accounts.find(addr);
if (it != accounts.end())
return it->second.storage[key];
return {};
}

evmc_storage_status set_storage(const evmc_address& addr,
const evmc_bytes32& key,
const evmc_bytes32& value) noexcept final
evmc_storage_status set_storage(const evmc::address& addr,
const evmc::bytes32& key,
const evmc::bytes32& value) noexcept final
{
auto& account = accounts[addr];
auto prev_value = account.storage[key];
Expand All @@ -51,31 +51,31 @@ class ExampleHost : public evmc::Host
return (prev_value == value) ? EVMC_STORAGE_UNCHANGED : EVMC_STORAGE_MODIFIED;
}

evmc_uint256be get_balance(const evmc_address& addr) noexcept final
evmc_uint256be get_balance(const evmc::address& addr) noexcept final
{
auto it = accounts.find(addr);
if (it != accounts.end())
return it->second.balance;
return {};
}

size_t get_code_size(const evmc_address& addr) noexcept final
size_t get_code_size(const evmc::address& addr) noexcept final
{
auto it = accounts.find(addr);
if (it != accounts.end())
return it->second.code_size;
return 0;
}

evmc_bytes32 get_code_hash(const evmc_address& addr) noexcept final
evmc::bytes32 get_code_hash(const evmc::address& addr) noexcept final
{
auto it = accounts.find(addr);
if (it != accounts.end())
return it->second.code_hash;
return {};
}

size_t copy_code(const evmc_address& addr,
size_t copy_code(const evmc::address& addr,
size_t code_offset,
uint8_t* buffer_data,
size_t buffer_size) noexcept final
Expand All @@ -87,7 +87,7 @@ class ExampleHost : public evmc::Host
return 0;
}

void selfdestruct(const evmc_address& addr, const evmc_address& beneficiary) noexcept final
void selfdestruct(const evmc::address& addr, const evmc::address& beneficiary) noexcept final
{
(void)addr;
(void)beneficiary;
Expand All @@ -100,7 +100,7 @@ class ExampleHost : public evmc::Host

evmc_tx_context get_tx_context() noexcept final { return {}; }

evmc_bytes32 get_block_hash(int64_t number) noexcept final
evmc::bytes32 get_block_hash(int64_t number) noexcept final
{
const int64_t current_block_number = get_tx_context().block_number;

Expand All @@ -109,10 +109,10 @@ class ExampleHost : public evmc::Host
0_bytes32;
}

void emit_log(const evmc_address& addr,
void emit_log(const evmc::address& addr,
const uint8_t* data,
size_t data_size,
const evmc_bytes32 topics[],
const evmc::bytes32 topics[],
size_t topics_count) noexcept final
{
(void)addr;
Expand Down
61 changes: 30 additions & 31 deletions include/evmc/evmc.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,35 +423,33 @@ class HostInterface
virtual ~HostInterface() noexcept = default;

/// @copydoc evmc_host_interface::account_exists
virtual bool account_exists(const evmc_address& addr) noexcept = 0;
virtual bool account_exists(const address& addr) noexcept = 0;

/// @copydoc evmc_host_interface::get_storage
virtual evmc_bytes32 get_storage(const evmc_address& addr,
const evmc_bytes32& key) noexcept = 0;
virtual bytes32 get_storage(const address& addr, const bytes32& key) noexcept = 0;

/// @copydoc evmc_host_interface::set_storage
virtual evmc_storage_status set_storage(const evmc_address& addr,
const evmc_bytes32& key,
const evmc_bytes32& value) noexcept = 0;
virtual evmc_storage_status set_storage(const address& addr,
const bytes32& key,
const bytes32& value) noexcept = 0;

/// @copydoc evmc_host_interface::get_balance
virtual evmc_uint256be get_balance(const evmc_address& addr) noexcept = 0;
virtual evmc_uint256be get_balance(const address& addr) noexcept = 0;

/// @copydoc evmc_host_interface::get_code_size
virtual size_t get_code_size(const evmc_address& addr) noexcept = 0;
virtual size_t get_code_size(const address& addr) noexcept = 0;

/// @copydoc evmc_host_interface::get_code_hash
virtual evmc_bytes32 get_code_hash(const evmc_address& addr) noexcept = 0;
virtual bytes32 get_code_hash(const address& addr) noexcept = 0;

/// @copydoc evmc_host_interface::copy_code
virtual size_t copy_code(const evmc_address& addr,
virtual size_t copy_code(const address& addr,
size_t code_offset,
uint8_t* buffer_data,
size_t buffer_size) noexcept = 0;

/// @copydoc evmc_host_interface::selfdestruct
virtual void selfdestruct(const evmc_address& addr,
const evmc_address& beneficiary) noexcept = 0;
virtual void selfdestruct(const address& addr, const address& beneficiary) noexcept = 0;

/// @copydoc evmc_host_interface::call
virtual result call(const evmc_message& msg) noexcept = 0;
Expand All @@ -460,13 +458,13 @@ class HostInterface
virtual evmc_tx_context get_tx_context() noexcept = 0;

/// @copydoc evmc_host_interface::get_block_hash
virtual evmc_bytes32 get_block_hash(int64_t block_number) noexcept = 0;
virtual bytes32 get_block_hash(int64_t block_number) noexcept = 0;

/// @copydoc evmc_host_interface::emit_log
virtual void emit_log(const evmc_address& addr,
virtual void emit_log(const address& addr,
const uint8_t* data,
size_t data_size,
const evmc_bytes32 topics[],
const bytes32 topics[],
size_t num_topics) noexcept = 0;
};

Expand All @@ -483,49 +481,49 @@ class HostContext : public HostInterface
/// Implicit converting constructor from evmc_context.
HostContext(evmc_context* ctx) noexcept : context{ctx} {} // NOLINT

bool account_exists(const evmc_address& address) noexcept final
bool account_exists(const address& address) noexcept final
{
return context->host->account_exists(context, &address);
}

evmc_bytes32 get_storage(const evmc_address& address, const evmc_bytes32& key) noexcept final
bytes32 get_storage(const address& address, const bytes32& key) noexcept final
{
return context->host->get_storage(context, &address, &key);
}

evmc_storage_status set_storage(const evmc_address& address,
const evmc_bytes32& key,
const evmc_bytes32& value) noexcept final
evmc_storage_status set_storage(const address& address,
const bytes32& key,
const bytes32& value) noexcept final
{
return context->host->set_storage(context, &address, &key, &value);
}

evmc_uint256be get_balance(const evmc_address& address) noexcept final
evmc_uint256be get_balance(const address& address) noexcept final
{
return context->host->get_balance(context, &address);
}

size_t get_code_size(const evmc_address& address) noexcept final
size_t get_code_size(const address& address) noexcept final
{
return context->host->get_code_size(context, &address);
}

evmc_bytes32 get_code_hash(const evmc_address& address) noexcept final
bytes32 get_code_hash(const address& address) noexcept final
{
return context->host->get_code_hash(context, &address);
}

size_t copy_code(const evmc_address& address,
size_t copy_code(const address& address,
size_t code_offset,
uint8_t* buffer_data,
size_t buffer_size) noexcept final
{
return context->host->copy_code(context, &address, code_offset, buffer_data, buffer_size);
}

void selfdestruct(const evmc_address& address, const evmc_address& beneficiary) noexcept final
void selfdestruct(const address& addr, const address& beneficiary) noexcept final
{
context->host->selfdestruct(context, &address, &beneficiary);
context->host->selfdestruct(context, &addr, &beneficiary);
}

result call(const evmc_message& message) noexcept final
Expand All @@ -546,18 +544,18 @@ class HostContext : public HostInterface
return tx_context;
}

evmc_bytes32 get_block_hash(int64_t number) noexcept final
bytes32 get_block_hash(int64_t number) noexcept final
{
return context->host->get_block_hash(context, number);
}

void emit_log(const evmc_address& address,
void emit_log(const address& addr,
const uint8_t* data,
size_t data_size,
const evmc_bytes32 topics[],
const bytes32 topics[],
size_t topics_count) noexcept final
{
context->host->emit_log(context, &address, data, data_size, topics, topics_count);
context->host->emit_log(context, &addr, data, data_size, topics, topics_count);
}
};

Expand Down Expand Up @@ -636,7 +634,8 @@ inline void emit_log(evmc_context* h,
const evmc_bytes32 topics[],
size_t num_topics) noexcept
{
static_cast<Host*>(h)->emit_log(*addr, data, data_size, topics, num_topics);
static_cast<Host*>(h)->emit_log(*addr, data, data_size, static_cast<const bytes32*>(topics),
num_topics);
}

constexpr evmc_host_interface interface{
Expand Down

0 comments on commit 2caa00b

Please sign in to comment.