Index 4337 UserOperations

.github/workflows/python.yml

@@ -93,6 +93,7 @@ jobs:
         ETHEREUM_MAINNET_NODE: ${{ secrets.ETHEREUM_MAINNET_NODE }}
         ETHEREUM_NODE_URL: http://localhost:8545
         ETHEREUM_TRACING_NODE_URL: http://localhost:8545
+        ETHEREUM_4337_BUNDLER_URL: ${{ secrets.ETHEREUM_4337_BUNDLER_URL }}
         ETH_HASH_BACKEND: pysha3
         REDIS_URL: redis://localhost:6379/0
         EVENTS_QUEUE_URL: amqp://guest:guest@localhost:5672/

config/settings/base.py

@@ -104,13 +104,14 @@
     "rest_framework.authtoken",
 ]
 LOCAL_APPS = [
+    "safe_transaction_service.account_abstraction.apps.AccountAbstractionConfig",
     "safe_transaction_service.analytics.apps.AnalyticsConfig",
     "safe_transaction_service.contracts.apps.ContractsConfig",
+    "safe_transaction_service.events.apps.EventsConfig",
     "safe_transaction_service.history.apps.HistoryConfig",
     "safe_transaction_service.notifications.apps.NotificationsConfig",
     "safe_transaction_service.safe_messages.apps.SafeMessagesConfig",
     "safe_transaction_service.tokens.apps.TokensConfig",
-    "safe_transaction_service.events.apps.EventsConfig",
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
@@ -435,6 +436,18 @@
 # ------------------------------------------------------------------------------
 ETHEREUM_NODE_URL = env("ETHEREUM_NODE_URL", default=None)
 
+# Ethereum 4337 Bundler RPC
+# ------------------------------------------------------------------------------
+ETHEREUM_4337_BUNDLER_URL = env("ETHEREUM_4337_BUNDLER_URL", default=None)
+ETHEREUM_4337_SUPPORTED_ENTRY_POINTS = env.list(
+    "ETHEREUM_4337_SUPPORTED_ENTRY_POINTS",
+    default=["0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"],
+)
+ETHEREUM_4337_SUPPORTED_SAFE_MODULES = env.list(
+    "ETHEREUM_4337_SUPPORTED_SAFE_MODULES",
+    default=["0xa581c4A4DB7175302464fF3C06380BC3270b4037"],
+)
+
 # Tracing indexing configuration (not useful for L2 indexing)
 # ------------------------------------------------------------------------------
 ETHEREUM_TRACING_NODE_URL = env("ETHEREUM_TRACING_NODE_URL", default=None)

config/urls.py

@@ -43,6 +43,13 @@
 
 urlpatterns_v1 = [
     path("", include("safe_transaction_service.history.urls", namespace="history")),
+    path(
+        "",
+        include(
+            "safe_transaction_service.account_abstraction.urls",
+            namespace="account_abstraction",
+        ),
+    ),
     path(
         "contracts/",
         include("safe_transaction_service.contracts.urls", namespace="contracts"),

requirements.txt

@@ -33,5 +33,5 @@ psycogreen==1.0.2
 psycopg2==2.9.9
 redis==5.0.3
 requests==2.31.0
-safe-eth-py[django]==6.0.0b22
+safe-eth-py[django]==6.0.0b23
 web3==6.15.1

safe_transaction_service/account_abstraction/admin.py

@@ -0,0 +1,91 @@
+from django.contrib import admin
+
+from eth_typing import ChecksumAddress, HexStr
+
+from safe_transaction_service.history import models as history_models
+
+from .models import SafeOperation, UserOperation, UserOperationReceipt
+
+
+@admin.register(UserOperation)
+class UserOperationAdmin(admin.ModelAdmin):
+    list_display = ("hash", "ethereum_tx", "sender", "nonce", "success")
+    list_filter = [
+        "receipt__success",
+    ]
+    search_fields = [
+        "==sender",
+    ]
+    ordering = ["-nonce"]
+
+    @admin.display(boolean=True, description="Is successful?")
+    def success(self, obj: UserOperation) -> bool:
+        return obj.receipt.success
+
+
+@admin.register(UserOperationReceipt)
+class UserOperationReceiptAdmin(admin.ModelAdmin):
+    list_display = (
+        "user_operation_hash",
+        "user_operation_sender",
+        "user_operation_nonce",
+        "success",
+        "deposited",
+    )
+    list_filter = [
+        "success",
+    ]
+    search_fields = [
+        "==user_operation__sender",
+    ]
+
+    @admin.display()
+    def user_operation_hash(self, obj: UserOperationReceipt) -> HexStr:
+        return obj.user_operation.hash
+
+    @admin.display()
+    def user_operation_sender(self, obj: UserOperationReceipt) -> ChecksumAddress:
+        return obj.user_operation.sender
+
+    @admin.display()
+    def user_operation_nonce(self, obj: UserOperationReceipt) -> int:
+        return obj.user_operation.nonce
+
+
+@admin.register(SafeOperation)
+class SafeOperationAdmin(admin.ModelAdmin):
+    list_display = (
+        "hash",
+        "user_operation_hash",
+        "ethereum_tx",
+        "user_operation_sender",
+        "user_operation_nonce",
+        "success",
+        "module_address",
+    )
+    list_filter = ["module_address"]
+    list_select_related = ["user_operation__receipt"]
+    search_fields = [
+        "==user_operation__sender",
+    ]
+    ordering = ["-modified"]
+
+    @admin.display()
+    def ethereum_tx(self, obj: SafeOperation) -> history_models.EthereumTx:
+        return obj.user_operation.ethereum_tx
+
+    @admin.display()
+    def user_operation_hash(self, obj: SafeOperation) -> HexStr:
+        return obj.user_operation.hash
+
+    @admin.display()
+    def user_operation_sender(self, obj: SafeOperation) -> ChecksumAddress:
+        return obj.user_operation.sender
+
+    @admin.display()
+    def user_operation_nonce(self, obj: SafeOperation) -> int:
+        return obj.user_operation.nonce
+
+    @admin.display(boolean=True, description="Is successful?")
+    def success(self, obj: SafeOperation) -> bool:
+        return obj.user_operation.receipt.success

safe_transaction_service/account_abstraction/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class AccountAbstractionConfig(AppConfig):
+    name = "safe_transaction_service.account_abstraction"
+    verbose_name = "Account Abstraction (ERC4337) indexing support"

safe_transaction_service/account_abstraction/constants.py

@@ -0,0 +1,23 @@
+"""
+ERC4337 Constants
+
+EntryPoint v0.6.0 and 0.7.0
+---------------------------
+    0x49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f
+    UserOperationEvent (
+                        indexed bytes32 userOpHash,
+                        indexed address sender,
+                        indexed address paymaster,
+                        uint256 nonce,
+                        bool success,
+                        uint256 actualGasCost,
+                        uint256 actualGasUsed
+                        )
+"""
+
+from hexbytes import HexBytes
+
+USER_OPERATION_NUMBER_TOPICS = 4
+USER_OPERATION_EVENT_TOPICS = {
+    HexBytes("0x49628fd1471006c1482da88028e9ce4dbb080b815c9b0344d39e5a8e6ec1419f")
+}