Skip to content

Commit

Permalink
chore: update Veramo and Iden3 libs (#627)
Browse files Browse the repository at this point in the history
  • Loading branch information
martines3000 authored Apr 22, 2024
1 parent 3f6d73e commit 160d322
Show file tree
Hide file tree
Showing 50 changed files with 949 additions and 1,797 deletions.
5 changes: 5 additions & 0 deletions .changeset/cold-deers-allow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/oidc-client-plugin": minor
---

Update Veramo libraries.
5 changes: 5 additions & 0 deletions .changeset/cyan-ravens-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/utils": minor
---

Update Veramo libraries.
5 changes: 5 additions & 0 deletions .changeset/five-goats-stare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/extended-verification": minor
---

Update Veramo libraries.
5 changes: 5 additions & 0 deletions .changeset/funny-tools-flow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/dapp": minor
---

Update Veramo libraries.
5 changes: 5 additions & 0 deletions .changeset/grumpy-drinks-mix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/did-provider-key": minor
---

Update Veramo libraries.
5 changes: 5 additions & 0 deletions .changeset/late-radios-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/masca-types": minor
---

Update Veramo libraries.
7 changes: 7 additions & 0 deletions .changeset/lemon-bears-lay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@blockchain-lab-um/masca-connector": minor
"@blockchain-lab-um/masca-types": minor
"@blockchain-lab-um/masca": minor
---

Deprecate Polygon Mumbai and add support for Polygon Amoy.
5 changes: 5 additions & 0 deletions .changeset/metal-carrots-try.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/oidc-types": minor
---

Update Veramo libraries.
5 changes: 5 additions & 0 deletions .changeset/poor-walls-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/masca": patch
---

Update Veramo and iden3 libraries
5 changes: 5 additions & 0 deletions .changeset/sixty-students-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/masca-connector": minor
---

Update Veramo libraries.
5 changes: 5 additions & 0 deletions .changeset/swift-roses-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/veramo-datamanager": minor
---

Update Veramo libraries.
16 changes: 8 additions & 8 deletions libs/did-provider-key/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
"@blockchain-lab-um/utils": "1.3.8",
"@cef-ebsi/key-did-resolver": "^2.0.0",
"@stablelib/ed25519": "^1.0.3",
"@veramo/core": "5.6.1-next.57",
"@veramo/did-manager": "5.6.1-next.57",
"@veramo/core": "6.0.0",
"@veramo/did-manager": "6.0.0",
"did-resolver": "4.1.0"
},
"devDependencies": {
"@veramo/core-types": "5.6.1-next.57",
"@veramo/credential-w3c": "5.6.1-next.57",
"@veramo/data-store": "5.6.1-next.57",
"@veramo/did-resolver": "5.6.1-next.57",
"@veramo/key-manager": "5.6.1-next.57",
"@veramo/kms-local": "5.6.1-next.57",
"@veramo/core-types": "6.0.0",
"@veramo/credential-w3c": "6.0.0",
"@veramo/data-store": "6.0.0",
"@veramo/did-resolver": "6.0.0",
"@veramo/key-manager": "6.0.0",
"@veramo/kms-local": "6.0.0",
"@vitest/coverage-v8": "1.3.1",
"better-sqlite3": "^9.4.3",
"jest-extended": "4.0.2",
Expand Down
24 changes: 12 additions & 12 deletions libs/extended-verification/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@
"@blockchain-lab-um/did-provider-key": "1.0.8",
"@blockchain-lab-um/masca-types": "1.3.2",
"@blockchain-lab-um/utils": "1.3.8",
"@veramo/core": "5.6.0",
"@veramo/credential-eip712": "5.6.0",
"@veramo/credential-status": "5.4.1",
"@veramo/credential-w3c": "5.6.0",
"@veramo/did-provider-jwk": "5.6.0",
"@veramo/did-provider-pkh": "5.6.0",
"@veramo/did-resolver": "5.6.0",
"@veramo/utils": "5.6.0",
"@veramo/core": "6.0.0",
"@veramo/credential-eip712": "6.0.0",
"@veramo/credential-status": "6.0.0",
"@veramo/credential-w3c": "6.0.0",
"@veramo/did-provider-jwk": "6.0.0",
"@veramo/did-provider-pkh": "6.0.0",
"@veramo/did-resolver": "6.0.0",
"@veramo/utils": "6.0.0",
"did-jwt-vc": "^4.0.0",
"did-resolver": "4.1.0",
"ens-did-resolver": "^1.0.4",
"ethers": "^6.11.1",
"ethr-did-resolver": "10.1.3"
},
"devDependencies": {
"@veramo/did-manager": "5.6.0",
"@veramo/did-provider-ethr": "5.6.0",
"@veramo/key-manager": "5.6.0",
"@veramo/kms-local": "5.6.0",
"@veramo/did-manager": "6.0.0",
"@veramo/did-provider-ethr": "6.0.0",
"@veramo/key-manager": "6.0.0",
"@veramo/kms-local": "6.0.0",
"@vitest/coverage-v8": "1.3.1",
"desm": "^1.3.1",
"did-jwt": "^8.0.1",
Expand Down
4 changes: 2 additions & 2 deletions libs/oidc/client-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@blockchain-lab-um/oidc-types": "0.0.8",
"@blockchain-lab-um/utils": "1.3.8",
"@sphereon/pex": "^2.0.1",
"@veramo/core": "5.6.1-next.57",
"@veramo/utils": "5.6.1-next.57",
"@veramo/core": "6.0.0",
"@veramo/utils": "6.0.0",
"cross-fetch": "^4.0.0",
"ethereum-cryptography": "^2.1.3",
"jose": "^5.2.2",
Expand Down
2 changes: 1 addition & 1 deletion libs/oidc/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lint:fix": "biome check --apply ."
},
"dependencies": {
"@veramo/core": "5.6.1-next.57"
"@veramo/core": "6.0.0"
},
"devDependencies": {
"tsup": "^8.0.2"
Expand Down
2 changes: 1 addition & 1 deletion libs/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"lint:fix": "biome check --apply ."
},
"dependencies": {
"@veramo/utils": "5.6.1-next.57",
"@veramo/utils": "6.0.0",
"did-resolver": "4.1.0",
"elliptic": "^6.5.5",
"multiformats": "13.1.0",
Expand Down
7 changes: 1 addition & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,10 @@
"cross-fetch@4.0.0": "patches/cross-fetch@4.0.0.patch",
"@ceramicnetwork/common@2.30.0": "patches/@ceramicnetwork__common@2.30.0.patch",
"@changesets/assemble-release-plan@6.0.0": "patches/@changesets__assemble-release-plan@6.0.0.patch",
"@iden3/js-iden3-core@1.2.1": "patches/@iden3__js-iden3-core@1.2.1.patch",
"@iden3/js-crypto@1.0.3": "patches/@iden3__js-crypto@1.0.3.patch",
"@iden3/js-jwz@1.3.0": "patches/@iden3__js-jwz@1.3.0.patch",
"@iden3/js-merkletree@1.1.2": "patches/@iden3__js-merkletree@1.1.2.patch",
"ffjavascript@0.2.63": "patches/ffjavascript@0.2.63.patch",
"did-jwt@6.11.6": "patches/did-jwt@6.11.6.patch",
"web-worker@1.3.0": "patches/web-worker@1.3.0.patch",
"@iden3/js-jsonld-merklization@1.1.2": "patches/@iden3__js-jsonld-merklization@1.1.2.patch",
"@metamask/snaps-sdk@3.2.0": "patches/@metamask__snaps-sdk@3.2.0.patch"
"@iden3/js-jsonld-merklization@1.2.0": "patches/@iden3__js-jsonld-merklization@1.2.0.patch"
},
"allowNonAppliedPatches": false
}
Expand Down
4 changes: 2 additions & 2 deletions packages/connector/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
"@blockchain-lab-um/masca-types": "1.3.2",
"@blockchain-lab-um/utils": "1.3.8",
"@didtools/pkh-ethereum": "0.4.0",
"@veramo/core": "5.6.1-next.57",
"@veramo/core": "6.0.0",
"did-session": "2.0.1",
"eip-712-types-generation": "^0.1.6",
"mipd": "^0.0.5",
"viem": "^2.7.20"
"viem": "^2.9.23"
},
"devDependencies": {
"esbuild-loader": "^4.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp/.example
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MAINNET_RPC_URL=
SEPOLIA_RPC_URL=
IPFS_GATEWAY=
POLYGON_RPC_URL=
POLYGON_MUMBAI_RPC_URL=
POLYGON_AMOY_RPC_URL=

# Campaign Issuer
CAMPAIGN_ISSUER_DID=did:ens:mainnet:masca.eth
Expand Down
24 changes: 12 additions & 12 deletions packages/dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
"@types/dompurify": "^3.0.5",
"@types/js-cookie": "^3.0.6",
"@types/jsdom": "^21.1.6",
"@veramo/core": "5.6.1-next.57",
"@veramo/credential-eip712": "5.6.1-next.57",
"@veramo/credential-w3c": "5.6.1-next.57",
"@veramo/did-manager": "5.6.1-next.57",
"@veramo/did-provider-ethr": "5.6.1-next.57",
"@veramo/did-provider-pkh": "5.6.1-next.57",
"@veramo/did-resolver": "5.6.1-next.57",
"@veramo/key-manager": "5.6.1-next.57",
"@veramo/kms-local": "5.6.1-next.57",
"@veramo/utils": "5.6.1-next.57",
"@veramo/core": "6.0.0",
"@veramo/credential-eip712": "6.0.0",
"@veramo/credential-w3c": "6.0.0",
"@veramo/did-manager": "6.0.0",
"@veramo/did-provider-ethr": "6.0.0",
"@veramo/did-provider-pkh": "6.0.0",
"@veramo/did-resolver": "6.0.0",
"@veramo/key-manager": "6.0.0",
"@veramo/kms-local": "6.0.0",
"@veramo/utils": "6.0.0",
"@vercel/analytics": "^1.2.2",
"@vercel/og": "^0.6.2",
"clsx": "^2.1.0",
Expand Down Expand Up @@ -78,8 +78,8 @@
"siwe": "^2.1.4",
"swr": "^2.2.5",
"tailwind-scrollbar": "^3.1.0",
"viem": "^2.7.20",
"wagmi": "^2.5.7",
"viem": "^2.9.23",
"wagmi": "^2.5.20",
"zustand": "^4.5.2"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/dapp/src/config/wagmiConfig.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { http, createConfig } from 'wagmi';
import { mainnet, polygon, polygonMumbai, sepolia } from 'wagmi/chains';
import { mainnet, polygon, polygonAmoy, sepolia } from 'wagmi/chains';
import { injected } from 'wagmi/connectors';

export const config = createConfig({
chains: [mainnet, sepolia, polygon, polygonMumbai],
chains: [mainnet, sepolia, polygon, polygonAmoy],
connectors: [injected({ target: 'metaMask' })],
ssr: true,
transports: {
[mainnet.id]: http(),
[sepolia.id]: http(),
[polygon.id]: http(),
[polygonMumbai.id]: http(),
[polygonAmoy.id]: http(),
},
});
6 changes: 3 additions & 3 deletions packages/dapp/src/utils/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ export const NETWORKS: Record<string, string> = {
'0x1': 'Ethereum',
'0xaa36a7': 'Sepolia',
'0x89': 'Polygon',
'0x13881': 'Polygon Mumbai',
'0x13882': 'Polygon Amoy',
};

export const NETWORKS_BY_DID: Record<string, string[]> = {
'did:ethr': ['*'],
'did:pkh': ['0x1', '0x89'],
'did:ens': ['0x1'],
'did:polygonid': ['0x1', '0x89', '0x13881'],
'did:iden3': ['0x1', '0x89', '0x13881'],
'did:polygonid': ['0x89', '0x13882'],
'did:iden3': ['0x89', '0x13882'],
};

export function getAvailableNetworksList(method: string): string[] {
Expand Down
2 changes: 1 addition & 1 deletion packages/datamanager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test:ci": "pnpm run test"
},
"dependencies": {
"@veramo/core": "5.6.1-next.57",
"@veramo/core": "6.0.0",
"jsonpath": "^1.1.1",
"uuid": "^9.0.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/docs/integrate-masca/polygonid.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This part handles credential offers, which are received from Polygon ID issuers.
// The credential offer received from a Polygon ID issuer
// The credential offer is a JSON string
const credentialOffer: string =
'{"body":{"credentials":[{"description":"KYCAgeCredential","id":"348a8620-40fd-11ee-beda-0242ac1d0006"}],"url":"https://dev.polygonid.me/api/v1/agent"},"from":"did:polygonid:polygon:mumbai:2qLPqvayNQz9TA2r5VPxUugoF18teGU583zJ859wfy","id":"3a0fbba4-601c-4773-baca-0b8f0cfc7f43","thid":"3a0fbba4-601c-4773-baca-0b8f0cfc7f43","to":"did:polygonid:polygon:main:2q6KWUhghmPGRuh8GFMzDX3EYp1WVspWN9ZdQEk4D2","typ":"application/iden3comm-plain-json","type":"https://iden3-communication.io/credentials/1.0/offer"}';
'{"body":{"credentials":[{"description":"KYCAgeCredential","id":"348a8620-40fd-11ee-beda-0242ac1d0006"}],"url":"https://dev.polygonid.me/api/v1/agent"},"from":"did:polygonid:polygon:amoy:2qLPqvayNQz9TA2r5VPxUugoF18teGU583zJ859wfy","id":"3a0fbba4-601c-4773-baca-0b8f0cfc7f43","thid":"3a0fbba4-601c-4773-baca-0b8f0cfc7f43","to":"did:polygonid:polygon:main:2q6KWUhghmPGRuh8GFMzDX3EYp1WVspWN9ZdQEk4D2","typ":"application/iden3comm-plain-json","type":"https://iden3-communication.io/credentials/1.0/offer"}';

const handleCredentialOfferResponse = api.handleCredentialOffer({
credentialOffer,
Expand Down Expand Up @@ -48,7 +48,7 @@ This part handles authorization requests, which are received from Polygon ID ver
// The authorization request received from a Polygon ID verifier
// The authorization request is a JSON string
const authorizationRequest: string =
'{"body":{"callbackUrl":"https://issuer-v2.polygonid.me/api/callback?sessionId=334944","reason":"test flow","scope":[]},"from":"did:polygonid:polygon:mumbai:2qLPqvayNQz9TA2r5VPxUugoF18teGU583zJ859wfy","id":"ea786170-f45f-4f13-b631-c4a7bbc03905","thid":"ea786170-f45f-4f13-b631-c4a7bbc03905","typ":"application/iden3comm-plain-json","type":"https://iden3-communication.io/authorization/1.0/request"}';
'{"body":{"callbackUrl":"https://issuer-v2.polygonid.me/api/callback?sessionId=334944","reason":"test flow","scope":[]},"from":"did:polygonid:polygon:amoy:2qLPqvayNQz9TA2r5VPxUugoF18teGU583zJ859wfy","id":"ea786170-f45f-4f13-b631-c4a7bbc03905","thid":"ea786170-f45f-4f13-b631-c4a7bbc03905","typ":"application/iden3comm-plain-json","type":"https://iden3-communication.io/authorization/1.0/request"}';

const handleAuthorizationRequestResponse = api.handleAuthorizationRequest({
authorizationRequest,
Expand Down
36 changes: 18 additions & 18 deletions packages/snap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"test:debug": "cross-env IS_TESTING=true cross-env NODE_NO_WARNINGS=1 vitest --inspect-brk --pool threads --poolOptions.threads.singleThread --poolOptions.threads.isolate false"
},
"dependencies": {
"@0xpolygonid/js-sdk": "1.9.4",
"@0xpolygonid/js-sdk": "1.10.4",
"@blockchain-lab-um/did-provider-key": "1.0.8",
"@blockchain-lab-um/extended-verification": "0.1.2",
"@blockchain-lab-um/masca-types": "1.3.2",
Expand All @@ -64,26 +64,26 @@
"@blockchain-lab-um/veramo-datamanager": "1.0.2",
"@ceramicnetwork/http-client": "2.27.0",
"@glazed/did-datastore": "0.3.2",
"@iden3/js-iden3-core": "1.2.1",
"@iden3/js-jwz": "1.3.0",
"@iden3/js-merkletree": "1.1.2",
"@iden3/js-iden3-core": "1.3.1",
"@iden3/js-jwz": "1.4.0",
"@iden3/js-merkletree": "1.2.0",
"@metamask/key-tree": "^9.0.0",
"@metamask/providers": "14.0.2",
"@metamask/snaps-sdk": "3.2.0",
"@metamask/utils": "^8.2.1",
"@veramo/core": "5.6.1-next.57",
"@veramo/credential-eip712": "5.6.1-next.57",
"@veramo/credential-ld": "5.6.1-next.57",
"@veramo/credential-status": "5.6.1-next.57",
"@veramo/credential-w3c": "5.6.1-next.57",
"@veramo/did-manager": "5.6.1-next.57",
"@veramo/did-provider-ethr": "5.6.1-next.57",
"@veramo/did-provider-jwk": "5.6.1-next.57",
"@veramo/did-provider-pkh": "5.6.1-next.57",
"@veramo/did-resolver": "5.6.1-next.57",
"@veramo/key-manager": "5.6.1-next.57",
"@veramo/kms-local": "5.6.1-next.57",
"@veramo/utils": "5.6.1-next.57",
"@veramo/core": "6.0.0",
"@veramo/credential-eip712": "6.0.0",
"@veramo/credential-ld": "6.0.0",
"@veramo/credential-status": "6.0.0",
"@veramo/credential-w3c": "6.0.0",
"@veramo/did-manager": "6.0.0",
"@veramo/did-provider-ethr": "6.0.0",
"@veramo/did-provider-jwk": "6.0.0",
"@veramo/did-provider-pkh": "6.0.0",
"@veramo/did-resolver": "6.0.0",
"@veramo/key-manager": "6.0.0",
"@veramo/kms-local": "6.0.0",
"@veramo/utils": "6.0.0",
"did-jwt-vc": "3.2.13",
"did-resolver": "4.1.0",
"did-session": "2.0.1",
Expand All @@ -97,7 +97,7 @@
"lodash.clonedeep": "^4.5.0",
"multiformats": "^13.1.0",
"qs": "^6.11.2",
"viem": "^2.7.20"
"viem": "^2.9.23"
},
"devDependencies": {
"@ceramicnetwork/streamid": "2.17.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/snap/snap.manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"./files/circuits/credentialAtomicQuerySigV2/circuit_final.zkey",
"./files/circuits/credentialAtomicQuerySigV2/verification_key.json"
],
"shasum": "kqzTcg3I/aUg/O0tRt8kBvQHnP6f/GeTJNCJK6q2fDk="
"shasum": "nJD8ZmvsKsRpincDU6YiKWIBAI0PCtt5pEqLhbFPesw="
},
"initialPermissions": {
"endowment:ethereum-provider": {},
Expand Down
Loading

0 comments on commit 160d322

Please sign in to comment.