Type fixes for pyright

Author: SamWilsn

src/ethereum/arrow_glacier/utils/address.py

@@ -65,7 +65,7 @@ def compute_contract_address(address: Address, nonce: Uint) -> Address:
 
 
 def compute_create2_contract_address(
-    address: Address, salt: Bytes32, call_data: bytearray
+    address: Address, salt: Bytes32, call_data: bytes
 ) -> Address:
     """
     Computes address of the new account that needs to be created, which is

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

@@ -364,7 +364,7 @@ def signextend(evm: Evm) -> None:
         else:
             num_bytes_prepend = U256(32) - (byte_num + U256(1))
             result = U256.from_be_bytes(
-                bytearray([0xFF] * num_bytes_prepend) + value_bytes
+                bytes([0xFF] * num_bytes_prepend) + value_bytes
             )
 
     push(evm.stack, result)

src/ethereum/arrow_glacier/vm/interpreter.py

@@ -286,6 +286,7 @@ def execute_code(message: Message) -> Evm:
     )
     try:
         if evm.message.code_address in PRE_COMPILED_CONTRACTS:
+            assert evm.message.code_address is not None
             evm_trace(evm, PrecompileStart(evm.message.code_address))
             PRE_COMPILED_CONTRACTS[evm.message.code_address](evm)
             evm_trace(evm, PrecompileEnd())

src/ethereum/arrow_glacier/vm/memory.py

@@ -37,7 +37,7 @@ def memory_write(
 
 def memory_read_bytes(
     memory: bytearray, start_position: U256, size: U256
-) -> bytearray:
+) -> bytes:
     """
     Read bytes from memory.
 
@@ -55,7 +55,7 @@ def memory_read_bytes(
     data_bytes :
         Data read from memory.
     """
-    return memory[start_position : Uint(start_position) + Uint(size)]
+    return bytes(memory[start_position : Uint(start_position) + Uint(size)])
 
 
 def buffer_read(buffer: Bytes, start_position: U256, size: U256) -> Bytes:

src/ethereum/berlin/utils/address.py

@@ -65,7 +65,7 @@ def compute_contract_address(address: Address, nonce: Uint) -> Address:
 
 
 def compute_create2_contract_address(
-    address: Address, salt: Bytes32, call_data: bytearray
+    address: Address, salt: Bytes32, call_data: bytes
 ) -> Address:
     """
     Computes address of the new account that needs to be created, which is

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

@@ -364,7 +364,7 @@ def signextend(evm: Evm) -> None:
         else:
             num_bytes_prepend = U256(32) - (byte_num + U256(1))
             result = U256.from_be_bytes(
-                bytearray([0xFF] * num_bytes_prepend) + value_bytes
+                bytes([0xFF] * num_bytes_prepend) + value_bytes
             )
 
     push(evm.stack, result)

src/ethereum/berlin/vm/interpreter.py

@@ -282,6 +282,7 @@ def execute_code(message: Message) -> Evm:
     )
     try:
         if evm.message.code_address in PRE_COMPILED_CONTRACTS:
+            assert evm.message.code_address is not None
             evm_trace(evm, PrecompileStart(evm.message.code_address))
             PRE_COMPILED_CONTRACTS[evm.message.code_address](evm)
             evm_trace(evm, PrecompileEnd())

src/ethereum/berlin/vm/memory.py

@@ -37,7 +37,7 @@ def memory_write(
 
 def memory_read_bytes(
     memory: bytearray, start_position: U256, size: U256
-) -> bytearray:
+) -> bytes:
     """
     Read bytes from memory.
 
@@ -55,7 +55,7 @@ def memory_read_bytes(
     data_bytes :
         Data read from memory.
     """
-    return memory[start_position : Uint(start_position) + Uint(size)]
+    return bytes(memory[start_position : Uint(start_position) + Uint(size)])
 
 
 def buffer_read(buffer: Bytes, start_position: U256, size: U256) -> Bytes:

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

@@ -364,7 +364,7 @@ def signextend(evm: Evm) -> None:
         else:
             num_bytes_prepend = U256(32) - (byte_num + U256(1))
             result = U256.from_be_bytes(
-                bytearray([0xFF] * num_bytes_prepend) + value_bytes
+                bytes([0xFF] * num_bytes_prepend) + value_bytes
             )
 
     push(evm.stack, result)

src/ethereum/byzantium/vm/interpreter.py

@@ -273,6 +273,7 @@ def execute_code(message: Message) -> Evm:
     )
     try:
         if evm.message.code_address in PRE_COMPILED_CONTRACTS:
+            assert evm.message.code_address is not None
             evm_trace(evm, PrecompileStart(evm.message.code_address))
             PRE_COMPILED_CONTRACTS[evm.message.code_address](evm)
             evm_trace(evm, PrecompileEnd())