Update psycopg2 to psycopg3

.github/workflows/python.yml

@@ -42,7 +42,7 @@ jobs:
         ports:
           - 6379:6379
       postgres:
-        image: postgres:14
+        image: postgres:16-alpine
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres

config/settings/base.py

@@ -66,7 +66,7 @@
     "default": env.db("DATABASE_URL"),
 }
 DATABASES["default"]["ATOMIC_REQUESTS"] = False
-DATABASES["default"]["ENGINE"] = "django_db_geventpool.backends.postgresql_psycopg2"
+DATABASES["default"]["ENGINE"] = "django_db_geventpool.backends.postgresql_psycopg3"
 DATABASES["default"]["CONN_MAX_AGE"] = 0
 DB_MAX_CONNS = env.int("DB_MAX_CONNS", default=50)
 DATABASES["default"]["OPTIONS"] = {

docker-compose.yml

@@ -34,7 +34,7 @@ services:
       retries: 3
 
   db:
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     ports:
       - "5432:5432"
     environment:

gunicorn_custom_workers.py

@@ -1,19 +1,12 @@
 import gevent
 from gunicorn.workers.ggevent import GeventWorker
-from psycogreen.gevent import patch_psycopg
 
 
 class MyGeventWorker(GeventWorker):
-    def patch_psycopg2(self):
-        patch_psycopg()
-        self.log.info("Patched Psycopg2 for gevent")
-
-    def patch(self):
-        super().patch()
-        self.log.info("Patched all for gevent")
-        self.patch_psycopg2()
-
     def handle_request(self, listener_name, req, sock, addr):
+        """
+        Add timeout for Gunicorn requests
+        """
         try:
             with gevent.Timeout(self.cfg.timeout):
                 super().handle_request(listener_name, req, sock, addr)

requirements.txt

@@ -30,8 +30,8 @@ packaging>=21.0
 pika==1.3.2
 pillow==11.0.0
 psycogreen==1.0.2
-psycopg2==2.9.10
+psycopg[binary]==3.2.3
 redis==5.2.1
 requests==2.32.3
-safe-eth-py[django]==6.1.0
+safe-eth-py[django]==6.3.0
 web3==6.20.2

safe_transaction_service/history/admin.py

@@ -444,7 +444,7 @@ class ModuleTransactionAdmin(AdvancedAdminSearchMixin, admin.ModelAdmin):
     search_fields = ["==safe", "==module", "==to"]
 
     def data_hex(self, o: ModuleTransaction):
-        return HexBytes(o.data.tobytes()).hex() if o.data else None
+        return HexBytes(o.data).hex() if o.data else None
 
     def tx_hash(self, o: ModuleTransaction):
         return o.internal_tx.ethereum_tx_id

safe_transaction_service/history/management/commands/export_multisig_tx_data.py

@@ -61,9 +61,7 @@ def handle(self, *args, **options):
                                 str(m.failed),
                                 m.origin,
                                 (
-                                    json.dumps(
-                                        decoder.get_data_decoded(m.data.tobytes())
-                                    )
+                                    json.dumps(decoder.get_data_decoded(m.data))
                                     if m.data
                                     else ""
                                 ),

safe_transaction_service/history/migrations/0016_multisigconfirmation_signature_type.py

@@ -35,7 +35,7 @@ def add_signature_type(apps, schema_editor):
 
     for multisig_tx in MultisigTransaction.objects.exclude(signatures=None):
         for safe_signature in SafeSignature.parse_signature(
-            multisig_tx.signatures.tobytes(), HexBytes(multisig_tx.safe_tx_hash)
+            multisig_tx.signatures, HexBytes(multisig_tx.safe_tx_hash)
         ):
             multisig_confirmation, _ = MultisigConfirmation.objects.get_or_create(
                 multisig_transaction_hash=multisig_tx.safe_tx_hash,

safe_transaction_service/history/serializers.py

@@ -630,9 +630,7 @@ class Meta:
         )
 
     def get_data_decoded(self, obj: ModuleTransaction) -> Dict[str, Any]:
-        return get_data_decoded_from_data(
-            obj.data.tobytes() if obj.data else b"", address=obj.to
-        )
+        return get_data_decoded_from_data(obj.data if obj.data else b"", address=obj.to)
 
     def get_is_successful(self, obj: ModuleTransaction) -> bool:
         return not obj.failed
@@ -738,7 +736,7 @@ def get_data_decoded(self, obj: MultisigTransaction) -> Dict[str, Any]:
         # If delegate call contract must be whitelisted (security)
         if obj.data_should_be_decoded():
             return get_data_decoded_from_data(
-                obj.data.tobytes() if obj.data else b"", address=obj.to
+                obj.data if obj.data else b"", address=obj.to
             )