eth.defaultAccount to eth.default_account

Author: billbsing

docs/contracts.rst

@@ -69,7 +69,7 @@ To run this example, you will need to install a few extra features:
     >>> w3 = Web3(Web3.EthereumTesterProvider())
 
     # set pre-funded account as sender
-    >>> w3.eth.defaultAccount = w3.eth.accounts[0]
+    >>> w3.eth.default_account = w3.eth.accounts[0]
 
     # get bytecode
     >>> bytecode = compiled_sol['contracts']['Greeter.sol']['Greeter']['evm']['bytecode']['object']

docs/middleware.rst

@@ -402,7 +402,7 @@ Signing
 
 .. py:method:: web3.middleware.construct_sign_and_send_raw_middleware(private_key_or_account)
 
-This middleware automatically captures transactions, signs them, and sends them as raw transactions. The from field on the transaction, or ``w3.eth.defaultAccount`` must be set to the address of the private key for this middleware to have any effect.
+This middleware automatically captures transactions, signs them, and sends them as raw transactions. The from field on the transaction, or ``w3.eth.default_account`` must be set to the address of the private key for this middleware to have any effect.
 
    * ``private_key_or_account`` A single private key or a tuple, list or set of private keys.
 
@@ -420,5 +420,5 @@ This middleware automatically captures transactions, signs them, and sends them
    >>> from eth_account import Account
    >>> acct = Account.create('KEYSMASH FJAFJKLDSKF7JKFDJ 1530')
    >>> w3.middleware_onion.add(construct_sign_and_send_raw_middleware(acct))
-   >>> w3.eth.defaultAccount = acct.address
+   >>> w3.eth.default_account = acct.address
    # Now you can send a tx from acct.address without having to build and sign each raw transaction

docs/web3.eth.rst

@@ -38,11 +38,16 @@ Properties
 The following properties are available on the ``web3.eth`` namespace.
 
 
-.. py:attribute:: Eth.defaultAccount
+.. py:attribute:: Eth.default_account
 
     The ethereum address that will be used as the default ``from`` address for
     all transactions.
 
+.. py:attribute:: Eth.defaultAccount
+
+    .. warning:: Deprecated: This property is deprecated in favor of
+      :attr:`~web3.eth.default_account`
+
 
 .. py:attribute:: Eth.defaultBlock
 

web3/contract.py

@@ -633,9 +633,9 @@ def estimateGas(
             self.check_forbidden_keys_in_transaction(estimate_gas_transaction,
                                                      ["data", "to"])
 
-        if self.web3.eth.defaultAccount is not empty:
-            # type ignored b/c check prevents an empty defaultAccount
-            estimate_gas_transaction.setdefault('from', self.web3.eth.defaultAccount)  # type: ignore # noqa: E501
+        if self.web3.eth.default_account is not empty:
+            # type ignored b/c check prevents an empty default_account
+            estimate_gas_transaction.setdefault('from', self.web3.eth.default_account)  # type: ignore # noqa: E501
 
         estimate_gas_transaction['data'] = self.data_in_transaction
 
@@ -652,9 +652,9 @@ def transact(self, transaction: Optional[TxParams] = None) -> HexBytes:
             self.check_forbidden_keys_in_transaction(transact_transaction,
                                                      ["data", "to"])
 
-        if self.web3.eth.defaultAccount is not empty:
-            # type ignored b/c check prevents an empty defaultAccount
-            transact_transaction.setdefault('from', self.web3.eth.defaultAccount)  # type: ignore
+        if self.web3.eth.default_account is not empty:
+            # type ignored b/c check prevents an empty default_account
+            transact_transaction.setdefault('from', self.web3.eth.default_account)  # type: ignore
 
         transact_transaction['data'] = self.data_in_transaction
 
@@ -674,9 +674,9 @@ def buildTransaction(self, transaction: Optional[TxParams] = None) -> TxParams:
             self.check_forbidden_keys_in_transaction(built_transaction,
                                                      ["data", "to"])
 
-        if self.web3.eth.defaultAccount is not empty:
-            # type ignored b/c check prevents an empty defaultAccount
-            built_transaction.setdefault('from', self.web3.eth.defaultAccount)  # type: ignore
+        if self.web3.eth.default_account is not empty:
+            # type ignored b/c check prevents an empty default_account
+            built_transaction.setdefault('from', self.web3.eth.default_account)  # type: ignore
 
         built_transaction['data'] = self.data_in_transaction
         built_transaction['to'] = Address(b'')
@@ -933,9 +933,9 @@ def call(
 
         if self.address:
             call_transaction.setdefault('to', self.address)
-        if self.web3.eth.defaultAccount is not empty:
-            # type ignored b/c check prevents an empty defaultAccount
-            call_transaction.setdefault('from', self.web3.eth.defaultAccount)  # type: ignore
+        if self.web3.eth.default_account is not empty:
+            # type ignored b/c check prevents an empty default_account
+            call_transaction.setdefault('from', self.web3.eth.default_account)  # type: ignore
 
         if 'to' not in call_transaction:
             if isinstance(self, type):
@@ -975,9 +975,9 @@ def transact(self, transaction: Optional[TxParams] = None) -> HexBytes:
 
         if self.address is not None:
             transact_transaction.setdefault('to', self.address)
-        if self.web3.eth.defaultAccount is not empty:
-            # type ignored b/c check prevents an empty defaultAccount
-            transact_transaction.setdefault('from', self.web3.eth.defaultAccount)  # type: ignore
+        if self.web3.eth.default_account is not empty:
+            # type ignored b/c check prevents an empty default_account
+            transact_transaction.setdefault('from', self.web3.eth.default_account)  # type: ignore
 
         if 'to' not in transact_transaction:
             if isinstance(self, type):
@@ -1017,9 +1017,9 @@ def estimateGas(
 
         if self.address:
             estimate_gas_transaction.setdefault('to', self.address)
-        if self.web3.eth.defaultAccount is not empty:
-            # type ignored b/c check prevents an empty defaultAccount
-            estimate_gas_transaction.setdefault('from', self.web3.eth.defaultAccount)  # type: ignore # noqa: E501
+        if self.web3.eth.default_account is not empty:
+            # type ignored b/c check prevents an empty default_account
+            estimate_gas_transaction.setdefault('from', self.web3.eth.default_account)  # type: ignore # noqa: E501
 
         if 'to' not in estimate_gas_transaction:
             if isinstance(self, type):

web3/eth.py

@@ -104,7 +104,7 @@
 
 class Eth(ModuleV2, Module):
     account = Account()
-    defaultAccount = empty
+    _default_account = empty
     defaultBlock: Literal["latest"] = "latest"  # noqa: E704
     defaultContractFactory: Type[Union[Contract, ConciseContract, ContractCaller]] = Contract  # noqa: E704,E501
     iban = Iban
@@ -197,6 +197,18 @@ def blockNumber(self) -> BlockNumber:
     def chainId(self) -> int:
         return self.web3.manager.request_blocking(RPC.eth_chainId, [])
 
+    @property
+    def default_account(self) -> str:
+        return self.default_account
+
+    @property
+    def defaultAccount(self) -> str:
+        warnings.warn(
+            'defaultAccount is deprecated in favor of default_account',
+            category=DeprecationWarning,
+        )
+        return self._default_account
+
     def block_id_munger(
         self,
         account: Union[Address, ChecksumAddress, ENS],
@@ -371,8 +383,8 @@ def modifyTransaction(
 
     def send_transaction_munger(self, transaction: TxParams) -> Tuple[TxParams]:
         # TODO: move to middleware
-        if 'from' not in transaction and is_checksum_address(self.defaultAccount):
-            transaction = assoc(transaction, 'from', self.defaultAccount)
+        if 'from' not in transaction and is_checksum_address(self.default_account):
+            transaction = assoc(transaction, 'from', self.default_account)
 
         # TODO: move gas estimation in middleware
         if 'gas' not in transaction:
@@ -424,13 +436,14 @@ def call_munger(
         block_identifier: Optional[BlockIdentifier] = None
     ) -> Tuple[TxParams, BlockIdentifier]:
         # TODO: move to middleware
-        if 'from' not in transaction and is_checksum_address(self.defaultAccount):
-            transaction = assoc(transaction, 'from', self.defaultAccount)
+        if 'from' not in transaction and is_checksum_address(self.default_account):
+            transaction = assoc(transaction, 'from', self.default_account)
 
         # TODO: move to middleware
         if block_identifier is None:
             block_identifier = self.defaultBlock
 
+<<<<<<< HEAD
         return (transaction, block_identifier)
 
     call: Method[Callable[..., Union[bytes, bytearray]]] = Method(
@@ -445,6 +458,12 @@ def estimate_gas_munger(
     ) -> Sequence[Union[TxParams, BlockIdentifier]]:
         if 'from' not in transaction and is_checksum_address(self.defaultAccount):
             transaction = assoc(transaction, 'from', self.defaultAccount)
+=======
+    def estimateGas(self, transaction: TxParams, block_identifier: BlockIdentifier=None) -> Wei:
+        # TODO: move to middleware
+        if 'from' not in transaction and is_checksum_address(self.default_account):
+            transaction = assoc(transaction, 'from', self.default_account)
+>>>>>>> 1b792773... eth.defaultAccount to eth.default_account
 
         if block_identifier is None:
             params: Sequence[Union[TxParams, BlockIdentifier]] = [transaction]

web3/parity.py

@@ -161,8 +161,8 @@ def trace_call_munger(
         block_identifier: Optional[BlockIdentifier] = None
     ) -> Tuple[TxParams, ParityTraceMode, BlockIdentifier]:
         # TODO: move to middleware
-        if 'from' not in transaction and is_checksum_address(self.web3.eth.defaultAccount):
-            transaction = assoc(transaction, 'from', self.web3.eth.defaultAccount)
+        if 'from' not in transaction and is_checksum_address(self.web3.eth.default_account):
+            transaction = assoc(transaction, 'from', self.web3.eth.default_account)
 
         # TODO: move to middleware
         if block_identifier is None:

web3/pm.py

@@ -417,7 +417,7 @@ def release_package(
     ) -> bytes:
         """
         Returns the release id generated by releasing a package on the current registry.
-        Requires ``web3.PM`` to have a registry set. Requires ``web3.eth.defaultAccount``
+        Requires ``web3.PM`` to have a registry set. Requires ``web3.eth.default_account``
         to be the registry owner.
 
         * Parameters: