Merge branch 'hyperledger:main' into pstlouis/add-di-support

aries_cloudagent/__main__.py

@@ -21,7 +21,7 @@ def init_debug(args):
     # --debug to use microsoft's visual studio remote debugger
     if ENABLE_PTVSD or "--debug" in args:
         DAP_HOST = os.getenv("PTVSD_HOST", None) or os.getenv("DAP_HOST", "localhost")
-        DAP_PORT = os.getenv("PTVSD_PORT", None) or os.getenv("DAP_PORT", 5678)
+        DAP_PORT = int(os.getenv("PTVSD_PORT", None) or os.getenv("DAP_PORT", 5678))
         try:
             import debugpy
 

aries_cloudagent/protocols/connections/v1_0/messages/connection_invitation.py

@@ -82,7 +82,7 @@ def to_url(self, base_url: Optional[str] = None) -> str:
 
         """
         c_json = self.to_json()
-        c_i = bytes_to_b64(c_json.encode("ascii"), urlsafe=True)
+        c_i = bytes_to_b64(c_json.encode("ascii"), urlsafe=True, pad=False)
         result = urljoin(base_url or self.endpoint or "", "?c_i={}".format(c_i))
         return result
 

aries_cloudagent/protocols/out_of_band/v1_0/messages/invitation.py

@@ -175,7 +175,7 @@ def to_url(self, base_url: Optional[str] = None) -> str:
 
         """
         c_json = self.to_json()
-        oob = bytes_to_b64(c_json.encode("ascii"), urlsafe=True)
+        oob = bytes_to_b64(c_json.encode("ascii"), urlsafe=True, pad=False)
         endpoint = None
         if not base_url:
             for service_item in self.services:

aries_cloudagent/protocols/out_of_band/v1_0/tests/test_manager.py

@@ -9,6 +9,7 @@
 from unittest.mock import ANY
 
 from aries_cloudagent.tests import mock
+from aries_cloudagent.wallet.util import pad
 
 from .....connections.models.conn_record import ConnRecord
 from .....connections.models.connection_target import ConnectionTarget
@@ -883,7 +884,8 @@ async def test_create_invitation_goal_code(self):
 
             base64_message = invi_rec.invitation_url.split("=", maxsplit=1)[1]
             base64_bytes = base64_message.encode("ascii")
-            message_bytes = base64.b64decode(base64_bytes)
+            message_bytes = base64.b64decode(base64_bytes + b"==")
+            base64.urlsafe_b64decode(pad(base64_message))
             data = message_bytes.decode("ascii")
             assert data
             invite_json = json.loads(data)

aries_cloudagent/vc/ld_proofs/crypto/tests/test_wallet_key_pair.py

@@ -76,4 +76,4 @@ async def test_from_verification_method_x_no_public_key_base58(self):
 
         with self.assertRaises(LinkedDataProofException) as context:
             key_pair.from_verification_method({})
-        assert "no publicKeyBase58" in str(context.exception)
+        assert "Unrecognized" in str(context.exception)

aries_cloudagent/vc/ld_proofs/crypto/wallet_key_pair.py

@@ -1,13 +1,15 @@
 """Key pair based on base wallet interface."""
 
 from typing import List, Optional, Union
+from base58 import b58encode
 
 from ....core.profile import Profile
 from ....wallet.base import BaseWallet
 from ....wallet.key_type import KeyType
 from ....wallet.util import b58_to_bytes
 from ..error import LinkedDataProofException
 from .key_pair import KeyPair
+from ....utils.multiformats import multibase, multicodec
 
 
 class WalletKeyPair(KeyPair):
@@ -57,15 +59,23 @@ async def verify(self, message: Union[List[bytes], bytes], signature: bytes) ->
 
     def from_verification_method(self, verification_method: dict) -> "WalletKeyPair":
         """Create new WalletKeyPair from public key in verification method."""
-        if "publicKeyBase58" not in verification_method:
+        if "publicKeyBase58" in verification_method:
+            key_material = verification_method["publicKeyBase58"]
+        elif "sec:publicKeyMultibase" in verification_method:
+            # verification_method is framed
+            _, raw_key = multicodec.unwrap(
+                multibase.decode(verification_method["sec:publicKeyMultibase"]["@value"])
+            )
+            key_material = b58encode(raw_key).decode()
+        else:
             raise LinkedDataProofException(
-                "Unable to set public key from verification method: no publicKeyBase58"
+                f"Unrecognized verification method type: {verification_method}"
             )
 
         return WalletKeyPair(
             profile=self.profile,
             key_type=self.key_type,
-            public_key_base58=verification_method["publicKeyBase58"],
+            public_key_base58=key_material,
         )
 
     @property