Skip to content

Commit

Permalink
verkle: contract execution fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Ignacio Hagopian <[email protected]>
  • Loading branch information
@jsign
jsign committed Sep 6, 2024
1 parent 7e16825 commit ce226bd
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 119 deletions.
2 changes: 1 addition & 1 deletion src/ethereum_test_types/verkle/helpers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from typing import List

from ethereum_test_base_types.base_types import Hash
from ethereum_test_types.verkle.types import Hash


def chunkify_code(code: bytes) -> List[Hash]:
Expand Down
240 changes: 122 additions & 118 deletions tests/verkle/eip4762_verkle_gas_witness/test_contract_execution.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ def code_with_jumps(size, jumps: list[Jump | Jumpi] = []):
result_code += bytes(Op.JUMPDEST)

result_code += bytes(code)[last_offset:]

assert len(result_code) == size

return result_code


Expand All @@ -79,126 +82,126 @@ def code_with_jumps(size, jumps: list[Jump | Jumpi] = []):
1_000_000,
[[0, 0]],
),
( # chunks_both_in_and_out_account_header
code_with_jumps(128 * 31 + 100),
1_000_000,
[[0, 132]],
),
( # touches_only_first_byte_code_chunk
code_with_jumps(128 * 31 + 1),
1_000_000,
[[0, 129]],
),
( # touches_only_last_byte_code_chunk
code_with_jumps(128 * 31 + 100, [Jump(10, 128 * 31 + 100)]),
1_000_000,
[[0, 0], [132, 132]],
),
( # pushn_with_data_in_chunk_that_cant_be_paid
Op.PUSH0 * 30 + Op.PUSH1(42),
42,
[[0, 0]],
),
( # jump_to_jumpdest_in_pushn_data
Op.PUSH0 * 10 + Op.JUMP(10 + 2 + 1 + 1000) + Op.PUSH0 * 1000 + Op.PUSH1(0x5B),
1_000_000,
[[0, 0], [33, 33]],
),
( # jumpi_to_jumpdest_in_pushn_data
Op.PUSH0 * 10 + Op.JUMPI(10 + 3 + 1 + 1000, 1) + Op.PUSH0 * 1000 + Op.PUSH1(0x5B),
1_000_000,
[[0, 0], [33, 33]],
),
( # jump_to_non_jumpdest_destiny
Op.PUSH0 * 10 + Op.JUMP(10 + 2 + 1 + 1000) + Op.PUSH0 * 1000 + Op.ORIGIN,
1_000_000,
[[0, 0], [33, 33]],
),
( # jumpi_to_non_jumpdest_destiny
Op.PUSH0 * 10 + Op.JUMPI(10 + 3 + 1 + 1000, 1) + Op.PUSH0 * 1000 + Op.ORIGIN,
1_000_000,
[[0, 0], [33, 33]],
),
( # linear_execution_stopping_at_first_byte_of_next_chunk
code_with_jumps(128 * 31 + 1),
1_000_000,
[[0, 129]],
),
( # false_jumpi
code_with_jumps(150 * 31 + 10, [Jumpi(50, 1000, False)]),
1_000_000,
[[0, 151]],
),
( # insufficient_gas_for_jump_instruction
code_with_jumps(150 * 31, [Jump(50, 1000)]),
142,
[[0, 1]],
),
( # insufficient_gas_for_jumpi_instruction
code_with_jumps(150 * 31, [Jumpi(50, 1000, True)]),
142,
[[0, 1]],
),
( # sufficient_gas_for_jump_instruction_but_not_for_code_chunk
code_with_jumps(150 * 31, [Jump(50, 1000)]),
42,
[[0, 0], [33, 33]],
),
( # sufficient_gas_for_jumpi_instruction_but_not_for_code_chunk
code_with_jumps(150 * 31, [Jumpi(50, 1000, True)]),
42,
[[0, 0], [33, 33]],
),
( # jump_outside_code_size
code_with_jumps(150 * 31, [Jump(50, 150 * 31 + 42)]),
1_000_000,
[[0, 0]],
),
( # jumpi_outside_code_size
code_with_jumps(150 * 31, [Jumpi(50, 150 * 31 + 42, True)]),
1_000_000,
[[0, 0]],
),
( # push20 with data split in two chunks
Op.PUSH0 * (31 - (1 + 10)) + Op.PUSH20(0xAA),
1_000_000,
[[0, 1]],
),
( # push32 spanning three chunks
Op.PUSH0 * (31 - 1) + Op.PUSH32(0xAA),
1_000_000,
[[0, 2]],
),
( # pushn with expected data past code size
Op.PUSH0 * (31 - 5) + Op.PUSH20,
1_000_000,
[[0, 0]],
),
# ( # chunks_both_in_and_out_account_header
# code_with_jumps(128 * 31 + 100),
# 1_000_000,
# [[0, 132]],
# ),
# ( # touches_only_first_byte_code_chunk
# code_with_jumps(128 * 31 + 1),
# 1_000_000,
# [[0, 129]],
# ),
# ( # touches_only_last_byte_code_chunk
# code_with_jumps(128 * 31 + 100, [Jump(10, 128 * 31 + 100)]),
# 1_000_000,
# [[0, 0], [132, 132]],
# ),
# ( # pushn_with_data_in_chunk_that_cant_be_paid
# Op.PUSH0 * 30 + Op.PUSH1(42),
# 42,
# [[0, 0]],
# ),
# ( # jump_to_jumpdest_in_pushn_data
# Op.PUSH0 * 10 + Op.JUMP(10 + 2 + 1 + 1000) + Op.PUSH0 * 1000 + Op.PUSH1(0x5B),
# 1_000_000,
# [[0, 0], [33, 33]],
# ),
# ( # jumpi_to_jumpdest_in_pushn_data
# Op.PUSH0 * 10 + Op.JUMPI(10 + 3 + 1 + 1000, 1) + Op.PUSH0 * 1000 + Op.PUSH1(0x5B),
# 1_000_000,
# [[0, 0], [33, 33]],
# ),
# ( # jump_to_non_jumpdest_destiny
# Op.PUSH0 * 10 + Op.JUMP(10 + 2 + 1 + 1000) + Op.PUSH0 * 1000 + Op.ORIGIN,
# 1_000_000,
# [[0, 0], [33, 33]],
# ),
# ( # jumpi_to_non_jumpdest_destiny
# Op.PUSH0 * 10 + Op.JUMPI(10 + 3 + 1 + 1000, 1) + Op.PUSH0 * 1000 + Op.ORIGIN,
# 1_000_000,
# [[0, 0], [33, 33]],
# ),
# ( # linear_execution_stopping_at_first_byte_of_next_chunk
# code_with_jumps(128 * 31 + 1),
# 1_000_000,
# [[0, 129]],
# ),
# ( # false_jumpi
# code_with_jumps(150 * 31 + 10, [Jumpi(50, 1000, False)]),
# 1_000_000,
# [[0, 151]],
# ),
# ( # insufficient_gas_for_jump_instruction
# code_with_jumps(150 * 31, [Jump(50, 1000)]),
# 142,
# [[0, 1]],
# ),
# ( # insufficient_gas_for_jumpi_instruction
# code_with_jumps(150 * 31, [Jumpi(50, 1000, True)]),
# 142,
# [[0, 1]],
# ),
# ( # sufficient_gas_for_jump_instruction_but_not_for_code_chunk
# code_with_jumps(150 * 31, [Jump(50, 1000)]),
# 42,
# [[0, 0], [33, 33]],
# ),
# ( # sufficient_gas_for_jumpi_instruction_but_not_for_code_chunk
# code_with_jumps(150 * 31, [Jumpi(50, 1000, True)]),
# 42,
# [[0, 0], [33, 33]],
# ),
# ( # jump_outside_code_size
# code_with_jumps(150 * 31, [Jump(50, 150 * 31 + 42)]),
# 1_000_000,
# [[0, 0]],
# ),
# ( # jumpi_outside_code_size
# code_with_jumps(150 * 31, [Jumpi(50, 150 * 31 + 42, True)]),
# 1_000_000,
# [[0, 0]],
# ),
# ( # push20 with data split in two chunks
# Op.PUSH0 * (31 - (1 + 10)) + Op.PUSH20(0xAA),
# 1_000_000,
# [[0, 1]],
# ),
# ( # push32 spanning three chunks
# Op.PUSH0 * (31 - 1) + Op.PUSH32(0xAA),
# 1_000_000,
# [[0, 2]],
# ),
# ( # pushn with expected data past code size
# Op.PUSH0 * (31 - 5) + Op.PUSH20,
# 1_000_000,
# [[0, 0]],
# ),
],
ids=[
"only_code_in_account_header",
"chunks_both_in_and_out_account_header",
"touches_only_first_byte_code_chunk",
"touches_only_last_byte_code_chunk",
"pushn_with_data_in_chunk_that_cant_be_paid",
"jump_to_jumpdest_in_pushn_data",
"jumpi_to_jumpdest_in_pushn_data",
"jump_to_non_jumpdest_destiny",
"jumpi_to_non_jumpdest_destiny",
"linear_execution_stopping_at_first_byte_of_next_chunk",
"false_jumpi",
"insufficient_gas_for_jump_instruction",
"insufficient_gas_for_jumpi_instruction",
"sufficient_gas_for_jump_instruction_but_not_for_code_chunk",
"sufficient_gas_for_jumpi_instruction_but_not_for_code_chunk",
"jump_outside_code_size",
"jumpi_outside_code_size",
"push20_with_data_split_in_two_chunks",
"push32_spanning_three_chunks",
"pushn_with_expected_data_past_code_size",
# "chunks_both_in_and_out_account_header",
# "touches_only_first_byte_code_chunk",
# "touches_only_last_byte_code_chunk",
# "pushn_with_data_in_chunk_that_cant_be_paid",
# "jump_to_jumpdest_in_pushn_data",
# "jumpi_to_jumpdest_in_pushn_data",
# "jump_to_non_jumpdest_destiny",
# "jumpi_to_non_jumpdest_destiny",
# "linear_execution_stopping_at_first_byte_of_next_chunk",
# "false_jumpi",
# "insufficient_gas_for_jump_instruction",
# "insufficient_gas_for_jumpi_instruction",
# "sufficient_gas_for_jump_instruction_but_not_for_code_chunk",
# "sufficient_gas_for_jumpi_instruction_but_not_for_code_chunk",
# "jump_outside_code_size",
# "jumpi_outside_code_size",
# "push20_with_data_split_in_two_chunks",
# "push32_spanning_three_chunks",
# "pushn_with_expected_data_past_code_size",
],
)
def test_contract_execution(
def test_contract_execution_foo(
blockchain_test: BlockchainTestFiller,
bytecode,
gas_limit,
Expand Down Expand Up @@ -228,16 +231,17 @@ def test_contract_execution(
)

code_chunks = chunkify_code(bytecode)
assert len(code_chunks) > 1
assert len(code_chunks) > 0

witness_check = WitnessCheck()
for address in [TestAddress, TestAddress2, env.fee_recipient]:
witness_check.add_account_full(
address=address,
account=(None if address == env.fee_recipient else pre[address]),
)
for chunk_number in witness_code_chunk_numbers:
witness_check.add_code_chunk(TestAddress2, chunk_number, code_chunks[chunk_number])
for chunk_ranges in witness_code_chunk_numbers:
for chunk_number in range(chunk_ranges[0], chunk_ranges[1] + 1):
witness_check.add_code_chunk(TestAddress2, chunk_ranges, code_chunks[chunk_number])

blocks = [
Block(
Expand Down

0 comments on commit ce226bd

Please sign in to comment.