Skip to content

Commit

Permalink
fix(did-resolver): use interface Resolvable instead of the `Resolve…
Browse files Browse the repository at this point in the history
…r` class

and update dependencies
  • Loading branch information
mirceanis committed Jan 13, 2022
1 parent 8c49e70 commit 9c2e59f
Show file tree
Hide file tree
Showing 27 changed files with 1,030 additions and 977 deletions.
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@
"packages/*"
],
"devDependencies": {
"@microsoft/api-documenter": "7.13.68",
"@microsoft/api-extractor": "7.18.19",
"@microsoft/api-extractor-model": "7.13.16",
"@types/jest": "27.0.3",
"@microsoft/api-documenter": "7.14.1",
"@microsoft/api-extractor": "7.19.4",
"@microsoft/api-extractor-model": "7.15.3",
"@types/jest": "27.4.0",
"codecov": "3.8.3",
"cross-fetch": "3.1.4",
"ethr-did-registry": "0.0.3",
"ganache-cli": "6.12.2",
"jest": "27.3.1",
"jest": "27.4.7",
"jest-fetch-mock": "3.0.3",
"json-schema": "0.4.0",
"lerna": "4.0.0",
"lerna-changelog": "2.2.0",
"oas-resolver": "2.5.6",
"openapi-types": "10.0.0",
"prettier": "2.5.0",
"pretty-quick": "3.1.2",
"prettier": "2.5.1",
"pretty-quick": "3.1.3",
"rimraf": "3.0.2",
"semantic-release": "18.0.1",
"ts-jest": "27.0.7",
"ts-jest": "27.1.2",
"ts-json-schema-generator": "0.97.0",
"ts-node": "10.4.0",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"repository": {
"type": "git",
Expand Down
40 changes: 20 additions & 20 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@microsoft/api-extractor": "7.19.4",
"@microsoft/api-extractor-model": "7.15.3",
"@types/blessed": "^0.1.17",
"@types/swagger-ui-express": "^4.1.2",
"@types/swagger-ui-express": "^4.1.3",
"@veramo/core": "^3.1.0",
"@veramo/credential-w3c": "^3.1.0",
"@veramo/data-store": "^3.1.0",
Expand All @@ -37,46 +37,46 @@
"@veramo/selective-disclosure": "^3.1.0",
"@veramo/url-handler": "^3.1.0",
"blessed": "^0.1.81",
"commander": "^8.0.0",
"console-table-printer": "^2.8.2",
"commander": "^8.3.0",
"console-table-printer": "^2.10.0",
"cors": "^2.8.5",
"cross-fetch": "^3.1.4",
"date-fns": "^2.16.1",
"debug": "^4.1.1",
"did-resolver": "3.1.3",
"dotenv": "^10.0.0",
"ethr-did-resolver": "5.0.2",
"express": "^4.17.1",
"express-handlebars": "^6.0.0",
"date-fns": "^2.28.0",
"debug": "^4.3.3",
"did-resolver": "^3.1.5",
"dotenv": "^11.0.0",
"ethr-did-resolver": "^5.0.3",
"express": "^4.17.2",
"express-handlebars": "^6.0.2",
"fuzzy": "^0.1.3",
"handlebars": "^4.7.6",
"inquirer": "^8.0.0",
"inquirer": "^8.2.0",
"inquirer-autocomplete-prompt": "^1.2.0",
"json-schema": "^0.4.0",
"json5": "^2.2.0",
"jsonpointer": "^5.0.0",
"oas-resolver": "^2.5.3",
"openapi-types": "10.0.0",
"passport": "^0.5.0",
"passport": "^0.5.2",
"passport-http-bearer": "^1.0.1",
"pg": "^8.6.0",
"pg": "^8.7.1",
"qrcode-terminal": "^0.12.0",
"sqlite3": "^5.0.0",
"swagger-ui-express": "^4.1.5",
"swagger-ui-express": "^4.3.0",
"ts-json-schema-generator": "^0.97.0",
"typeorm": "0.2.41",
"url-parse": "^1.5.1",
"web-did-resolver": "2.0.8",
"ws": "^8.0.0",
"url-parse": "^1.5.4",
"web-did-resolver": "^2.0.12",
"ws": "^8.4.0",
"yaml": "^1.10.0"
},
"devDependencies": {
"@types/debug": "4.1.7",
"@types/inquirer": "8.1.3",
"@types/node-fetch": "3.0.2",
"@types/node-fetch": "3.0.3",
"@types/passport-http-bearer": "1.0.37",
"@types/ws": "8.2.0",
"typescript": "4.5.2"
"@types/ws": "8.2.2",
"typescript": "4.5.4"
},
"files": [
"bin/**/*",
Expand Down
10 changes: 5 additions & 5 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
}
},
"dependencies": {
"debug": "^4.1.1",
"did-jwt-vc": "2.1.8",
"debug": "^4.3.3",
"did-jwt-vc": "^2.1.9",
"events": "^3.2.0",
"z-schema": "^5.0.0"
"z-schema": "^5.0.2"
},
"devDependencies": {
"@types/debug": "4.1.7",
"did-resolver": "3.1.3",
"typescript": "4.5.2"
"did-resolver": "3.1.5",
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
17 changes: 17 additions & 0 deletions packages/core/plugin.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,23 @@
"DIDResolutionResult": {
"type": "object",
"properties": {
"@context": {
"anyOf": [
{
"type": "string",
"const": "https://w3id.org/did-resolution/v1"
},
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"didResolutionMetadata": {
"$ref": "#/components/schemas/DIDResolutionMetadata"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/credential-ld/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
}
},
"dependencies": {
"@transmute/credentials-context": "^0.7.0-unstable.26",
"@transmute/ed25519-signature-2018": "^0.7.0-unstable.27",
"@transmute/credentials-context": "^0.7.0-unstable.34",
"@transmute/ed25519-signature-2018": "^0.7.0-unstable.34",
"@transmute/lds-ecdsa-secp256k1-recovery2020": "^0.0.7",
"@veramo/core": "^3.1.0",
"@veramo/did-resolver": "^3.1.0",
"@veramo/utils": "^3.1.0",
"debug": "^4.1.1",
"did-resolver": "3.1.3",
"debug": "^4.3.3",
"did-resolver": "^3.1.5",
"jsonld": "^5.2.0",
"jsonld-signatures": "^9.0.2",
"uint8arrays": "^2.1.3",
"jsonld-signatures": "^9.3.1",
"uint8arrays": "^3.0.0",
"vc-js": "^0.6.4"
},
"devDependencies": {
"@types/debug": "4.1.7",
"borc": "3.0.0",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
10 changes: 5 additions & 5 deletions packages/credential-w3c/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
"@veramo/did-resolver": "^3.1.0",
"@veramo/message-handler": "^3.1.0",
"@veramo/utils": "^3.1.0",
"debug": "^4.1.1",
"did-jwt-vc": "2.1.8",
"did-resolver": "3.1.3",
"uint8arrays": "^2.1.3",
"debug": "^4.3.3",
"did-jwt-vc": "^2.1.9",
"did-resolver": "^3.1.5",
"uint8arrays": "^3.0.0",
"uuid": "^8.3.0"
},
"optionalDependencies": {
"@veramo/credential-ld": "^3.1.0"
},
"devDependencies": {
"@types/debug": "4.1.7",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
4 changes: 2 additions & 2 deletions packages/data-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"@veramo/did-manager": "^3.1.0",
"@veramo/key-manager": "^3.1.0",
"@veramo/utils": "^3.1.0",
"debug": "^4.1.1",
"debug": "^4.3.3",
"typeorm": "0.2.41"
},
"devDependencies": {
"@types/debug": "4.1.7",
"sqlite3": "5.0.2",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
10 changes: 5 additions & 5 deletions packages/did-comm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
"@veramo/message-handler": "^3.1.0",
"@veramo/utils": "^3.1.0",
"cross-fetch": "^3.1.4",
"debug": "^4.1.1",
"did-jwt": "5.12.0",
"did-resolver": "3.1.3",
"debug": "^4.3.3",
"did-jwt": "^5.12.3",
"did-resolver": "^3.1.5",
"uint8arrays": "3.0.0",
"uuid": "^8.3.0"
},
"devDependencies": {
"@types/debug": "4.1.7",
"@types/uuid": "8.3.3",
"typescript": "4.5.2"
"@types/uuid": "8.3.4",
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
4 changes: 2 additions & 2 deletions packages/did-discovery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
},
"dependencies": {
"@veramo/core": "^3.1.0",
"debug": "^4.1.1"
"debug": "^4.3.3"
},
"devDependencies": {
"@types/debug": "4.1.7",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
8 changes: 4 additions & 4 deletions packages/did-jwt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"dependencies": {
"@veramo/core": "^3.1.0",
"@veramo/message-handler": "^3.1.0",
"debug": "^4.1.1",
"did-jwt": "5.12.0",
"did-resolver": "3.1.3"
"debug": "^4.3.3",
"did-jwt": "^5.12.3",
"did-resolver": "^3.1.5"
},
"devDependencies": {
"@types/debug": "4.1.7",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
2 changes: 1 addition & 1 deletion packages/did-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@veramo/did-discovery": "^3.1.0"
},
"devDependencies": {
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
6 changes: 3 additions & 3 deletions packages/did-provider-ethr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"@ethersproject/transactions": "5.5.0",
"@veramo/core": "^3.1.0",
"@veramo/did-manager": "^3.1.0",
"debug": "^4.1.1",
"ethr-did": "2.1.5"
"debug": "^4.3.3",
"ethr-did": "^2.2.0"
},
"devDependencies": {
"@types/debug": "4.1.7",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
14 changes: 7 additions & 7 deletions packages/did-provider-key/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
"extract-api": "yarn veramo dev extract-api"
},
"dependencies": {
"@transmute/did-key-ed25519": "^0.3.0-unstable.4",
"@transmute/did-key-secp256k1": "^0.3.0-unstable.4",
"@transmute/did-key-x25519": "^0.3.0-unstable.4",
"@transmute/did-key-ed25519": "^0.3.0-unstable.5",
"@transmute/did-key-secp256k1": "^0.3.0-unstable.5",
"@transmute/did-key-x25519": "^0.3.0-unstable.5",
"@veramo/core": "^3.1.0",
"@veramo/did-manager": "^3.1.0",
"debug": "^4.1.1",
"multibase": "^4.0.2",
"multicodec": "^3.0.0"
"debug": "^4.3.3",
"multibase": "^4.0.6",
"multicodec": "^3.2.1"
},
"devDependencies": {
"@types/debug": "4.1.7",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
4 changes: 2 additions & 2 deletions packages/did-provider-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"dependencies": {
"@veramo/core": "^3.1.0",
"@veramo/did-manager": "^3.1.0",
"debug": "^4.1.1"
"debug": "^4.3.3"
},
"devDependencies": {
"@types/debug": "4.1.7",
"typescript": "4.5.2"
"typescript": "4.5.4"
},
"files": [
"build/**/*",
Expand Down
10 changes: 5 additions & 5 deletions packages/did-resolver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"dependencies": {
"@veramo/core": "^3.1.0",
"cross-fetch": "^3.1.4",
"debug": "^4.1.1"
"debug": "^4.3.3"
},
"devDependencies": {
"@types/debug": "4.1.7",
"did-resolver": "3.1.3",
"ethr-did-resolver": "5.0.2",
"typescript": "4.5.2",
"web-did-resolver": "2.0.8"
"did-resolver": "3.1.5",
"ethr-did-resolver": "5.0.3",
"typescript": "4.5.4",
"web-did-resolver": "2.0.12"
},
"files": [
"build/**/*",
Expand Down
10 changes: 5 additions & 5 deletions packages/did-resolver/src/__tests__/integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ const providerConfig = {
networks: [
{ name: 'rinkeby', rpcUrl: 'https://rinkeby.infura.io/v3/6b734e0b04454df8a6ce234023c04f26' },
{ name: 'development', rpcUrl: 'http://localhost:7545' },
//FIXME: add this example
// FIXME: add this example
// { name: 'test', provider: TBD_add_example_of_custom_provider_usage },
],
}

/** This creates a resolver that supports the [ethr, web, key, elem] DID methods */
let resolver: Resolver = new Resolver({
//resolve did:ethr using the embedded ethr-did-resolver
let resolver = new Resolver({
// resolve did:ethr using the embedded ethr-did-resolver
...getEthrResolver(providerConfig),
//resolve did:web using the embedded web-did-resolver
// resolve did:web using the embedded web-did-resolver
...getWebDidResolver(),
//resolve some other DID methods using the centralized `uniresolver.io` service
// resolve some other DID methods using the centralized `uniresolver.io` service
...getUniversalResolverFor(['key', 'elem']),
})

Expand Down
Loading

0 comments on commit 9c2e59f

Please sign in to comment.