feat!: Handle 0.7 breaking changes and updates [SBK-369]

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.5.0
     hooks:
     -   id: check-yaml
 
@@ -10,24 +10,24 @@ repos:
       - id: isort
 
 -   repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.12.0
     hooks:
       - id: black
         name: black
 
 -   repo: https://github.com/pycqa/flake8
-    rev: 5.0.4
+    rev: 6.1.0
     hooks:
     -   id: flake8
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.4.1
+    rev: v1.7.1
     hooks:
     -   id: mypy
         additional_dependencies: [types-setuptools, pydantic]
 
 -   repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.14
+    rev: 0.7.17
     hooks:
     -   id: mdformat
         additional_dependencies: [mdformat-gfm, mdformat-frontmatter]

setup.py

@@ -5,20 +5,20 @@
 extras_require = {
     "test": [  # `test` GitHub Action jobs uses this
         "pytest>=6.0",  # Core testing package
-        "pytest-xdist",  # multi-process runner
+        "pytest-xdist",  # Multi-process runner
         "pytest-cov",  # Coverage analyzer plugin
         "hypothesis>=6.2.0,<7.0",  # Strategy-based fuzzer
     ],
     "lint": [
-        "black>=23.7.0",  # auto-formatter and linter
-        "mypy>=1.4.1,<2",  # Static type analyzer
+        "black>=23.12.0,<24",  # Auto-formatter and linter
+        "mypy>=1.7.1,<2",  # Static type analyzer
         "types-setuptools",  # Needed for mypy type shed
-        "flake8>=5.0.4",  # Style linter
-        "isort>=5.10.1",  # Import sorting linter
-        "mdformat>=0.7.16",  # Auto-formatter for markdown
+        "flake8>=6.1.0,<7",  # Style linter
+        "isort>=5.10.1,<6",  # Import sorting linter
+        "mdformat>=0.7.17",  # Auto-formatter for markdown
         "mdformat-gfm>=0.3.5",  # Needed for formatting GitHub-flavored markdown
         "mdformat-frontmatter>=0.4.1",  # Needed for frontmatters-style headers in issue templates
-        "mdformat-pyproject>=0.0.1",  # So we can keep config for mdformat in `pyproject.toml`
+        "mdformat-pyproject>=0.0.1",  # Allows configuring in pyproject.toml
     ],
     "doc": [
         "myst-parser>=1.0.0,<2",  # Parse markdown docs
@@ -67,9 +67,11 @@
     url="https://github.com/ApeWorX/silverback",
     include_package_data=True,
     install_requires=[
-        "eth-ape>=0.6.19,<1.0",
-        "taskiq[metrics]>=0.6.0,<0.7.0",
         "click",  # Use same version as eth-ape
+        "eth-ape>=0.7.0,<1.0",
+        "eth-pydantic-types",  # Use same version as eth-ape
+        "pydantic_settings",  # Use same version as eth-ape
+        "taskiq[metrics]>=0.10.4,<0.11.0",
     ],
     entry_points={
         "console_scripts": ["silverback=silverback._cli:cli"],

silverback/application.py

@@ -127,7 +127,7 @@ def get_startup_handler(self) -> Optional[AsyncTaskiqDecoratedTask]:
         Returns:
             Optional[AsyncTaskiqDecoratedTask]: Returns decorated task, if one has been created.
         """
-        return self.broker.available_tasks.get("silverback_startup")
+        return self.broker.find_task("silverback_startup")
 
     def get_shutdown_handler(self) -> Optional[AsyncTaskiqDecoratedTask]:
         """
@@ -136,7 +136,7 @@ def get_shutdown_handler(self) -> Optional[AsyncTaskiqDecoratedTask]:
         Returns:
             Optional[AsyncTaskiqDecoratedTask]: Returns decorated task, if one has been created.
         """
-        return self.broker.available_tasks.get("silverback_shutdown")
+        return self.broker.find_task("silverback_shutdown")
 
     def get_block_handler(self) -> Optional[AsyncTaskiqDecoratedTask]:
         """
@@ -145,7 +145,7 @@ def get_block_handler(self) -> Optional[AsyncTaskiqDecoratedTask]:
         Returns:
             Optional[AsyncTaskiqDecoratedTask]: Returns decorated task, if one has been created.
         """
-        return self.broker.available_tasks.get("block")
+        return self.broker.find_task("block")
 
     def get_event_handler(
         self, event_target: AddressType, event_name: str
@@ -160,7 +160,7 @@ def get_event_handler(
         Returns:
             Optional[AsyncTaskiqDecoratedTask]: Returns decorated task, if one has been created.
         """
-        return self.broker.available_tasks.get(f"{event_target}/event/{event_name}")
+        return self.broker.find_task(f"{event_target}/event/{event_name}")
 
     def on_(
         self,

silverback/middlewares.py

@@ -82,7 +82,7 @@ def pre_execute(self, message: TaskiqMessage) -> TaskiqMessage:
 
         elif "event" in message.task_name:
             # NOTE: Just in case the user doesn't specify type as `ContractLog`
-            message.args[0] = ContractLog.parse_obj(message.args[0])
+            message.args[0] = ContractLog.model_validate(message.args[0])
 
         logger.info(f"{self._create_label(message)} - Started")
         return message

silverback/settings.py

@@ -2,7 +2,7 @@
 
 from ape.api import AccountAPI, ProviderContextManager
 from ape.utils import ManagerAccessMixin
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 from taskiq import AsyncBroker, InMemoryBroker, PrometheusMiddleware, TaskiqMiddleware
 
 from ._importer import import_from_string
@@ -38,9 +38,7 @@ class Settings(BaseSettings, ManagerAccessMixin):
     # Used for persistent store
     PERSISTENCE_CLASS: Optional[str] = None
 
-    class Config:
-        env_prefix = "SILVERBACK_"
-        case_sensitive = True
+    model_config = SettingsConfigDict(env_prefix="SILVERBACK_", case_sensitive=True)
 
     def get_broker(self) -> AsyncBroker:
         broker_class = import_from_string(self.BROKER_CLASS)