refactor!: make verifyDidSignature accept Uint8Array

packages/core/src/credential/Credential.ts

@@ -21,6 +21,8 @@ import {
   isDidSignature,
   verifyDidSignature,
   resolveKey,
+  signatureToJson,
+  signatureFromJson,
 } from '@kiltprotocol/did'
 import type {
   DidResolveKey,
@@ -34,7 +36,6 @@ import type {
   SignCallback,
 } from '@kiltprotocol/types'
 import { Crypto, DataUtils, SDKErrors } from '@kiltprotocol/utils'
-import { u8aToHex } from '@polkadot/util'
 import * as Claim from '../claim/index.js'
 import { hashClaimContents } from '../claim/index.js'
 import { verifyClaimAgainstSchema } from '../ctype/index.js'
@@ -233,7 +234,7 @@ export async function verifySignature(
     )
   const signingData = makeSigningData(input, claimerSignature.challenge)
   await verifyDidSignature({
-    signature: claimerSignature,
+    ...signatureFromJson(claimerSignature),
     message: signingData,
     expectedVerificationMethod: 'authentication',
     didResolveKey,
@@ -415,14 +416,14 @@ export async function createPresentation({
     excludedClaimProperties
   )
 
-  const { signature, keyUri } = await signCallback({
+  const signature = await signCallback({
     data: makeSigningData(presentation, challenge),
     did: credential.claim.owner,
     keyRelationship: 'authentication',
   })
 
   return {
     ...presentation,
-    claimerSignature: { signature: u8aToHex(signature), keyUri, challenge },
+    claimerSignature: { ...signatureToJson(signature), challenge },
   }
 }

packages/core/src/quote/Quote.spec.ts

@@ -9,8 +9,6 @@
  * @group unit/quote
  */
 
-import { u8aToHex } from '@polkadot/util'
-
 import type {
   DidDocument,
   IClaim,
@@ -27,7 +25,6 @@ import { Crypto } from '@kiltprotocol/utils'
 import * as Did from '@kiltprotocol/did'
 import {
   createLocalDemoFullDidFromKeypair,
-  makeDidSignature,
   makeSigningKeyTool,
 } from '@kiltprotocol/testing'
 import * as CType from '../ctype'
@@ -142,10 +139,13 @@ describe('Quote', () => {
 
   it('tests created quote data against given data', async () => {
     expect(validQuoteData.attesterDid).toEqual(attesterIdentity.uri)
-    const signature = await makeDidSignature(
-      Crypto.hashStr(Crypto.encodeObjectAsStr(validAttesterSignedQuote)),
-      claimerIdentity.uri,
-      claimer.getSignCallback(claimerIdentity)
+    const sign = claimer.getSignCallback(claimerIdentity)
+    const signature = Did.signatureToJson(
+      await sign({
+        data: Crypto.hash(Crypto.encodeObjectAsStr(validAttesterSignedQuote)),
+        did: claimerIdentity.uri,
+        keyRelationship: 'authentication',
+      })
     )
     expect(signature).toEqual(quoteBothAgreed.claimerSignature)
 
@@ -166,10 +166,8 @@ describe('Quote', () => {
           })
         ),
         validAttesterSignedQuote.attesterSignature.signature,
-        u8aToHex(
-          Did.getKey(attesterIdentity, attesterKeyId!)?.publicKey ||
-            new Uint8Array()
-        )
+        Did.getKey(attesterIdentity, attesterKeyId!)?.publicKey ||
+          new Uint8Array()
       )
     ).not.toThrow()
     await Quote.verifyAttesterSignedQuote(validAttesterSignedQuote, {

packages/core/src/quote/Quote.ts

@@ -25,7 +25,12 @@ import type {
   DidUri,
 } from '@kiltprotocol/types'
 import { Crypto, JsonSchema, SDKErrors } from '@kiltprotocol/utils'
-import { resolveKey, verifyDidSignature } from '@kiltprotocol/did'
+import {
+  resolveKey,
+  verifyDidSignature,
+  signatureToJson,
+  signatureFromJson,
+} from '@kiltprotocol/did'
 import { QuoteSchema } from './QuoteSchema.js'
 
 /**
@@ -79,10 +84,7 @@ export async function createAttesterSignedQuote(
   })
   return {
     ...quoteInput,
-    attesterSignature: {
-      keyUri: signature.keyUri,
-      signature: Crypto.u8aToHex(signature.signature),
-    },
+    attesterSignature: signatureToJson(signature),
   }
 }
 
@@ -103,7 +105,7 @@ export async function verifyAttesterSignedQuote(
 ): Promise<void> {
   const { attesterSignature, ...basicQuote } = quote
   await verifyDidSignature({
-    signature: attesterSignature,
+    ...signatureFromJson(attesterSignature),
     message: Crypto.hashStr(Crypto.encodeObjectAsStr(basicQuote)),
     expectedVerificationMethod: 'authentication',
     didResolveKey,
@@ -140,13 +142,13 @@ export async function createQuoteAgreement(
   const { attesterSignature, ...basicQuote } = attesterSignedQuote
 
   await verifyDidSignature({
-    signature: attesterSignature,
+    ...signatureFromJson(attesterSignature),
     message: Crypto.hashStr(Crypto.encodeObjectAsStr(basicQuote)),
     expectedVerificationMethod: 'authentication',
     didResolveKey,
   })
 
-  const { signature, keyUri } = await sign({
+  const signature = await sign({
     data: Crypto.hash(Crypto.encodeObjectAsStr(attesterSignedQuote)),
     did: claimerDid,
     keyRelationship: 'authentication',
@@ -155,10 +157,7 @@ export async function createQuoteAgreement(
   return {
     ...attesterSignedQuote,
     rootHash: credentialRootHash,
-    claimerSignature: {
-      signature: Crypto.u8aToHex(signature),
-      keyUri,
-    },
+    claimerSignature: signatureToJson(signature),
   }
 }