Skip to content

Commit e588cf2

Browse files
author
william-brooks
authored
Merge pull request #211 from identity-com/develop
Develop to Master
2 parents 7b4cf5b + b604adf commit e588cf2

File tree

117 files changed

+22651
-9098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+22651
-9098
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ node_modules/
66
npm-debug.log
77
build
88
.DS_Store
9-
#dist
9+
dist/
1010
.history/
1111
.tmp/
1212
.history
13+

‎__test__/creds/VerifiableCredentialProxy.test.js

+9
Original file line numberDiff line numberDiff line change
@@ -1886,6 +1886,15 @@ describe('Signned Verifiable Credentials', () => {
18861886

18871887
expect(cred.credentialSubject).toBeDefined();
18881888
});
1889+
1890+
it('Should verify an old schema signature', async () => {
1891+
const credJSon = require('./fixtures/emailCredentialOld.json'); // eslint-disable-line
1892+
const cred = await VC.fromJSON(credJSon);
1893+
1894+
expect(await cred.verifyMerkletreeSignature(
1895+
'xpub661MyMwAqRbcH4Fx3W36ddbLfZwHsguhE6x7JxwbX5E1hY8ov9L4CrNfCCQpV8pVK64CVqkhYQ9QLFgkVAUqkRThkTY1R4GiWHNZtAFSVpD',
1896+
)).toBe(true);
1897+
});
18891898
});
18901899

18911900
describe('Verifiable Credential JSON serialization', () => {

‎__test__/creds/fixtures/emailCredentialOld.json

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
2+
{
3+
"@context": [
4+
"https://www.w3.org/2018/credentials/v1",
5+
"https://www.identity.com/credentials/v3"
6+
],
7+
"id": "852854bf-86aa-47a8-8570-6911b439342b",
8+
"identifier": "credential-cvc:Email-v3",
9+
"issuer": "did:sol:tid652xmv91UHLW3HKnQSYMoNYko6FWd8sUEuYF5LPn",
10+
"issuanceDate": "2023-02-02T13:12:39.394Z",
11+
"type": [
12+
"VerifiableCredential",
13+
"IdentityCredential"
14+
],
15+
"credentialSubject": {
16+
"id": "did:sol:QuhsMqH2DTCUSYkCdvE9fcaq7pER7iYd8BRJmdBpwEC",
17+
"contact": {
18+
"email": {
19+
"domain": {
20+
"name": "civic",
21+
"tld": "com"
22+
},
23+
"username": "lucas"
24+
}
25+
}
26+
},
27+
"proof": {
28+
"type": "CvcMerkleProof2018",
29+
"merkleRoot": "0152d816dc649aea82473cdb7467de9eecd6dafb5bc72059d7d92ea012dbf6dd",
30+
"anchor": "TBD (Civic Blockchain Attestation)",
31+
"leaves": [
32+
{
33+
"identifier": "claim-cvc:Contact.email-v1",
34+
"value": "urn:email.domain.name:56a8b5dc58caa0ed416a82eb48cbf7e1dee4449e6a289839037ccf7a79be0f61:civic|urn:email.domain.tld:92c4c27240f59ff2e1cf02e8d34c406f54f9ca3ebd802719354fb5081a9beca5:com|urn:email.username:85018d3234c84b7adc22cfc0682c9610b0ed2e7d2f9fd8d0bc73cc2d823d089a:lucas|",
35+
"claimPath": "contact.email",
36+
"targetHash": "5e9773b0433acea7e150f5d62a716789a1679d7fdc69910b55b0b462811da8ba",
37+
"node": [
38+
{
39+
"right": "2c19051202e3da553836b89f16646fbf718be0d84090484b3840589aeedab66b"
40+
},
41+
{
42+
"right": "e3ef4f46b4f635bac2fab6b779510e97a7d4f1b18374de4089edc9fc4c4a25ed"
43+
},
44+
{
45+
"right": "bd4f9f71c2b6b93e6641e11b781e5188c24641952f9690bba80fc16a66f224c9"
46+
},
47+
{
48+
"right": "7ddd7075dc704b653d1f24cec85114f743e593f88ab6bcb8217434b9bedab489"
49+
},
50+
{
51+
"right": "3c69f2bb8f4c402be9e2522bb1544b56d401b7ddb5fe263f71ee9f89d551ed83"
52+
}
53+
]
54+
},
55+
{
56+
"identifier": "claim-cvc:Email.domain-v1",
57+
"value": "urn:domain.name:56a8b5dc58caa0ed416a82eb48cbf7e1dee4449e6a289839037ccf7a79be0f61:civic|urn:domain.tld:92c4c27240f59ff2e1cf02e8d34c406f54f9ca3ebd802719354fb5081a9beca5:com|",
58+
"claimPath": "contact.email.domain",
59+
"targetHash": "2c19051202e3da553836b89f16646fbf718be0d84090484b3840589aeedab66b",
60+
"node": [
61+
{
62+
"left": "5e9773b0433acea7e150f5d62a716789a1679d7fdc69910b55b0b462811da8ba"
63+
},
64+
{
65+
"right": "e3ef4f46b4f635bac2fab6b779510e97a7d4f1b18374de4089edc9fc4c4a25ed"
66+
},
67+
{
68+
"right": "bd4f9f71c2b6b93e6641e11b781e5188c24641952f9690bba80fc16a66f224c9"
69+
},
70+
{
71+
"right": "7ddd7075dc704b653d1f24cec85114f743e593f88ab6bcb8217434b9bedab489"
72+
},
73+
{
74+
"right": "3c69f2bb8f4c402be9e2522bb1544b56d401b7ddb5fe263f71ee9f89d551ed83"
75+
}
76+
]
77+
},
78+
{
79+
"identifier": "cvc:Meta:issuer",
80+
"value": "urn:issuer:542609fea6749d154bec471a5140a004593f239417a082580e21485312637339:did:sol:tid652xmv91UHLW3HKnQSYMoNYko6FWd8sUEuYF5LPn|",
81+
"claimPath": "meta.issuer",
82+
"targetHash": "82c70faffba5e4507214549dd527c4a1f088ad65cf7cce6d53b83a38dbd6c64e",
83+
"node": [
84+
{
85+
"right": "8c00eea4b9e4ff41013ac92b4bd7e9dd6a21e2a76ed31b930fd9de17325438dd"
86+
},
87+
{
88+
"left": "a8dcbe1accb61ad409b19ff02129bef53df1c10e91b0f762885ccb433c6e7a9f"
89+
},
90+
{
91+
"right": "bd4f9f71c2b6b93e6641e11b781e5188c24641952f9690bba80fc16a66f224c9"
92+
},
93+
{
94+
"right": "7ddd7075dc704b653d1f24cec85114f743e593f88ab6bcb8217434b9bedab489"
95+
},
96+
{
97+
"right": "3c69f2bb8f4c402be9e2522bb1544b56d401b7ddb5fe263f71ee9f89d551ed83"
98+
}
99+
]
100+
},
101+
{
102+
"identifier": "cvc:Meta:issuanceDate",
103+
"value": "urn:issuanceDate:9e1f567c70f07536bcf604a5f03fb9e2fe241871b579fa9757085a00e61d698f:2023-02-02T13:12:39.394Z|",
104+
"claimPath": "meta.issuanceDate",
105+
"targetHash": "8c00eea4b9e4ff41013ac92b4bd7e9dd6a21e2a76ed31b930fd9de17325438dd",
106+
"node": [
107+
{
108+
"left": "82c70faffba5e4507214549dd527c4a1f088ad65cf7cce6d53b83a38dbd6c64e"
109+
},
110+
{
111+
"left": "a8dcbe1accb61ad409b19ff02129bef53df1c10e91b0f762885ccb433c6e7a9f"
112+
},
113+
{
114+
"right": "bd4f9f71c2b6b93e6641e11b781e5188c24641952f9690bba80fc16a66f224c9"
115+
},
116+
{
117+
"right": "7ddd7075dc704b653d1f24cec85114f743e593f88ab6bcb8217434b9bedab489"
118+
},
119+
{
120+
"right": "3c69f2bb8f4c402be9e2522bb1544b56d401b7ddb5fe263f71ee9f89d551ed83"
121+
}
122+
]
123+
},
124+
{
125+
"identifier": "cvc:Meta:expirationDate",
126+
"value": "urn:expirationDate:6b4f012ea5cfce84ca08c49941c64883a8d5955627b35c830a641b3e29ead7e0:null|",
127+
"claimPath": "meta.expirationDate",
128+
"targetHash": "978807d6506bc2748e7976c515df311e247be299b0d7237e3bea0e702b30fc7d",
129+
"node": [
130+
{
131+
"right": "91dfdf2b1a4072f6316c2241d0cbd3b9efc9159f061d23b7f60f0f38bf7b3217"
132+
},
133+
{
134+
"right": "17b28becc9cd28693064fb80120d8fd00e9150337db6d2f1b3b8767326c14274"
135+
},
136+
{
137+
"left": "a92335740e6ad78e0dcd0758459a5b21f9fa62e462803cc939166d9380a590b1"
138+
},
139+
{
140+
"right": "7ddd7075dc704b653d1f24cec85114f743e593f88ab6bcb8217434b9bedab489"
141+
},
142+
{
143+
"right": "3c69f2bb8f4c402be9e2522bb1544b56d401b7ddb5fe263f71ee9f89d551ed83"
144+
}
145+
]
146+
}
147+
],
148+
"merkleRootSignature": {
149+
"signature": "a67f362f6e8ff8c7c11e832d1587c4e0bc22c669f2f3bd69c37603628fbc3db0c40840ffec74a4ce4deafc93980e652dbe7e0c938911d917287cbc0568b64b08",
150+
"verificationMethod": "did:sol:tid652xmv91UHLW3HKnQSYMoNYko6FWd8sUEuYF5LPn#default"
151+
},
152+
"granted": null
153+
}
154+
}

‎audit-ci.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"low": true,
33
"package-manager": "auto",
44
"report": true,
5-
"allowlist": [1086436, 1088664, 1088730, 1088811, 1088828, 1088831, 1088948, 1089128, 1089129, 1089152, 1089185, 1089394, 1089513, 1090135, 1090146, 1090169, 1090170]
6-
}
5+
"allowlist": [1086436, 1088664, 1088730, 1088811, 1088828, 1088831, 1088948, 1089128, 1089129, 1089152, 1089185, 1089394, 1089513, 1090135, 1090146, 1090169, 1090170, 1090532]
6+
}

‎dist/browser/AggregationHandler.js

-1
This file was deleted.

‎dist/browser/SecureRandom.js

-1
This file was deleted.

0 commit comments

Comments
 (0)