Skip to content

Commit f15ad54

Browse files
vaibhavahire99vaibhavahire99
authored
Merge branch 'main' into earthid-driver-integration
2 parents 60df65c + 7fd6f2f commit f15ad54

18 files changed

Lines changed: 120 additions & 72 deletions

File tree

‎.github/workflows/latest.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,19 @@ jobs:
3333
CI_SECRET_READER_PERIODIC_TOKEN: ${{ secrets.CI_SECRET_READER_PERIODIC_TOKEN }}
3434
VAULTCA: ${{ secrets.VAULTCA }}
3535
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
36+
37+
trigger-deployment:
38+
needs: [ docker-latest ]
39+
runs-on: ubuntu-latest
40+
steps:
41+
- name: Trigger AWS Kubernetes deployment
42+
uses: actions/github-script@v6
43+
with:
44+
github-token: ${{ secrets.GITHUB_TOKEN }}
45+
script: |
46+
await github.rest.actions.createWorkflowDispatch({
47+
owner: context.repo.owner,
48+
repo: context.repo.repo,
49+
workflow_id: 'kubernetes-deploy-to-cluster.yml',
50+
ref: 'main'
51+
})

‎README.md‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ You should then be able to resolve identifiers locally using simple `curl` reque
7979
curl -X GET http://localhost:8080/1.0/identifiers/did:iid:3QUs61mk7a9CdCpckriQbA5emw8pubj6RMtHXP6gD66YbcungS6w2sa
8080
curl -X GET http://localhost:8080/1.0/identifiers/did:evan:testcore:0x126E901F6F408f5E260d95c62E7c73D9B60fd734
8181
curl -X GET http://localhost:8080/1.0/identifiers/did:bid:ef214PmkhKndUcArDQPgD5J4fFVwqJFPt
82-
curl -X GET http://localhost:8080/1.0/identifiers/did:polygonid:polygon:amoy:2qZBvRQPTZwYEKDVT3xY8W8zXvznqykyeqjSmXdz4U
8382
curl -X GET http://localhost:8080/1.0/identifiers/did:pdc:8801:0xf47b66bc0d9b7c73f9ff27bf1f49a2b69dc167fc
8483
curl -X GET http://localhost:8080/1.0/identifiers/did:tys:4B4AbVzzcJSnCZsdX4VaKyQgHRnC
8584
curl -X GET http://localhost:8080/1.0/identifiers/did:plc:yk4dd2qkboz2yv6tpubpc6co
@@ -90,10 +89,16 @@ You should then be able to resolve identifiers locally using simple `curl` reque
9089
curl -X GET http://localhost:8080/1.0/identifiers/did:algo:mainnet:app:1845671812:da490f2d15a625459bf970a3d55e1a646dfd3a956d011546e953e945d39fdada
9190
curl -X GET http://localhost:8080/1.0/identifiers/did:itn:PA7xLNkMAqzzrDp4UBnrZm
9291
curl -X GET http://localhost:8080/1.0/identifiers/did:iota:0xf4d6f08f5a1b80dd578da7dc1b49c886d580acd4cf7d48119dfeb82b538ad88a
93-
curl -X GET http://localhost:8080/1.0/identifiers/did:iden3:polygon:amoy:xC8VZLUUfo5p9DWUawReh7QSstmYN6zR7qsQhQCsw
9492
curl -X GET http://localhost:8080/1.0/identifiers/did:prism:c36cd59bbc62dee1925e1343a8fed051416e417116d6169d060746f1e6816cd4
95-
curl -X GET http://localhost:8080/1.0/identifiers/did:tdw:QmbnQXj7DhWFrmgjDPKZCybn8fkKW7Wze57SQHpwsSQ7NZ:gist.githubusercontent.com:brianorwhatever:9c4633d18eb644f7a47f93a802691626:raw
93+
curl -X GET http://localhost:8080/1.0/identifiers/did:webvh:QmPEQVM1JPTyrvEgBcDXwjK4TeyLGSX1PxjgyeAisdWM1p:gist.githubusercontent.com:brianorwhatever:9c4633d18eb644f7a47f93a802691626:raw
9694
curl -X GET http://localhost:8080/1.0/identifiers/did:quarkid:EiBJ_1z9_OtvrfSgUNnBIs808vsRq7dQCKMP4LuSUosdXQ
95+
96+
curl -X GET http://localhost:8080/1.0/identifiers/did:zkjm:mainnet:d90e52b36a2e2306dc873ec0f7a94351
97+
98+
curl -X GET http://localhost:8080/1.0/identifiers/did:iden3:polygon:amoy:xC8VZLUUfo5p9DWUawReh7QSstmYN6zR7qsQhQCsw
99+
curl -X GET 'http://localhost:8080/1.0/identifiers/did:iden3:polygon:amoy:xC8VZLUUfo5p9DWUawReh7QSstmYN6zR7qsQhQCsw?gist=f12d4f6fddeed78cb8b1faf1c6f4f171a590c1b05c484118a09847f5caa74d03'
100+
curl -X GET 'http://localhost:8080/1.0/identifiers/did:iden3:polygon:amoy:xC8VZLUUfo5p9DWUawReh7QSstmYN6zR7qsQhQCsw?state=7a1a45d22b686cf1bd2f9fbecbed38b725a555e6d8ad68d3780feda9124b1a13'
101+
97102
You can also use an "Accept" header to request the DID document in a specific representation, e.g.:
98103

99104
curl -H "Accept: application/did+ld+json" https://dev.uniresolver.io/1.0/identifiers/did:sov:WRfXPg8dantKVubE3HX8pw
@@ -159,7 +164,7 @@ Are you developing a DID method and Universal Resolver driver? Click [Driver Dev
159164
| [did-indy](https://github.com/decentralized-identity/uni-resolver-driver-did-indy) | 0.9.0 | [0.1](https://hyperledger.github.io/indy-did-method/) | [universalresolver/driver-did-indy](https://hub.docker.com/r/universalresolver/driver-did-indy) | Hyperledger Indy |
160165
| [did-everscale](https://git.defispace.com/ssi-4/everscale-resolver-driver) | 0.1 | [0.1](https://git.defispace.com/ssi-4/everscale-did-registry/-/blob/master/docs/documentation.md) | [radianceteamssi/everscale-did-resolver-driver](https://hub.docker.com/r/radianceteamssi/everscale-did-resolver-driver) | Everscale Blockchain |
161166
| [did-alastria-mvp2](https://github.com/alastria/uni-resolver-driver-did-alastria) | 1.0.0 | [MVP2](https://github.com/alastria/alastria-identity/wiki) | [alastria/universal-resolver](https://hub.docker.com/r/alastria/uni-resolver-driver-did-alastria) | AlastriaID MVP2 |
162-
| [did-cheqd](https://github.com/cheqd/did-resolver) | 3.6.1 | [1.0](https://docs.cheqd.io/identity/architecture/adr-list/adr-001-cheqd-did-method) | [cheqd/did-resolver](https://github.com/cheqd/did-resolver) | cheqd network |
167+
| [did-cheqd](https://github.com/cheqd/did-resolver) | 3.7.6 | [1.0](https://docs.cheqd.io/identity/architecture/adr-list/adr-001-cheqd-did-method) | [cheqd/did-resolver](https://github.com/cheqd/did-resolver) | cheqd network |
163168
| [did-com](https://github.com/commercionetwork/uni-resolver-driver-did-com/) | 1.0.0 | [1.0](https://docs.commercio.network/modules/did/) | [ghcr.io/commercionetwork/uni-resolver-driver-did-com](https://github.com/commercionetwork/uni-resolver-driver-did-com/pkgs/container/uni-resolver-driver-did-com) | Commercio public ledger |
164169
| [did-dyne](https://github.com/dyne/W3C-DID) | 0.1 | [1.0](https://dyne.github.io/W3C-DID/#/) | [dyne/w3c-did-driver](https://hub.docker.com/r/dyne/w3c-did-driver/) | Dyne.org Decentralized Identifiers |
165170
| [did-jwk](https://github.com/transmute-industries/restricted-resolver) | 0.1 | [1.0](https://github.com/quartzjer/did-jwk/blob/main/spec.md) | [transmute/restricted-resolver](https://hub.docker.com/repository/docker/transmute/restricted-resolver) | DID Json Web Key |
@@ -169,7 +174,6 @@ Are you developing a DID method and Universal Resolver driver? Click [Driver Dev
169174
| [did-iid](https://github.com/InspurIndustrialInternet/uni-resolver-driver-did-iid) | 0.1.0 | [0.1](https://github.com/InspurIndustrialInternet/iid/blob/main/doc/en/InspurChain_DID_protocol_Specification.md) | [zoeyian/driver-did-iid:latest](https://hub.docker.com/repository/docker/zoeyian/driver-did-iid) | Inspur DID Method |
170175
| [did-evan](https://github.com/evannetwork/did-driver) | 0.1.3 | [0.9](https://github.com/evannetwork/evan.network-DID-method-specification/blob/master/evan_did_method_spec.md) | [evannetwork/evan-did-driver](https://hub.docker.com/r/evannetwork/evan-did-driver) | evan.network |
171176
| [did-bid](https://github.com/caict-4iot-dev/uni-resolver-driver-did-bid) | 2.0.0 | [2.0 WD](https://github.com/teleinfo-bif/bid/blob/master/doc/en/BID%20Protocol%20Specification.md) | [caictdevelop/driver-did-bid](https://hub.docker.com/repository/docker/caictdevelop/driver-did-bid) | BIF blockchain |
172-
| [did-polygonid](https://github.com/iden3/driver-did-iden3) | 0.0.4 | [1.0.0](https://github.com/0xPolygonID/did-polygonid/blob/main/did-polygonid-method.md) | [ghcr.io/iden3/driver-did-iden3:v0.0.4](https://github.com/iden3/driver-did-iden3/pkgs/container/driver-did-iden3) | PolygonID DID |
173177
| [did-pdc](https://github.com/pdc-community/uni-resolver-driver-did-pdc/blob/master/README.md) | 0.0.1 | (missing) | [w744219971/driver-did-pdc](https://hub.docker.com/r/w744219971/driver-did-pdc) | PDC DID |
174178
| [did-tys](https://github.com/itpeople-cy/tys-did-driver/blob/master/README.md) | 1.0 | 1.0 | [itpeoplecorp/tys-did-driver](https://hub.docker.com/r/itpeoplecorp/tys-did-driver) | TYS DID |
175179
| [did-plc](https://plc.directory) | 0.0.1 | [dev](https://github.com/bluesky-social/did-method-plc/blob/main/README.md) | [bnewbold/uni-resolver-driver-did-plc](https://hub.docker.com/r/bnewbold/uni-resolver-driver-did-plc) | PLC DID |
@@ -180,12 +184,15 @@ Are you developing a DID method and Universal Resolver driver? Click [Driver Dev
180184
| [did-algo](https://github.com/algorandfoundation/did-algo) | 1.0.0 | [2.0](https://github.com/algorandfoundation/did-algo/blob/main/SPEC.md) | [ghcr.io/algorandfoundation/did-algo](https://ghcr.io/algorandfoundation/did-algo) | Algorand Blockchain DID Method |
181185
| [did-itn](https://github.com/itn-trust/uni-resolver-driver-did-itn) | 1.0.0 | [1.0](https://github.com/itn-trust/itn-did-spec) | [ghcr.io/itn-trust/driver-did-itn](https://ghcr.io/itn-trust/driver-did-itn) | Integrated Trust Network (ITN) DID Method |
182186
| [did-iota](https://github.com/iotaledger/uni-resolver-driver-iota) | 0.1.2 | 1.0 | [iotaledger/uni-resolver-driver-iota](https://hub.docker.com/r/iotaledger/uni-resolver-driver-iota) | IOTA DID |
183-
| [did-iden3](https://github.com/iden3/driver-did-iden3) | 0.0.4 | [1.0.0](https://github.com/iden3/did-iden3/blob/main/did-iden3-method.md) | [ghcr.io/iden3/driver-did-iden3:v0.0.4](https://github.com/iden3/driver-did-iden3/pkgs/container/driver-did-iden3) | Iden3 DID |
184-
| [did-prism](https://github.com/FabioPinheiro/uni-resolver-driver-did-prism) | 0.2 | [1.0](https://github.com/input-output-hk/prism-did-method-spec) | [ghcr.io/fabiopinheiro/uni-resolver-driver-did-prism](https://github.com/FabioPinheiro/uni-resolver-driver-did-prism/pkgs/container/uni-resolver-driver-did-prism) | PRISM DID |
185-
| [did-tdw](https://github.com/brianorwhatever/uni-resolver-driver-did-tdw) | 0.4 | [0.4](https://identity.foundation/trustdidweb/) | [uni-resolver-driver-did-tdw](https://hub.docker.com/r/brianrichter/uni-resolver-driver-did-tdw) | Trust DID Web |
187+
| [did-prism](https://github.com/FabioPinheiro/uni-resolver-driver-did-prism) | 1.1 | [1.0](https://github.com/input-output-hk/prism-did-method-spec) | [ghcr.io/fabiopinheiro/uni-resolver-driver-did-prism](https://github.com/FabioPinheiro/uni-resolver-driver-did-prism/pkgs/container/uni-resolver-driver-did-prism) | PRISM DID |
188+
| [did-webvh](https://github.com/brianorwhatever/uni-resolver-driver-did-webvh) | 0.5 | [0.5](https://identity.foundation/didwebvh/) | [uni-resolver-driver-did-webvh](ghcr.io/brianorwhatever/uni-resolver-driver-did-webvh:main) | DID WEBVH - Verifiable History |
186189
| [did-quarkid](https://github.com/ssi-quarkid/api-proxy) | 1.0 | 1.0 | [uni-resolver-driver-did-quarkid](extrimianpublic.azurecr.io/modena-resolver:metadataSupport) | QuarkID
187190
| [did-earthid](https://github.com/vibhi09/driver-did-earthid) | 0.1.0 | [1.0](https://github.com/earthid/earthid-did-method-specification) | [vibhi09/driver-did-earthid](https://hub.docker.com/r/vibhi09/driver-did-earthid) | EarthID DID Method |
188191

192+
| [did-zkjm](https://github.com/JupiterMetaZK/.github) | 1.0.0 | 1.0.0 | [uni-resolver-driver-did-zkjm](https://hub.docker.com/r/saishibu38380/uni-resolver-driver-zkjm) | ZKJM DID |
193+
| [did-iden3](https://github.com/iden3/driver-did-iden3) | 0.0.8 | [1.0.0](https://github.com/iden3/did-iden3/blob/main/did-iden3-method.md) | [ghcr.io/iden3/driver-did-iden3:v0.0.8](https://github.com/iden3/driver-did-iden3/pkgs/container/driver-did-iden3) | Iden3 DID
194+
195+
189196
## More Information
190197

191198
* [Driver Development](/docs/driver-development.md)

‎docker-compose.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,15 @@ services:
6868
uniresolver_web_driver_url_did_iid:
6969
uniresolver_web_driver_url_did_evan:
7070
uniresolver_web_driver_url_did_bid:
71-
uniresolver_web_driver_url_did_polygonid:
7271
uniresolver_web_driver_url_did_pdc:
7372
uniresolver_web_driver_url_did_tys:
7473
uniresolver_web_driver_url_did_plc:
7574
uniresolver_web_driver_url_did_evrc:
7675
uniresolver_web_driver_url_did_kerri:
7776
uniresolver_web_driver_url_did_webs:
7877
uniresolver_web_driver_url_did_content:
79-
uniresolver_web_driver_url_did_iden3:
8078
uniresolver_web_driver_url_did_prism:
79+
uniresolver_web_driver_url_did_iden3:
8180
uniresolver_web_driver_url_did_earthid:
8281

8382
driver-did-btcr:
@@ -273,7 +272,7 @@ services:
273272
ports:
274273
- "8130:8080"
275274
cheqd-did-driver:
276-
image: ghcr.io/cheqd/did-resolver:3.6.1
275+
image: ghcr.io/cheqd/did-resolver:3.7.6
277276
ports:
278277
- "8131:8080"
279278
environment:
@@ -319,10 +318,6 @@ services:
319318
image: caictdevelop/driver-did-bid:latest
320319
ports:
321320
- "8139:8080"
322-
driver-did-polygonid:
323-
image: ghcr.io/iden3/driver-did-iden3:v0.0.4
324-
ports:
325-
- "8141:8080"
326321
driver-did-pdc:
327322
image: w744219971/driver-did-pdc:latest
328323
ports:
@@ -344,7 +339,7 @@ services:
344339
ports:
345340
- "8146:7678"
346341
driver-did-webs:
347-
image: gleif/did-webs-resolver-service:latest
342+
image: gleif/did-webs-resolver-service:iiw37
348343
ports:
349344
- "8147:7677"
350345
driver-did-content:
@@ -374,15 +369,15 @@ services:
374369
IOTA_CUSTOM_NODE_ENDPOINT: ${uniresolver_driver_did_iota_customNodeEndpoint}
375370
IOTA_CUSTOM_NODE_AUTH_TOKEN: ${uniresolver_driver_did_iota_customNodeAuthToken}
376371
driver-did-iden3:
377-
image: ghcr.io/iden3/driver-did-iden3:v0.0.4
372+
image: ghcr.io/iden3/driver-did-iden3:v0.0.8
378373
ports:
379374
- "8152:8080"
380375
driver-did-prism:
381-
image: ghcr.io/fabiopinheiro/uni-resolver-driver-did-prism:0.2
376+
image: ghcr.io/fabiopinheiro/uni-resolver-driver-did-prism:1.1
382377
ports:
383378
- "8153:9090"
384-
driver-did-tdw:
385-
image: brianrichter/uni-resolver-driver-did-tdw:0.4
379+
driver-did-webvh:
380+
image: ghcr.io/decentralized-identity/uni-resolver-driver-did-webvh:main
386381
ports:
387382
- "8154:8080"
388383
driver-did-quarkid:
@@ -401,3 +396,7 @@ services:
401396
baseUrl: "https://did.myearth.id/v2/resolve"
402397
ports:
403398
- "8156:8080"
399+
driver-did-zkjm:
400+
image: saishibu38380/uni-resolver-driver-zkjm:v1.0.0
401+
ports:
402+
- "8081:8080"

‎driver-http/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>decentralized-identity</groupId>
1010
<artifactId>uni-resolver</artifactId>
11-
<version>0.28-SNAPSHOT</version>
11+
<version>0.31-SNAPSHOT</version>
1212
</parent>
1313

1414
<dependencies>

‎driver-http/src/main/java/uniresolver/driver/http/HttpDriver.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class HttpDriver implements Driver {
4343
private URI resolveUri = null;
4444
private URI propertiesUri = null;
4545
private boolean supportsDereference = false;
46+
private String acceptHeaderValue = null;
4647
private List<String> testIdentifiers = Collections.emptyList();
4748
private Map<String, Object> traits = Collections.emptyMap();
4849

@@ -108,7 +109,8 @@ public ResolveResult resolve(DID did, Map<String, Object> resolutionOptions) thr
108109
// set Accept header
109110

110111
String accept = (String) resolutionOptions.get("accept");
111-
if (accept == null) throw new ResolutionException("No 'accept' provided in 'resolutionOptions' for resolve().");
112+
if (this.getAcceptHeaderValue() != null) accept = this.getAcceptHeaderValue();
113+
if (accept == null) throw new ResolutionException("No 'accept' provided in 'resolutionOptions' for resolve(), or in driver configuration.");
112114

113115
List<String> acceptMediaTypes = Arrays.asList(ResolveResult.MEDIA_TYPE, accept);
114116
String acceptMediaTypesString = String.join(",", acceptMediaTypes);
@@ -465,6 +467,14 @@ public void setSupportsDereference(boolean supportsDereference) {
465467
this.supportsDereference = supportsDereference;
466468
}
467469

470+
public String getAcceptHeaderValue() {
471+
return this.acceptHeaderValue;
472+
}
473+
474+
public void setAcceptHeaderValue(String acceptHeaderValue) {
475+
this.acceptHeaderValue = acceptHeaderValue;
476+
}
477+
468478
public List<String> getTestIdentifiers() {
469479
return this.testIdentifiers;
470480
}

0 commit comments

Comments
 (0)