Rename base gas fee transaction to dynamic fee txn

This seems to be a commonly used name, and is definitely better than
BaseGasFee.

Author: carver

eth/tools/factories/transaction.py

@@ -80,7 +80,7 @@ def new_access_list_transaction(
 
 
 @curry
-def new_fee_burn_transaction(
+def new_dynamic_fee_transaction(
         vm,
         from_,
         to,
@@ -103,7 +103,7 @@ def new_fee_burn_transaction(
     if access_list is None:
         access_list = []
 
-    tx = vm.get_transaction_builder().new_unsigned_fee_burn_transaction(
+    tx = vm.get_transaction_builder().new_unsigned_dynamic_fee_transaction(
         chain_id=chain_id,
         nonce=nonce,
         max_priority_fee_per_gas=max_priority_fee_per_gas,

eth/vm/forks/london/constants.py

@@ -4,9 +4,9 @@
 )
 
 # EIP 1559
-BASE_GAS_FEE_TRANSACTION_TYPE = 2
-BASE_GAS_FEE_ADDRESS_COST = ACCESS_LIST_ADDRESS_COST_EIP_2930
-BASE_GAS_FEE_STORAGE_KEY_COST = ACCESS_LIST_STORAGE_KEY_COST_EIP_2930
+DYNAMIC_FEE_TRANSACTION_TYPE = 2
+DYNAMIC_FEE_ADDRESS_COST = ACCESS_LIST_ADDRESS_COST_EIP_2930
+DYNAMIC_FEE_STORAGE_KEY_COST = ACCESS_LIST_STORAGE_KEY_COST_EIP_2930
 
 BASE_FEE_MAX_CHANGE_DENOMINATOR = 8
 INITIAL_BASE_FEE = 1000000000

eth/vm/forks/london/receipts.py

@@ -13,11 +13,11 @@
     ACCESS_LIST_TRANSACTION_TYPE,
 )
 
-from .constants import BASE_GAS_FEE_TRANSACTION_TYPE
+from .constants import DYNAMIC_FEE_TRANSACTION_TYPE
 
 
 class LondonReceiptBuilder(BerlinReceiptBuilder):
     codecs: Dict[int, Type[Receipt]] = {
         ACCESS_LIST_TRANSACTION_TYPE: Receipt,
-        BASE_GAS_FEE_TRANSACTION_TYPE: Receipt,
+        DYNAMIC_FEE_TRANSACTION_TYPE: Receipt,
     }

eth/vm/forks/london/transactions.py

@@ -53,7 +53,7 @@
     ISTANBUL_TX_GAS_SCHEDULE,
 )
 
-from .constants import BASE_GAS_FEE_TRANSACTION_TYPE
+from .constants import DYNAMIC_FEE_TRANSACTION_TYPE
 
 
 class LondonLegacyTransaction(BerlinLegacyTransaction):
@@ -78,8 +78,8 @@ def as_signed_transaction(self,
         )
 
 
-class UnsignedBaseGasFeeTransaction(rlp.Serializable):
-    _type_id = BASE_GAS_FEE_TRANSACTION_TYPE
+class UnsignedDynamicFeeTransaction(rlp.Serializable):
+    _type_id = DYNAMIC_FEE_TRANSACTION_TYPE
     fields = [
         ('chain_id', big_endian_int),
         ('nonce', big_endian_int),
@@ -105,7 +105,7 @@ def as_signed_transaction(self, private_key: PrivateKey) -> 'TypedTransaction':
         signature = private_key.sign_msg(message)
         y_parity, r, s = signature.vrs
 
-        signed_transaction = BaseGasFeeTransaction(
+        signed_transaction = DynamicFeeTransaction(
             self.chain_id,
             self.nonce,
             self.max_priority_fee_per_gas,
@@ -122,8 +122,8 @@ def as_signed_transaction(self, private_key: PrivateKey) -> 'TypedTransaction':
         return LondonTypedTransaction(self._type_id, signed_transaction)
 
 
-class BaseGasFeeTransaction(rlp.Serializable, SignedTransactionMethods, SignedTransactionAPI):
-    _type_id = BASE_GAS_FEE_TRANSACTION_TYPE
+class DynamicFeeTransaction(rlp.Serializable, SignedTransactionMethods, SignedTransactionAPI):
+    _type_id = DYNAMIC_FEE_TRANSACTION_TYPE
     fields = [
         ('chain_id', big_endian_int),
         ('nonce', big_endian_int),
@@ -141,14 +141,15 @@ class BaseGasFeeTransaction(rlp.Serializable, SignedTransactionMethods, SignedTr
 
     @property
     def gas_price(self) -> None:
-        # maybe add a warning, or raise an exception instead?
-        return None
+        raise AttributeError(
+            "Gas price is no longer available. See max_priority_fee_per_gas or max_fee_per_gas"
+        )
 
     def get_sender(self) -> Address:
         return extract_transaction_sender(self)
 
     def get_message_for_signing(self) -> bytes:
-        unsigned = UnsignedBaseGasFeeTransaction(
+        unsigned = UnsignedDynamicFeeTransaction(
             self.chain_id,
             self.nonce,
             self.max_priority_fee_per_gas,
@@ -206,16 +207,16 @@ def make_receipt(
         )
 
 
-class BaseGasFeePayloadDecoder(TransactionDecoderAPI):
+class DynamicFeePayloadDecoder(TransactionDecoderAPI):
     @classmethod
     def decode(cls, payload: bytes) -> SignedTransactionAPI:
-        return rlp.decode(payload, sedes=BaseGasFeeTransaction)
+        return rlp.decode(payload, sedes=DynamicFeeTransaction)
 
 
 class LondonTypedTransaction(TypedTransaction):
     decoders: Dict[int, Type[TransactionDecoderAPI]] = {
         ACCESS_LIST_TRANSACTION_TYPE: AccessListPayloadDecoder,
-        BASE_GAS_FEE_TRANSACTION_TYPE: BaseGasFeePayloadDecoder,
+        DYNAMIC_FEE_TRANSACTION_TYPE: DynamicFeePayloadDecoder,
     }
 
 
@@ -225,7 +226,7 @@ class LondonTransactionBuilder(BerlinTransactionBuilder):
     typed_transaction = LondonTypedTransaction
 
     @classmethod
-    def new_unsigned_fee_burn_transaction(
+    def new_unsigned_dynamic_fee_transaction(
             cls,
             chain_id: int,
             nonce: int,
@@ -236,7 +237,7 @@ def new_unsigned_fee_burn_transaction(
             value: int,
             data: bytes,
             access_list: Sequence[Tuple[Address, Sequence[int]]],) -> LondonTypedTransaction:
-        transaction = UnsignedBaseGasFeeTransaction(
+        transaction = UnsignedDynamicFeeTransaction(
             chain_id,
             nonce,
             max_priority_fee_per_gas,
@@ -250,7 +251,7 @@ def new_unsigned_fee_burn_transaction(
         return transaction
 
     @classmethod
-    def new_fee_burn_transaction(
+    def new_dynamic_fee_transaction(
             cls,
             chain_id: int,
             nonce: int,
@@ -264,7 +265,7 @@ def new_fee_burn_transaction(
             y_parity: int,
             r: int,
             s: int) -> LondonTypedTransaction:
-        transaction = BaseGasFeeTransaction(
+        transaction = DynamicFeeTransaction(
             chain_id,
             nonce,
             max_priority_fee_per_gas,
@@ -278,4 +279,4 @@ def new_fee_burn_transaction(
             r,
             s,
         )
-        return LondonTypedTransaction(BASE_GAS_FEE_TRANSACTION_TYPE, transaction)
+        return LondonTypedTransaction(DYNAMIC_FEE_TRANSACTION_TYPE, transaction)

tests/core/vm/test_rewards.py

@@ -25,7 +25,7 @@
     london_at,
     genesis,
 )
-from eth.tools.factories.transaction import new_fee_burn_transaction
+from eth.tools.factories.transaction import new_dynamic_fee_transaction
 
 
 @pytest.mark.parametrize(
@@ -348,7 +348,7 @@ def test_eip1559_txn_rewards(
         ),
     )
     vm = chain.get_vm()
-    txn = new_fee_burn_transaction(
+    txn = new_dynamic_fee_transaction(
         vm,
         from_=funded_address,
         to=funded_address,

tests/core/vm/test_validate_transaction.py

@@ -4,7 +4,7 @@
 from eth._utils.address import force_bytes_to_address
 from eth.chains.base import MiningChain
 from eth.constants import GAS_TX
-from eth.tools.factories.transaction import new_fee_burn_transaction
+from eth.tools.factories.transaction import new_dynamic_fee_transaction
 from eth.vm.forks import LondonVM
 
 
@@ -36,7 +36,7 @@ def test_transaction_cost_valid(london_plus_miner, funded_address, funded_addres
 
     account_balance = vm.state.get_balance(funded_address)
 
-    tx = new_fee_burn_transaction(
+    tx = new_dynamic_fee_transaction(
         vm,
         from_=funded_address,
         to=ADDRESS_A,
@@ -66,7 +66,7 @@ def test_transaction_cost_invalid(london_plus_miner, funded_address, funded_addr
 
     account_balance = vm.state.get_balance(funded_address)
 
-    tx = new_fee_burn_transaction(
+    tx = new_dynamic_fee_transaction(
         vm,
         from_=funded_address,
         to=ADDRESS_A,