Skip to content

Commit e4e88b2

Browse files
hugo-dchugo-dc
committed
new(tests): EOF validation RETF stack overflow
1 parent 2c07538 commit e4e88b2

File tree

3 files changed

+137
-5
lines changed

3 files changed

+137
-5
lines changed

‎converted-ethereum-tests.txt

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ EOFTests/efStack/backwards_rjumpi_variable_stack_.json
2323
EOFTests/efStack/backwards_rjumpv_.json
2424
EOFTests/efStack/backwards_rjumpv_variable_stack_.json
2525
EOFTests/efStack/jumpf_stack_overflow_.json
26+
EOFTests/efStack/retf_stack_validation_.json
27+
EOFTests/efStack/retf_variable_stack_.json
2628
EOFTests/efStack/forwards_rjump_.json
2729
EOFTests/efStack/forwards_rjump_variable_stack_.json
2830
EOFTests/efStack/forwards_rjumpi_.json

‎tests/osaka/eip7692_eof_v1/eip4750_functions/test_code_validation.py

+124
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,34 @@
2424
pytestmark = pytest.mark.valid_from(EOF_FORK_NAME)
2525

2626
VALID: List[Container] = [
27+
Container(
28+
name="retf_stack_validation_0",
29+
sections=[
30+
Section.Code(code=Op.CALLF[1] + Op.STOP, max_stack_height=2),
31+
Section.Code(
32+
code=Op.PUSH0 * 2 + Op.RETF,
33+
code_outputs=2,
34+
max_stack_height=2,
35+
),
36+
],
37+
expected_bytecode="ef000101000802000200040003040000000080000200020002e30001005f5fe4",
38+
),
39+
Container(
40+
name="retf_stack_validation_3",
41+
sections=[
42+
Section.Code(
43+
code=Op.PUSH0 + Op.CALLF[1] + Op.STOP,
44+
max_stack_height=2,
45+
),
46+
Section.Code(
47+
code=Op.RJUMPI[7] + Op.PUSH1[1] * 2 + Op.RJUMP[2] + Op.PUSH0 * 2 + Op.RETF,
48+
code_inputs=1,
49+
code_outputs=2,
50+
max_stack_height=2,
51+
),
52+
],
53+
expected_bytecode="ef00010100080200020005000d0400000000800002010200025fe3000100e1000760016001e000025f5fe4",
54+
),
2755
Container(
2856
name="retf_code_input_output",
2957
sections=[
@@ -90,6 +118,63 @@
90118
]
91119

92120
INVALID: List[Container] = [
121+
Container(
122+
name="retf_stack_validation_1",
123+
sections=[
124+
Section.Code(code=Op.CALLF[1] + Op.STOP, max_stack_height=2),
125+
Section.Code(
126+
code=Op.PUSH0 + Op.RETF,
127+
code_outputs=2,
128+
max_stack_height=1,
129+
),
130+
],
131+
expected_bytecode="ef000101000802000200040002040000000080000200020001e30001005fe4",
132+
validity_error=EOFException.STACK_UNDERFLOW,
133+
),
134+
Container(
135+
name="retf_variable_stack_0",
136+
sections=[
137+
Section.Code(code=Op.CALLF[1] + Op.STOP, max_stack_height=5),
138+
Section.Code(
139+
code=Op.PUSH0 + Op.PUSH1[0] + Op.RJUMPI[2] + Op.PUSH0 * 2 + Op.RETF,
140+
code_outputs=5,
141+
max_stack_height=3,
142+
),
143+
],
144+
expected_bytecode="ef000101000802000200040009040000000080000500050003e30001005f6000e100025f5fe4",
145+
validity_error=EOFException.STACK_UNDERFLOW,
146+
),
147+
Container(
148+
name="retf_variable_stack_1",
149+
sections=[
150+
Section.Code(code=Op.CALLF[1] + Op.STOP, max_stack_height=3),
151+
Section.Code(
152+
code=Op.PUSH0 + Op.PUSH1[0] + Op.RJUMPI[2] + Op.PUSH0 * 2 + Op.RETF,
153+
code_outputs=3,
154+
max_stack_height=3,
155+
),
156+
],
157+
expected_bytecode="ef000101000802000200040009040000000080000300030003e30001005f6000e100025f5fe4",
158+
validity_error=EOFException.STACK_UNDERFLOW,
159+
),
160+
Container(
161+
name="callf_inputs_underflow_0",
162+
sections=[
163+
Section.Code(code=Op.CALLF[1] + Op.STOP, max_stack_height=1),
164+
Section.Code(
165+
code=Op.PUSH0 + Op.CALLF[2] + Op.RETF,
166+
code_outputs=1,
167+
max_stack_height=1,
168+
),
169+
Section.Code(
170+
code=Op.POP + Op.RETF,
171+
code_inputs=2,
172+
code_outputs=1,
173+
max_stack_height=2,
174+
),
175+
],
176+
validity_error=EOFException.STACK_UNDERFLOW,
177+
),
93178
Container(
94179
# CALLF to function with incorrectly specified number of inputs
95180
name="code_inputs_underflow_1", # EOF1I4750_0020
@@ -128,6 +213,45 @@
128213
],
129214
validity_error=EOFException.STACK_UNDERFLOW,
130215
),
216+
Container(
217+
name="retf_stack_validation_2",
218+
sections=[
219+
Section.Code(code=Op.CALLF[1] + Op.STOP, max_stack_height=2),
220+
Section.Code(
221+
code=Op.PUSH0 * 3 + Op.RETF,
222+
code_outputs=2,
223+
max_stack_height=3,
224+
),
225+
],
226+
expected_bytecode="ef000101000802000200040004040000000080000200020003e30001005f5f5fe4",
227+
validity_error=EOFException.STACK_HIGHER_THAN_OUTPUTS,
228+
),
229+
Container(
230+
name="retf_variable_stack_2",
231+
sections=[
232+
Section.Code(code=Op.CALLF[1] + Op.STOP, max_stack_height=1),
233+
Section.Code(
234+
code=Op.PUSH0 + Op.PUSH1[0] + Op.RJUMPI[2] + Op.PUSH0 * 2 + Op.RETF,
235+
code_outputs=1,
236+
max_stack_height=3,
237+
),
238+
],
239+
expected_bytecode="ef000101000802000200040009040000000080000100010003e30001005f6000e100025f5fe4",
240+
validity_error=EOFException.STACK_HIGHER_THAN_OUTPUTS,
241+
),
242+
Container(
243+
name="EOFV1_0000",
244+
sections=[
245+
Section.Code(code=Op.CALLF[1] + Op.STOP),
246+
Section.Code(
247+
code=Op.PUSH0 + Op.PUSH1[0] + Op.RJUMPI[2] + Op.PUSH0 * 2 + Op.RETF,
248+
code_outputs=0,
249+
max_stack_height=3,
250+
),
251+
],
252+
expected_bytecode="ef000101000802000200040009040000000080000000000003e30001005f6000e100025f5fe4",
253+
validity_error=EOFException.STACK_HIGHER_THAN_OUTPUTS,
254+
),
131255
Container(
132256
name="stack_higher_than_code_outputs",
133257
sections=[

‎tests/osaka/eip7692_eof_v1/eof_tracker.md

+11-5
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,17 @@
259259

260260
#### RETF
261261

262-
- [ ] Valid RETF with correct number of items on stack (ethereum/tests: src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json src/EOFTestsFiller/EIP5450/validInvalidFiller.yml)
263-
- [ ] Invalid RETF with extra items on stack (ethereum/tests: src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json ./src/EOFTestsFiller/efExample/validInvalidFiller.yml)
264-
- [ ] RETF stack underflow (ethereum/tests: src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json)
265-
- [ ] RETF reached via different paths (ethereum/tests: src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json)
266-
- [ ] RETF in variable stack segment is not allowed (ethereum/tests: src/EOFTestsFiller/efStack/retf_variable_stack_Copier.json)
262+
- [ ] Valid RETF with correct number of items on stack
263+
- ethereum/tests:
264+
- [x] src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json
265+
- [ ] src/EOFTestsFiller/EIP5450/validInvalidFiller.yml)
266+
- [ ] Invalid RETF with extra items on stack
267+
- ethereum/tests:
268+
- [x] src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json
269+
- [ ] ./src/EOFTestsFiller/efExample/validInvalidFiller.yml)
270+
- [x] RETF stack underflow(ethereum/tests: src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json)
271+
- [x] RETF reached via different paths (ethereum/tests: src/EOFTestsFiller/efStack/retf_stack_validation_Copier.json)
272+
- [x] RETF in variable stack segment is not allowed (ethereum/tests: src/EOFTestsFiller/efStack/retf_variable_stack_Copier.json)
267273
- [ ] Extra items on stack allowed for terminating instructions other than RETF (ethereum/tests: src/EOFTestsFiller/EIP5450/validInvalidFiller.yml)
268274
- [x] Invalid RETF in a non-returning function ([`tests/osaka/eip7692_eof_v1/eip6206_jumpf/test_nonreturning_validation.py::test_first_section_returning`](./eip6206_jumpf/test_nonreturning_validation/test_first_section_returning.md))
269275

0 commit comments

Comments
 (0)