Move tip v burn logic to Frontier to dedup code

Author: carver

eth/vm/forks/frontier/state.py

@@ -145,6 +145,8 @@ def build_computation(self,
     def finalize_computation(self,
                              transaction: SignedTransactionAPI,
                              computation: ComputationAPI) -> ComputationAPI:
+        transaction_context = self.vm_state.get_transaction_context(transaction)
+
         # Self Destruct Refunds
         num_deletions = len(computation.get_accounts_for_deletion())
         if num_deletions:
@@ -155,7 +157,7 @@ def finalize_computation(self,
         gas_refunded = computation.get_gas_refund()
         gas_used = transaction.gas - gas_remaining
         gas_refund = min(gas_refunded, gas_used // 2)
-        gas_refund_amount = (gas_refund + gas_remaining) * transaction.gas_price
+        gas_refund_amount = (gas_refund + gas_remaining) * transaction_context.gas_price
 
         if gas_refund_amount:
             self.vm_state.logger.debug2(
@@ -167,8 +169,8 @@ def finalize_computation(self,
             self.vm_state.delta_balance(computation.msg.sender, gas_refund_amount)
 
         # Miner Fees
-        transaction_fee = \
-            (transaction.gas - gas_remaining - gas_refund) * transaction.gas_price
+        gas_used = transaction.gas - gas_remaining - gas_refund
+        transaction_fee = gas_used * self.vm_state.get_tip(transaction)
         self.vm_state.logger.debug2(
             'TRANSACTION FEE: %s -> %s',
             transaction_fee,

eth/vm/forks/london/state.py

@@ -1,4 +1,3 @@
-from eth.vm.forks.frontier.constants import REFUND_SELFDESTRUCT
 from typing import Type
 
 from eth_hash.auto import keccak
@@ -9,7 +8,6 @@
 
 from eth.abc import (
     AccountDatabaseAPI,
-    ComputationAPI,
     MessageAPI,
     SignedTransactionAPI,
     StateAPI,
@@ -90,57 +88,6 @@ def build_evm_message(self, transaction: SignedTransactionAPI) -> MessageAPI:
         )
         return message
 
-    def finalize_computation(
-            self,
-            transaction: SignedTransactionAPI,
-            computation: ComputationAPI
-    ) -> ComputationAPI:
-        transaction_context = self.vm_state.get_transaction_context(transaction)
-
-        # Self Destruct Refunds
-        num_deletions = len(computation.get_accounts_for_deletion())
-        if num_deletions:
-            computation.refund_gas(REFUND_SELFDESTRUCT * num_deletions)
-
-        # Gas Refunds
-        gas_remaining = computation.get_gas_remaining()
-        gas_refunded = computation.get_gas_refund()
-        gas_used = transaction.gas - gas_remaining
-        gas_refund = min(gas_refunded, gas_used // 2)
-        gas_refund_amount = (gas_refund + gas_remaining) * transaction_context.gas_price
-
-        if gas_refund_amount:
-            self.vm_state.logger.debug2(
-                'TRANSACTION REFUND: %s -> %s',
-                gas_refund_amount,
-                encode_hex(computation.msg.sender),
-            )
-
-            self.vm_state.delta_balance(computation.msg.sender, gas_refund_amount)
-
-        # Miner Fees
-        gas_used = transaction.gas - gas_remaining - gas_refund
-        transaction_fee = gas_used * self.vm_state.get_tip(transaction)
-        self.vm_state.logger.debug2(
-            'TRANSACTION FEE: %s -> %s',
-            transaction_fee,
-            encode_hex(self.vm_state.coinbase),
-        )
-        self.vm_state.delta_balance(self.vm_state.coinbase, transaction_fee)
-
-        # Process Self Destructs
-        for account, _ in computation.get_accounts_for_deletion():
-            # TODO: need to figure out how we prevent multiple selfdestructs from
-            # the same account and if this is the right place to put this.
-            self.vm_state.logger.debug2('DELETING ACCOUNT: %s', encode_hex(account))
-
-            # TODO: this balance setting is likely superflous and can be
-            # removed since `delete_account` does this.
-            self.vm_state.set_balance(account, 0)
-            self.vm_state.delete_account(account)
-
-        return computation
-
 
 class LondonState(BerlinState):
     account_db_class: Type[AccountDatabaseAPI] = AccountDB