Skip to content

Commit 577f853

Browse files
renovate[bot]renovate[bot]
authored
fix(deps): Update dependency ethr-did-resolver to v11 (#126)
* fix(deps): Update dependency ethr-did-resolver to v11 * fix: use fallback provider with multiple RPC URLs for ethr * chore(ci): use node 20 in CI env
1 parent 080cb31 commit 577f853

File tree

9 files changed

+1533
-1060
lines changed

9 files changed

+1533
-1060
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Use Node.js
2424
uses: actions/setup-node@v4
2525
with:
26-
node-version: 18
26+
node-version: 20
2727
cache: 'yarn'
2828

2929
- run: yarn install --frozen-lockfile

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: 'Setup node with cache'
1111
uses: actions/setup-node@v4
1212
with:
13-
node-version: 18
13+
node-version: 20
1414
cache: 'yarn'
1515

1616
- run: yarn install --frozen-lockfile

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM node:21.6.2
2-
LABEL maintainer="Mircea NISTOR <mircea.nistor@mesh.xyz>"
2+
LABEL maintainer="Mircea NISTOR <mircea.nistor@consensys.net>"
33
LABEL repository="git@github.com:uport-project/uport-did-driver.git"
44

55
USER root

‎package.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"author": "Christian Lundkvist",
2121
"contributors": [
2222
"Andres Junge",
23-
"Mircea Nistor <mircea.nistor@mesh.xyz>"
23+
"Mircea Nistor"
2424
],
2525
"repository": {
2626
"type": "git",
@@ -30,8 +30,9 @@
3030
"dependencies": {
3131
"did-resolver": "^4.1.0",
3232
"ens-did-resolver": "^1.0.4",
33-
"ethr-did-resolver": "^10.0.0",
34-
"express": "^4.18.2",
33+
"ethers": "^6.13.3",
34+
"ethr-did-resolver": "^11.0.1",
35+
"express": "^4.21.0",
3536
"express-actuator": "^1.8.4",
3637
"peer-did-resolver": "^2.0.0",
3738
"plc-did-resolver": "^1.0.0",
@@ -40,22 +41,23 @@
4041
"devDependencies": {
4142
"@jest/globals": "29.7.0",
4243
"@semantic-release/changelog": "6.0.3",
43-
"@semantic-release/commit-analyzer": "11.1.0",
44+
"@semantic-release/commit-analyzer": "13.0.0",
4445
"@semantic-release/exec": "6.0.3",
4546
"@semantic-release/git": "10.0.1",
46-
"@semantic-release/github": "9.2.6",
47-
"@semantic-release/npm": "11.0.2",
48-
"@semantic-release/release-notes-generator": "12.1.0",
47+
"@semantic-release/github": "11.0.0",
48+
"@semantic-release/npm": "12.0.1",
49+
"@semantic-release/release-notes-generator": "14.0.1",
4950
"cross-env": "7.0.3",
5051
"jest": "29.7.0",
51-
"prettier": "3.2.5",
52-
"semantic-release": "22.0.12",
53-
"supertest": "6.3.4"
52+
"prettier": "3.3.3",
53+
"semantic-release": "24.1.2",
54+
"supertest": "7.0.0"
5455
},
5556
"jest": {
5657
"testEnvironment": "node",
5758
"coveragePathIgnorePatterns": [
5859
"/node_modules/"
5960
]
60-
}
61+
},
62+
"packageManager": "yarn@1.22.22"
6163
}

‎src/__tests__/ens.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ describe('did:ens driver', () => {
5454
})
5555
})
5656

57-
it('did:ens:goerli:whatever.eth', async () => {
57+
it.skip('did:ens:sepolia:whatever.eth', async () => {
5858
expect.assertions(2)
59-
const did = 'did:ens:goerli:whatever.eth'
59+
const did = 'did:ens:sepolia:whatever.eth'
6060
const ethrAddr = '0x4af859d61d07A8c515FE0E3Cc1Ea5e49A260bBa3'
6161
const response = await request(app).get(`/1.0/identifiers/${did}`)
6262
expect(response.status).toBe(200)
@@ -75,7 +75,7 @@ describe('did:ens driver', () => {
7575
id: `${did}#${ethrAddr}`,
7676
type: 'EcdsaSecp256k1RecoveryMethod2020',
7777
controller: did,
78-
blockchainAccountId: `${ethrAddr}@eip155:5`,
78+
blockchainAccountId: `${ethrAddr}@eip155:11155111`,
7979
},
8080
{
8181
id: `${did}#my-key`,

‎src/__tests__/ethr.test.js

Lines changed: 33 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1-
import app from '../app.js'
1+
import app, { providerConfig, timers } from '../app.js'
22
import request from 'supertest'
3-
import { jest } from '@jest/globals'
3+
import { afterAll, describe, expect, it, jest } from '@jest/globals'
4+
import { deployments } from 'ethr-did-resolver'
45

56
jest.setTimeout(30000)
67

78
describe('did:ethr driver', () => {
9+
afterAll(() => {
10+
// poor man's benchmarking
11+
for (const rpcUrl of Object.keys(timers)) {
12+
const average =
13+
Object.values(timers[rpcUrl]).reduce((acc, val) => acc + val, 0) /
14+
Object.values(timers[rpcUrl]).length
15+
console.log(`Average time for ${rpcUrl}: ${average}ms`)
16+
}
17+
})
18+
19+
it.skip('configures all official deployments', () => {
20+
const configured = providerConfig.networks.map((network) => network.chainId)
21+
const known = deployments.map((deployment) => deployment.chainId)
22+
const knownButNotConfigured = known.filter((x) => !new Set(configured).has(x))
23+
expect(knownButNotConfigured).toEqual([])
24+
})
25+
26+
it.skip('configures only official deployments', () => {
27+
const configured = providerConfig.networks.map((network) => network.chainId)
28+
const known = deployments.map((deployment) => deployment.chainId)
29+
const configuredButUnknown = configured.filter((x) => !new Set(known).has(x))
30+
expect(configuredButUnknown).toEqual([])
31+
})
32+
833
it('responds with didResolutionResult', async () => {
934
expect.assertions(4)
1035
const did = 'did:ethr:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
@@ -128,106 +153,19 @@ describe('did:ethr driver', () => {
128153
})
129154

130155
describe('responds with didResolutionResult for', () => {
131-
it('did:ethr:mainnet:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
132-
expect.assertions(1)
133-
const did = 'did:ethr:mainnet:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
134-
const response = await request(app).get(`/1.0/identifiers/${did}`)
135-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
136-
})
137-
138-
it('did:ethr:0x1:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
139-
expect.assertions(1)
140-
const did = 'did:ethr:0x1:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
141-
const response = await request(app).get(`/1.0/identifiers/${did}`)
142-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
143-
})
156+
const names = providerConfig.networks.map((network) => network.name)
157+
const chainIds = providerConfig.networks.map((network) => `0x${BigInt(network.chainId).toString(16)}`)
144158

145-
it('did:ethr:goerli:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
146-
expect.assertions(1)
147-
const did = 'did:ethr:goerli:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
148-
const response = await request(app).get(`/1.0/identifiers/${did}`)
149-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
150-
})
151-
152-
it('did:ethr:0x5:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
153-
expect.assertions(1)
154-
const did = 'did:ethr:0x5:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
155-
const response = await request(app).get(`/1.0/identifiers/${did}`)
156-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
157-
})
158-
159-
// it('did:ethr:rsk:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
160-
// expect.assertions(1)
161-
// const did = 'did:ethr:rsk:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
162-
// const response = await request(app).get(`/1.0/identifiers/${did}`)
163-
// expect(response.body.didDocument).toHaveProperty('verificationMethod')
164-
// })
165-
166-
// it('did:ethr:0x1e:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
167-
// expect.assertions(1)
168-
// const did = 'did:ethr:0x1e:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
169-
// const response = await request(app).get(`/1.0/identifiers/${did}`)
170-
// expect(response.body.didDocument).toHaveProperty('verificationMethod')
171-
// })
172-
173-
it('did:ethr:matic:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
174-
expect.assertions(1)
175-
const did = 'did:ethr:matic:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
176-
const response = await request(app).get(`/1.0/identifiers/${did}`)
177-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
178-
})
179-
180-
it('did:ethr:0x89:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
181-
expect.assertions(1)
182-
const did = 'did:ethr:0x89:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
183-
const response = await request(app).get(`/1.0/identifiers/${did}`)
184-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
185-
})
186-
187-
it.skip('did:ethr:maticmum:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
188-
expect.assertions(1)
189-
const did = 'did:ethr:maticmum:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
190-
const response = await request(app).get(`/1.0/identifiers/${did}`)
191-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
192-
})
193-
194-
it.skip('did:ethr:0x13881:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
195-
expect.assertions(1)
196-
const did = 'did:ethr:0x13881:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
197-
const response = await request(app).get(`/1.0/identifiers/${did}`)
198-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
199-
})
200-
201-
it('did:ethr:0x03c401:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
202-
expect.assertions(1)
203-
const did = 'did:ethr:0x03c401:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
204-
const response = await request(app).get(`/1.0/identifiers/${did}`)
205-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
206-
})
207-
208-
it('did:ethr:volta:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
209-
expect.assertions(1)
210-
const did = 'did:ethr:volta:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
211-
const response = await request(app).get(`/1.0/identifiers/${did}`)
212-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
213-
})
214-
215-
it('did:ethr:0x12047:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
216-
expect.assertions(1)
217-
const did = 'did:ethr:0x12047:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
218-
const response = await request(app).get(`/1.0/identifiers/${did}`)
219-
expect(response.body.didDocument).toHaveProperty('verificationMethod')
220-
})
221-
it('did:ethr:ewc:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
159+
it.each(names)('did:ethr:%s:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async (name) => {
222160
expect.assertions(1)
223-
const did = 'did:ethr:ewc:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
161+
const did = `did:ethr:${name}:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736`
224162
const response = await request(app).get(`/1.0/identifiers/${did}`)
225163
expect(response.body.didDocument).toHaveProperty('verificationMethod')
226164
})
227165

228-
it('did:ethr:0xf6:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async () => {
166+
it.each(chainIds)('did:ethr:%s:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736', async (chainId) => {
229167
expect.assertions(1)
230-
const did = 'did:ethr:0xf6:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736'
168+
const did = `did:ethr:${chainId}:0x3b0BC51Ab9De1e5B7B6E34E5b960285805C41736`
231169
const response = await request(app).get(`/1.0/identifiers/${did}`)
232170
expect(response.body.didDocument).toHaveProperty('verificationMethod')
233171
})

‎src/__tests__/web.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import app from '../app.js'
22
import request from 'supertest'
33

44
describe('did:web driver', () => {
5-
it('responds with didResolutionResult for did:web:did.actor:alice', async () => {
5+
it('responds with didResolutionResult for did:web:skounis.github.io', async () => {
66
expect.assertions(5)
7-
const did = 'did:web:did.actor:alice'
7+
const did = 'did:web:skounis.github.io'
88
const response = await request(app).get(`/1.0/identifiers/${did}`)
99
expect(response.status).toBe(200)
1010
expect(response.body).toHaveProperty('didDocument')

0 commit comments

Comments
 (0)