Skip to content

EIP-3540: Merge FORMAT and MAGIC #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gumb0 merged 1 commit into from
Jun 14, 2022
Merged

EIP-3540: Merge FORMAT and MAGIC #471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions lib/evmone/eof.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ namespace evmone
{
namespace
{
constexpr uint8_t FORMAT = 0xef;
constexpr uint8_t MAGIC = 0x00;
constexpr uint8_t MAGIC[] = {0xef, 0x00};
constexpr uint8_t TERMINATOR = 0x00;
constexpr uint8_t CODE_SECTION = 0x01;
constexpr uint8_t DATA_SECTION = 0x02;
Expand All @@ -35,7 +34,7 @@ std::pair<EOFSectionHeaders, EOFValidationError> validate_eof_headers(bytes_view
uint8_t section_id = 0;
EOFSectionHeaders section_headers{};
const auto container_end = container.end();
auto it = container.begin() + 1 + sizeof(MAGIC) + 1; // FORMAT + MAGIC + VERSION
auto it = container.begin() + std::size(MAGIC) + 1; // MAGIC + VERSION
while (it != container_end && state != State::terminated)
{
switch (state)
Expand Down Expand Up @@ -144,20 +143,20 @@ size_t EOF1Header::code_begin() const noexcept
assert(code_size != 0);

if (data_size == 0)
return 7; // EF + MAGIC + VERSION + SECTION_ID + SIZE + TERMINATOR
return 7; // MAGIC + VERSION + SECTION_ID + SIZE + TERMINATOR
else
return 10; // EF + MAGIC + VERSION + SECTION_ID + SIZE + SECTION_ID + SIZE + TERMINATOR
return 10; // MAGIC + VERSION + SECTION_ID + SIZE + SECTION_ID + SIZE + TERMINATOR
}

bool is_eof_code(bytes_view code) noexcept
{
return code.size() > 1 && code[0] == FORMAT && code[1] == MAGIC;
return code.size() > 1 && code[0] == MAGIC[0] && code[1] == MAGIC[1];
}

EOF1Header read_valid_eof1_header(bytes_view::const_iterator code) noexcept
{
EOF1Header header;
const auto code_size_offset = 4; // FORMAT + MAGIC + VERSION + CODE_SECTION_ID
const auto code_size_offset = 4; // MAGIC + VERSION + CODE_SECTION_ID
header.code_size =
static_cast<uint16_t>((code[code_size_offset] << 8) | code[code_size_offset + 1]);
if (code[code_size_offset + 2] == 2) // is data section present
Expand All @@ -171,7 +170,7 @@ EOF1Header read_valid_eof1_header(bytes_view::const_iterator code) noexcept

uint8_t get_eof_version(bytes_view container) noexcept
{
return (container.size() >= 3 && container[0] == FORMAT && container[1] == MAGIC) ?
return (container.size() >= 3 && container[0] == MAGIC[0] && container[1] == MAGIC[1]) ?
container[2] :
0;
}
Expand Down