Skip to content

Commit

Permalink
Merge pull request #18 from Sphereon-Opensource/develop
Browse files Browse the repository at this point in the history
New release
  • Loading branch information
nklomp authored Sep 30, 2023
2 parents b908a91 + 0a49c5e commit 63735cc
Show file tree
Hide file tree
Showing 15 changed files with 2,755 additions and 2,556 deletions.
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,39 @@
]
},
"devDependencies": {
"@babel/cli": "^7.21.5",
"@babel/core": "^7.21.8",
"@babel/plugin-transform-runtime": "^7.21.4",
"@babel/preset-env": "^7.21.5",
"@babel/preset-typescript": "^7.21.5",
"babel-jest": "^29.5.0",
"@babel/runtime": "^7.21.5",
"@microsoft/api-documenter": "^7.22.3",
"@microsoft/api-extractor": "^7.34.7",
"@microsoft/api-extractor-model": "^7.26.7",
"@types/debug": "^4.1.7",
"@types/jest": "^29.5.1",
"@types/node": "^18.15.11",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"@babel/cli": "^7.23.0",
"@babel/core": "^7.23.0",
"@babel/plugin-transform-runtime": "^7.22.15",
"@babel/preset-env": "^7.22.20",
"@babel/preset-typescript": "^7.23.0",
"@babel/runtime": "^7.23.1",
"@microsoft/api-documenter": "^7.23.8",
"@microsoft/api-extractor": "^7.37.3",
"@microsoft/api-extractor-model": "^7.28.2",
"@types/debug": "^4.1.9",
"@types/jest": "^29.5.5",
"@types/node": "^18.18.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"babel-jest": "^29.7.0",
"codecov": "^3.8.3",
"eslint": "^8.38.0",
"eslint-config-prettier": "^8.8.0",
"eslint": "^8.50.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.27.5",
"jest": "^29.5.0",
"eslint-plugin-import": "^2.28.1",
"jest": "^29.7.0",
"jest-fetch-mock": "^3.0.3",
"json-schema": "^0.4.0",
"lerna": "^6.6.1",
"lerna": "^6.6.2",
"lerna-changelog": "^2.2.0",
"oas-resolver": "^2.5.6",
"openapi-types": "^12.1.0",
"prettier": "^2.8.7",
"openapi-types": "^12.1.3",
"prettier": "^2.8.8",
"pretty-quick": "^3.1.3",
"rimraf": "^5.0.0",
"semantic-release": "^21.0.1",
"ts-jest": "^29.1.0",
"ts-json-schema-generator": "^1.2.0",
"rimraf": "^5.0.5",
"semantic-release": "^21.1.2",
"ts-jest": "^29.1.1",
"ts-json-schema-generator": "^1.3.0",
"ts-node": "^10.9.1",
"typescript": "4.9.5"
},
Expand All @@ -95,8 +95,8 @@
"@veramo/remote-server": "4.2.0",
"@veramo/selective-disclosure": "4.2.0",
"@veramo/url-handler": "4.2.0",
"@sphereon/ssi-sdk.core": "0.15.2-next.121",
"@sphereon/ssi-types": "0.15.2-next.121",
"@sphereon/ssi-sdk.core": "0.17.1",
"@sphereon/ssi-types": "0.17.1",
"@digitalcredentials/ed25519-verification-key-2020": "3.2.2",
"did-jwt": "6.11.6",
"did-jwt-vc": "3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/did-provider-ebsi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@ethersproject/random": "^5.7.0",
"@sphereon/ssi-sdk-ext.did-resolver-ebsi": "workspace:^",
"@transmute/did-key-bls12381": "^0.3.0-unstable.10",
"@transmute/did-key-bls12381": "0.3.0-unstable.10",
"@veramo/core": "4.2.0",
"@veramo/did-manager": "4.2.0",
"@veramo/did-provider-key": "4.2.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/did-provider-jwk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@ethersproject/random": "^5.6.1",
"@ethersproject/random": "^5.7.0",
"@sphereon/ssi-sdk-ext.did-utils": "workspace:^",
"@sphereon/ssi-sdk-ext.key-utils": "workspace:^",
"@sphereon/ssi-types": "^0.15.1",
"@stablelib/ed25519": "^1.0.2",
"@sphereon/ssi-types": "0.17.1",
"@stablelib/ed25519": "^1.0.3",
"@veramo/core": "4.2.0",
"@veramo/did-manager": "4.2.0",
"base64url": "^3.0.1",
Expand All @@ -28,7 +28,7 @@
"@sphereon/ssi-sdk-ext.kms-local": "workspace:^",
"@veramo/did-resolver": "4.2.0",
"@veramo/key-manager": "4.2.0",
"jose": "^4.10.3",
"jose": "^4.14.6",
"uint8arrays": "^3.1.1"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/did-provider-key/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@sphereon/ssi-sdk-ext.did-resolver-key": "workspace:^",
"@sphereon/ssi-sdk-ext.key-utils": "workspace:^",
"@transmute/did-key-bls12381": "^0.3.0-unstable.10",
"@transmute/did-key-bls12381": "0.3.0-unstable.10",
"@veramo/core": "4.2.0",
"@veramo/did-manager": "4.2.0",
"@veramo/did-provider-key": "4.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/did-provider-lto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"lto-api": "^0.5.14"
},
"devDependencies": {
"@types/uuid": "^8.3.3",
"@types/uuid": "^8.3.4",
"did-resolver": "^4.1.0",
"typescript": "4.9.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/did-provider-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"debug": "^4.3.4"
},
"devDependencies": {
"@types/debug": "^4.1.8",
"@types/debug": "^4.1.9",
"typescript": "4.9.5"
},
"files": [
Expand Down
4 changes: 2 additions & 2 deletions packages/did-resolver-ebsi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"build": "tsc"
},
"dependencies": {
"cross-fetch": "^3.1.5",
"cross-fetch": "^3.1.8",
"did-resolver": "^4.1.0",
"dotenv": "^16.0.3"
"dotenv": "^16.3.1"
},
"devDependencies": {
"@types/lodash.isplainobject": "^4.0.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/did-resolver-jwk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@sphereon/ssi-types": "^0.15.1",
"@sphereon/ssi-types": "0.17.1",
"base64url": "^3.0.1",
"debug": "^4.3.4",
"did-resolver": "^4.1.0",
Expand All @@ -20,7 +20,7 @@
"@or13/did-jwk": "^0.0.4",
"@veramo/core": "4.2.0",
"@veramo/did-resolver": "4.2.0",
"jose": "^4.10.3"
"jose": "^4.14.6"
},
"files": [
"dist/**/*",
Expand Down
4 changes: 2 additions & 2 deletions packages/did-resolver-key/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"dependencies": {
"@sphereon/ssi-sdk-ext.key-utils": "workspace:^",
"@stablelib/ed25519": "^1.0.3",
"bigint-mod-arith": "^3.2.1",
"bigint-mod-arith": "^3.3.1",
"did-resolver": "^4.1.0",
"enhanced-resolve": "^5.12.0",
"enhanced-resolve": "^5.15.0",
"lodash.isplainobject": "^4.0.6",
"multiformats": "^9.9.0",
"nist-weierstrauss": "^1.6.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/did-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
},
"dependencies": {
"@ethersproject/transactions": "^5.7.0",
"@sphereon/ssi-sdk.core": "0.17.1",
"@sphereon/did-uni-client": "^0.6.0",
"@sphereon/ssi-sdk-ext.key-utils": "workspace:^",
"@sphereon/ssi-sdk.core": "0.15.2-next.121",
"@stablelib/ed25519": "^1.0.3",
"@veramo/core": "4.2.0",
"@veramo/utils": "4.2.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/did-utils/src/did-functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,9 @@ export class AgentDIDResolver implements Resolvable {
let resolutionResult: DIDResolutionResult | undefined
let origResolutionResult: DIDResolutionResult | undefined
let err: any
if (!this.resolverResolution && !this.localResolution && !this.uniresolverResolution) {
throw Error(`No agent hosted DID resolution, regular agent resolution nor universal resolver resolution is enabled. Cannot resolve DIDs.`)
}
if (this.resolverResolution) {
try {
resolutionResult = await this.context.agent.resolveDid({ didUrl, options })
Expand All @@ -383,14 +386,19 @@ export class AgentDIDResolver implements Resolvable {
if (resolutionResult.didDocument === null) {
resolutionResult = undefined
}
} else {
console.log(`Agent resolver resolution is disabled. This typically isn't desirable!`)
}
if (!resolutionResult && this.localResolution) {
console.log(`Using local DID resolution, looking at DIDs hosted by the agent.`)
try {
const did = didUrl.split('#')[0]
const iIdentifier = await this.context.agent.didManagerGet({ did })
resolutionResult = toDidResolutionResult(iIdentifier, { did })
if (resolutionResult.didDocument) {
err = undefined
} else {
console.log(`Local resolution resulted in a DID Document for ${did}`)
}
} catch (error: unknown) {
if (!err) {
Expand All @@ -407,6 +415,7 @@ export class AgentDIDResolver implements Resolvable {
}
}
if (!resolutionResult && this.uniresolverResolution) {
console.log(`Using universal resolver resolution for did ${didUrl} `)
resolutionResult = await new UniResolver().resolve(didUrl, options)
if (!origResolutionResult) {
origResolutionResult = resolutionResult
Expand Down
2 changes: 1 addition & 1 deletion packages/key-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"generate-plugin-schema": "sphereon dev generate-plugin-schema"
},
"dependencies": {
"@mattrglobal/bbs-signatures": "^1.1.0",
"@mattrglobal/bbs-signatures": "^1.3.0",
"@sphereon/ssi-sdk-ext.kms-local": "workspace:^",
"@veramo/core": "4.2.0",
"@veramo/key-manager": "4.2.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/key-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@ethersproject/random": "^5.6.1",
"@sphereon/isomorphic-webcrypto": "^2.4.0-unstable.4",
"@stablelib/ed25519": "^1.0.2",
"@ethersproject/random": "^5.7.0",
"@sphereon/isomorphic-webcrypto": "2.4.0-unstable.4",
"@stablelib/ed25519": "^1.0.3",
"@stablelib/sha256": "^1.0.1",
"@stablelib/sha512": "^1.0.1",
"@veramo/core": "4.2.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/kms-local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
"generate-plugin-schema": "sphereon dev generate-plugin-schema"
},
"dependencies": {
"@mattrglobal/bbs-signatures": "^1.1.0",
"@sphereon/isomorphic-webcrypto": "^2.4.0-unstable.4",
"@mattrglobal/bbs-signatures": "^1.3.0",
"@sphereon/isomorphic-webcrypto": "2.4.0-unstable.4",
"@sphereon/ssi-sdk-ext.did-utils": "workspace:^",
"@sphereon/ssi-sdk-ext.key-utils": "workspace:^",
"@trust/keyto": "^2.0.0-alpha1",
"@trust/keyto": "2.0.0-alpha1",
"@veramo/core": "4.2.0",
"@veramo/key-manager": "4.2.0",
"@veramo/kms-local": "4.2.0",
"elliptic": "^6.5.4",
"uint8arrays": "3.1.1"
},
"devDependencies": {
"@sphereon/jsencrypt": "^3.3.2-unstable.0",
"@sphereon/jsencrypt": "3.3.2-unstable.0",
"@sphereon/ssi-sdk.dev": "^0.15.1",
"@types/elliptic": "6.4.14",
"@veramo/cli": "4.2.0"
Expand Down
Loading

0 comments on commit 63735cc

Please sign in to comment.