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

enhancement: factor out a type from access lists #960

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

enhancement: factor out a type from access lists #960

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cd8dcbf
enhancement: factor out a type from access lists in Cancun
richardgreg Jun 6, 2024
9f73e2c
enhancement: factor out a type from access lists in Paris
richardgreg Jun 27, 2024
6020ece
enhancement: factor out a type from access lists in Berlin
richardgreg Jun 27, 2024
ce3c77f
enhancement: factor out a type from access lists in London
richardgreg Jun 27, 2024
2303ffc
enhancement: factor out a type from access lists in Shanghai
richardgreg Jun 27, 2024
c23af04
enhancement: factor out a type from access lists in Arrow Glacier
richardgreg Jun 27, 2024
a4c56ee
enhancement: factor out a type from access lists in Gray Glacier
richardgreg Jun 27, 2024
4d20eb0
Modify Cancun's test_rlp and fork to use new Access type
richardgreg Aug 7, 2024
2b748a7
Modify Paris' test_rlp and fork to use new Access type
richardgreg Aug 8, 2024
76b516a
Modify Berlin's test_rlp and fork to use new Access type.
richardgreg Aug 8, 2024
2fa9581
Modify London's test_rlp and fork to use new Access type.
richardgreg Aug 8, 2024
aacfcaa
Modify Shanghai's test_rlp and fork to use new Access type.
richardgreg Aug 8, 2024
deac7c2
Modify Gray Glacier's fork to use new Access type.
richardgreg Aug 8, 2024
eb2f271
Modify Arrow Glacier's fork to use new Access type.
richardgreg Aug 8, 2024
c2a769b
black and isort
SamWilsn Aug 13, 2024
eed3064
Re-add deleted constants in Cancun's transaction.py
richardgreg Aug 14, 2024
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
11 changes: 9 additions & 2 deletions src/ethereum/arrow_glacier/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ class LegacyTransaction:
s: U256


@slotted_freezable
@dataclass
class Access:
account: Address
slots: Tuple[Bytes32, ...]


@slotted_freezable
@dataclass
class AccessListTransaction:
Expand All @@ -59,7 +66,7 @@ class AccessListTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand All @@ -80,7 +87,7 @@ class FeeMarketTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand Down
13 changes: 7 additions & 6 deletions src/ethereum/berlin/fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,10 +687,10 @@ def process_transaction(
preaccessed_addresses = set()
preaccessed_storage_keys = set()
if isinstance(tx, AccessListTransaction):
for address, keys in tx.access_list:
preaccessed_addresses.add(address)
for key in keys:
preaccessed_storage_keys.add((address, key))
for access in tx.access_list:
preaccessed_addresses.add(access.account)
for key in access.slots:
preaccessed_storage_keys.add((access.account, key))

message = prepare_message(
sender,
Expand Down Expand Up @@ -804,9 +804,10 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:

access_list_cost = 0
if isinstance(tx, AccessListTransaction):
for _address, keys in tx.access_list:
for access in tx.access_list:
access_list_cost += TX_ACCESS_LIST_ADDRESS_COST
access_list_cost += len(keys) * TX_ACCESS_LIST_STORAGE_KEY_COST
slots_cost = len(access.slots) * TX_ACCESS_LIST_STORAGE_KEY_COST
access_list_cost += slots_cost

return Uint(TX_BASE_COST + data_cost + create_cost + access_list_cost)

Expand Down
9 changes: 8 additions & 1 deletion src/ethereum/berlin/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ class LegacyTransaction:
s: U256


@slotted_freezable
@dataclass
class Access:
account: Address
slots: Tuple[Bytes32, ...]


@slotted_freezable
@dataclass
class AccessListTransaction:
Expand All @@ -59,7 +66,7 @@ class AccessListTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand Down
13 changes: 7 additions & 6 deletions src/ethereum/cancun/fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,10 +754,10 @@ def process_transaction(
if isinstance(
tx, (AccessListTransaction, FeeMarketTransaction, BlobTransaction)
):
for address, keys in tx.access_list:
preaccessed_addresses.add(address)
for key in keys:
preaccessed_storage_keys.add((address, key))
for access in tx.access_list:
preaccessed_addresses.add(access.account)
for key in access.slots:
preaccessed_storage_keys.add((access.account, key))

message = prepare_message(
sender,
Expand Down Expand Up @@ -849,9 +849,10 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:
if isinstance(
tx, (AccessListTransaction, FeeMarketTransaction, BlobTransaction)
):
for _address, keys in tx.access_list:
for access in tx.access_list:
access_list_cost += TX_ACCESS_LIST_ADDRESS_COST
access_list_cost += len(keys) * TX_ACCESS_LIST_STORAGE_KEY_COST
slots_cost = len(access.slots) * TX_ACCESS_LIST_STORAGE_KEY_COST
access_list_cost += slots_cost

return Uint(TX_BASE_COST + data_cost + create_cost + access_list_cost)

Expand Down
18 changes: 9 additions & 9 deletions src/ethereum/cancun/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
from ..exceptions import InvalidBlock
from .fork_types import Address, VersionedHash

TX_BASE_COST = 21000
TX_DATA_COST_PER_NON_ZERO = 16
TX_DATA_COST_PER_ZERO = 4
TX_CREATE_COST = 32000
TX_ACCESS_LIST_ADDRESS_COST = 2400
TX_ACCESS_LIST_STORAGE_KEY_COST = 1900
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was removing these intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. Fixed it 🙂


@slotted_freezable
@dataclass
class Access:
account: Address
slots: Tuple[Bytes32, ...]


@slotted_freezable
Expand Down Expand Up @@ -59,7 +59,7 @@ class AccessListTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand All @@ -80,7 +80,7 @@ class FeeMarketTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand All @@ -101,7 +101,7 @@ class BlobTransaction:
to: Address
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
max_fee_per_blob_gas: U256
blob_versioned_hashes: Tuple[VersionedHash, ...]
y_parity: U256
Expand Down
13 changes: 7 additions & 6 deletions src/ethereum/gray_glacier/fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,10 +800,10 @@ def process_transaction(
preaccessed_addresses = set()
preaccessed_storage_keys = set()
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for address, keys in tx.access_list:
preaccessed_addresses.add(address)
for key in keys:
preaccessed_storage_keys.add((address, key))
for access in tx.access_list:
preaccessed_addresses.add(access.account)
for key in access.slots:
preaccessed_storage_keys.add((access.account, key))

message = prepare_message(
sender,
Expand Down Expand Up @@ -923,9 +923,10 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:

access_list_cost = 0
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for _address, keys in tx.access_list:
for access in tx.access_list:
access_list_cost += TX_ACCESS_LIST_ADDRESS_COST
access_list_cost += len(keys) * TX_ACCESS_LIST_STORAGE_KEY_COST
slots_cost = len(access.slots) * TX_ACCESS_LIST_STORAGE_KEY_COST
access_list_cost += slots_cost

return Uint(TX_BASE_COST + data_cost + create_cost + access_list_cost)

Expand Down
11 changes: 9 additions & 2 deletions src/ethereum/gray_glacier/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ class LegacyTransaction:
s: U256


@slotted_freezable
@dataclass
class Access:
account: Address
slots: Tuple[Bytes32, ...]


@slotted_freezable
@dataclass
class AccessListTransaction:
Expand All @@ -59,7 +66,7 @@ class AccessListTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand All @@ -80,7 +87,7 @@ class FeeMarketTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand Down
13 changes: 7 additions & 6 deletions src/ethereum/london/fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,10 +808,10 @@ def process_transaction(
preaccessed_addresses = set()
preaccessed_storage_keys = set()
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for address, keys in tx.access_list:
preaccessed_addresses.add(address)
for key in keys:
preaccessed_storage_keys.add((address, key))
for access in tx.access_list:
preaccessed_addresses.add(access.account)
for key in access.slots:
preaccessed_storage_keys.add((access.account, key))

message = prepare_message(
sender,
Expand Down Expand Up @@ -931,9 +931,10 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:

access_list_cost = 0
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for _address, keys in tx.access_list:
for access in tx.access_list:
access_list_cost += TX_ACCESS_LIST_ADDRESS_COST
access_list_cost += len(keys) * TX_ACCESS_LIST_STORAGE_KEY_COST
slots_cost = len(access.slots) * TX_ACCESS_LIST_STORAGE_KEY_COST
access_list_cost += slots_cost

return Uint(TX_BASE_COST + data_cost + create_cost + access_list_cost)

Expand Down
11 changes: 9 additions & 2 deletions src/ethereum/london/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ class LegacyTransaction:
s: U256


@slotted_freezable
@dataclass
class Access:
account: Address
slots: Tuple[Bytes32, ...]


@slotted_freezable
@dataclass
class AccessListTransaction:
Expand All @@ -59,7 +66,7 @@ class AccessListTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand All @@ -80,7 +87,7 @@ class FeeMarketTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand Down
13 changes: 7 additions & 6 deletions src/ethereum/paris/fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,10 @@ def process_transaction(
preaccessed_addresses = set()
preaccessed_storage_keys = set()
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for address, keys in tx.access_list:
preaccessed_addresses.add(address)
for key in keys:
preaccessed_storage_keys.add((address, key))
for access in tx.access_list:
preaccessed_addresses.add(access.account)
for key in access.slots:
preaccessed_storage_keys.add((access.account, key))

message = prepare_message(
sender,
Expand Down Expand Up @@ -717,9 +717,10 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:

access_list_cost = 0
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for _address, keys in tx.access_list:
for access in tx.access_list:
access_list_cost += TX_ACCESS_LIST_ADDRESS_COST
access_list_cost += len(keys) * TX_ACCESS_LIST_STORAGE_KEY_COST
slots_cost = len(access.slots) * TX_ACCESS_LIST_STORAGE_KEY_COST
access_list_cost += slots_cost

return Uint(TX_BASE_COST + data_cost + create_cost + access_list_cost)

Expand Down
11 changes: 9 additions & 2 deletions src/ethereum/paris/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
TX_ACCESS_LIST_STORAGE_KEY_COST = 1900


@slotted_freezable
@dataclass
class Access:
account: Address
slots: Tuple[Bytes32, ...]


@slotted_freezable
@dataclass
class LegacyTransaction:
Expand Down Expand Up @@ -59,7 +66,7 @@ class AccessListTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand All @@ -80,7 +87,7 @@ class FeeMarketTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand Down
13 changes: 7 additions & 6 deletions src/ethereum/shanghai/fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,10 +618,10 @@ def process_transaction(
preaccessed_storage_keys = set()
preaccessed_addresses.add(env.coinbase)
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for address, keys in tx.access_list:
preaccessed_addresses.add(address)
for key in keys:
preaccessed_storage_keys.add((address, key))
for access in tx.access_list:
preaccessed_addresses.add(access.account)
for key in access.slots:
preaccessed_storage_keys.add((access.account, key))

message = prepare_message(
sender,
Expand Down Expand Up @@ -748,9 +748,10 @@ def calculate_intrinsic_cost(tx: Transaction) -> Uint:

access_list_cost = 0
if isinstance(tx, (AccessListTransaction, FeeMarketTransaction)):
for _address, keys in tx.access_list:
for access in tx.access_list:
access_list_cost += TX_ACCESS_LIST_ADDRESS_COST
access_list_cost += len(keys) * TX_ACCESS_LIST_STORAGE_KEY_COST
slots_cost = len(access.slots) * TX_ACCESS_LIST_STORAGE_KEY_COST
access_list_cost += slots_cost

return Uint(TX_BASE_COST + data_cost + create_cost + access_list_cost)

Expand Down
11 changes: 9 additions & 2 deletions src/ethereum/shanghai/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ class LegacyTransaction:
s: U256


@slotted_freezable
@dataclass
class Access:
account: Address
slots: Tuple[Bytes32, ...]


@slotted_freezable
@dataclass
class AccessListTransaction:
Expand All @@ -59,7 +66,7 @@ class AccessListTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand All @@ -80,7 +87,7 @@ class FeeMarketTransaction:
to: Union[Bytes0, Address]
value: U256
data: Bytes
access_list: Tuple[Tuple[Address, Tuple[Bytes32, ...]], ...]
access_list: Tuple[Access, ...]
y_parity: U256
r: U256
s: U256
Expand Down
Loading
Loading