EOF DATA* opcodes #586

gumb0 · 2023-03-18T15:32:33Z

No description provided.

lib/evmone/instructions.hpp

codecov · 2023-03-18T16:36:20Z

Codecov Report

Merging #586 (f31a835) into master (5983bd7) will increase coverage by 0.04%.
The diff coverage is 99.10%.

❗ Current head f31a835 differs from pull request most recent head bb6001b. Consider uploading reports for the commit bb6001b to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #586      +/-   ##
==========================================
+ Coverage   97.33%   97.38%   +0.04%     
==========================================
  Files          80       80              
  Lines        7739     7949     +210     
==========================================
+ Hits         7533     7741     +208     
- Misses        206      208       +2

Flag	Coverage Δ
blockchaintests	`62.97% <30.23%> (-1.20%)`	⬇️
statetests	`73.89% <40.00%> (-0.67%)`	⬇️
unittests	`94.94% <99.10%> (+0.11%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
lib/evmone/advanced_instructions.cpp	`100.00% <ø> (ø)`
lib/evmone/baseline_instruction_table.cpp	`100.00% <ø> (ø)`
test/unittests/instructions_test.cpp	`89.58% <ø> (ø)`
lib/evmone/eof.cpp	`83.01% <80.00%> (-0.18%)`	⬇️
lib/evmone/advanced_analysis.hpp	`100.00% <100.00%> (ø)`
lib/evmone/advanced_execution.cpp	`100.00% <100.00%> (ø)`
lib/evmone/baseline.cpp	`100.00% <100.00%> (ø)`
lib/evmone/eof.hpp	`100.00% <100.00%> (ø)`
lib/evmone/execution_state.hpp	`96.22% <100.00%> (+0.39%)`	⬆️
lib/evmone/instructions.hpp	`100.00% <100.00%> (ø)`
... and 5 more

axic · 2023-03-18T16:38:14Z

lib/evmone/instructions.hpp

+    for (size_t i = 0; i < 32; ++i)
+        data[i] = state.data[begin + i];
+
+    index = intx::be::load<uint256>(data);


Is this taking an array (and not iterators)? Otherwise could just use

Suggested change

index = intx::be::load<uint256>(data);

index = intx::be::load<uint256>(begin + index);

It takes array

Need an overload in intx 😅

Made an issue: chfast/intx#288

Use intx::be::unsafe::load(&state.data[begin]).

lib/evmone/instructions.hpp

lib/evmone/instructions_opcodes.hpp

lib/evmone/eof.hpp

lib/evmone/execution_state.hpp

test/unittests/eof_validation_test.cpp

test/unittests/evm_eof_test.cpp

lib/evmone/instructions.hpp

gumb0 · 2023-05-15T10:55:12Z

@hugo-dc Any idea why EIP-3670 tests don't fail here? Don't we check that all undefined opcodes are rejected?

We change the validation to accept some new opcodes that tests consider invalid, so supposedly this change shouldn't pass current tests.

I investigated this a bit and I think that codes with new opcodes are most certainly still invalid for some other reason.
The tests I found check the code generated from a pattern 0xef000101000402000100020300000000000000<invalid_opcode>00 - this would be invalid either because of wrong stack for new instruction, or for wrong max stack height declared as 0.

So this makes those tests (stEIP3670/*InvalidOpcodes) kinda useless.

lib/evmone/execution_state.hpp

lib/evmone/instructions.hpp

test/unittests/evm_eof_test.cpp

axic · 2023-05-22T23:13:49Z

@gumb0 what is outstanding here?

gumb0 · 2023-05-23T08:38:10Z

@gumb0 what is outstanding here?

I think another round of review form @chfast

lib/evmone/instructions.hpp

chfast · 2023-05-24T09:17:51Z

lib/evmone/instructions.hpp

+    auto& index = stack.top();
+
+    if (state.data.size() < 32 || (state.data.size() - 32) < index)
+        return {EVMC_INVALID_MEMORY_ACCESS, gas_left};  // TODO: Introduce EVMC_INVALID_DATA_ACCESS


I mean general design: maybe padding with zero is better. But I think this is good staring point.

lib/evmone/instructions.hpp

Also increase stack allowance.

gumb0 force-pushed the eof-data-opcodes branch from 38565bf to aefb67e Compare March 18, 2023 15:34

chfast force-pushed the eof branch from 4c03243 to c94614c Compare March 18, 2023 15:41

axic reviewed Mar 18, 2023

View reviewed changes

lib/evmone/instructions.hpp Outdated Show resolved Hide resolved

gumb0 force-pushed the eof-data-opcodes branch from 428b2f3 to 72f771d Compare March 18, 2023 16:29

axic reviewed Mar 18, 2023

View reviewed changes

gumb0 force-pushed the eof-data-opcodes branch 2 times, most recently from 336a205 to 8b93f3f Compare March 18, 2023 18:52

chfast force-pushed the eof branch 2 times, most recently from cf08fe5 to 8891cbc Compare March 21, 2023 08:09

Base automatically changed from eof to master March 21, 2023 12:02

axic force-pushed the eof-data-opcodes branch from 9b21905 to ffefb54 Compare March 22, 2023 19:14

axic reviewed Mar 22, 2023

View reviewed changes

lib/evmone/instructions.hpp Outdated Show resolved Hide resolved

axic reviewed Mar 22, 2023

View reviewed changes

lib/evmone/instructions_opcodes.hpp Outdated Show resolved Hide resolved

axic added the EOF label Mar 22, 2023

axic reviewed Mar 27, 2023

View reviewed changes

lib/evmone/instructions_opcodes.hpp Outdated Show resolved Hide resolved

axic force-pushed the eof-data-opcodes branch 2 times, most recently from 72693a7 to ad36c18 Compare March 28, 2023 10:31

gumb0 force-pushed the eof-data-opcodes branch 11 times, most recently from 3fada02 to 5b2a4d8 Compare April 13, 2023 15:42

gumb0 force-pushed the eof-data-opcodes branch from 5b2a4d8 to 34c3f57 Compare April 20, 2023 10:34

gumb0 force-pushed the eof-data-opcodes branch from 8376f7c to 0e2a34a Compare May 12, 2023 18:27

gumb0 requested review from axic and chfast May 12, 2023 18:35

chfast reviewed May 15, 2023

View reviewed changes

gumb0 force-pushed the eof-data-opcodes branch 3 times, most recently from b592f2e to 54bf309 Compare May 16, 2023 10:53

chfast reviewed May 16, 2023

View reviewed changes

gumb0 force-pushed the eof-data-opcodes branch from d8d7a92 to f31a835 Compare May 16, 2023 12:34

gumb0 requested a review from chfast May 23, 2023 08:37

chfast reviewed May 24, 2023

View reviewed changes

gumb0 force-pushed the eof-data-opcodes branch 2 times, most recently from bb6001b to 043b1b5 Compare May 24, 2023 10:58

gumb0 requested a review from chfast May 24, 2023 11:07

chfast approved these changes May 24, 2023

View reviewed changes

gumb0 added 9 commits May 26, 2023 17:59

Implement DATALOAD instruction

0914193

Implement DATASIZE instruction

5177832

Implement DATACOPY instruction

75054c0

Also increase stack allowance.

Implement DATALOADN instruction

ab97d32

Validate DATALOADN immediate argument

6e2de2b

Validate EOF code before execution in evm fixture

57527a2

Unit tests for DATA*

a6b3e1a

Add DATACOPY to evm.memory_access test

f72b92f

Undefine DATA opcodes for legacy

8fce131

gumb0 force-pushed the eof-data-opcodes branch from 043b1b5 to 8fce131 Compare May 26, 2023 16:00

gumb0 merged commit 894fe66 into master May 26, 2023

gumb0 deleted the eof-data-opcodes branch May 26, 2023 16:13

	index = intx::be::load<uint256>(data);
	index = intx::be::load<uint256>(begin + index);

EOF DATA* opcodes #586

EOF DATA* opcodes #586

Uh oh!

Conversation

gumb0 commented Mar 18, 2023

Uh oh!

Uh oh!

codecov bot commented Mar 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

axic Mar 18, 2023

Choose a reason for hiding this comment

Uh oh!

gumb0 Mar 18, 2023

Choose a reason for hiding this comment

Uh oh!

axic Mar 18, 2023

Choose a reason for hiding this comment

Uh oh!

axic Mar 18, 2023

Choose a reason for hiding this comment

Uh oh!

chfast May 12, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gumb0 commented May 15, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

axic commented May 22, 2023

Uh oh!

gumb0 commented May 23, 2023

Uh oh!

Uh oh!

chfast May 24, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Mar 18, 2023 •

edited

Loading