Fix CI issues

ethereum · Mar 12, 2024 · d43ee77 · d43ee77
1 parent 4a23064
commit d43ee77
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/eth/vm/base.py b/eth/vm/base.py
@@ -285,6 +285,7 @@ def apply_all_transactions(
             result_header = self.add_receipt_to_header(previous_header, receipt)
             previous_header = result_header
 
+            # cancun and beyond
             result_header = self.increment_blob_gas_used(previous_header, transaction)
             previous_header = result_header
 

diff --git a/eth/vm/forks/berlin/transactions.py b/eth/vm/forks/berlin/transactions.py
@@ -453,7 +453,7 @@ class BerlinTransactionBuilder(TransactionBuilderAPI):
 
     legacy_signed = BerlinLegacyTransaction
     legacy_unsigned = BerlinUnsignedLegacyTransaction
-    typed_transaction: type[TypedTransaction] = TypedTransaction
+    typed_transaction: Type[TypedTransaction] = TypedTransaction
 
     @classmethod
     def decode(cls, encoded: bytes) -> SignedTransactionAPI:

diff --git a/eth/vm/forks/cancun/transactions.py b/eth/vm/forks/cancun/transactions.py
@@ -217,7 +217,7 @@ class CancunTypedTransaction(TypedTransaction):
 class CancunTransactionBuilder(ShanghaiTransactionBuilder):
     legacy_signed = CancunLegacyTransaction
     legacy_unsigned = CancunUnsignedLegacyTransaction
-    typed_transaction: type[TypedTransaction] = CancunTypedTransaction
+    typed_transaction: Type[TypedTransaction] = CancunTypedTransaction
 
     @classmethod
     def new_unsigned_blob_transaction(

diff --git a/eth/vm/forks/frontier/__init__.py b/eth/vm/forks/frontier/__init__.py
@@ -101,7 +101,7 @@ def increment_blob_gas_used(
         self, old_header: BlockHeaderAPI, transaction: TransactionFieldsAPI
     ) -> BlockHeaderAPI:
         # This is only relevant for the Cancun fork and later
-        pass
+        return old_header
 
     @classmethod
     def calculate_net_gas_refund(cls, consumed_gas: int, gross_refund: int) -> int:

diff --git a/eth/vm/forks/london/transactions.py b/eth/vm/forks/london/transactions.py
@@ -270,7 +270,7 @@ class LondonTypedTransaction(TypedTransaction):
 class LondonTransactionBuilder(BerlinTransactionBuilder):
     legacy_signed = LondonLegacyTransaction
     legacy_unsigned = LondonUnsignedLegacyTransaction
-    typed_transaction: type[TypedTransaction] = LondonTypedTransaction
+    typed_transaction: Type[TypedTransaction] = LondonTypedTransaction
 
     @classmethod
     def new_unsigned_dynamic_fee_transaction(

diff --git a/eth/vm/state.py b/eth/vm/state.py
@@ -111,6 +111,12 @@ def get_tip(self, transaction: SignedTransactionAPI) -> int:
     def get_gas_price(self, transaction: SignedTransactionAPI) -> int:
         return transaction.gas_price
 
+    @property
+    def blob_base_fee(self) -> int:
+        raise NotImplementedError(
+            "Basefee opcode is not implemented prior to Cancun hard fork"
+        )
+
     #
     # Access to account db
     #