Merge pull request #690 from BoostryJP/feature/bump-dep

Bump dependencies

Dockerfile

@@ -124,7 +124,7 @@ COPY --from=builder --chown=apl:apl /app/ibet-Prime/ /app/ibet-Prime/
 RUN . ~/.bash_profile
 
 ENV PYTHONUNBUFFERED=1
-ENV PYTHONPATH /app/ibet-Prime:/app/ibet-Prime/cmd
+ENV PYTHONPATH=/app/ibet-Prime:/app/ibet-Prime/cmd
 
 COPY run.sh healthcheck.sh /app/
 

app/utils/contract_utils.py

@@ -28,7 +28,7 @@
 from sqlalchemy.orm import Session
 from web3.contract import AsyncContract, Contract
 from web3.exceptions import (
-    ABIEventFunctionNotFound,
+    ABIEventNotFound,
     ABIFunctionNotFound,
     BadFunctionCallOutput,
     ContractLogicError,
@@ -284,7 +284,7 @@ def get_event_logs(
                 to_block=block_to,
                 argument_filters=argument_filters,
             )
-        except ABIEventFunctionNotFound:
+        except ABIEventNotFound:
             return []
 
         return result
@@ -607,7 +607,7 @@ async def get_event_logs(
                 to_block=block_to,
                 argument_filters=argument_filters,
             )
-        except ABIEventFunctionNotFound:
+        except ABIEventNotFound:
             return []
 
         return result

batch/processor_monitor_block_sync.py

@@ -37,8 +37,9 @@
     BLOCK_SYNC_REMAINING_THRESHOLD,
     BLOCK_SYNC_STATUS_CALC_PERIOD,
     BLOCK_SYNC_STATUS_SLEEP_INTERVAL,
+    EXPECTED_BLOCKS_PER_SEC,
     WEB3_HTTP_PROVIDER,
-    WEB3_HTTP_PROVIDER_STANDBY, EXPECTED_BLOCKS_PER_SEC,
+    WEB3_HTTP_PROVIDER_STANDBY,
 )
 
 """

config.py

@@ -117,7 +117,7 @@
         else 20
     )
 # Average block generation interval
-EXPECTED_BLOCKS_PER_SEC = int(os.environ.get("EXPECTED_BLOCKS_PER_SEC", 1))
+EXPECTED_BLOCKS_PER_SEC = float(os.environ.get("EXPECTED_BLOCKS_PER_SEC", 1))
 
 
 ####################################################

pyproject.toml

@@ -13,23 +13,23 @@ settlement-cli = "cmd.settlement.src:main"
 [tool.poetry.dependencies]
 python = "3.12.2"
 alembic = "^1.13.1"
-boto3 = "~1.34.59"
-coincurve = "~19.0.1"
+boto3 = "~1.35.11"
+coincurve = "~20.0.0"
 eth-keyfile = "0.8.1"
-eth-utils = "~4.1.1"
-fastapi = "~0.111.0"
-gunicorn = "~22.0.0"
+eth-utils = "~5.0.0"
+fastapi = "~0.112.0"
+gunicorn = "~23.0.0"
 orjson = "~3.10.3"
-psycopg = {extras = ["c"], version = "^3.1.18"}
+psycopg = {extras = ["c"], version = "^3.2.0"}
 pycryptodome = "~3.20"
-pydantic = "~2.7.1"
+pydantic = "~2.8.2"
 pytz = "~2024.1"
 shared-memory-dict = "~0.7.2"
-web3 = "7.0.0b6"
+web3 = "7.2.0"
 httpx = "^0.27.0"
-sqlalchemy = {extras = ["asyncio"], version = "^2.0.28"}
+sqlalchemy = {extras = ["asyncio"], version = "^2.0.33"}
 uvicorn = {extras = ["standard"], version = "~0.30.0"}
-uvloop = "~0.19.0"
+uvloop = "~0.20.0"
 memray = "^1.12.0"
 
 ibet-prime-explorer = {path = "cmd/explorer", optional = true, develop = true}

tests/Dockerfile_unittest

@@ -130,6 +130,6 @@ COPY --from=builder --chown=apl:apl /app/ibet-Prime/ /app/ibet-Prime/
 RUN . ~/.bash_profile
 
 ENV PYTHONUNBUFFERED=1
-ENV PYTHONPATH /app/ibet-Prime:/app/ibet-Prime/cmd
+ENV PYTHONPATH=/app/ibet-Prime:/app/ibet-Prime/cmd
 
 CMD ["/app/ibet-Prime/tests/qa.sh"]

tests/app/model/blockchain/test_TokenList.py

@@ -24,7 +24,7 @@
 import pytest
 from eth_keyfile import decode_keyfile_json
 from web3 import Web3
-from web3.exceptions import ContractLogicError, InvalidAddress, ValidationError
+from web3.exceptions import ContractLogicError, InvalidAddress, MismatchedABI
 from web3.middleware import ExtraDataToPOAMiddleware
 
 import config
@@ -168,7 +168,7 @@ async def test_error_1(self, db, contract_list):
                 tx_from=issuer_address,
                 private_key=private_key,
             )
-        assert isinstance(exc_info.value.args[0], ValidationError)
+        assert isinstance(exc_info.value.args[0], MismatchedABI)
 
     # <Error_2> Invalid argument: token_list_address
     @pytest.mark.asyncio

tests/app/model/blockchain/test_token_IbetShare.py

@@ -30,9 +30,9 @@
 from web3.exceptions import (
     ContractLogicError,
     InvalidAddress,
+    MismatchedABI,
     TimeExhausted,
     TransactionNotFound,
-    ValidationError as Web3ValidationError,
 )
 
 from app.exceptions import ContractRevertError, SendTransactionError
@@ -3093,7 +3093,7 @@ async def test_error_1(self, db):
         )
 
         # execute the function
-        with pytest.raises(Web3ValidationError):
+        with pytest.raises(MismatchedABI):
             await share_contract.get_account_balance(issuer_address[:-1])  # short
 
 

tests/app/model/blockchain/test_token_IbetStraightBond.py

@@ -30,9 +30,9 @@
 from web3.exceptions import (
     ContractLogicError,
     InvalidAddress,
+    MismatchedABI,
     TimeExhausted,
     TransactionNotFound,
-    ValidationError as Web3ValidationError,
 )
 
 from app.exceptions import ContractRevertError, SendTransactionError
@@ -3388,7 +3388,7 @@ async def test_error_2(self, db):
         )
 
         # execute the function
-        with pytest.raises(Web3ValidationError):
+        with pytest.raises(MismatchedABI):
             await bond_contract.get_account_balance(issuer_address[:-1])  # short