chore: upgrade sdk to v0.35 (#81)

## fixes KILTProtocol/ticket#NoTicket Upgrades to SDK version v0.35 It also fixes a bug that stoped the `did-configuration` from running succesfully.
KILTprotocol · May 6, 2024 · 2ee5d7d · 2ee5d7d
1 parent 0882d58
commit 2ee5d7d
Show file tree

Hide file tree

Showing 8 changed files with 215 additions and 158 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -11,9 +11,9 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@kiltprotocol/sdk-js": "^0.32.0",
-    "@kiltprotocol/types": "^0.32.0",
-    "@kiltprotocol/vc-export": "^0.32.0",
+    "@kiltprotocol/sdk-js": "^0.35.0",
+    "@kiltprotocol/types": "^0.35.0",
+    "@kiltprotocol/vc-export": "^0.35.0",
     "body-parser": "^1.20.1",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",

diff --git a/backend/src/credentials/verifySubmittedCredential.ts b/backend/src/credentials/verifySubmittedCredential.ts
@@ -13,7 +13,7 @@ import { readCredentialCookie } from './readCredentialCookie'
 export async function verifySubmittedCredential(
   request: Request,
   response: Response,
-  cTypeRequested: Kilt.IRequestCredentialContent
+  cTypesRequested: Kilt.IRequestCredentialContent
 ): Promise<Kilt.ICredentialPresentation> {
   const encryptedMessage = request.body
   console.log(
@@ -23,7 +23,7 @@ export async function verifySubmittedCredential(
       2
     )}`
   )
-  const api = await getApi()
+  await getApi()
 
   const { keyAgreement } = generateKeyPairs(DAPP_DID_MNEMONIC)
   const decryptedMessage = await Kilt.Message.decrypt(
@@ -44,51 +44,46 @@ export async function verifySubmittedCredential(
 
   console.log('Decrypted Credential being verify: \n', credential)
 
+  const chosenCType = cTypesRequested.cTypes.find(
+    (ctype) => ctype.cTypeHash === credential.claim.cTypeHash
+  )
+
+  if (!chosenCType) {
+    throw new Error(
+      "The User did not complied to the Credential Request. The Server does not accept the submitted Credential's Type."
+    )
+  }
+
   // Know against to what structure you want to compare to:
-  const requestedCTypeHash = cTypeRequested.cTypes[0].cTypeHash
-  const requestedCTypeDetailed = await Kilt.CType.fetchFromChain(
+  const requestedCTypeHash = chosenCType.cTypeHash
+  const { cType: requestedCType } = await Kilt.CType.fetchFromChain(
     `kilt:ctype:${requestedCTypeHash}`
   )
 
-  // The function Credential.verifyPresentation can check against a specific cType structure.
-  // This cType needs to match the ICType-interface.
-  // To fullfil this structure we need to remove the 'creator' and 'createdAt' properties from our fetched object.
-  const { $id, $schema, title, properties, type } = requestedCTypeDetailed
-  const requestedCType = { $id, $schema, title, properties, type }
-
   const challengeOnRequest = await readCredentialCookie(
     request,
     response,
     JWT_SIGNER_SECRET
   )
 
-  await Kilt.Credential.verifyPresentation(credential, {
-    challenge: challengeOnRequest,
-    ctype: requestedCType
-  })
-
-  const attestationChain = await api.query.attestation.attestations(
-    credential.rootHash
-  )
-
-  const attestation = Kilt.Attestation.fromChain(
-    attestationChain,
-    credential.rootHash
+  const verifiedCredential = await Kilt.Credential.verifyPresentation(
+    credential,
+    {
+      challenge: challengeOnRequest,
+      ctype: requestedCType
+    }
   )
 
-  if (attestation.revoked) {
+  if (verifiedCredential.revoked) {
     throw new Error("Credential has been revoked and hence it's not valid.")
   }
 
   // Check if the credentials was issued by one of our "trusted attesters"
-  const attesterOfTheirCredential = attestation.owner
-  const ourTrustedAttesters = cTypeRequested.cTypes.find((ctype) => {
-    ctype.cTypeHash === credential.claim.cTypeHash
-  })?.trustedAttesters
+  const ourTrustedAttesters = chosenCType.trustedAttesters
 
   // If you don't include a list of trusted attester on the credential-request, this check would be skipped
   if (ourTrustedAttesters) {
-    if (!ourTrustedAttesters.includes(attesterOfTheirCredential)) {
+    if (!ourTrustedAttesters.includes(verifiedCredential.attester)) {
       throw new Error(
         `The Credential was not issued by any of the trusted Attesters that the dApp relies on. \n List of trusted attesters: ${ourTrustedAttesters}`
       )

diff --git a/backend/src/server.ts b/backend/src/server.ts
@@ -1,4 +1,3 @@
-import * as Kilt from '@kiltprotocol/sdk-js'
 import express, { Express, NextFunction, Request, Response } from 'express'
 import cors from 'cors'
 import bodyParser from 'body-parser'
@@ -23,6 +22,7 @@ import {
 
 import { logout } from './access/logout'
 import { checkAccessCookie } from './access/checkAccessCookie'
+import { getApi } from './utils/connection'
 
 const app: Express = express()
 
@@ -117,7 +117,8 @@ validateEnvironmentConstants()
 
 async function connectToKiltWebSocket() {
   try {
-    await Kilt.connect(WSS_ADDRESS)
+    // internally calls Kilt.connect(WSS_ADDRESS)
+    await getApi()
     console.log(
       `🔗[websocket]: Connected to WebSocket server at ${WSS_ADDRESS}`
     )

diff --git a/backend/src/utils/fetchDidDocument.ts b/backend/src/utils/fetchDidDocument.ts
@@ -44,7 +44,5 @@ export async function fetchDidDocument(): Promise<Kilt.DidDocument> {
     )
   }
 
-  Kilt.disconnect()
-
   return didDocument
 }
diff --git a/frontend/package.json b/frontend/package.json
@@ -4,9 +4,9 @@
   "private": true,
   "proxy": "http://localhost:2525/",
   "dependencies": {
-    "@kiltprotocol/sdk-js": "^0.32.0",
-    "@kiltprotocol/types": "^0.31.0",
-    "@kiltprotocol/vc-export": "^0.31.0",
+    "@kiltprotocol/sdk-js": "^0.35.0",
+    "@kiltprotocol/types": "^0.35.0",
+    "@kiltprotocol/vc-export": "^0.35.0",
     "@polkadot/util": "^10.4.2",
     "kilt-extension-api": "0.1.0",
     "react": "^18.2.0",

diff --git a/package.json b/package.json
@@ -49,9 +49,9 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@kiltprotocol/sdk-js": "^0.32.0",
-    "@kiltprotocol/types": "^0.32.0",
-    "@kiltprotocol/vc-export": "^0.32.0",
+    "@kiltprotocol/sdk-js": "^0.35.0",
+    "@kiltprotocol/types": "^0.35.0",
+    "@kiltprotocol/vc-export": "^0.35.0",
     "@polkadot/util": "10.4.2",
     "@polkadot/util-crypto": "10.4.2",
     "@types/valid-url": "^1.0.7",

diff --git a/scripts/wellKnownDIDConfiguration.ts b/scripts/wellKnownDIDConfiguration.ts
@@ -76,7 +76,7 @@ export async function createCredential(
   // Make sure that `ctypeDomainLinkage` contains the correct Domain Linkage CType.
   // Extensions expect this specific CTypes other CTypes will not be recognized.
   const cTypeUri =
-    'kilt:ctype:0x9d271c790775ee831352291f01c5d04c7979713a5896dcf5e81708184cc5c643'
+    'kilt:ctype:0xb08800a574c436831a2b9fce00fd16e9df489b2b3695e88a0895d148eca0311e'
   if (ctypeDomainLinkage.$id !== cTypeUri) {
     console.log(
       'The following CType URI is not the expected one:',