Skip to content

Commit

Permalink
fix: remove support for Ed25519 LD crypto suites and fix EcdsaSecp256…
Browse files Browse the repository at this point in the history 
…k1RecoveryMethod2020
  • Loading branch information
@mirceanis
mirceanis committed Sep 9, 2021
1 parent 5d9bbe8 commit aa9909e
Show file tree
Hide file tree
Showing 17 changed files with 268 additions and 404 deletions.
39 changes: 14 additions & 25 deletions __tests__/localAgent.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import {
LdContextLoader,
LdDefaultContexts,
LdSuiteLoader,
VeramoEd25519Signature2018,
VeramoEcdsaSecp256k1RecoverySignature2020
VeramoEcdsaSecp256k1RecoverySignature2020,
} from '../packages/credential-w3c/src'
import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
import { WebDIDProvider } from '../packages/did-provider-web/src'
Expand All @@ -48,15 +47,13 @@ import {
PrivateKeyStore,
migrations,
} from '../packages/data-store/src'
import { createConnection, Connection } from 'typeorm'

import { FakeDidProvider, FakeDidResolver } from './utils/fake-did'

import { createConnection, Connection } from 'typeorm'
import { Resolver } from 'did-resolver'
import { getResolver as ethrDidResolver } from 'ethr-did-resolver'
import { getResolver as webDidResolver } from 'web-did-resolver'
import { getDidKeyResolver } from '../packages/did-provider-key'
import { IDIDDiscovery, DIDDiscovery } from '../packages/did-discovery'
import {contexts as credential_contexts} from '@transmute/credentials-context'
import { contexts as credential_contexts } from '@transmute/credentials-context'
import fs from 'fs'

jest.setTimeout(30000)
Expand Down Expand Up @@ -162,9 +159,6 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
'did:key': new KeyDIDProvider({
defaultKms: 'local',
}),
'did:key': new KeyDIDProvider({
defaultKms: 'local',
}),
'did:fake': new FakeDidProvider(),
},
}),
Expand All @@ -189,21 +183,16 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
new DIDComm([new DIDCommHttpTransport()]),
new CredentialIssuer({
ldCredentialModule: new LdCredentialModule({
ldContextLoader: new LdContextLoader({
contextsPaths: [
LdDefaultContexts,
credential_contexts as Map<string, object>
]
}),
ldSuiteLoader: new LdSuiteLoader({
veramoLdSignatures: [
new VeramoEd25519Signature2018(),
new VeramoEcdsaSecp256k1RecoverySignature2020()
]
})
})
}
),
ldContextLoader: new LdContextLoader({
contextsPaths: [LdDefaultContexts, credential_contexts as Map<string, object>],
}),
ldSuiteLoader: new LdSuiteLoader({
veramoLdSignatures: [
new VeramoEcdsaSecp256k1RecoverySignature2020(),
],
}),
}),
}),
new SelectiveDisclosure(),
new DIDDiscovery({
providers: [new AliasDiscoveryProvider(), new ProfileDiscoveryProvider()],
Expand Down
41 changes: 15 additions & 26 deletions __tests__/localMemoryStoreAgent.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ import {
LdContextLoader,
LdDefaultContexts,
LdSuiteLoader,
VeramoEd25519Signature2018,
VeramoEcdsaSecp256k1RecoverySignature2020,
} from '../packages/credential-w3c/src'
import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
import { WebDIDProvider } from '../packages/did-provider-web/src'
import { KeyDIDProvider } from '../packages/did-provider-key/src'
import { KeyDIDProvider, getDidKeyResolver } from '../packages/did-provider-key/src'
import { DIDComm, DIDCommMessageHandler, IDIDComm } from '../packages/did-comm/src'
import {
SelectiveDisclosure,
Expand All @@ -36,14 +35,12 @@ import {
} from '../packages/selective-disclosure/src'
import { KeyManagementSystem } from '../packages/kms-local/src'
import { Entities, IDataStoreORM, DataStore, DataStoreORM, migrations } from '../packages/data-store/src'
import { getDidKeyResolver } from '../packages/did-provider-key/src'
import { FakeDidProvider, FakeDidResolver } from './utils/fake-did'

import { Resolver } from 'did-resolver'
import { getResolver as ethrDidResolver } from 'ethr-did-resolver'
import { getResolver as webDidResolver } from 'web-did-resolver'
import { getDidKeyResolver } from '../packages/did-provider-key'
import {contexts as credential_contexts} from '@transmute/credentials-context'
import { contexts as credential_contexts } from '@transmute/credentials-context'
import fs from 'fs'

jest.setTimeout(30000)
Expand Down Expand Up @@ -84,7 +81,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
database: databaseFile,
synchronize: false,
migrations: migrations,
migrationsRun:true,
migrationsRun: true,
logging: false,
entities: Entities,
})
Expand Down Expand Up @@ -141,9 +138,6 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
'did:key': new KeyDIDProvider({
defaultKms: 'local',
}),
'did:key': new KeyDIDProvider({
defaultKms: 'local',
}),
'did:fake': new FakeDidProvider(),
},
}),
Expand All @@ -167,22 +161,17 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
}),
new DIDComm(),
new CredentialIssuer({
ldCredentialModule: new LdCredentialModule({
ldContextLoader: new LdContextLoader({
contextsPaths: [
LdDefaultContexts,
credential_contexts as Map<string, object>
]
}),
ldSuiteLoader: new LdSuiteLoader({
veramoLdSignatures: [
new VeramoEd25519Signature2018(),
new VeramoEcdsaSecp256k1RecoverySignature2020()
]
})
})
}
),
ldCredentialModule: new LdCredentialModule({
ldContextLoader: new LdContextLoader({
contextsPaths: [LdDefaultContexts, credential_contexts as Map<string, object>],
}),
ldSuiteLoader: new LdSuiteLoader({
veramoLdSignatures: [
new VeramoEcdsaSecp256k1RecoverySignature2020(),
],
}),
}),
}),
new SelectiveDisclosure(),
...(options?.plugins || []),
],
Expand All @@ -197,7 +186,7 @@ const tearDown = async (): Promise<boolean> => {
} catch (e) {
// nop
}
try{
try {
fs.unlinkSync(databaseFile)
} catch (e) {
//nop
Expand Down
38 changes: 13 additions & 25 deletions __tests__/restAgent.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ import {
LdContextLoader,
LdDefaultContexts,
LdSuiteLoader,
VeramoEd25519Signature2018,
VeramoEcdsaSecp256k1RecoverySignature2020,
} from '../packages/credential-w3c/src'
import { EthrDIDProvider } from '../packages/did-provider-ethr/src'
import { WebDIDProvider } from '../packages/did-provider-web/src'
import { KeyDIDProvider } from '../packages/did-provider-key/src'
import { KeyDIDProvider, getDidKeyResolver } from '../packages/did-provider-key/src'
import { DIDComm, DIDCommMessageHandler, IDIDComm, DIDCommHttpTransport } from '../packages/did-comm/src'
import {
SelectiveDisclosure,
Expand All @@ -51,18 +50,15 @@ import {
import { createConnection, Connection } from 'typeorm'
import { AgentRestClient } from '../packages/remote-client/src'
import { AgentRouter, RequestWithAgentRouter, MessagingRouter } from '../packages/remote-server/src'
import { getDidKeyResolver } from '../packages/did-provider-key/src'
import { IDIDDiscovery, DIDDiscovery } from '../packages/did-discovery/src'
import { KeyDIDProvider } from '../packages/did-provider-key/src'
import { getUniversalResolver } from '../packages/did-resolver/src'
import { FakeDidProvider, FakeDidResolver } from './utils/fake-did'

import { Resolver } from 'did-resolver'
import { getResolver as ethrDidResolver } from 'ethr-did-resolver'
import { getResolver as webDidResolver } from 'web-did-resolver'
import express from 'express'
import { Server } from 'http'
import {contexts as credential_contexts} from '@transmute/credentials-context'
import { contexts as credential_contexts } from '@transmute/credentials-context'
import fs from 'fs'

jest.setTimeout(30000)
Expand Down Expand Up @@ -165,9 +161,6 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
'did:key': new KeyDIDProvider({
defaultKms: 'local',
}),
'did:key': new KeyDIDProvider({
defaultKms: 'local',
}),
'did:fake': new FakeDidProvider(),
},
}),
Expand All @@ -192,22 +185,17 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
}),
new DIDComm([new DIDCommHttpTransport()]),
new CredentialIssuer({
ldCredentialModule: new LdCredentialModule({
ldContextLoader: new LdContextLoader({
contextsPaths: [
LdDefaultContexts,
credential_contexts as Map<string, object>
]
}),
ldSuiteLoader: new LdSuiteLoader({
veramoLdSignatures: [
new VeramoEd25519Signature2018(),
new VeramoEcdsaSecp256k1RecoverySignature2020()
]
})
})
}
),
ldCredentialModule: new LdCredentialModule({
ldContextLoader: new LdContextLoader({
contextsPaths: [LdDefaultContexts, credential_contexts as Map<string, object>],
}),
ldSuiteLoader: new LdSuiteLoader({
veramoLdSignatures: [
new VeramoEcdsaSecp256k1RecoverySignature2020(),
],
}),
}),
}),
new SelectiveDisclosure(),
new DIDDiscovery({
providers: [new AliasDiscoveryProvider(), new ProfileDiscoveryProvider()],
Expand Down
Loading

0 comments on commit aa9909e

Please sign in to comment.