Skip to content
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

Jump to bottom

fillers/eips/eip3860: Update EIP-3860 Due to Spec Change #29

Merged
merged 10 commits into from
Jan 13, 2023
Merged

fillers/eips/eip3860: Update EIP-3860 Due to Spec Change #29

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4721148
Small change for EIP-3860 spec change.
spencer-tb Jan 11, 2023
c544afe
Small change for EIP-3860 spec change and fix for salt change.
spencer-tb Jan 11, 2023
b3b0ef4
Tox fix.
spencer-tb Jan 11, 2023
788d21b
Add additional OOG error catching.
spencer-tb Jan 12, 2023
b2289a7
Fix initcode contract data copy.
spencer-tb Jan 12, 2023
dc99b80
Merge conflicts.
spencer-tb Jan 13, 2023
e29c0fb
fillers/eips: add salt to create2 contract creation (#20)
MariusVanDerWijden Jan 10, 2023
f365c1a
fillers/eips: add salt to create2 contract creation (#20)
MariusVanDerWijden Jan 10, 2023
9b3e061
SSTORE a value regardless of what CALL returns for further validation.
spencer-tb Jan 13, 2023
f3bc8dc
Apply suggestions from code review
marioevz Jan 13, 2023
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
44 changes: 40 additions & 4 deletions fillers/eips/eip3860.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,18 @@ def generate_create_opcode_initcode_test_cases(
"""
env = Environment()

call_code = Yul(
"""
{
calldatacopy(0, 0, calldatasize())
let call_result := call(5000000, \
0x0000000000000000000000000000000000000100, \
0, 0, calldatasize(), 0, 0)
sstore(call_result, 1)
}
"""
)

if opcode == "create":
code = Yul(
"""
Expand All @@ -483,7 +495,7 @@ def generate_create_opcode_initcode_test_cases(
let contract_length := calldatasize()
calldatacopy(0, 0, contract_length)
let gas1 := gas()
let res := create2(0, 0, contract_length, 0xdeadbeef)
let res := create2(0, 0, contract_length, 0xDEADBEEF)
let gas2 := gas()
sstore(0, res)
sstore(1, sub(gas1, gas2))
Expand All @@ -492,9 +504,10 @@ def generate_create_opcode_initcode_test_cases(
)
created_contract_address = compute_create2_address(
address=0x100,
salt=0,
salt=0xDEADBEEF,
initcode=initcode.assemble(),
)

else:
raise Exception("invalid opcode for generator")

Expand All @@ -504,13 +517,17 @@ def generate_create_opcode_initcode_test_cases(
code=code,
nonce=1,
),
to_address(0x200): Account(
code=call_code,
nonce=1,
),
}

post: Dict[Any, Any] = {}

tx = Transaction(
nonce=0,
to=to_address(0x100),
to=to_address(0x200),
data=initcode,
gas_limit=10000000,
gas_price=10,
Expand All @@ -525,14 +542,24 @@ def generate_create_opcode_initcode_test_cases(
expected_gas_usage += PUSH_DUP_OPCODE_GAS

if len(initcode.assemble()) > MAX_INITCODE_SIZE and eip_3860_active:
# Call returns 0 as out of gas s[0]==1
post[to_address(0x200)] = Account(
nonce=1,
storage={
0: 1,
marioevz marked this conversation as resolved.
Show resolved Hide resolved
1: 0,
},
)

post[created_contract_address] = Account.NONEXISTENT
post[to_address(0x100)] = Account(
nonce=1,
storage={
0: 0,
1: expected_gas_usage,
1: 0,
},
)

else:
# The initcode is only executed if the length check succeeds
expected_gas_usage += initcode.execution_gas
Expand All @@ -552,6 +579,15 @@ def generate_create_opcode_initcode_test_cases(
len(initcode.assemble())
)

# Call returns 1 as valid initcode length s[0]==1 && s[1]==1
post[to_address(0x200)] = Account(
nonce=1,
storage={
0: 0,
1: 1,
},
)

post[created_contract_address] = Account(code=initcode.deploy_code)
post[to_address(0x100)] = Account(
nonce=2,
Expand Down