diff --git a/backend/database_handler/transactions_processor.py b/backend/database_handler/transactions_processor.py index 0ecc18ef4..c06700c63 100644 --- a/backend/database_handler/transactions_processor.py +++ b/backend/database_handler/transactions_processor.py @@ -1005,9 +1005,9 @@ def get_activated_transactions_older_than(self, seconds: int) -> list[dict]: Returns: List of transaction data dictionaries for stuck transactions """ - from datetime import datetime, timedelta + from datetime import datetime, timedelta, timezone - cutoff_time = datetime.now() - timedelta(seconds=seconds) + cutoff_time = datetime.now(timezone.utc) - timedelta(seconds=seconds) stuck_transactions = ( self.session.query(Transactions) .options(selectinload(Transactions.triggered_transactions)) diff --git a/backend/node/base.py b/backend/node/base.py index 34e1e2052..c388d91b6 100644 --- a/backend/node/base.py +++ b/backend/node/base.py @@ -805,7 +805,7 @@ async def deploy_contract( transaction_datetime = self._date_from_str(transaction_created_at) if transaction_datetime is None: - transaction_datetime = datetime.datetime.now() + transaction_datetime = datetime.datetime.now(tz=datetime.timezone.utc) return await self._run_genvm( from_address, diff --git a/backend/protocol_rpc/endpoints.py b/backend/protocol_rpc/endpoints.py index c150d4830..431edf73c 100644 --- a/backend/protocol_rpc/endpoints.py +++ b/backend/protocol_rpc/endpoints.py @@ -2654,13 +2654,13 @@ def dev_get_pool_status(sqlalchemy_db) -> dict: Returns: dict: Pool status information including timestamp and metrics """ - from datetime import datetime + from datetime import datetime, timezone engine = sqlalchemy_db.engine pool = engine.pool return { - "timestamp": datetime.now().isoformat(), + "timestamp": datetime.now(timezone.utc).isoformat(), "pool": { "size": pool.size(), "checked_out": pool.checkedout(), diff --git a/backend/services/usage_metrics_service.py b/backend/services/usage_metrics_service.py index 8b1e09ba6..af9dafaa7 100644 --- a/backend/services/usage_metrics_service.py +++ b/backend/services/usage_metrics_service.py @@ -4,7 +4,7 @@ import math import os from typing import Any, Optional -from datetime import datetime +from datetime import datetime, timezone import aiohttp from loguru import logger @@ -464,7 +464,7 @@ def _safe_int(self, value: Any) -> int: def _format_created_at(self, created_at) -> str: """Format created_at to ISO8601 string.""" if created_at is None: - return datetime.utcnow().isoformat() + return datetime.now(timezone.utc).isoformat() if isinstance(created_at, datetime): return created_at.isoformat()