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

Change Transaction nonce to U64 #995

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

Change Transaction nonce to U64 #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
805f3b2
Change Cancun's transaction nonce to U64
richardgreg Aug 23, 2024
0fe51fd
Change Paris' transaction nonce to U64
richardgreg Aug 29, 2024
649c7a2
Change Berlin's transaction nonce to U64
richardgreg Aug 29, 2024
37e1b26
Change London's transaction nonce to U64
richardgreg Aug 29, 2024
f40fd74
Change Dao Fork's transaction nonce to U64
richardgreg Aug 29, 2024
6ba66d6
Change Spurious Dragon's transaction nonce to U64
richardgreg Aug 29, 2024
4f69d50
Change Shanghai's transaction nonce to U64
richardgreg Aug 29, 2024
fb574db
Constantinopole's transaction nonce to U64
richardgreg Aug 29, 2024
cfebe05
Change Tangerine Whistle's transaction nonce to U64
richardgreg Aug 29, 2024
ec345b8
Change Frontier's transaction nonce to U64
richardgreg Aug 29, 2024
2d5b5d4
Change Instanbul's transaction nonce to U64
richardgreg Aug 29, 2024
8590621
Change Byzantium's transaction nonce to U64
richardgreg Aug 29, 2024
34aa96c
Change Homestead's transaction nonce to U64
richardgreg Aug 29, 2024
12cbcb7
Change Arrow Glacier's transaction nonce to U64
richardgreg Aug 29, 2024
22fd07f
Change Gray Glacier's transaction nonce to U64
richardgreg Aug 29, 2024
7b43037
Change Muir Glacier's transaction nonce to U64
richardgreg Aug 29, 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
6 changes: 3 additions & 3 deletions src/ethereum/arrow_glacier/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LegacyTransaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -53,7 +53,7 @@ class AccessListTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -73,7 +73,7 @@ class FeeMarketTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
max_priority_fee_per_gas: Uint
max_fee_per_gas: Uint
gas: Uint
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/berlin/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LegacyTransaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -53,7 +53,7 @@ class AccessListTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/byzantium/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
8 changes: 4 additions & 4 deletions src/ethereum/cancun/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LegacyTransaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -53,7 +53,7 @@ class AccessListTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -73,7 +73,7 @@ class FeeMarketTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
max_priority_fee_per_gas: Uint
max_fee_per_gas: Uint
gas: Uint
Expand All @@ -94,7 +94,7 @@ class BlobTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
max_priority_fee_per_gas: Uint
max_fee_per_gas: Uint
gas: Uint
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/constantinople/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/dao_fork/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/frontier/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -21,7 +21,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
6 changes: 3 additions & 3 deletions src/ethereum/gray_glacier/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LegacyTransaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -53,7 +53,7 @@ class AccessListTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -73,7 +73,7 @@ class FeeMarketTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
max_priority_fee_per_gas: Uint
max_fee_per_gas: Uint
gas: Uint
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/homestead/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/istanbul/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
6 changes: 3 additions & 3 deletions src/ethereum/london/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LegacyTransaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -53,7 +53,7 @@ class AccessListTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -73,7 +73,7 @@ class FeeMarketTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
max_priority_fee_per_gas: Uint
max_fee_per_gas: Uint
gas: Uint
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/muir_glacier/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
6 changes: 3 additions & 3 deletions src/ethereum/paris/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LegacyTransaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -53,7 +53,7 @@ class AccessListTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -73,7 +73,7 @@ class FeeMarketTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
max_priority_fee_per_gas: Uint
max_fee_per_gas: Uint
gas: Uint
Expand Down
6 changes: 3 additions & 3 deletions src/ethereum/shanghai/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LegacyTransaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -53,7 +53,7 @@ class AccessListTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand All @@ -73,7 +73,7 @@ class FeeMarketTransaction:
"""

chain_id: U64
nonce: U256
nonce: U64
max_priority_fee_per_gas: Uint
max_fee_per_gas: Uint
gas: Uint
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/spurious_dragon/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/tangerine_whistle/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from typing import Union

from ..base_types import U256, Bytes, Bytes0, Uint, slotted_freezable
from ..base_types import U64, U256, Bytes, Bytes0, Uint, slotted_freezable
from .fork_types import Address

TX_BASE_COST = 21000
Expand All @@ -22,7 +22,7 @@ class Transaction:
Atomic operation performed on the block chain.
"""

nonce: U256
nonce: U64
gas_price: Uint
gas: Uint
to: Union[Bytes0, Address]
Expand Down
4 changes: 2 additions & 2 deletions tests/berlin/test_rlp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
)

legacy_transaction = LegacyTransaction(
U256(1),
U64(1),
Uint(2),
Uint(3),
Bytes0(),
Expand All @@ -52,7 +52,7 @@

access_list_transaction = AccessListTransaction(
U64(1),
U256(1),
U64(1),
Uint(2),
Uint(3),
Bytes0(),
Expand Down
6 changes: 3 additions & 3 deletions tests/byzantium/test_rlp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest

import ethereum.rlp as rlp
from ethereum.base_types import U256, Bytes, Bytes0, Bytes8, Uint
from ethereum.base_types import U64, U256, Bytes, Bytes0, Bytes8, Uint
from ethereum.byzantium.blocks import Block, Header, Log, Receipt
from ethereum.byzantium.transactions import Transaction
from ethereum.byzantium.utils.hexadecimal import hex_to_address
Expand Down Expand Up @@ -33,7 +33,7 @@
)

transaction1 = Transaction(
U256(1),
U64(1),
Uint(2),
Uint(3),
Bytes0(),
Expand All @@ -45,7 +45,7 @@
)

transaction2 = Transaction(
U256(1),
U64(1),
Uint(2),
Uint(3),
Bytes0(),
Expand Down
Loading
Loading