Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(deps): Update dependency ethr-did-resolver to v7 #1038

Merged
merged 4 commits into from
Oct 24, 2022
Merged

fix(deps): Update dependency ethr-did-resolver to v7 #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
918e924
fix(deps): Update dependency ethr-did-resolver to v7
renovate[bot] Oct 24, 2022
cc69c58
fix(deps): bump did-* dependencies
mirceanis Oct 24, 2022
a8ca52d
chore: specify timeouts in browser tests
mirceanis Oct 24, 2022
79bc444
fix(deps): bump ethr-did-resolver to 7.0.2
mirceanis Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"cross-fetch": "^3.1.4",
"date-fns": "^2.28.0",
"debug": "^4.3.3",
"did-resolver": "^4.0.0",
"did-resolver": "^4.0.1",
"dotenv": "^16.0.0",
"ethr-did-resolver": "^6.1.0",
"ethr-did-resolver": "^7.0.2",
"express": "^4.17.2",
"express-handlebars": "^6.0.2",
"fuzzy": "^0.1.3",
Expand All @@ -66,7 +66,7 @@
"ts-json-schema-generator": "^1.0.0",
"typeorm": "^0.3.10",
"url-parse": "^1.5.4",
"web-did-resolver": "^2.0.20",
"web-did-resolver": "^2.0.21",
"ws": "^8.4.0",
"yaml": "^2.0.0"
},
Expand Down
38 changes: 25 additions & 13 deletions packages/core/plugin.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@
},
"required": [
"id"
]
],
"description": "Represents a DID document."
},
"VerificationMethod": {
"type": "object",
Expand Down Expand Up @@ -193,7 +194,8 @@
"id",
"type",
"controller"
]
],
"description": "Represents the properties of a Verification Method listed in a DID document.\n\nThis data type includes public key representations that are no longer present in the spec but are still used by several DID methods / resolvers and kept for backward compatibility."
},
"JsonWebKey": {
"type": "object",
Expand Down Expand Up @@ -267,7 +269,8 @@
"id",
"type",
"serviceEndpoint"
]
],
"description": "Represents a Service entry in a {@link https://www.w3.org/TR/did-core/#did-document-properties | DID document } ."
},
"ServiceEndpoint": {
"anyOf": [
Expand All @@ -277,7 +280,8 @@
{
"type": "object"
}
]
],
"description": "Represents an endpoint of a Service entry in a DID document."
},
"DIDDocumentSection": {
"type": "string",
Expand Down Expand Up @@ -327,7 +331,8 @@
"accept": {
"type": "string"
}
}
},
"description": "Describes the options forwarded to the resolver when executing a {@link Resolvable.resolve } operation."
},
"DIDResolutionResult": {
"type": "object",
Expand Down Expand Up @@ -370,7 +375,8 @@
"didResolutionMetadata",
"didDocument",
"didDocumentMetadata"
]
],
"description": "Defines the result of a DID resolution operation."
},
"DIDResolutionMetadata": {
"type": "object",
Expand All @@ -381,7 +387,8 @@
"error": {
"type": "string"
}
}
},
"description": "Encapsulates the resolution metadata resulting from a {@link Resolvable.resolve } operation."
},
"DIDDocumentMetadata": {
"type": "object",
Expand Down Expand Up @@ -410,7 +417,8 @@
"canonicalId": {
"type": "string"
}
}
},
"description": "Represents metadata about the DID document resulting from a {@link Resolvable.resolve } operation."
}
},
"methods": {
Expand Down Expand Up @@ -4571,7 +4579,8 @@
},
"required": [
"id"
]
],
"description": "Represents a DID document."
},
"VerificationMethod": {
"type": "object",
Expand Down Expand Up @@ -4611,7 +4620,8 @@
"id",
"type",
"controller"
]
],
"description": "Represents the properties of a Verification Method listed in a DID document.\n\nThis data type includes public key representations that are no longer present in the spec but are still used by several DID methods / resolvers and kept for backward compatibility."
},
"JsonWebKey": {
"type": "object",
Expand Down Expand Up @@ -4685,7 +4695,8 @@
"id",
"type",
"serviceEndpoint"
]
],
"description": "Represents a Service entry in a {@link https://www.w3.org/TR/did-core/#did-document-properties | DID document } ."
},
"ServiceEndpoint": {
"anyOf": [
Expand All @@ -4695,7 +4706,8 @@
{
"type": "object"
}
]
],
"description": "Represents an endpoint of a Service entry in a DID document."
},
"CredentialStatus": {
"type": "object",
Expand Down Expand Up @@ -4907,4 +4919,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion packages/credential-ld/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@veramo/did-resolver": "^4.0.0",
"@veramo/utils": "^4.0.0",
"debug": "^4.3.3",
"did-resolver": "^4.0.0",
"did-resolver": "^4.0.1",
"uint8arrays": "^3.0.0"
},
"resolutions": {
Expand Down
4 changes: 2 additions & 2 deletions packages/credential-status/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@veramo/core": "^4.0.0",
"@veramo/utils": "^4.0.0",
"credential-status": "^2.0.5",
"did-jwt": "^6.6.0",
"did-resolver": "^4.0.0"
"did-jwt": "^6.9.0",
"did-resolver": "^4.0.1"
},
"devDependencies": {
"@types/debug": "4.1.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/credential-w3c/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@veramo/utils": "^4.0.0",
"debug": "^4.3.3",
"did-jwt-vc": "^3.1.0",
"did-resolver": "^4.0.0",
"did-resolver": "^4.0.1",
"uint8arrays": "^3.0.0",
"uuid": "^9.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/did-comm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@veramo/utils": "^4.0.0",
"cross-fetch": "^3.1.4",
"debug": "^4.3.3",
"did-jwt": "^6.6.0",
"did-resolver": "^4.0.0",
"did-jwt": "^6.9.0",
"did-resolver": "^4.0.1",
"uint8arrays": "^3.0.0",
"uuid": "^9.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/did-jwt/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@veramo/core": "^4.0.0",
"@veramo/message-handler": "^4.0.0",
"debug": "^4.3.3",
"did-jwt": "^6.6.0",
"did-resolver": "^4.0.0"
"did-jwt": "^6.9.0",
"did-resolver": "^4.0.1"
},
"devDependencies": {
"@types/debug": "4.1.7",
Expand Down
6 changes: 3 additions & 3 deletions packages/did-provider-ion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "@veramo/did-provider-ion",
"description": "Veramo ion-did based identity controller plugin.",
"version": "4.0.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"main": "build/index.js",
"types": "build/index.d.ts",
"scripts": {
"build": "tsc",
"extract-api": "yarn veramo dev extract-api"
Expand All @@ -30,7 +30,7 @@
"@sphereon/react-native-argon2": "^2.0.7"
},
"files": [
"dist/**/*",
"build/**/*",
"src/**/*",
"README.md",
"LICENSE"
Expand Down
15 changes: 14 additions & 1 deletion packages/did-provider-ion/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,18 @@
"outDir": "build",
"declarationDir": "build"
},
"references": [{ "path": "../core" }, { "path": "../did-manager" }, { "path": "../key-manager" }, { "path": "../kms-local" }]
"references": [
{
"path": "../core"
},
{
"path": "../did-manager"
},
{
"path": "../key-manager"
},
{
"path": "../kms-local"
}
]
}
4 changes: 2 additions & 2 deletions packages/did-resolver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"@veramo/utils": "^4.0.0",
"cross-fetch": "^3.1.4",
"debug": "^4.3.3",
"did-resolver": "^4.0.0"
"did-resolver": "^4.0.1"
},
"devDependencies": {
"@types/debug": "4.1.7",
"ethr-did-resolver": "^6.1.0",
"ethr-did-resolver": "7.0.2",
"typescript": "4.7.3",
"web-did-resolver": "2.0.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/key-manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@ethersproject/transactions": "^5.6.2",
"@stablelib/ed25519": "^1.0.2",
"@veramo/core": "^4.0.0",
"did-jwt": "^6.6.0",
"did-jwt": "^6.9.0",
"uint8arrays": "^3.0.0",
"uuid": "^9.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/kms-local/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"@stablelib/nacl": "^1.0.2",
"@veramo/core": "^4.0.0",
"@veramo/key-manager": "^4.0.0",
"elliptic": "^6.5.4",
"base-58": "^0.0.1",
"debug": "^4.3.3",
"did-jwt": "^6.6.0",
"did-jwt": "^6.9.0",
"elliptic": "^6.5.4",
"uint8arrays": "^3.0.0"
},
"devDependencies": {
Expand Down
5 changes: 2 additions & 3 deletions packages/kms-local/src/key-management-system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export class KeyManagementSystem extends AbstractKeyManagementSystem {
} else if (managedKey.type === 'Secp256r1' &&
(typeof algorithm === 'undefined' || algorithm === 'ES256')
) {
return await this.signES256(managedKey.privateKeyHex, algorithm, data)
return await this.signES256(managedKey.privateKeyHex, data)
}

throw Error(`not_supported: Cannot sign ${algorithm} using key of type ${managedKey.type}`)
Expand Down Expand Up @@ -280,10 +280,9 @@ export class KeyManagementSystem extends AbstractKeyManagementSystem {
*/
private async signES256(
privateKeyHex: string,
alg: string | undefined,
data: Uint8Array,
): Promise<string> {
const signer = ES256Signer(arrayify(privateKeyHex, { allowMissingPrefix: true }), false)
const signer = ES256Signer(arrayify(privateKeyHex, { allowMissingPrefix: true }))
const signature = await signer(data)
// base64url encoded string
return signature as string
Expand Down
2 changes: 1 addition & 1 deletion packages/remote-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"@types/debug": "4.1.7",
"@types/express": "4.17.13",
"did-resolver": "^4.0.0",
"did-resolver": "^4.0.1",
"express": "4.18.1",
"typescript": "4.7.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/selective-disclosure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@veramo/did-jwt": "^4.0.0",
"@veramo/message-handler": "^4.0.0",
"debug": "^4.3.3",
"did-jwt": "^6.6.0",
"did-jwt": "^6.9.0",
"uuid": "^9.0.0"
},
"devDependencies": {
Expand Down
7 changes: 4 additions & 3 deletions packages/test-react-app/headless-tests/browserAgent.browser-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import didCommPacking from '../../../__tests__/shared/didCommPacking'
import messageHandler from '../../../__tests__/shared/messageHandler'
import utils from '../../../__tests__/shared/utils'

jest.setTimeout(3 * 60 * 1000)
const JEST_TIMEOUT = 3 * 60 * 1000
jest.setTimeout(JEST_TIMEOUT)

describe('Browser integration tests', () => {
describe('shared tests', () => {
Expand Down Expand Up @@ -66,7 +67,7 @@ describe('Browser integration tests', () => {
},
}

await page.waitForSelector('#result').then(async (element) => {
await page.waitForSelector('#result', { timeout: JEST_TIMEOUT }).then(async (element) => {
let result = await element!.evaluate((el) => el.textContent)
let parsedResult = JSON.parse(result!)
await expect(parsedResult).toMatchObject(resultSnapshot)
Expand All @@ -83,7 +84,7 @@ describe('Browser integration tests', () => {
didDocument: null,
}

await page.waitForSelector('#invalid-result').then(async (element) => {
await page.waitForSelector('#invalid-result', { timeout: JEST_TIMEOUT }).then(async (element) => {
let result = await element!.evaluate((el) => el.textContent)
let parsedResult = JSON.parse(result!)
await expect(parsedResult).toMatchObject(resultSnapshot)
Expand Down
6 changes: 3 additions & 3 deletions packages/test-react-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"@veramo/url-handler": "^4.0.0",
"@veramo/utils": "^4.0.0",
"crypto": "npm:crypto-browserify",
"did-resolver": "^4.0.0",
"ethr-did-resolver": "^6.1.0",
"did-resolver": "^4.0.1",
"ethr-did-resolver": "^7.0.2",
"react": "18.1.0",
"react-dom": "18.1.0",
"stream": "npm:stream-browserify",
"typeorm": "^0.3.10",
"web-did-resolver": "^2.0.20",
"web-did-resolver": "^2.0.21",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@veramo/did-manager": "^4.0.0",
"@veramo/key-manager": "^4.0.0",
"@veramo/utils": "^4.0.0",
"did-resolver": "^4.0.0"
"did-resolver": "^4.0.1"
},
"devDependencies": {
"typescript": "4.7.3"
Expand Down
12 changes: 6 additions & 6 deletions packages/utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"blakejs": "^1.1.1",
"cross-fetch": "^3.1.4",
"debug": "^4.3.3",
"did-jwt": "^6.6.0",
"did-jwt": "^6.9.0",
"did-jwt-vc": "^3.1.0",
"did-resolver": "^4.0.0",
"uint8arrays": "^3.0.0",
"elliptic": "^6.5.4"
"did-resolver": "^4.0.1",
"elliptic": "^6.5.4",
"uint8arrays": "^3.0.0"
},
"devDependencies": {
"@types/debug": "4.1.7",
"@types/uuid": "8.3.4",
"@types/elliptic": "6.4.14"
"@types/elliptic": "6.4.14",
"@types/uuid": "8.3.4"
},
"files": [
"build/**/*",
Expand Down
Loading