More bytes -> Bytes changes

Author: SamWilsn

src/ethereum/arrow_glacier/blocks.py

@@ -72,7 +72,7 @@ class Log:
 
     address: Address
     topics: Tuple[Hash32, ...]
-    data: bytes
+    data: Bytes
 
 
 @slotted_freezable

src/ethereum/arrow_glacier/bloom.py

@@ -18,6 +18,7 @@
 
 from typing import Tuple
 
+from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import Uint
 
 from ethereum.crypto.hash import keccak256
@@ -26,7 +27,7 @@
 from .fork_types import Bloom
 
 
-def add_to_bloom(bloom: bytearray, bloom_entry: bytes) -> None:
+def add_to_bloom(bloom: bytearray, bloom_entry: Bytes) -> None:
     """
     Add a bloom entry to the bloom filter (`bloom`).
 

src/ethereum/arrow_glacier/utils/hexadecimal.py

@@ -12,6 +12,8 @@
 Hexadecimal utility functions used in this specification, specific to
 Arrow Glacier types.
 """
+from ethereum_types.bytes import Bytes
+
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
 from ..fork_types import Address, Bloom, Root
@@ -31,7 +33,7 @@ def hex_to_root(hex_string: str) -> Root:
     root : `Root`
         Trie root obtained from the given hexadecimal string.
     """
-    return Root(bytes.fromhex(remove_hex_prefix(hex_string)))
+    return Root(Bytes.fromhex(remove_hex_prefix(hex_string)))
 
 
 def hex_to_bloom(hex_string: str) -> Bloom:
@@ -48,7 +50,7 @@ def hex_to_bloom(hex_string: str) -> Bloom:
     bloom : `Bloom`
         Bloom obtained from the given hexadecimal string.
     """
-    return Bloom(bytes.fromhex(remove_hex_prefix(hex_string)))
+    return Bloom(Bytes.fromhex(remove_hex_prefix(hex_string)))
 
 
 def hex_to_address(hex_string: str) -> Address:
@@ -65,4 +67,4 @@ def hex_to_address(hex_string: str) -> Address:
     address : `Address`
         The address obtained from the given hexadecimal string.
     """
-    return Address(bytes.fromhex(remove_hex_prefix(hex_string).rjust(40, "0")))
+    return Address(Bytes.fromhex(remove_hex_prefix(hex_string).rjust(40, "0")))

src/ethereum/arrow_glacier/vm/instructions/arithmetic.py

@@ -12,6 +12,7 @@
 Implementations of the EVM Arithmetic instructions.
 """
 
+from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.utils.numeric import get_sign
@@ -354,7 +355,7 @@ def signextend(evm: Evm) -> None:
         result = value
     else:
         # U256(0).to_be_bytes() gives b'' instead b'\x00'.
-        value_bytes = bytes(value.to_be_bytes32())
+        value_bytes = Bytes(value.to_be_bytes32())
         # Now among the obtained value bytes, consider only
         # N `least significant bytes`, where N is `byte_num + 1`.
         value_bytes = value_bytes[31 - int(byte_num) :]

src/ethereum/arrow_glacier/vm/instructions/system.py

@@ -12,7 +12,7 @@
 Implementations of the EVM system related instructions.
 """
 
-from ethereum_types.bytes import Bytes0
+from ethereum_types.bytes import Bytes, Bytes0
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.utils.numeric import ceil32
@@ -680,7 +680,7 @@ def revert(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     output = memory_read_bytes(evm.memory, memory_start_index, size)
-    evm.output = bytes(output)
+    evm.output = Bytes(output)
     raise Revert
 
     # PROGRAM COUNTER

src/ethereum/arrow_glacier/vm/runtime.py

@@ -13,12 +13,13 @@
 """
 from typing import Set
 
+from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import Uint, ulen
 
 from .instructions import Ops
 
 
-def get_valid_jump_destinations(code: bytes) -> Set[Uint]:
+def get_valid_jump_destinations(code: Bytes) -> Set[Uint]:
     """
     Analyze the evm code to obtain the set of valid jump destinations.
 

src/ethereum/berlin/blocks.py

@@ -66,7 +66,7 @@ class Log:
 
     address: Address
     topics: Tuple[Hash32, ...]
-    data: bytes
+    data: Bytes
 
 
 @slotted_freezable

src/ethereum/berlin/bloom.py

@@ -18,6 +18,7 @@
 
 from typing import Tuple
 
+from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import Uint
 
 from ethereum.crypto.hash import keccak256
@@ -26,7 +27,7 @@
 from .fork_types import Bloom
 
 
-def add_to_bloom(bloom: bytearray, bloom_entry: bytes) -> None:
+def add_to_bloom(bloom: bytearray, bloom_entry: Bytes) -> None:
     """
     Add a bloom entry to the bloom filter (`bloom`).
 

src/ethereum/berlin/utils/hexadecimal.py

@@ -12,6 +12,8 @@
 Hexadecimal utility functions used in this specification, specific to
 Berlin types.
 """
+from ethereum_types.bytes import Bytes
+
 from ethereum.utils.hexadecimal import remove_hex_prefix
 
 from ..fork_types import Address, Bloom, Root
@@ -31,7 +33,7 @@ def hex_to_root(hex_string: str) -> Root:
     root : `Root`
         Trie root obtained from the given hexadecimal string.
     """
-    return Root(bytes.fromhex(remove_hex_prefix(hex_string)))
+    return Root(Bytes.fromhex(remove_hex_prefix(hex_string)))
 
 
 def hex_to_bloom(hex_string: str) -> Bloom:
@@ -48,7 +50,7 @@ def hex_to_bloom(hex_string: str) -> Bloom:
     bloom : `Bloom`
         Bloom obtained from the given hexadecimal string.
     """
-    return Bloom(bytes.fromhex(remove_hex_prefix(hex_string)))
+    return Bloom(Bytes.fromhex(remove_hex_prefix(hex_string)))
 
 
 def hex_to_address(hex_string: str) -> Address:
@@ -65,4 +67,4 @@ def hex_to_address(hex_string: str) -> Address:
     address : `Address`
         The address obtained from the given hexadecimal string.
     """
-    return Address(bytes.fromhex(remove_hex_prefix(hex_string).rjust(40, "0")))
+    return Address(Bytes.fromhex(remove_hex_prefix(hex_string).rjust(40, "0")))

src/ethereum/berlin/vm/instructions/arithmetic.py

@@ -12,6 +12,7 @@
 Implementations of the EVM Arithmetic instructions.
 """
 
+from ethereum_types.bytes import Bytes
 from ethereum_types.numeric import U256, Uint
 
 from ethereum.utils.numeric import get_sign
@@ -354,7 +355,7 @@ def signextend(evm: Evm) -> None:
         result = value
     else:
         # U256(0).to_be_bytes() gives b'' instead b'\x00'.
-        value_bytes = bytes(value.to_be_bytes32())
+        value_bytes = Bytes(value.to_be_bytes32())
         # Now among the obtained value bytes, consider only
         # N `least significant bytes`, where N is `byte_num + 1`.
         value_bytes = value_bytes[31 - int(byte_num) :]