address comments from PR ethereum#2151

eth/validation.py

@@ -40,7 +40,7 @@
 )
 
 
-def validate_is_bytes(value: bytes, size: int = None, title: str = "Value") -> None:
+def validate_is_bytes(value: bytes, title: str = "Value", size: int = None) -> None:
     if not isinstance(value, bytes):
         raise ValidationError(f"{title} must be a byte string.  Got: {type(value)}")
     if size is not None and len(value) != size:

eth/vm/forks/cancun/__init__.py

@@ -2,7 +2,9 @@
     Type,
 )
 
-from eth._utils.db import get_block_header_by_hash
+from eth._utils.db import (
+    get_block_header_by_hash,
+)
 from eth.abc import (
     BlockAPI,
     BlockHeaderAPI,
@@ -58,19 +60,11 @@ class CancunVM(ShanghaiVM):
         create_cancun_header_from_parent()
     )
 
-    @staticmethod
-    def _get_total_blob_gas(transaction: TransactionFieldsAPI) -> int:
-        try:
-            return GAS_PER_BLOB * len(transaction.blob_versioned_hashes)  # type: ignore
-        except (AttributeError, NotImplementedError):
-            return 0
-
     def increment_blob_gas_used(
         self, old_header: BlockHeaderAPI, transaction: TransactionFieldsAPI
     ) -> BlockHeaderAPI:
         return old_header.copy(
-            blob_gas_used=old_header.blob_gas_used
-            + self._get_total_blob_gas(transaction)
+            blob_gas_used=old_header.blob_gas_used + get_total_blob_gas(transaction)
         )
 
     @classmethod

eth/vm/forks/cancun/constants.py

@@ -21,5 +21,5 @@
 GAS_PER_BLOB = 2**17
 HASH_OPCODE_GAS = 3
 
-# EIP-75416
+# EIP-7516
 BASEFEE_OPCODE_GAS = 2

eth/vm/forks/cancun/headers.py

@@ -33,12 +33,11 @@ def calc_excess_blob_gas(parent_header: BlockHeaderAPI) -> int:
     ):
         return 0
     else:
-        excess_blob_gas = (
+        return (
             parent_header.excess_blob_gas
             + parent_header.blob_gas_used
             - TARGET_BLOB_GAS_PER_BLOCK
         )
-        return excess_blob_gas
 
 
 @curry
@@ -70,5 +69,4 @@ def create_cancun_header_from_parent(
     if parent_header is not None:
         all_fields["excess_blob_gas"] = calc_excess_blob_gas(parent_header)
 
-    new_header = CancunBlockHeader(**all_fields)
-    return new_header
+    return CancunBlockHeader(**all_fields)

eth/vm/forks/cancun/state.py

@@ -51,6 +51,10 @@
 )
 
 
+# ``max_iterations`` was added to prevent the exponential nature from running
+# indefinitely. Some ``ethereum/tests`` would hang forever on this calculation. We
+# should keep an eye on this function to see if this value is accurate enough for
+# the use case.
 def fake_exponential(
     factor: int, numerator: int, denominator: int, max_iterations: int = 10000
 ) -> int:

eth/vm/state.py

@@ -102,7 +102,7 @@ def gas_limit(self) -> int:
     @property
     def base_fee(self) -> int:
         raise NotImplementedError(
-            "Basefee opcode is not implemented prior to London hard fork"
+            "BASEFEE opcode is not implemented prior to London hard fork"
         )
 
     def get_tip(self, transaction: SignedTransactionAPI) -> int:
@@ -114,7 +114,7 @@ def get_gas_price(self, transaction: SignedTransactionAPI) -> int:
     @property
     def blob_base_fee(self) -> int:
         raise NotImplementedError(
-            "Basefee opcode is not implemented prior to Cancun hard fork"
+            "BLOBBASEFEE opcode is not implemented prior to Cancun hard fork"
         )
 
     #