chore(forks): Fix issues from lint after rebase with Osaka latest

Author: fselmo

src/ethereum/amsterdam/bloom.py

@@ -42,14 +42,14 @@ def add_to_bloom(bloom: bytearray, bloom_entry: Bytes) -> None:
     bloom_entry :
         An entry which is to be added to bloom filter.
     """
-    hash = keccak256(bloom_entry)
+    hashed = keccak256(bloom_entry)
 
     for idx in (0, 2, 4):
         # Obtain the least significant 11 bits from the pair of bytes
         # (16 bits), and set this bit in bloom bytearray.
         # The obtained bit is 0-indexed in the bloom filter from the least
         # significant bit to the most significant bit.
-        bit_to_set = Uint.from_be_bytes(hash[idx : idx + 2]) & Uint(0x07FF)
+        bit_to_set = Uint.from_be_bytes(hashed[idx : idx + 2]) & Uint(0x07FF)
         # Below is the index of the bit in the bytearray (where 0-indexed
         # byte is the most significant byte)
         bit_index = 0x07FF - int(bit_to_set)

src/ethereum/amsterdam/fork.py

@@ -458,7 +458,7 @@ def check_transaction(
     NoBlobDataError :
         If the transaction is a type 3 but has no blobs.
     BlobCountExceededError :
-        If the transaction is a type 3 and has nore blobs than the limit.
+        If the transaction is a type 3 and has more blobs than the limit.
     TransactionTypeContractCreationError:
         If the transaction type is not allowed to create contracts.
     EmptyAuthorizationListError :

src/ethereum/amsterdam/fork_types.py

@@ -9,7 +9,7 @@
 Introduction
 ------------
 
-Types re-used throughout the specification, which are specific to Ethereum.
+Types reused throughout the specification, which are specific to Ethereum.
 """
 
 from dataclasses import dataclass

src/ethereum/amsterdam/vm/gas.py

@@ -160,8 +160,8 @@ def calculate_memory_gas_cost(size_in_bytes: Uint) -> Uint:
     total_gas_cost = linear_cost + quadratic_cost
     try:
         return total_gas_cost
-    except ValueError:
-        raise OutOfGasError
+    except ValueError as e:
+        raise OutOfGasError from e
 
 
 def calculate_gas_extend_memory(
@@ -264,7 +264,7 @@ def max_message_call_gas(gas: Uint) -> Uint:
 
 def init_code_cost(init_code_length: Uint) -> Uint:
     """
-    Calculates the gas to be charged for the init code in CREAT*
+    Calculates the gas to be charged for the init code in CREATE*
     opcodes as well as create transactions.
 
     Parameters

src/ethereum/amsterdam/vm/instructions/block.py

@@ -52,13 +52,13 @@ def block_hash(evm: Evm) -> None:
         # Default hash to 0, if the block of interest is not yet on the chain
         # (including the block which has the current executing transaction),
         # or if the block's age is more than 256.
-        hash = b"\x00"
+        current_block_hash = b"\x00"
     else:
-        hash = evm.message.block_env.block_hashes[
+        current_block_hash = evm.message.block_env.block_hashes[
             -(current_block_number - block_number)
         ]
 
-    push(evm.stack, U256.from_be_bytes(hash))
+    push(evm.stack, U256.from_be_bytes(current_block_hash))
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)

src/ethereum/amsterdam/vm/instructions/keccak.py

@@ -56,9 +56,9 @@ def keccak(evm: Evm) -> None:
     # OPERATION
     evm.memory += b"\x00" * extend_memory.expand_by
     data = memory_read_bytes(evm.memory, memory_start_index, size)
-    hash = keccak256(data)
+    hashed = keccak256(data)
 
-    push(evm.stack, U256.from_be_bytes(hash))
+    push(evm.stack, U256.from_be_bytes(hashed))
 
     # PROGRAM COUNTER
     evm.pc += Uint(1)

src/ethereum/amsterdam/vm/interpreter.py

@@ -310,8 +310,8 @@ def execute_code(message: Message) -> Evm:
         while evm.running and evm.pc < ulen(evm.code):
             try:
                 op = Ops(evm.code[evm.pc])
-            except ValueError:
-                raise InvalidOpcode(evm.code[evm.pc])
+            except ValueError as e:
+                raise InvalidOpcode(evm.code[evm.pc]) from e
 
             evm_trace(evm, OpStart(op))
             op_implementation[op](evm)

src/ethereum/amsterdam/vm/precompiled_contracts/bls12_381/__init__.py

@@ -25,11 +25,11 @@
     curve_order,
     is_inf,
     is_on_curve,
+    normalize,
 )
 from py_ecc.optimized_bls12_381.optimized_curve import (
     multiply as bls12_multiply,
 )
-from py_ecc.optimized_bls12_381.optimized_curve import normalize
 from py_ecc.typing import Optimized_Point3D as Point3D
 
 from ....vm.memory import buffer_read
@@ -547,7 +547,7 @@ def bytes_to_g2(
     return _bytes_to_g2_cached(data, subgroup_check)
 
 
-def FQ2_to_bytes(fq2: FQ2) -> Bytes:
+def fq2_to_bytes(fq2: FQ2) -> Bytes:
     """
     Encode a FQ2 point to 128 bytes.
 
@@ -582,7 +582,7 @@ def g2_to_bytes(
         The encoded data.
     """
     x_coords, y_coords = normalize(g2_point)
-    return FQ2_to_bytes(x_coords) + FQ2_to_bytes(y_coords)
+    return fq2_to_bytes(x_coords) + fq2_to_bytes(y_coords)
 
 
 def decode_g2_scalar_pair(

src/ethereum/amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_pairing.py

@@ -13,9 +13,8 @@
 """
 
 from ethereum_types.numeric import Uint
-from py_ecc.optimized_bls12_381 import FQ12, curve_order, is_inf
+from py_ecc.optimized_bls12_381 import FQ12, curve_order, is_inf, pairing
 from py_ecc.optimized_bls12_381 import multiply as bls12_multiply
-from py_ecc.optimized_bls12_381 import pairing
 
 from ....vm import Evm
 from ....vm.gas import charge_gas