refactor!: rename didResolveKey param to dereferenceDidUrl

Author: rflechtner

src/messaging/interface/attestation/response.ts

@@ -79,7 +79,7 @@ export async function requestAttestation(
   const { did: receiver } = Did.parse(receiverEncryptionKeyUri)
 
   if (attesterQuote) {
-    verifyAttesterSignedQuote(attesterQuote, { didResolveKey: dereferenceDidUrl })
+    verifyAttesterSignedQuote(attesterQuote, { dereferenceDidUrl })
 
     quote = await createQuoteAgreement(attesterQuote, rootHash, authenticationSigner, sender, {
       dereferenceDidUrl,

src/quote/Quote.ts

@@ -15,12 +15,12 @@
  * @packageDocumentation
  */
 
-import type { ICredential, Did, SignerInterface, DidUrl } from '@kiltprotocol/types'
+import { dereference, signatureFromJson, verifyDidSignature } from '@kiltprotocol/did'
+import type { Did, DidUrl, ICredential, SignerInterface } from '@kiltprotocol/types'
 import { Crypto, JsonSchema, Signers } from '@kiltprotocol/utils'
+import { IQuote, IQuoteAgreement, IQuoteAttesterSigned } from '../types/Quote.js'
 import * as QuoteError from './Error.js'
-import { dereference, verifyDidSignature, signatureFromJson } from '@kiltprotocol/did'
 import { QuoteSchema } from './QuoteSchema.js'
-import { IQuote, IQuoteAgreement, IQuoteAttesterSigned } from '../types/Quote.js'
 
 /**
  * Validates the quote against the meta schema and quote data against the provided schema.
@@ -81,19 +81,21 @@ export async function createAttesterSignedQuote(
 export async function verifyAttesterSignedQuote(
   quote: IQuoteAttesterSigned,
   {
-    didResolveKey,
+    dereferenceDidUrl,
   }: {
-    didResolveKey?: typeof dereference
+    dereferenceDidUrl?: typeof dereference
   } = {}
 ): Promise<void> {
   const { attesterSignature, ...basicQuote } = quote
+  const { keyUri, signature } = signatureFromJson(attesterSignature)
   await verifyDidSignature({
-    ...signatureFromJson(attesterSignature),
+    signerUrl: keyUri,
+    signature,
     message: Crypto.hashStr(Crypto.encodeObjectAsStr(basicQuote)),
     expectedSigner: basicQuote.attesterDid,
     expectedVerificationRelationship: 'authentication',
     // @ts-expect-error this is dumb
-    dereferenceDidUrl: didResolveKey,
+    dereferenceDidUrl,
   })
 
   const messages: string[] = []
@@ -161,21 +163,23 @@ export async function createQuoteAgreement(
 export async function verifyQuoteAgreement(
   quote: IQuoteAgreement,
   {
-    didResolveKey,
+    dereferenceDidUrl,
   }: {
-    didResolveKey?: typeof dereference
+    dereferenceDidUrl?: typeof dereference
   } = {}
 ): Promise<void> {
   const { claimerSignature, claimerDid, rootHash, ...attesterSignedQuote } = quote
   // verify attester signature
-  await verifyAttesterSignedQuote(attesterSignedQuote, { didResolveKey })
+  await verifyAttesterSignedQuote(attesterSignedQuote, { dereferenceDidUrl })
   // verify claimer signature
+  const { keyUri, signature } = signatureFromJson(claimerSignature)
   await verifyDidSignature({
-    ...signatureFromJson(claimerSignature),
+    signature,
+    signerUrl: keyUri,
     message: Crypto.hashStr(Crypto.encodeObjectAsStr({ ...attesterSignedQuote, claimerDid, rootHash })),
     expectedSigner: claimerDid,
     expectedVerificationRelationship: 'authentication',
     // @ts-expect-error why would this complain?
-    dereferenceDidUrl: didResolveKey,
+    dereferenceDidUrl,
   })
 }