Merge remote-tracking branch 'thiagoromanos/feat/use-besu-vdr' into feat/indy-besu-cpqd

Author: thiagoromanos

aries_cloudagent/admin/server.py

@@ -12,13 +12,13 @@
 import aiohttp_cors
 import jwt
 from aiohttp import web
+from aiohttp.web_log import AccessLogger
 from aiohttp_apispec import (
     docs,
     response_schema,
     setup_aiohttp_apispec,
     validation_middleware,
 )
-
 from marshmallow import fields
 
 from ..config.injection_context import InjectionContext
@@ -59,6 +59,18 @@
 }
 
 
+class CustomAccessLogger(AccessLogger):
+    """Custom logger that doesn't logs healthcheck endpoints."""
+
+    def log(
+        self, request: web.BaseRequest, response: web.StreamResponse, time: float
+    ) -> None:
+        """Log everything but ready and live."""
+        if request.path == "/status/ready" or request.path == "/status/live":
+            return
+        return super().log(request, response, time)
+
+
 class AdminModulesSchema(OpenAPISchema):
     """Schema for the modules endpoint."""
 
@@ -218,6 +230,21 @@ async def debug_middleware(request: web.BaseRequest, handler: Coroutine):
     return await handler(request)
 
 
+@web.middleware
+async def debug_middleware_supress(request: web.BaseRequest, handler: Coroutine):
+    """Show request detail in debug log, except for live and ready status."""
+
+    if LOGGER.isEnabledFor(logging.DEBUG) and not (
+        request.path == "/status/ready" or request.path == "/status/live"
+    ):
+        LOGGER.debug(f"Incoming request: {request.method} {request.path_qs}")
+        LOGGER.debug(f"Match info: {request.match_info}")
+        body = await request.text() if request.body_exists else None
+        LOGGER.debug(f"Body: {body}")
+
+    return await handler(request)
+
+
 def const_compare(string1, string2):
     """Compare two strings in constant time."""
     if string1 is None or string2 is None:
@@ -257,6 +284,9 @@ def __init__(
         self.admin_insecure_mode = bool(
             context.settings.get("admin.admin_insecure_mode")
         )
+        self.supressHealthEndpoints = bool(
+            context.settings.get("log.supress-healthcheck-log")
+        )
         self.host = host
         self.port = port
         self.context = context
@@ -299,7 +329,13 @@ def _matches_additional_routes(self, path: str) -> bool:
     async def make_application(self) -> web.Application:
         """Get the aiohttp application instance."""
 
-        middlewares = [ready_middleware, debug_middleware]
+        middlewares = [ready_middleware]
+
+        (
+            middlewares.append(debug_middleware)
+            if not self.supressHealthEndpoints
+            else middlewares.append(debug_middleware_supress)
+        )
 
         # admin-token and admin-token are mutually exclusive and required.
         # This should be enforced during parameter parsing but to be sure,
@@ -529,7 +565,13 @@ def sort_dict(raw: dict) -> dict:
             return dict(sorted(raw.items(), key=lambda x: x[0]))
 
         self.app = await self.make_application()
-        runner = web.AppRunner(self.app)
+
+        runner = (
+            web.AppRunner(self.app, access_log_class=CustomAccessLogger)
+            if self.supressHealthEndpoints
+            else web.AppRunner(self.app)
+        )
+
         await runner.setup()
 
         plugin_registry = self.context.inject_or(PluginRegistry)

aries_cloudagent/anoncreds/__init__.py

@@ -15,6 +15,14 @@ async def setup(context: InjectionContext):
         LOGGER.error("No AnonCredsRegistry instance found in context!!!")
         return
 
+    besu_registry = ClassProvider(
+        "aries_cloudagent.anoncreds.default.did_besu.registry.DIDBesuRegistry",
+        # supported_identifiers=[],
+        # method_name="did:indy2",
+    ).provide(context.settings, context.injector)
+    await besu_registry.setup(context)
+    registry.register(besu_registry)
+
     indy_registry = ClassProvider(
         "aries_cloudagent.anoncreds.default.did_indy.registry.DIDIndyRegistry",
         # supported_identifiers=[],

aries_cloudagent/anoncreds/default/did_besu/__init__.py

@@ -26,6 +26,9 @@
 from ..wallet.error import WalletNotFoundError
 from .error_messages import ANONCREDS_PROFILE_REQUIRED_MSG
 from .models.anoncreds_cred_def import CredDef
+from base58 import alphabet
+
+B58 = alphabet if isinstance(alphabet, str) else alphabet.decode("ascii")
 
 LOGGER = logging.getLogger(__name__)
 
@@ -143,8 +146,8 @@ async def create_credential_request(
             ) = await asyncio.get_event_loop().run_in_executor(
                 None,
                 CredentialRequest.create,
+                holder_did, # FIX ME PLEEEEASE
                 None,
-                holder_did,
                 credential_definition.to_native(),
                 secret,
                 AnonCredsHolder.MASTER_SECRET_ID,
@@ -207,27 +210,53 @@ async def store_credential(
 
         schema_id = cred_recvd.schema_id
         schema_id_parts = re.match(r"^(\w+):2:([^:]+):([^:]+)$", schema_id)
+        if 'indy2'in schema_id:
+             INDY_SCHEMA_ID = rf"^(did:indy2)?:.+:[{B58}]{{21,22}}/anoncreds/v0/SCHEMA/.+/[0-9.]+$"
+             schema_id_parts = re.match(INDY_SCHEMA_ID, schema_id)
         if not schema_id_parts:
             raise AnonCredsHolderError(
                 f"Error parsing credential schema ID: {schema_id}"
             )
-        cred_def_id = cred_recvd.cred_def_id
-        cdef_id_parts = re.match(r"^(\w+):3:CL:([^:]+):([^:]+)$", cred_def_id)
+        cred_def_id = cred_recvd.cred_def_id    
+        cdef_id_parts = re.match(r"^(\w+):3:CL:([^:]+):([^:]+)$", cred_def_id)        
+        if 'indy2' in cred_def_id:
+            INDY_CRED_DEF_ID = (
+            rf"^((did:indy2)?:.+:[{B58}]{{21,22}})"  # issuer DID
+            f"/anoncreds/v0/CLAIM_DEF/"  # cred def id marker
+            # f":CL"  # sig alg
+            rf"((did:indy2)?:.+:[{B58}]{{21,22}}/anoncreds/v0/SCHEMA/.+/[0-9.]+)"  # schema txn / id
+            f"/(.+)?$"  # tag
+            )
+            cdef_id_parts = re.match(INDY_CRED_DEF_ID, cred_def_id)        
         if not cdef_id_parts:
             raise AnonCredsHolderError(
                 f"Error parsing credential definition ID: {cred_def_id}"
             )
 
         credential_id = credential_id or str(uuid.uuid4())
-        tags = {
-            "schema_id": schema_id,
-            "schema_issuer_did": schema_id_parts[1],
-            "schema_name": schema_id_parts[2],
-            "schema_version": schema_id_parts[3],
-            "issuer_did": cdef_id_parts[1],
-            "cred_def_id": cred_def_id,
-            "rev_reg_id": cred_recvd.rev_reg_id or "None",
-        }
+        tags = {}
+        if 'indy2' in cred_def_id and 'indy2' in schema_id:
+            schema_id_parts = schema_id.split('/')
+            cdef_id_parts = cred_def_id.split('/')
+            tags = {
+                "schema_id": schema_id,
+                "schema_issuer_did": schema_id_parts[0],
+                "schema_name": schema_id_parts[4],
+                "schema_version": schema_id_parts[5],
+                "issuer_did": cdef_id_parts[0],
+                "cred_def_id": cred_def_id,
+                "rev_reg_id": cred_recvd.rev_reg_id or "None",
+            }
+        else:
+            tags = {
+                "schema_id": schema_id,
+                "schema_issuer_did": schema_id_parts[1],
+                "schema_name": schema_id_parts[2],
+                "schema_version": schema_id_parts[3],
+                "issuer_did": cdef_id_parts[1],
+                "cred_def_id": cred_def_id,
+                "rev_reg_id": cred_recvd.rev_reg_id or "None",
+            }
 
         # FIXME - sdk has some special handling for fully qualified DIDs here
 

aries_cloudagent/anoncreds/default/did_besu/registry.py

@@ -5,7 +5,6 @@
 import time
 
 # import traceback
-
 from typing import Any, Mapping
 from weakref import ref
 
@@ -19,14 +18,21 @@
 from ..indy.holder import IndyHolder
 from ..indy.issuer import IndyIssuer
 from ..ledger.base import BaseLedger
+from ..ledger.besu_vdr import (
+    CREDENTIAL_DEFINITION_REGISTRY,
+    INDY_DID_REGISTRY,
+    REVOCATION_REGISTRY,
+    SCHEMA_REGISTRY,
+    BesuVdrLedger,
+    BesuVDRWeb3Config,
+)
 from ..ledger.indy_vdr import IndyVdrLedger, IndyVdrLedgerPool
 from ..storage.base import BaseStorage, BaseStorageSearch
 from ..storage.vc_holder.base import VCHolder
 from ..utils.multi_ledger import get_write_ledger_config_for_profile
 from ..wallet.base import BaseWallet
 from ..wallet.crypto import validate_seed
-
-from .store import AskarStoreConfig, AskarOpenStore
+from .store import AskarOpenStore, AskarStoreConfig
 
 LOGGER = logging.getLogger(__name__)
 
@@ -48,6 +54,7 @@ def __init__(
         super().__init__(context=context, name=opened.name, created=opened.created)
         self.opened = opened
         self.ledger_pool: IndyVdrLedgerPool = None
+        self.besu_configs: BesuVDRWeb3Config = None
         self.profile_id = profile_id
         self.init_ledger_pool()
         self.bind_providers()
@@ -89,6 +96,26 @@ def init_ledger_pool(self):
                 read_only=read_only,
                 socks_proxy=socks_proxy,
             )
+        elif self.settings.get("ledger.besu_provider_url"):
+            self.besu_configs = BesuVDRWeb3Config(
+                ledgerAddr=self.settings.get("ledger.besu_provider_url"),
+                trusteeAccount=self.settings.get("ledger.account_address"),
+                trusteePKey=self.settings.get("ledger.private_account_key"),
+                contractAddrs={
+                    SCHEMA_REGISTRY: self.settings.get(
+                        "ledger.schema_contract_address"
+                    ),
+                    CREDENTIAL_DEFINITION_REGISTRY: self.settings.get(
+                        "ledger.credef_contract_address"
+                    ),
+                    REVOCATION_REGISTRY: self.settings.get(
+                        "ledger.revocation_contract_address"
+                    ),
+                    INDY_DID_REGISTRY: self.settings.get(
+                        "ledger.indy_did_contract_address"
+                    ),
+                },
+            )
 
     def bind_providers(self):
         """Initialize the profile-level instance providers."""
@@ -161,6 +188,10 @@ def bind_providers(self):
             injector.bind_provider(
                 BaseLedger, ClassProvider(IndyVdrLedger, self.ledger_pool, ref(self))
             )
+        elif self.besu_configs:
+            injector.bind_provider(
+                BaseLedger, ClassProvider(BesuVdrLedger, self.besu_configs, ref(self))
+            )
 
     def session(
         self, context: InjectionContext = None