feat: enabling Indy2 DIDs to make connections using public did

Author: thiagoromanos

aries_cloudagent/anoncreds/default/did_besu/registry.py

@@ -375,7 +375,7 @@ async def send_credential_definition_anoncreds(
 
     def _send_signed_transaction(
         self, contractFunction: ContractFunction, includeGasInTx: bool = True
-    ) -> TxReceipt:
+    ) -> TxReceipt:        
         nonce = self.web3.eth.get_transaction_count(self.ledgerConfig.trusteeAccount)
         chain_id = self.web3.eth.chain_id
         txParams = {
@@ -385,26 +385,26 @@ def _send_signed_transaction(
             "gasPrice": self.web3.eth.gas_price,
         }
         if includeGasInTx:
-            txParams["gas"] = 3000000
+            txParams["gas"] = 3000000        
         tx = contractFunction.build_transaction(txParams)
         # Sign transaction
         signed_tx = self.web3.eth.account.sign_transaction(
             tx, private_key=self.ledgerConfig.trusteePKey
         )
 
         # Send transaction
-        LOGGER.debug("Transaction: %s", signed_tx.rawTransaction)
+        # LOGGER.debug("Transaction: %s", signed_tx.rawTransaction))
+        LOGGER.debug("Sending contract function %s: tuple %s", contractFunction.fn_name, contractFunction.arguments)
         send_tx = self.web3.eth.send_raw_transaction(signed_tx.rawTransaction)
 
         # Wait for transaction receipt
-        tx_receipt = self.web3.eth.wait_for_transaction_receipt(send_tx)
+        tx_receipt = self.web3.eth.wait_for_transaction_receipt(transaction_hash=send_tx, poll_latency=1.0)
 
         if tx_receipt["status"] == 0:
             raise LedgerError("Transaction rollback")
 
         return tx_receipt
 
-
     async def get_key_for_did(self, did: str) -> str:
         """Get key for did."""
         LOGGER.info(f"Getting key for did {did}")
@@ -493,7 +493,7 @@ async def get_endpoint_for_did(
 
     async def get_all_endpoints_for_did(self, did: str) -> dict:
         """Getting all endpoints there is."""
-        return {"endpoint": {"endpoint": await self.get_endpoint_for_did(did)}}
+        return {"endpoint": await self.get_endpoint_for_did(did)}
 
     async def register_nym(
         self,
@@ -740,4 +740,4 @@ def _didDocDictFromTuple(self, didDoc) -> dict:
             "service": service,
             "alsoKnownAs": alsoKnownAs,
         }
-        return didDocument
+        return didDocument

aries_cloudagent/ledger/besu_vdr.py

@@ -4,7 +4,6 @@
 import re
 
 from base58 import alphabet
-
 from marshmallow.exceptions import ValidationError
 from marshmallow.fields import Field
 from marshmallow.validate import OneOf, Range, Regexp, Validator
@@ -338,7 +337,7 @@ class IndyDID(Regexp):
     """Validate value against indy DID."""
 
     EXAMPLE = "WgWxqztrNooG92RXvxSTWv"
-    PATTERN = re.compile(rf"^(did:sov:)?[{B58}]{{21,22}}$|^(did:indy2)?:.+:[{B58}]{{21,22}}$")
+    PATTERN = re.compile(rf"^(did:sov:)?[{B58}]{{21,22}}$")
 
     def __init__(self):
         """Initialize the instance."""
@@ -349,6 +348,21 @@ def __init__(self):
         )
 
 
+class Indy2DID(Regexp):
+    """Validate value against indy2 DID."""
+
+    EXAMPLE = "WgWxqztrNooG92RXvxSTWv"
+    PATTERN = re.compile(rf"^(did:indy2)?:.+:[{B58}]{{21,22}}$")
+
+    def __init__(self):
+        """Initialize the instance."""
+
+        super().__init__(
+            Indy2DID.PATTERN,
+            error="Value {input} is not an indy decentralized identifier (DID)",
+        )
+
+
 class DIDValidation(Regexp):
     """Validate value against any valid DID spec."""
 
@@ -423,7 +437,8 @@ def __init__(self):
             ),
         )
 
-# Modifiquei aqui 
+
+# Modifiquei aqui
 class IndyCredDefId(Regexp):
     """Validate value against indy credential definition identifier specification."""
 
@@ -433,7 +448,7 @@ class IndyCredDefId(Regexp):
         f":3"  # cred def id marker
         f":CL"  # sig alg
         rf":(([1-9][0-9]*)|([{B58}]{{21,22}}:2:.+:[0-9.]+))"  # schema txn / id
-        f":(.+)?$|"  # tag    
+        f":(.+)?$|"  # tag
         rf"^((did:indy2)?:.+:[{B58}]{{21,22}})"  # issuer DID
         f"/anoncreds/v0/CLAIM_DEF/"  # cred def id marker
         # f":CL"  # sig alg
@@ -489,12 +504,12 @@ class IndyRevRegId(Regexp):
         rf"([{B58}]{{21,22}}):3:"
         rf"CL:(([1-9][0-9]*)|([{B58}]{{21,22}}:2:.+:[0-9.]+))(:.+)?:"
         rf"CL_ACCUM:(.+$)|^((did:indy2)?:.+:[{B58}]{{21,22}})"  # issuer DID
-            f"\/anoncreds\/v0\/REV_REG_DEF\/"  # cred def id marker
-            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"\/(.+)?(:|\/)CL_ACCUM(:|\/).+$"
+        f"\/anoncreds\/v0\/REV_REG_DEF\/"  # cred def id marker
+        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"\/(.+)?(:|\/)CL_ACCUM(:|\/).+$"
     )
 
     def __init__(self):

aries_cloudagent/messaging/valid.py

@@ -1,8 +1,8 @@
 """Classes to manage connections."""
 
 import logging
-from typing import Optional, Sequence, Tuple, Union, cast
 import warnings
+from typing import Optional, Sequence, Tuple, Union, cast
 
 from ....connections.base_manager import BaseConnectionManager
 from ....connections.models.conn_record import ConnRecord
@@ -15,7 +15,7 @@
 from ....storage.error import StorageNotFoundError
 from ....transport.inbound.receipt import MessageReceipt
 from ....wallet.base import BaseWallet
-from ....wallet.did_method import SOV
+from ....wallet.did_method import INDY2, SOV
 from ....wallet.key_type import ED25519
 from ...coordinate_mediation.v1_0.manager import MediationManager
 from .message_types import ARIES_PROTOCOL as CONN_PROTO
@@ -180,7 +180,10 @@ async def create_invitation(
             # FIXME - allow ledger instance to format public DID with prefix?
             public_did_did = public_did.did
             if bool(IndyDID.PATTERN.match(public_did_did)):
-                public_did_did = f"did:sov:{public_did.did}"
+                if public_did.method == INDY2:
+                    public_did_did = f"did:indy2:indy_besu:{public_did.did}"
+                else:
+                    public_did_did = f"did:sov:{public_did.did}"
 
             invitation = ConnectionInvitation(
                 label=my_label, did=public_did_did, image_url=image_url

aries_cloudagent/protocols/connections/v1_0/manager.py

@@ -3,8 +3,8 @@
 import asyncio
 import logging
 import re
-from typing import List, Mapping, NamedTuple, Optional, Sequence, Text, Union
 import uuid
+from typing import List, Mapping, NamedTuple, Optional, Sequence, Text, Union
 
 from aries_cloudagent.protocols.coordinate_mediation.v1_0.route_manager import (
     RouteManager,
@@ -26,7 +26,7 @@
 from ....transport.inbound.receipt import MessageReceipt
 from ....wallet.base import BaseWallet
 from ....wallet.did_info import INVITATION_REUSE_KEY, DIDInfo
-from ....wallet.did_method import PEER2, PEER4
+from ....wallet.did_method import INDY2, PEER2, PEER4
 from ....wallet.key_type import ED25519
 from ...connections.v1_0.manager import ConnectionManager
 from ...connections.v1_0.messages.connection_invitation import ConnectionInvitation
@@ -42,8 +42,8 @@
 from .messages.problem_report import OOBProblemReport
 from .messages.reuse import HandshakeReuse
 from .messages.reuse_accept import HandshakeReuseAccept
-from .messages.service import Service as ServiceMessage
 from .messages.service import Service
+from .messages.service import Service as ServiceMessage
 from .models.invitation import InvitationRecord
 from .models.oob_record import OobRecord
 
@@ -353,6 +353,7 @@ async def handle_did(
         mediation_record: Optional[MediationRecord],
     ) -> CreateResult:
         """Handle use_did invitation creation."""
+
         invi_msg = InvitationMessage(
             _id=self.msg_id,
             label=self.my_label,
@@ -363,6 +364,7 @@ async def handle_did(
             version=self.version,
             image_url=self.image_url,
         )
+
         endpoint, recipient_keys, routing_keys = await self.oob.resolve_invitation(
             did_info.did
         )
@@ -412,8 +414,11 @@ async def handle_public(
             )
 
         if bool(IndyDID.PATTERN.match(public_did.did)):
+            did = f"did:sov:{public_did.did}"
+            if public_did.method == INDY2:
+                did = f"did:indy2:indy_besu:{public_did.did}"
             public_did = DIDInfo(
-                did=f"did:sov:{public_did.did}",
+                did=did,
                 verkey=public_did.verkey,
                 metadata=public_did.metadata,
                 method=public_did.method,
@@ -1048,7 +1053,7 @@ async def _perform_handshake(
             # in an out-of-band message (RFC 0434).
             # OR did:peer:2 or did:peer:4.
 
-            if service.startswith("did:peer"):
+            if service.startswith("did:peer") or service.startswith("did:indy2"):
                 public_did = service
                 if public_did.startswith("did:peer:4"):
                     public_did = self.long_did_peer_to_short(public_did)

aries_cloudagent/protocols/out_of_band/v1_0/manager.py

@@ -43,6 +43,12 @@ async def setup(context: InjectionContext):
     else:
         LOGGER.warning("Ledger is not configured, not loading IndyDIDResolver")
 
+    indy2_resolver = ClassProvider(
+        "aries_cloudagent.resolver.default.indy2.Indy2DIDResolver"
+    ).provide(context.settings, context.injector)
+    await indy2_resolver.setup(context)
+    registry.register_resolver(indy2_resolver)
+
     web_resolver = ClassProvider(
         "aries_cloudagent.resolver.default.web.WebDIDResolver"
     ).provide(context.settings, context.injector)