Move London-specific gas price code to LondonState

Author: carver

eth/vm/forks/london/state.py

@@ -147,6 +147,18 @@ class LondonState(BerlinState):
     computation_class = LondonComputation
     transaction_executor_class: Type[TransactionExecutorAPI] = LondonTransactionExecutor
 
+    def get_tip(self, transaction: SignedTransactionAPI) -> int:
+        return min(
+            transaction.max_fee_per_gas - self.execution_context.base_fee_per_gas,
+            transaction.max_priority_fee_per_gas,
+        )
+
+    def get_gas_price(self, transaction: SignedTransactionAPI) -> int:
+        return min(
+            transaction.max_fee_per_gas,
+            transaction.max_priority_fee_per_gas + self.execution_context.base_fee_per_gas,
+        )
+
     def validate_transaction(
         self,
         transaction: SignedTransactionAPI

eth/vm/state.py

@@ -88,27 +88,11 @@ def difficulty(self) -> int:
     def gas_limit(self) -> int:
         return self.execution_context.gas_limit
 
-    def _get_burn_price(self) -> int:
-        """
-        How much of the gas price will be burned?
-        """
-        execution_context = self.execution_context
-        try:
-            return execution_context.base_fee_per_gas
-        except AttributeError:
-            return 0
-
     def get_tip(self, transaction: SignedTransactionAPI) -> int:
-        return min(
-            transaction.max_fee_per_gas - self._get_burn_price(),
-            transaction.max_priority_fee_per_gas,
-        )
+        return transaction.gas_price
 
     def get_gas_price(self, transaction: SignedTransactionAPI) -> int:
-        return min(
-            transaction.max_fee_per_gas,
-            transaction.max_priority_fee_per_gas + self._get_burn_price(),
-        )
+        return transaction.gas_price
 
     #
     # Access to account db