Update dependencies

- Rename camelcase functions for Web3 v6
- Fix coveralls

Author: Uxio0

.github/workflows/python.yml

@@ -67,7 +67,7 @@ jobs:
     - name: Install dependencies
       run: |
         pip install wheel
-        pip install -r requirements-test.txt coveralls
+        pip install -r requirements-test.txt
       env:
         PIP_USE_MIRRORS: true
     - name: Run tests and coverage
@@ -84,11 +84,8 @@ jobs:
         ETHEREUM_TRACING_NODE_URL: http://localhost:8545
         ETH_HASH_BACKEND: pysha3
         REDIS_URL: redis://localhost:6379/0
-    - name: Send results to coveralls
-      continue-on-error: true  # Ignore coveralls problems
-      run: coveralls --service=github
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Required for coveralls
+    - name: Coveralls
+      uses: coverallsapp/github-action@v2
   docker-deploy:
     runs-on: ubuntu-latest
     needs:

requirements.txt

@@ -1,27 +1,27 @@
-cachetools==5.3.0
-celery==5.2.7
-django==4.1.7
+cachetools==5.3.1
+celery==5.3.1
+django==4.2.4
 django-authtools==2.0.0
 django-celery-beat==2.5.0
 django-debug-toolbar
 django-debug-toolbar-force
 django-environ==0.10.0
-django-filter==22.1
+django-filter==23.2
 django-model-utils==4.3.1
-django-redis==5.2.0
-django-timezone-field==5.0
+django-redis==5.3.0
+django-timezone-field==5.1
 djangorestframework==3.14.0
 djangorestframework-camel-case==1.4.2
-docutils==0.19
-drf-yasg[validation]==1.21.5
-gunicorn[gevent]==20.1.0
-hiredis==2.2.2
-lxml==4.9.2
-numpy==1.24.2
-packaging==23.0
+docutils==0.20.1
+drf-yasg[validation]==1.21.7
+gunicorn[gevent]==21.2.0
+hiredis==2.2.3
+lxml==4.9.3
+numpy==1.25.2
+packaging==23.1
 psycogreen==1.0.2
-psycopg2==2.9.5
-redis==4.5.4
-requests==2.28.2
-safe-eth-py[django]==5.0.2
-web3==5.31.3
+psycopg2==2.9.6
+redis==4.6.0
+requests==2.31.0
+safe-eth-py[django]==5.6.0
+web3==6.8.0

safe_relay_service/gas_station/gas_station.py

@@ -169,17 +169,17 @@ def get_gas_prices(self) -> GasPrice:
 class GasStationMock(GasStation):
     def __init__(self, gas_price: Optional[int] = None):
         if gas_price is None:
-            self.lowest = Web3.toWei(1, "gwei")
-            self.safe_low = Web3.toWei(5, "gwei")
-            self.standard = Web3.toWei(10, "gwei")
-            self.fast = Web3.toWei(20, "gwei")
-            self.fastest = Web3.toWei(50, "gwei")
+            self.lowest = Web3.to_wei(1, "gwei")
+            self.safe_low = Web3.to_wei(5, "gwei")
+            self.standard = Web3.to_wei(10, "gwei")
+            self.fast = Web3.to_wei(20, "gwei")
+            self.fastest = Web3.to_wei(50, "gwei")
         else:
-            self.lowest = Web3.toWei(gas_price, "gwei")
-            self.safe_low = Web3.toWei(gas_price + 1, "gwei")
-            self.standard = Web3.toWei(gas_price + 2, "gwei")
-            self.fast = Web3.toWei(gas_price + 3, "gwei")
-            self.fastest = Web3.toWei(gas_price + 4, "gwei")
+            self.lowest = Web3.to_wei(gas_price, "gwei")
+            self.safe_low = Web3.to_wei(gas_price + 1, "gwei")
+            self.standard = Web3.to_wei(gas_price + 2, "gwei")
+            self.fast = Web3.to_wei(gas_price + 3, "gwei")
+            self.fastest = Web3.to_wei(gas_price + 4, "gwei")
 
     def calculate_gas_prices(self) -> GasPrice:
         return GasPrice(

safe_relay_service/gas_station/tests/test_gas_station.py

@@ -22,7 +22,7 @@ def test_gas_station_mock(self):
 
         if w3.eth.block_number < number_of_blocks and w3.eth.accounts:  # Ganache
             # Mine some blocks
-            eth_balance = w3.toWei(0.00001, "ether")
+            eth_balance = w3.to_wei(0.00001, "ether")
             for _ in range(number_of_blocks - w3.eth.block_number + 2):
                 w3.eth.wait_for_transaction_receipt(
                     w3.eth.send_transaction(

safe_relay_service/relay/admin.py

@@ -215,7 +215,7 @@ class SafeCreationAdmin(admin.ModelAdmin):
     search_fields = ["=safe__address", "=deployer", "owners"]
 
     def ether_deploy_cost(self, obj: SafeCreation) -> float:
-        return Web3.fromWei(obj.wei_deploy_cost(), "ether")
+        return Web3.from_wei(obj.wei_deploy_cost(), "ether")
 
 
 class SafeCreation2DeployedListFilter(admin.SimpleListFilter):
@@ -258,7 +258,7 @@ class SafeCreation2Admin(admin.ModelAdmin):
     search_fields = ["=safe__address", "owners", "=tx_hash"]
 
     def ether_deploy_cost(self, obj: SafeCreation2) -> float:
-        return Web3.fromWei(obj.wei_estimated_deploy_cost(), "ether")
+        return Web3.from_wei(obj.wei_estimated_deploy_cost(), "ether")
 
     def gas_used(self, obj: SafeCreation2) -> Optional[int]:
         return obj.gas_used()
@@ -330,7 +330,7 @@ class SafeMultisigTxAdmin(admin.ModelAdmin):
 
     def refund_benefit_eth(self, obj: SafeMultisigTx) -> Optional[float]:
         if (refund_benefit := obj.refund_benefit()) is not None:
-            refund_benefit_eth = Web3.fromWei(abs(refund_benefit), "ether") * (
+            refund_benefit_eth = Web3.from_wei(abs(refund_benefit), "ether") * (
                 -1 if refund_benefit < 0 else 1
             )
             return "{:.5f}".format(refund_benefit_eth)

safe_relay_service/relay/management/commands/test_relay_server.py

@@ -85,7 +85,7 @@ def handle(self, *args, **options):
             self.main_account.address, "pending"
         )
         main_account_balance = self.w3.eth.get_balance(self.main_account.address)
-        main_account_balance_eth = self.w3.fromWei(main_account_balance, "ether")
+        main_account_balance_eth = self.w3.from_wei(main_account_balance, "ether")
         self.stdout.write(
             self.style.SUCCESS(
                 f"Using {self.main_account.address} as main account with "
@@ -366,7 +366,7 @@ def send_multiple_txs(
             self.main_account.key,
             safe_address,
             self.ethereum_client.w3.eth.gasPrice,
-            self.w3.toWei(1, "ether"),
+            self.w3.to_wei(1, "ether"),
             nonce=self.main_account_nonce,
         )
         self.main_account_nonce += 1

safe_relay_service/relay/services/funding_service.py

@@ -68,7 +68,7 @@ def send_eth_to(
         if not gas_price:
             gas_price = self.gas_station.get_gas_prices().standard
 
-        if self.max_eth_to_send and value > Web3.toWei(self.max_eth_to_send, "ether"):
+        if self.max_eth_to_send and value > Web3.to_wei(self.max_eth_to_send, "ether"):
             raise EtherLimitExceeded(
                 "%d is bigger than %f" % (value, self.max_eth_to_send)
             )

safe_relay_service/relay/services/stats_service.py

@@ -41,7 +41,7 @@ def get_balances(self, safe_address: str) -> List[Dict[str, Union[str, int]]]:
         :param safe_address:
         :return: `{'token_address': str, 'balance': int}`. For ether, `token_address` is `None`
         """
-        assert Web3.isChecksumAddress(
+        assert Web3.is_checksum_address(
             safe_address
         ), f"Not valid address {safe_address} for getting balances"
 

safe_relay_service/relay/services/transaction_scan_service.py

@@ -241,7 +241,7 @@ def process_addresses(
         """
         assert safe_addresses, "Safe addresses cannot be empty!"
         assert all(
-            [Web3.isChecksumAddress(safe_address) for safe_address in safe_addresses]
+            [Web3.is_checksum_address(safe_address) for safe_address in safe_addresses]
         ), ("A safe address has invalid checksum: %s" % safe_addresses)
 
         parameters = self.get_block_numbers_for_search(safe_addresses)

safe_relay_service/relay/tasks.py

@@ -61,8 +61,8 @@ def fund_deployer_task(self, safe_address: str, retry: bool = True) -> None:
     payment = safe_creation.payment
 
     # These asserts just to make sure we are not wasting money
-    assert Web3.isChecksumAddress(safe_address)
-    assert Web3.isChecksumAddress(deployer_address)
+    assert Web3.is_checksum_address(safe_address)
+    assert Web3.is_checksum_address(deployer_address)
     assert mk_contract_address(deployer_address, 0) == safe_address
     assert payment > 0
 
@@ -358,7 +358,7 @@ def deploy_create2_safe_task(self, safe_address: str, retry: bool = True) -> Non
     :param retry: if True, retries are allowed, otherwise don't retry
     """
 
-    assert Web3.isChecksumAddress(safe_address)
+    assert Web3.is_checksum_address(safe_address)
 
     redis = RedisRepository().redis
     lock_name = f"locks:deploy_create2_safe:{safe_address}"