Remove unnecessary await for generate_gas_price() and move to BaseEth

Author: fselmo

newsfragments/2735.performance.rst

@@ -0,0 +1 @@
+Remove unnecessary ``await`` for ``generate_gas_price()`` method as it does not need to be awaited. Move this method to ``BaseEth`` to be used directly by both ``Eth`` and ``AsyncEth`` modules.

web3/_utils/async_transactions.py

@@ -51,28 +51,24 @@ async def _estimate_gas(w3: "Web3", tx: TxParams) -> Awaitable[int]:
     return await w3.eth.estimate_gas(tx)  # type: ignore
 
 
-async def _gas_price(w3: "Web3", tx: TxParams) -> Awaitable[Optional[Wei]]:
-    return await w3.eth.generate_gas_price(tx)  # type: ignore
-
-
-async def _max_fee_per_gas(w3: "Web3", tx: TxParams) -> Awaitable[Wei]:
+async def _max_fee_per_gas(w3: "Web3", _tx: TxParams) -> Awaitable[Wei]:
     block = await w3.eth.get_block("latest")  # type: ignore
     return await w3.eth.max_priority_fee + (2 * block["baseFeePerGas"])  # type: ignore
 
 
-async def _max_priority_fee_gas(w3: "Web3", tx: TxParams) -> Awaitable[Wei]:
+async def _max_priority_fee_gas(w3: "Web3", _tx: TxParams) -> Awaitable[Wei]:
     return await w3.eth.max_priority_fee  # type: ignore
 
 
-async def _chain_id(w3: "Web3", tx: TxParams) -> Awaitable[int]:
+async def _chain_id(w3: "Web3", _tx: TxParams) -> Awaitable[int]:
     return await w3.eth.chain_id  # type: ignore
 
 
 TRANSACTION_DEFAULTS = {
     "value": 0,
     "data": b"",
     "gas": _estimate_gas,
-    "gasPrice": _gas_price,
+    "gasPrice": lambda w3, tx: w3.eth.generate_gas_price(tx),
     "maxFeePerGas": _max_fee_per_gas,
     "maxPriorityFeePerGas": _max_priority_fee_gas,
     "chainId": _chain_id,
@@ -112,9 +108,8 @@ async def fill_transaction_defaults(w3: "Web3", transaction: TxParams) -> TxPara
     """
     if w3 is None, fill as much as possible while offline
     """
-    strategy_based_gas_price = await w3.eth.generate_gas_price(  # type: ignore
-        transaction
-    )
+    strategy_based_gas_price = w3.eth.generate_gas_price(transaction)
+
     is_dynamic_fee_transaction = strategy_based_gas_price is None and (
         "gasPrice" not in transaction  # default to dynamic fee transaction
         or any_in_dict(DYNAMIC_FEE_TXN_PARAMS, transaction)
@@ -138,7 +133,12 @@ async def fill_transaction_defaults(w3: "Web3", transaction: TxParams) -> TxPara
                     raise ValueError(
                         f"You must specify a '{key}' value in the transaction"
                     )
-                default_val = await default_getter(w3, transaction)
+                if key == "gasPrice":
+                    # `generate_gas_price()` is on the `BaseEth` class and does not
+                    # need to be awaited
+                    default_val = default_getter(w3, transaction)
+                else:
+                    default_val = await default_getter(w3, transaction)
             else:
                 default_val = default_getter
 

web3/eth.py

@@ -177,7 +177,7 @@ def send_transaction_munger(self, transaction: TxParams) -> Tuple[TxParams]:
         mungers=[default_root_munger],
     )
 
-    def _generate_gas_price(
+    def generate_gas_price(
         self, transaction_params: Optional[TxParams] = None
     ) -> Optional[Wei]:
         if self.gasPriceStrategy:
@@ -488,11 +488,6 @@ async def get_raw_transaction_by_block(
             block_identifier, index
         )
 
-    async def generate_gas_price(
-        self, transaction_params: Optional[TxParams] = None
-    ) -> Optional[Wei]:
-        return self._generate_gas_price(transaction_params)
-
     async def estimate_gas(
         self, transaction: TxParams, block_identifier: Optional[BlockIdentifier] = None
     ) -> int:
@@ -971,8 +966,3 @@ def filter_munger(
         RPC.eth_getWork,
         is_property=True,
     )
-
-    def generate_gas_price(
-        self, transaction_params: Optional[TxParams] = None
-    ) -> Optional[Wei]:
-        return self._generate_gas_price(transaction_params)

web3/middleware/gas_price_strategy.py

@@ -109,9 +109,7 @@ async def async_gas_price_strategy_middleware(
     async def middleware(method: RPCEndpoint, params: Any) -> RPCResponse:
         if method == "eth_sendTransaction":
             transaction = params[0]
-            generated_gas_price = await w3.eth.generate_gas_price(  # type: ignore
-                transaction
-            )
+            generated_gas_price = w3.eth.generate_gas_price(transaction)
             latest_block = await w3.eth.get_block("latest")  # type: ignore
             transaction = validate_transaction_params(
                 transaction, latest_block, generated_gas_price