Merge f64690c into 701b8ed

.gitignore

@@ -37,3 +37,5 @@ temp
 agent.yml
 data
 .vscode-upload.json
+
+local-database*.json

__tests__/localAgent.test.ts

@@ -36,6 +36,7 @@ import {
 import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
 import { WebDIDProvider } from '../packages/did-provider-web/src'
 import { getDidKeyResolver, KeyDIDProvider } from '../packages/did-provider-key/src'
+import { getDidPkhResolver, PkhDIDProvider } from '../packages/did-provider-pkh/src'
 import { DIDComm, DIDCommHttpTransport, DIDCommMessageHandler, IDIDComm } from '../packages/did-comm/src'
 import {
   ISelectiveDisclosure,
@@ -193,6 +194,9 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
           'did:key': new KeyDIDProvider({
             defaultKms: 'local',
           }),
+          'did:pkh': new PkhDIDProvider({
+            defaultKms: 'local',
+          }),
           'did:fake': new FakeDidProvider(),
         },
       }),
@@ -210,6 +214,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
         }),
         ...webDidResolver(),
         ...getDidKeyResolver(),
+        ...getDidPkhResolver(),
         ...new FakeDidResolver(() => agent).getDidFakeResolver(),
       }),
       new DataStore(dbConnection),

__tests__/localJsonStoreAgent.test.ts

@@ -34,6 +34,7 @@ import {
 import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
 import { WebDIDProvider } from '../packages/did-provider-web/src'
 import { getDidKeyResolver, KeyDIDProvider } from '../packages/did-provider-key/src'
+import { getDidPkhResolver, PkhDIDProvider } from '../packages/did-provider-pkh/src'
 import { DIDComm, DIDCommMessageHandler, IDIDComm } from '../packages/did-comm/src'
 import {
   ISelectiveDisclosure,
@@ -157,6 +158,9 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
           'did:key': new KeyDIDProvider({
             defaultKms: 'local',
           }),
+          'did:pkh': new PkhDIDProvider({
+            defaultKms: 'local',
+          }),
           'did:fake': new FakeDidProvider(),
         },
       }),
@@ -165,6 +169,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
           ...ethrDidResolver({ infuraProjectId }),
           ...webDidResolver(),
           ...getDidKeyResolver(),
+          ...getDidPkhResolver(),
           ...new FakeDidResolver(() => agent).getDidFakeResolver(),
         }),
       }),

__tests__/localMemoryStoreAgent.test.ts

@@ -35,6 +35,7 @@ import {
 import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
 import { WebDIDProvider } from '../packages/did-provider-web/src'
 import { getDidKeyResolver, KeyDIDProvider } from '../packages/did-provider-key/src'
+import { getDidPkhResolver, PkhDIDProvider } from '../packages/did-provider-pkh/src'
 import { DIDComm, DIDCommMessageHandler, IDIDComm } from '../packages/did-comm/src'
 import {
   ISelectiveDisclosure,
@@ -155,6 +156,9 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
           'did:key': new KeyDIDProvider({
             defaultKms: 'local',
           }),
+          'did:pkh': new PkhDIDProvider({
+            defaultKms: 'local',
+          }),
           'did:fake': new FakeDidProvider(),
         },
       }),
@@ -163,6 +167,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
           ...ethrDidResolver({ infuraProjectId }),
           ...webDidResolver(),
           ...getDidKeyResolver(),
+          ...getDidPkhResolver(),
           ...new FakeDidResolver(() => agent).getDidFakeResolver(),
         }),
       }),

__tests__/restAgent.test.ts

@@ -44,6 +44,7 @@ import {
 import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
 import { WebDIDProvider } from '../packages/did-provider-web/src'
 import { getDidKeyResolver, KeyDIDProvider } from '../packages/did-provider-key/src'
+import { getDidPkhResolver, PkhDIDProvider } from '../packages/did-provider-pkh/src'
 import { DIDComm, DIDCommHttpTransport, DIDCommMessageHandler, IDIDComm } from '../packages/did-comm/src'
 import {
   ISelectiveDisclosure,
@@ -184,6 +185,9 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
           'did:key': new KeyDIDProvider({
             defaultKms: 'local',
           }),
+          'did:pkh': new PkhDIDProvider({
+            defaultKms: 'local',
+          }),
           'did:fake': new FakeDidProvider(),
         },
       }),
@@ -193,6 +197,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
           ...webDidResolver(),
           // key: getUniversalResolver(), // resolve using remote resolver... when uniresolver becomes more stable,
           ...getDidKeyResolver(),
+          ...getDidPkhResolver(),
           ...new FakeDidResolver(() => serverAgent as TAgent<IDIDManager>).getDidFakeResolver(),
         }),
       }),

__tests__/shared/didManager.ts

@@ -33,6 +33,19 @@ export default (testContext: {
       expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
     })
 
+    it('should create pkh identifier using did:pkh provider', async () => {
+      identifier = await agent.didManagerCreate({
+        // this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:goerli` network specifier
+        provider: 'did:pkh',
+        options: { chainId: "1"}
+      })
+      expect(identifier.provider).toEqual('did:pkh')
+      //expect(identifier.did).toMatch(/^did:pkh:eip155:*$/)
+      expect(identifier.keys.length).toEqual(1)
+      expect(identifier.services.length).toEqual(0)
+      expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
+    })
+
     it('should create identifier using did:ethr:arbitrum:goerli provider', async () => {
       identifier = await agent.didManagerCreate({
         // this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:goerli` network specifier

__tests__/shared/resolveDid.ts

@@ -1,5 +1,6 @@
 // noinspection ES6PreferShortImport
 
+import { IIdentifier } from '@veramo/core'
 import { IAgentOptions, IDIDManager, IResolver, TAgent } from '../../packages/core/src'
 
 type ConfiguredAgent = TAgent<IResolver & IDIDManager>
@@ -34,6 +35,22 @@ export default (testContext: {
       expect(result).toHaveProperty('didResolutionMetadata')
     })
 
+    it('should resolve did:pkh', async () => {
+      let identifier: IIdentifier = await agent.didManagerCreate({
+        // this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:goerli` network specifier
+        provider: 'did:pkh',
+        options: { chainId: "1"}
+      });
+
+      const result = await agent.resolveDid({ didUrl: identifier.did});
+      const didDoc = result.didDocument
+      expect(didDoc?.id).toEqual(identifier.did)
+      expect(result).toHaveProperty('didDocumentMetadata')
+      expect(result).toHaveProperty('didResolutionMetadata')
+
+      //let cred = await agent.createVerifiableCredential()
+    });
+
     it('should resolve imported fake did', async () => {
       const did = 'did:fake:myfakedid'
       await agent.didManagerImport({

__tests__/shared/verifiableDataLD.ts

@@ -26,7 +26,9 @@ export default (testContext: {
     let agent: ConfiguredAgent
     let didEthrIdentifier: IIdentifier
     let didKeyIdentifier: IIdentifier
+    let pkhIdentifier: IIdentifier
     let storedCredentialHash: string
+    let storedPkhCredentialHash: string
     let challenge: string
 
     beforeAll(async () => {
@@ -35,6 +37,7 @@ export default (testContext: {
       challenge = 'TEST_CHALLENGE_STRING'
       didEthrIdentifier = await agent.didManagerCreate({ kms: 'local', provider: 'did:ethr' })
       didKeyIdentifier = await agent.didManagerCreate({ kms: 'local', provider: 'did:key' })
+      pkhIdentifier = await agent.didManagerCreate({ kms: 'local', provider: "did:pkh", options: { chainId: "1"} })
     })
     afterAll(testContext.tearDown)
 
@@ -257,6 +260,35 @@ export default (testContext: {
       expect(result.verified).toEqual(true)
     })
 
+    it('should create verifiable credential in LD with did:pkh', async () => {
+      const verifiableCredential = await agent.createVerifiableCredential({
+        credential: {
+          issuer: { id: pkhIdentifier.did },
+          '@context': ['https://www.w3.org/2018/credentials/v1', 'https://veramo.io/contexts/profile/v1'],
+          type: ['VerifiableCredential', 'Profile'],
+          issuanceDate: new Date().toISOString(),
+          credentialSubject: {
+            id: pkhIdentifier.did,
+            name: 'Martin, the great',
+          },
+        },
+        proofFormat: 'lds',
+      })
+
+      // Check credential:
+      expect(verifiableCredential).toHaveProperty('proof')
+      expect(verifiableCredential).toHaveProperty('proof.jws')
+      expect(verifiableCredential['type']).toEqual(['VerifiableCredential', 'Profile'])
+
+      storedPkhCredentialHash = await agent.dataStoreSaveVerifiableCredential({ verifiableCredential })
+      expect(typeof storedPkhCredentialHash).toEqual('string')
+
+      const verifiableCredential2 = await agent.dataStoreGetVerifiableCredential({
+        hash: storedPkhCredentialHash,
+      })
+      expect(verifiableCredential).toEqual(verifiableCredential2)
+    })
+
     describe('credential verification policies', () => {
       it('can verify credential at a particular time', async () => {
         const issuanceDate = '2019-08-19T09:15:20.000Z' // 1566206120

package.json

@@ -56,6 +56,7 @@
     "rimraf": "3.0.2",
     "semantic-release": "19.0.3",
     "ts-jest": "28.0.4",
+    "caip": "^1.1.0",
     "ts-json-schema-generator": "1.1.2",
     "ts-node": "10.9.1",
     "typescript": "4.9.3"

packages/credential-ld/src/action-handler.ts

@@ -251,6 +251,7 @@ export class CredentialIssuerLD implements IAgentPlugin {
       signingKey = extendedKeys.find((k) => supportedTypes.includes(k.meta.verificationMethod.type))
     }
 
+
     if (!signingKey) throw Error(`key_not_found: No suitable signing key found for ${identifier.did}`)
     verificationMethodId = signingKey.meta.verificationMethod.id
     return { signingKey, verificationMethodId }