Replace Uint(len(...)) with ulen(...) (#2580)

* chore(specs): replace `Uint(len(...))` with `ulen(...)`

* chore(spec-tool): pevent `Uint(len(...))` with a lint

Author: SamWilsn

src/ethereum/forks/amsterdam/block_access_lists.py

@@ -18,7 +18,7 @@
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes, Bytes32
 from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U32, U64, U256, Uint
+from ethereum_types.numeric import U32, U64, U256, Uint, ulen
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.state import EMPTY_CODE_HASH, Account, Address, PreState
@@ -760,7 +760,7 @@ def validate_block_access_list_gas_limit(
             unique_slots.add(slot)
 
         # Count each unique storage key as one item
-        bal_items += Uint(len(unique_slots))
+        bal_items += ulen(unique_slots)
 
     if bal_items > block_gas_limit // GasCosts.BLOCK_ACCESS_LIST_ITEM:
         raise BlockAccessListGasLimitExceededError(

src/ethereum/forks/amsterdam/fork.py

@@ -17,7 +17,7 @@
 from ethereum_rlp import rlp
 from ethereum_types.bytes import Bytes
 from ethereum_types.frozen import slotted_freezable
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.crypto.hash import Hash32, keccak256
 from ethereum.exceptions import (
@@ -850,7 +850,7 @@ def apply_body(
 
     # EIP-7928: Post-execution operations use index N+1
     block_env.block_access_list_builder.block_access_index = BlockAccessIndex(
-        Uint(len(transactions)) + Uint(1)
+        ulen(transactions) + Uint(1)
     )
 
     process_withdrawals(block_env, block_output, withdrawals)

src/ethereum/forks/amsterdam/vm/gas.py

@@ -14,7 +14,7 @@
 from dataclasses import dataclass
 from typing import List, Tuple
 
-from ethereum_types.numeric import U64, U256, Uint
+from ethereum_types.numeric import U64, U256, Uint, ulen
 
 from ethereum.forks.bpo5.blocks import Header as PreviousHeader
 from ethereum.trace import GasAndRefund, evm_trace
@@ -311,7 +311,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue

src/ethereum/forks/amsterdam/vm/precompiled_contracts/alt_bn128.py

@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -207,7 +207,7 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     # GAS
     charge_gas(
         evm,
-        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * Uint(len(data) // 192)
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
         + GasCosts.PRECOMPILE_ECPAIRING_BASE,
     )
 

src/ethereum/forks/amsterdam/vm/precompiled_contracts/identity.py

@@ -11,7 +11,7 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
@@ -35,7 +35,7 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
+    word_count = ceil32(ulen(data)) // Uint(32)
     charge_gas(
         evm,
         GasCosts.PRECOMPILE_IDENTITY_BASE

src/ethereum/forks/amsterdam/vm/precompiled_contracts/ripemd160.py

@@ -13,7 +13,7 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.byte import left_pad_zero_bytes
 from ethereum.utils.numeric import ceil32
@@ -38,7 +38,7 @@ def ripemd160(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
+    word_count = ceil32(ulen(data)) // Uint(32)
     charge_gas(
         evm,
         GasCosts.PRECOMPILE_RIPEMD160_BASE

src/ethereum/forks/amsterdam/vm/precompiled_contracts/sha256.py

@@ -13,7 +13,7 @@
 
 import hashlib
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
@@ -37,7 +37,7 @@ def sha256(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
+    word_count = ceil32(ulen(data)) // Uint(32)
     charge_gas(
         evm,
         GasCosts.PRECOMPILE_SHA256_BASE

src/ethereum/forks/arrow_glacier/vm/gas.py

@@ -14,7 +14,7 @@
 from dataclasses import dataclass
 from typing import List, Tuple
 
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 
 from ethereum.trace import GasAndRefund, evm_trace
 from ethereum.utils.numeric import ceil32
@@ -262,7 +262,7 @@ def calculate_gas_extend_memory(
     """
     size_to_extend = Uint(0)
     to_be_paid = Uint(0)
-    current_size = Uint(len(memory))
+    current_size = ulen(memory)
     for start_position, size in extensions:
         if size == 0:
             continue

src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/alt_bn128.py

@@ -12,7 +12,7 @@
 """
 
 from ethereum_types.bytes import Bytes
-from ethereum_types.numeric import U256, Uint
+from ethereum_types.numeric import U256, Uint, ulen
 from py_ecc.optimized_bn128.optimized_curve import (
     FQ,
     FQ2,
@@ -207,7 +207,7 @@ def alt_bn128_pairing_check(evm: Evm) -> None:
     # GAS
     charge_gas(
         evm,
-        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * Uint(len(data) // 192)
+        GasCosts.PRECOMPILE_ECPAIRING_PER_POINT * (ulen(data) // Uint(192))
         + GasCosts.PRECOMPILE_ECPAIRING_BASE,
     )
 

src/ethereum/forks/arrow_glacier/vm/precompiled_contracts/identity.py

@@ -11,7 +11,7 @@
 Implementation of the `IDENTITY` precompiled contract.
 """
 
-from ethereum_types.numeric import Uint
+from ethereum_types.numeric import Uint, ulen
 
 from ethereum.utils.numeric import ceil32
 
@@ -35,7 +35,7 @@ def identity(evm: Evm) -> None:
     data = evm.message.data
 
     # GAS
-    word_count = ceil32(Uint(len(data))) // Uint(32)
+    word_count = ceil32(ulen(data)) // Uint(32)
     charge_gas(
         evm,
         GasCosts.PRECOMPILE_IDENTITY_BASE