fix(deps): use did-jwt v6 and ethr-did-resolver v6 (#925)

* fix(deps): bump did-jwt to v6 and all related deps to latest closes #923 closes #848 * chore(deps): use ganache instead of ganache-cli This speeds up testing
decentralized-identity · Jun 10, 2022 · 0c77d03 · 0c77d03
1 parent 219cde2
commit 0c77d03
Show file tree

Hide file tree

Showing 37 changed files with 485 additions and 676 deletions.
diff --git a/__tests__/shared/documentationExamples.ts b/__tests__/shared/documentationExamples.ts
@@ -41,7 +41,7 @@ export default (testContext: {
         id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
         type: 'EcdsaSecp256k1RecoveryMethod2020',
         controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-        blockchainAccountId: '0xb09B66026bA5909A7CFE99b76875431D2b8D5190@eip155:4',
+        blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
       })
     })
 
@@ -52,15 +52,15 @@ export default (testContext: {
       expect(doc.didDocument).toEqual({
         '@context': [
           'https://www.w3.org/ns/did/v1',
-          'https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld',
+          'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
         ],
         id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
         verificationMethod: [
           {
             id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
             type: 'EcdsaSecp256k1RecoveryMethod2020',
             controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-            blockchainAccountId: '0xb09B66026bA5909A7CFE99b76875431D2b8D5190@eip155:4',
+            blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
           },
         ],
         authentication: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],

diff --git a/__tests__/utils/ganache-provider.ts b/__tests__/utils/ganache-provider.ts
@@ -1,8 +1,8 @@
-import { JsonRpcProvider, Web3Provider } from '@ethersproject/providers'
+import { JsonRpcProvider, Web3Provider, ExternalProvider } from '@ethersproject/providers'
 import { Contract, ContractFactory } from '@ethersproject/contracts'
 // @ts-ignore
 import DidRegistryContract from 'ethr-did-registry'
-import ganache from 'ganache-cli'
+import ganache from 'ganache'
 
 /**
  * Creates a Web3Provider that connects to a local ganache instance with a bunch of known keys and an ERC1056 contract.
@@ -12,6 +12,7 @@ import ganache from 'ganache-cli'
 export async function createGanacheProvider(): Promise<{ provider: JsonRpcProvider; registry: string }> {
   const provider = new Web3Provider(
     ganache.provider({
+      logging: { quiet: true },
       accounts: [
         {
           secretKey: '0x278a5de700e29faae8e40e366ec5012b5ec63d36ec77e8a2417154cc1d25383f',
@@ -54,7 +55,7 @@ export async function createGanacheProvider(): Promise<{ provider: JsonRpcProvid
           balance: `0x1000000000000000000000`,
         },
       ],
-    }),
+    }) as any
   )
   await provider.ready
   const factory = ContractFactory.fromSolidity(DidRegistryContract).connect(provider.getSigner(0))

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "test:integration-prepare": "ts-node --project packages/tsconfig.settings.json ./scripts/prepare-integration-tests.ts",
     "test:integration-pretty": "prettier --write __tests__/shared/documentationExamples.ts",
     "test:integration": "yarn test:integration-build && yarn test:ci",
-    "test:ci": "jest --config=jest.config.json --runInBand --coverage=true",
+    "test:ci": "jest --config=jest.config.json --coverage=true",
     "test": "jest --config=jest.config.json",
     "test:watch": "yarn test --watch --verbose",
     "test:browser": "cd packages/test-react-app && yarn test:browser",
@@ -37,7 +37,7 @@
     "codecov": "3.8.3",
     "cross-fetch": "3.1.5",
     "ethr-did-registry": "0.0.3",
-    "ganache-cli": "6.12.2",
+    "ganache": "7.2.0",
     "jest": "27.5.1",
     "jest-fetch-mock": "3.0.3",
     "json-schema": "0.4.0",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -43,9 +43,9 @@
     "cross-fetch": "^3.1.4",
     "date-fns": "^2.28.0",
     "debug": "^4.3.3",
-    "did-resolver": "3.2.2",
+    "did-resolver": "^3.2.2",
     "dotenv": "^16.0.0",
-    "ethr-did-resolver": "^5.0.4",
+    "ethr-did-resolver": "^6.0.1",
     "express": "^4.17.2",
     "express-handlebars": "^6.0.2",
     "fuzzy": "^0.1.3",
@@ -66,7 +66,7 @@
     "ts-json-schema-generator": "^1.0.0",
     "typeorm": "0.3.6",
     "url-parse": "^1.5.4",
-    "web-did-resolver": "^2.0.12",
+    "web-did-resolver": "^2.0.18",
     "ws": "^8.4.0",
     "yaml": "^2.0.0"
   },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "debug": "^4.3.3",
-    "did-jwt-vc": "^2.1.9",
+    "did-jwt-vc": "^2.1.12",
     "events": "^3.2.0",
     "z-schema": "^5.0.2"
   },

diff --git a/packages/core/src/agent.ts b/packages/core/src/agent.ts
@@ -313,5 +313,5 @@ export function createAgent<T extends IPluginMethodMap, C = Record<string, any>>
   options: IAgentOptions & { context?: C },
 ): TAgent<T> & { context?: C } {
   //@ts-ignore
-  return new Agent(options)
+  return new Agent(options) as TAgent<T>
 }
diff --git a/packages/core/src/types/IResolver.ts b/packages/core/src/types/IResolver.ts
@@ -80,15 +80,15 @@ export interface IResolver extends IPluginMethodMap {
    * expect(doc.didDocument).toEqual({
    *   '@context': [
    *     'https://www.w3.org/ns/did/v1',
-   *     'https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld',
+   *     'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
    *   ],
    *   id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
    *   verificationMethod: [
    *     {
    *       id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
    *       type: 'EcdsaSecp256k1RecoveryMethod2020',
    *       controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-   *       blockchainAccountId: '0xb09B66026bA5909A7CFE99b76875431D2b8D5190@eip155:4',
+   *       blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
    *     },
    *   ],
    *   authentication: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
@@ -114,11 +114,11 @@ export interface IResolver extends IPluginMethodMap {
    *   section: 'authentication'
    * })
    * expect(fragment).toEqual({
-   *       id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
-   *       type: 'EcdsaSecp256k1RecoveryMethod2020',
-   *       controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
-   *       blockchainAccountId: '0xb09B66026bA5909A7CFE99b76875431D2b8D5190@eip155:4',
-   *     })
+   *   id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
+   *   type: 'EcdsaSecp256k1RecoveryMethod2020',
+   *   controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
+   *   blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
+   * })
    * ```
    *
    * @param args - The description of the component you want.

diff --git a/packages/credential-ld/package.json b/packages/credential-ld/package.json
@@ -24,7 +24,7 @@
     "@veramo/did-resolver": "^3.1.0",
     "@veramo/utils": "^3.1.0",
     "debug": "^4.3.3",
-    "did-resolver": "3.2.2",
+    "did-resolver": "^3.2.2",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/credential-status/package.json b/packages/credential-status/package.json
@@ -15,9 +15,9 @@
   },
   "dependencies": {
     "@veramo/core": "^3.1.0",
-    "credential-status": "^2.0.2",
-    "did-jwt": "^5.12.4",
-    "did-resolver": "3.2.2"
+    "credential-status": "^2.0.3",
+    "did-jwt": "^6.1.2",
+    "did-resolver": "^3.2.2"
   },
   "devDependencies": {
     "@types/debug": "4.1.7",

diff --git a/packages/credential-w3c/package.json b/packages/credential-w3c/package.json
@@ -20,8 +20,8 @@
     "@veramo/message-handler": "^3.1.4",
     "@veramo/utils": "^3.1.4",
     "debug": "^4.3.3",
-    "did-jwt-vc": "^2.1.9",
-    "did-resolver": "3.2.2",
+    "did-jwt-vc": "^2.1.12",
+    "did-resolver": "^3.2.2",
     "uint8arrays": "^3.0.0",
     "uuid": "^8.3.0"
   },

diff --git a/packages/credential-w3c/src/__tests__/message-handler.test.ts b/packages/credential-w3c/src/__tests__/message-handler.test.ts
@@ -30,7 +30,7 @@ describe('@veramo/credential-w3c', () => {
                   id: `${didEthr}#owner`,
                   type: 'EcdsaSecp256k1RecoveryMethod2020',
                   controller: args?.didUrl,
-                  blockchainAccountId: `${didEthr.slice(-42)}@eip155:1`,
+                  blockchainAccountId: `eip155:1:${didEthr.slice(-42)}`,
                 },
               ],
               authentication: [`${didEthr}#owner`],

diff --git a/packages/did-comm/package.json b/packages/did-comm/package.json
@@ -21,9 +21,9 @@
     "@veramo/utils": "^3.1.4",
     "cross-fetch": "^3.1.4",
     "debug": "^4.3.3",
-    "did-jwt": "^5.12.3",
-    "did-resolver": "3.2.2",
-    "uint8arrays": "3.0.0",
+    "did-jwt": "^6.1.2",
+    "did-resolver": "^3.2.2",
+    "uint8arrays": "^3.0.0",
     "uuid": "^8.3.0"
   },
   "devDependencies": {

diff --git a/packages/did-jwt/package.json b/packages/did-jwt/package.json
@@ -12,8 +12,8 @@
     "@veramo/core": "^3.1.4",
     "@veramo/message-handler": "^3.1.4",
     "debug": "^4.3.3",
-    "did-jwt": "^5.12.3",
-    "did-resolver": "3.2.2"
+    "did-jwt": "^6.1.2",
+    "did-resolver": "^3.2.2"
   },
   "devDependencies": {
     "@types/debug": "4.1.7",

diff --git a/packages/did-provider-ethr/package.json b/packages/did-provider-ethr/package.json
@@ -19,7 +19,7 @@
     "@veramo/core": "^3.1.4",
     "@veramo/did-manager": "^3.1.4",
     "debug": "^4.3.3",
-    "ethr-did": "^2.2.0"
+    "ethr-did": "^2.2.3"
   },
   "devDependencies": {
     "@types/debug": "4.1.7",

diff --git a/packages/did-resolver/package.json b/packages/did-resolver/package.json
@@ -16,9 +16,9 @@
   "devDependencies": {
     "@types/debug": "4.1.7",
     "did-resolver": "3.2.2",
-    "ethr-did-resolver": "5.0.4",
+    "ethr-did-resolver": "6.0.1",
     "typescript": "4.7.3",
-    "web-did-resolver": "2.0.16"
+    "web-did-resolver": "2.0.18"
   },
   "files": [
     "build/**/*",

diff --git a/packages/did-resolver/src/__tests__/integration.test.ts b/packages/did-resolver/src/__tests__/integration.test.ts
@@ -70,15 +70,15 @@ describe('@veramo/did-resolver', () => {
       didDocument: {
         '@context': [
           'https://www.w3.org/ns/did/v1',
-          'https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld',
+          'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
         ],
         id: 'did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
         verificationMethod: [
           {
             id: 'did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller',
             type: 'EcdsaSecp256k1RecoveryMethod2020',
             controller: 'did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
-            blockchainAccountId: '0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6@eip155:4',
+            blockchainAccountId: 'eip155:4:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6',
           },
         ],
         authentication: ['did:ethr:rinkeby:0xE6Fe788d8ca214A080b0f6aC7F48480b2AEfa9a6#controller'],

diff --git a/packages/key-manager/package.json b/packages/key-manager/package.json
@@ -9,13 +9,13 @@
     "extract-api": "yarn veramo dev extract-api"
   },
   "dependencies": {
-    "@ethersproject/bytes": "5.6.1",
-    "@ethersproject/strings": "5.6.1",
-    "@ethersproject/transactions": "5.6.2",
+    "@ethersproject/bytes": "^5.6.1",
+    "@ethersproject/strings": "^5.6.1",
+    "@ethersproject/transactions": "^5.6.2",
     "@stablelib/ed25519": "^1.0.2",
     "@veramo/core": "^3.1.4",
-    "did-jwt": "^5.12.3",
-    "uint8arrays": "3.0.0",
+    "did-jwt": "^6.1.2",
+    "uint8arrays": "^3.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/kms-local/package.json b/packages/kms-local/package.json
@@ -9,21 +9,21 @@
     "extract-api": "yarn veramo dev extract-api"
   },
   "dependencies": {
-    "@ethersproject/abstract-provider": "5.6.1",
-    "@ethersproject/abstract-signer": "5.6.2",
-    "@ethersproject/bytes": "5.6.1",
-    "@ethersproject/random": "5.6.1",
-    "@ethersproject/signing-key": "5.6.2",
-    "@ethersproject/strings": "5.6.1",
-    "@ethersproject/transactions": "5.6.2",
-    "@ethersproject/wallet": "5.6.2",
+    "@ethersproject/abstract-provider": "^5.6.1",
+    "@ethersproject/abstract-signer": "^5.6.2",
+    "@ethersproject/bytes": "^5.6.1",
+    "@ethersproject/random": "^5.6.1",
+    "@ethersproject/signing-key": "^5.6.2",
+    "@ethersproject/strings": "^5.6.1",
+    "@ethersproject/transactions": "^5.6.2",
+    "@ethersproject/wallet": "^5.6.2",
     "@stablelib/ed25519": "^1.0.2",
     "@stablelib/nacl": "^1.0.2",
     "@veramo/core": "^3.1.4",
     "@veramo/key-manager": "^3.1.4",
     "base-58": "^0.0.1",
     "debug": "^4.3.3",
-    "did-jwt": "^5.12.3",
+    "did-jwt": "^6.1.2",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/kms-local/src/key-management-system.ts b/packages/kms-local/src/key-management-system.ts
@@ -239,7 +239,7 @@ export class KeyManagementSystem extends AbstractKeyManagementSystem {
    * @returns a base64url encoded signature for the `EdDSA` alg
    */
   private async signEdDSA(key: string, data: Uint8Array): Promise<string> {
-    const signer = EdDSASigner(key)
+    const signer = EdDSASigner(arrayify(key, { allowMissingPrefix: true }))
     const signature = await signer(data)
     // base64url encoded string
     return signature as string
@@ -253,7 +253,7 @@ export class KeyManagementSystem extends AbstractKeyManagementSystem {
     alg: string | undefined,
     data: Uint8Array,
   ): Promise<string> {
-    const signer = ES256KSigner(privateKeyHex, alg === 'ES256K-R')
+    const signer = ES256KSigner(arrayify(privateKeyHex, { allowMissingPrefix: true }), alg === 'ES256K-R')
     const signature = await signer(data)
     // base64url encoded string
     return signature as string

diff --git a/packages/selective-disclosure/package.json b/packages/selective-disclosure/package.json
@@ -19,7 +19,7 @@
     "@veramo/did-jwt": "^3.1.4",
     "@veramo/message-handler": "^3.1.4",
     "debug": "^4.3.3",
-    "did-jwt": "^5.12.3",
+    "did-jwt": "^6.1.2",
     "uuid": "^8.3.0"
   },
   "devDependencies": {

diff --git a/packages/test-react-app/.eslintrc.js b/packages/test-react-app/.eslintrc.js
diff --git a/packages/test-react-app/.eslintrc.json b/packages/test-react-app/.eslintrc.json
@@ -0,0 +1,33 @@
+{
+  "env": {
+    "jest": true,
+    "node": true,
+    "browser": true
+  },
+  "globals": {
+    "page": true,
+    "browser": true,
+    "context": true,
+    "jestPuppeteer": true
+  },
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 2020,
+    "ecmaFeatures": {
+      "jsx": true,
+      "modules": true,
+      "experimentalObjectRestSpread": true
+    }
+  },
+  "plugins": [
+    "react",
+    "@typescript-eslint"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "ignorePatterns": ["**/*.browser-test.ts"]
+}
diff --git a/packages/test-react-app/babel.config.js b/packages/test-react-app/babel.config.js