77 Union ,
88 Callable ,
99 Awaitable ,
10- Sequence ,
1110 Tuple ,
1211)
1312import aiohttp
@@ -263,7 +262,7 @@ async def send_http_message(
263262
264263
265264async def setup_relay (
266- dmp : DIDCommMessaging , my_did : DID , relay_did : DID , keys : Tuple [ Key ]
265+ dmp : DIDCommMessaging , my_did : DID , relay_did : DID , verkey : Key , xkey : Key
267266) -> Union [DID , None ]:
268267 """Negotiate services with an inbound relay.
269268
@@ -293,13 +292,13 @@ async def setup_relay(
293292 [
294293 KeySpec .verification (
295294 multibase .encode (
296- multicodec .wrap ("ed25519-pub" , key [ 0 ] .get_public_bytes ()),
295+ multicodec .wrap ("ed25519-pub" , verkey .get_public_bytes ()),
297296 "base58btc" ,
298297 )
299298 ),
300299 KeySpec .key_agreement (
301300 multibase .encode (
302- multicodec .wrap ("x25519-pub" , key [ 1 ] .get_public_bytes ()), "base58btc"
301+ multicodec .wrap ("x25519-pub" , xkey .get_public_bytes ()), "base58btc"
303302 )
304303 ),
305304 ],
@@ -323,14 +322,14 @@ async def setup_relay(
323322 # destined to us via our new DID
324323 doc = await resolver .resolve_and_parse (new_did )
325324 # New format, key-# is in order of keys in did
326- await secrets .add_secret (AskarSecretKey (keys [ 0 ] , f"{ new_did } #key-1" ))
327- await secrets .add_secret (AskarSecretKey (keys [ 1 ] , f"{ new_did } #key-2" ))
325+ await secrets .add_secret (AskarSecretKey (verkey , f"{ new_did } #key-1" ))
326+ await secrets .add_secret (AskarSecretKey (xkey , f"{ new_did } #key-2" ))
328327
329328 # Legacy formats
330329 # verkey
331- await secrets .add_secret (AskarSecretKey (keys [ 0 ] , doc .authentication [0 ]))
330+ await secrets .add_secret (AskarSecretKey (verkey , doc .authentication [0 ]))
332331 # xkey
333- await secrets .add_secret (AskarSecretKey (keys [ 1 ] , doc .key_agreement [0 ]))
332+ await secrets .add_secret (AskarSecretKey (xkey , doc .key_agreement [0 ]))
334333
335334 # Send a message to the relay informing it of our new endpoint that people
336335 # should contact us by
0 commit comments