Updating of evm-wallet version to 2.0.2

README.md

@@ -122,7 +122,7 @@ async def test_transaction(wallet, eth_amount):
 
 After test, you get similar report:
 
-![Test Report](https://i.ibb.co/n8vKXwB/Screenshot-2024-01-24-at-22-08-29.png)
+![Test Report](https://i.ibb.co/h98dNPL/Screenshot-2024-04-22-at-22-41-19.png)
 
 ## Usage Example
 Here is example of testing with `pytest-evm`:

pyproject.toml

@@ -1,8 +1,8 @@
 [tool.poetry]
 name = 'pytest_evm'
-version = '0.1.2'
+version = '0.2.0'
 description = 'The testing package containing tools to test Web3-based projects'
-authors = ['Alexey <abelenkov2006@gmail.com>']
+authors = ['Alexey <axbelenkov@gmail.com>']
 license = 'MIT'
 readme = 'README.md'
 repository = 'https://github.com/blnkoff/pytest-evm'
@@ -24,10 +24,10 @@ packages = [{ include = 'pytest_evm' }]
 [tool.poetry.dependencies]
 python = '^3.11'
 web3 = "^6.12.0"
-evm-wallet = "^1.2.0"
 python-dotenv = {version = "^1.0.1", optional = true}
 pytest = "^8.1.1"
 pytest-asyncio = "^0.23.6"
+evm-wallet = "^2.0.2"
 
 [tool.poetry.extras]
 dotenv = ["python-dotenv"]

pytest_evm/fixtures.py

@@ -1,15 +1,20 @@
 import os
 import pytest
 from typing import Optional
-from evm_wallet import ZERO_ADDRESS
-from evm_wallet.types import NetworkOrInfo
+from evm_wallet import ZERO_ADDRESS, NetworkInfo
 from evm_wallet import AsyncWallet, Wallet
+from evm_wallet.types import Network
 from web3 import AsyncWeb3
+from web3.types import Wei
 
 
 @pytest.fixture(scope="session")
 def make_wallet():
-    def _make_wallet(network: NetworkOrInfo, private_key: Optional[str] = None, is_async: bool = True):
+    def _make_wallet(
+            network: Network | NetworkInfo,
+            private_key: Optional[str] = None,
+            is_async: bool = True
+    ) -> AsyncWallet | Wallet:
         if not private_key:
             private_key = os.getenv('TEST_PRIVATE_KEY')
         return AsyncWallet(private_key, network) if is_async else Wallet(private_key, network)
@@ -18,11 +23,11 @@ def _make_wallet(network: NetworkOrInfo, private_key: Optional[str] = None, is_a
 
 
 @pytest.fixture(scope="session")
-def eth_amount():
+def eth_amount() -> Wei:
     amount = AsyncWeb3.to_wei(0.001, 'ether')
     return amount
 
 
 @pytest.fixture(scope="session")
-def zero_address():
+def zero_address() -> str:
     return ZERO_ADDRESS

pytest_evm/hooks.py

@@ -3,7 +3,7 @@
 from functools import wraps
 from typing import Iterable
 from evm_wallet import Wallet
-from pytest_evm.utils import validate_status, get_last_transaction, get_balance
+from pytest_evm.utils import validate_status, get_last_transaction
 
 
 def pytest_configure(config):
@@ -34,7 +34,7 @@ def pytest_runtest_makereport(item: pytest.Item, call):
                     wallet = Wallet(wallet.private_key, wallet.network)
                     tx = get_last_transaction(wallet)
                     last_tx_hash = tx['hash']
-                    balance = get_balance(wallet)
+                    balance = wallet.get_balance(True)
                     costs = tx['value'] + tx['gas']*tx['gasPrice']
                     costs = Web3.from_wei(costs, 'ether')
                     print()

pytest_evm/utils.py

@@ -55,10 +55,3 @@ def get_last_transaction(wallet: Wallet, timeout: float = 10):
             break
 
     return last_transaction
-
-
-def get_balance(wallet: Wallet) -> int:
-    w3 = Web3(Web3.HTTPProvider(wallet.network['rpc']))
-    balance = w3.eth.get_balance(account=wallet.public_key)
-    balance = w3.from_wei(balance, 'ether')
-    return balance

tests/test_hooks.py

@@ -5,5 +5,5 @@
 @pytest.mark.asyncio
 async def test_transaction(wallet, eth_amount):
     recipient = '0xe977Fa8D8AE7D3D6e28c17A868EF04bD301c583f'
-    params = await wallet.build_transaction_params(eth_amount, recipient=recipient)
+    params = await wallet.build_tx_params(eth_amount, recipient=recipient)
     return await wallet.transact(params)