Skip to content

Commit 57b5814

Browse files
committed
Rename BASE_GAS_FEE type to DYNAMIC_FEE type
1 parent d9316e3 commit 57b5814

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

eth/vm/forks/london/constants.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
)
55

66
# EIP 1559
7-
BASE_GAS_FEE_TRANSACTION_TYPE = 2
8-
BASE_GAS_FEE_ADDRESS_COST = ACCESS_LIST_ADDRESS_COST_EIP_2930
9-
BASE_GAS_FEE_STORAGE_KEY_COST = ACCESS_LIST_STORAGE_KEY_COST_EIP_2930
7+
DYNAMIC_FEE_TRANSACTION_TYPE = 2
8+
DYNAMIC_FEE_ADDRESS_COST = ACCESS_LIST_ADDRESS_COST_EIP_2930
9+
DYNAMIC_FEE_STORAGE_KEY_COST = ACCESS_LIST_STORAGE_KEY_COST_EIP_2930
1010

1111
BASE_FEE_MAX_CHANGE_DENOMINATOR = 8
1212
INITIAL_BASE_FEE = 1000000000

eth/vm/forks/london/receipts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
ACCESS_LIST_TRANSACTION_TYPE,
1414
)
1515

16-
from .constants import BASE_GAS_FEE_TRANSACTION_TYPE
16+
from .constants import DYNAMIC_FEE_TRANSACTION_TYPE
1717

1818

1919
class LondonReceiptBuilder(BerlinReceiptBuilder):
2020
codecs: Dict[int, Type[Receipt]] = {
2121
ACCESS_LIST_TRANSACTION_TYPE: Receipt,
22-
BASE_GAS_FEE_TRANSACTION_TYPE: Receipt,
22+
DYNAMIC_FEE_TRANSACTION_TYPE: Receipt,
2323
}

eth/vm/forks/london/transactions.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
ISTANBUL_TX_GAS_SCHEDULE,
5454
)
5555

56-
from .constants import BASE_GAS_FEE_TRANSACTION_TYPE
56+
from .constants import DYNAMIC_FEE_TRANSACTION_TYPE
5757

5858

5959
class LondonLegacyTransaction(BerlinLegacyTransaction):
@@ -79,7 +79,7 @@ def as_signed_transaction(self,
7979

8080

8181
class UnsignedDynamicFeeTransaction(rlp.Serializable):
82-
_type_id = BASE_GAS_FEE_TRANSACTION_TYPE
82+
_type_id = DYNAMIC_FEE_TRANSACTION_TYPE
8383
fields = [
8484
('chain_id', big_endian_int),
8585
('nonce', big_endian_int),
@@ -123,7 +123,7 @@ def as_signed_transaction(self, private_key: PrivateKey) -> 'TypedTransaction':
123123

124124

125125
class DynamicFeeTransaction(rlp.Serializable, SignedTransactionMethods, SignedTransactionAPI):
126-
_type_id = BASE_GAS_FEE_TRANSACTION_TYPE
126+
_type_id = DYNAMIC_FEE_TRANSACTION_TYPE
127127
fields = [
128128
('chain_id', big_endian_int),
129129
('nonce', big_endian_int),
@@ -216,7 +216,7 @@ def decode(cls, payload: bytes) -> SignedTransactionAPI:
216216
class LondonTypedTransaction(TypedTransaction):
217217
decoders: Dict[int, Type[TransactionDecoderAPI]] = {
218218
ACCESS_LIST_TRANSACTION_TYPE: AccessListPayloadDecoder,
219-
BASE_GAS_FEE_TRANSACTION_TYPE: DynamicFeePayloadDecoder,
219+
DYNAMIC_FEE_TRANSACTION_TYPE: DynamicFeePayloadDecoder,
220220
}
221221

222222

@@ -279,4 +279,4 @@ def new_dynamic_fee_transaction(
279279
r,
280280
s,
281281
)
282-
return LondonTypedTransaction(BASE_GAS_FEE_TRANSACTION_TYPE, transaction)
282+
return LondonTypedTransaction(DYNAMIC_FEE_TRANSACTION_TYPE, transaction)

0 commit comments

Comments
 (0)