Skip to content

Commit

Permalink
merge: develop to main (#98)
Browse files Browse the repository at this point in the history
Co-authored-by: Sai Ranjit Tummalapalli <[email protected]>
Signed-off-by: pallavicoder <[email protected]>
  • Loading branch information
2 people authored and pallavighule committed May 9, 2024
1 parent aa63d2e commit 541fcd4
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 0 deletions.
15 changes: 15 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"validate": "yarn lint && yarn check-types && yarn check-format"
},
"dependencies": {
<<<<<<< HEAD
"@ayanworks/credo-polygon-w3c-module": "0.0.2-alpha.8",
"@credo-ts/anoncreds": "0.5.3",
"@credo-ts/askar": "0.5.3",
Expand All @@ -49,6 +50,20 @@
"@hyperledger/anoncreds-nodejs": "0.2.2",
"@hyperledger/aries-askar-nodejs": "0.2.1",
"@hyperledger/indy-vdr-nodejs": "0.2.2",
=======
"@ayanworks/credo-polygon-w3c-module": "0.0.2-alpha.7",
"@credo-ts/anoncreds": "0.5.1",
"@credo-ts/askar": "0.5.1",
"@credo-ts/core": "0.5.1",
"@credo-ts/indy-vdr": "0.5.1",
"@credo-ts/node": "0.5.1",
"@credo-ts/push-notifications": "^0.7.0",
"@credo-ts/question-answer": "0.5.1",
"@credo-ts/tenants": "0.5.1",
"@hyperledger/anoncreds-nodejs": "0.2.1",
"@hyperledger/aries-askar-nodejs": "0.2.0",
"@hyperledger/indy-vdr-nodejs": "0.2.0",
>>>>>>> 81e66a3... merge: develop to main (#98)
"@tsoa/runtime": "^6.0.0",
"@types/node-fetch": "^2.6.4",
"@types/ref-struct-di": "^1.1.9",
Expand Down
114 changes: 114 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
dependencies:
static-eval "2.0.2"

<<<<<<< HEAD
"@ayanworks/[email protected]":
version "0.0.2-alpha.8"
resolved "https://registry.yarnpkg.com/@ayanworks/credo-polygon-w3c-module/-/credo-polygon-w3c-module-0.0.2-alpha.8.tgz#1d9f38cde0ba7ef2c09c805e390eab5928147c1c"
Expand All @@ -70,6 +71,29 @@
"@ayanworks/polygon-did-registry-contract" "2.0.1-alpha.4"
"@ayanworks/polygon-did-resolver" "^0.0.16-alpha.13"
"@credo-ts/core" "0.5.3"
=======
"@ayanworks/[email protected]":
version "0.0.2-alpha.7"
resolved "https://registry.yarnpkg.com/@ayanworks/credo-polygon-w3c-module/-/credo-polygon-w3c-module-0.0.2-alpha.7.tgz#003e09a4249a4618da914d3504ffafb522c74133"
integrity sha512-AK9rBqFYUvV8/VaD/X7b+/simfasbPuUgJCi1L1V4SIc2lJhJ2cxaI8OdEv5V1xBytmBdSC+THfSaKg0py3QRA==
dependencies:
"@ayanworks/polygon-did-registrar" "0.0.16-alpha.16"
"@ayanworks/polygon-did-resolver" "0.0.16-alpha.11"
"@ayanworks/polygon-schema-manager" "0.0.2-alpha.6"
"@credo-ts/askar" "0.5.1"
"@credo-ts/core" "0.5.1"
did-resolver "^4.1.0"
ethers "^6.9.0"

"@ayanworks/[email protected]":
version "0.0.16-alpha.16"
resolved "https://registry.yarnpkg.com/@ayanworks/polygon-did-registrar/-/polygon-did-registrar-0.0.16-alpha.16.tgz#8467412a8138ffb8b2305bf4ea7914a4ce979267"
integrity sha512-q3Y1bzeHmCAxRpbA6rXKaO9CQhLjlP4aMZuJxYiiicPlQ6plkRt+Icxdp1ozsCEcMouj3l4E5kgzjK48bhOxrw==
dependencies:
"@ayanworks/polygon-did-registry-contract" "2.0.1-alpha.3"
"@ayanworks/polygon-did-resolver" "^0.0.16-alpha.11"
"@credo-ts/core" "0.5.1"
>>>>>>> 81e66a3... merge: develop to main (#98)
"@ethersproject/basex" "^5.7.0"
"@ethersproject/signing-key" "^5.7.0"
"@ethersproject/transactions" "^5.7.0"
Expand All @@ -83,22 +107,39 @@
resolved "https://registry.yarnpkg.com/@ayanworks/polygon-did-registry-contract/-/polygon-did-registry-contract-2.0.1-alpha.4.tgz#5691d61f322959201813fe7ff2bd2234c8e7af72"
integrity sha512-a35EtcPyLyKjq0y0uqi7uHXPeoMMSoC2oai88xY2PlLV9avQwyCIOaVsIKcuKdJaPWPmFQaeU5S7iY/pfVguWQ==

<<<<<<< HEAD
"@ayanworks/[email protected]", "@ayanworks/polygon-did-resolver@^0.0.16-alpha.13":
version "0.0.16-alpha.13"
resolved "https://registry.yarnpkg.com/@ayanworks/polygon-did-resolver/-/polygon-did-resolver-0.0.16-alpha.13.tgz#24a0e0c674dde0d64fa5f4767c5368f791abbab3"
integrity sha512-8SRDPQpX/AU1xfmH2O7DzqeDtPdE1FA3z7ONp/v1xvP1h00GU2nKie4jeWHipCVfJOInEmiJbl0FIKFcviERsA==
=======
"@ayanworks/[email protected]", "@ayanworks/polygon-did-resolver@^0.0.16-alpha.11":
version "0.0.16-alpha.11"
resolved "https://registry.yarnpkg.com/@ayanworks/polygon-did-resolver/-/polygon-did-resolver-0.0.16-alpha.11.tgz#fe115f9a63eea5e0604712549e9c573dcef7d55c"
integrity sha512-rQ6iVz0uht/hLkYA29E2iHN7xW0EusG6ognndBJF0QUxuPBB2kbmcr/4kW1E1m8FJLPvmEX/ed5v0pbBnGSJwA==
>>>>>>> 81e66a3... merge: develop to main (#98)
dependencies:
"@ayanworks/polygon-did-registry-contract" "2.0.1-alpha.4"
did-resolver "^4.1.0"
ethers "^5.1.0"

<<<<<<< HEAD
"@ayanworks/[email protected]":
version "0.0.2-alpha.7"
resolved "https://registry.yarnpkg.com/@ayanworks/polygon-schema-manager/-/polygon-schema-manager-0.0.2-alpha.7.tgz#79b975e7f6524d86030b4a38453ea5c33079882a"
integrity sha512-XKHgvh7IT0pUuypeoPuf2pcSUlvpezjDTLie4ayncPWb1FI5drS6RvtiiHvZ2HTVQU7/PBldM6lCNLt4kvnV6A==
dependencies:
"@ayanworks/polygon-did-registry-contract" "2.0.1-alpha.4"
"@ayanworks/polygon-did-resolver" "^0.0.16-alpha.13"
=======
"@ayanworks/[email protected]":
version "0.0.2-alpha.6"
resolved "https://registry.yarnpkg.com/@ayanworks/polygon-schema-manager/-/polygon-schema-manager-0.0.2-alpha.6.tgz#a872afc1166e39561dba63f0ba83f898376bb874"
integrity sha512-H8W0eS//Q3eDCiwtEqfqPhGW3bRLWOkJU1EYOuiwZGaIuZb4kWbYqAGdgl0s5g0ZP1rjirk4Ztx1w10cWqsZWw==
dependencies:
"@ayanworks/polygon-did-registry-contract" "2.0.1-alpha.3"
"@ayanworks/polygon-did-resolver" "^0.0.16-alpha.11"
>>>>>>> 81e66a3... merge: develop to main (#98)
"@nomicfoundation/hardhat-verify" "^2.0.3"
axios "^1.6.3"
did-resolver "^4.1.0"
Expand Down Expand Up @@ -603,6 +644,7 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"@credo-ts/[email protected]":
Expand Down Expand Up @@ -630,12 +672,22 @@
"@astronautlabs/jsonpath" "^1.1.2"
"@credo-ts/core" "0.5.1"
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
"@credo-ts/[email protected]":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@credo-ts/anoncreds/-/anoncreds-0.5.1.tgz#d1ba19e5764e1de5982a0a7e51cd5bc1badce6ad"
integrity sha512-d97wELxvt7jOqgr21FOVfFqHFSu487L+qF0QObOVCl9xElsST9sYl1iaRPHHW2GzYUMWLlnSwZm8fN4pLo9UVA==
dependencies:
"@astronautlabs/jsonpath" "^1.1.2"
"@credo-ts/core" "0.5.1"
>>>>>>> 81e66a3... merge: develop to main (#98)
big-integer "^1.6.51"
bn.js "^5.2.1"
class-transformer "0.5.1"
class-validator "0.14.1"
reflect-metadata "^0.1.13"

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"@credo-ts/[email protected]":
Expand All @@ -660,12 +712,21 @@
dependencies:
"@credo-ts/core" "0.5.1"
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
"@credo-ts/[email protected]":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@credo-ts/askar/-/askar-0.5.1.tgz#107d2f91f6afecb77fc7f24556725ec0e7597989"
integrity sha512-O3XWnmpnEe5U/a0kGQHigzXPw6/SXKp2v4ob3DJdHA0kiK3DywANNeG/Hw44lxdg24nNpizmVlO5EjRa6ULcmw==
dependencies:
"@credo-ts/core" "0.5.1"
>>>>>>> 81e66a3... merge: develop to main (#98)
bn.js "^5.2.1"
class-transformer "0.5.1"
class-validator "0.14.1"
rxjs "^7.8.0"
tsyringe "^4.8.0"

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"@credo-ts/[email protected]":
Expand All @@ -679,11 +740,16 @@
integrity sha512-7SJBgs1yd2gpwv8BnCO+U63Uu06v6Cxzg+ypWpqyNkkG4nTsQZSI8r0oSQ+DgbiqwN/AZKsn9HuNISFftf5yKQ==
>>>>>>> 1374790... feat: upgrade credo to 0.5.0 (#78)
=======
=======
>>>>>>> 81e66a3... merge: develop to main (#98)
"@credo-ts/[email protected]":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@credo-ts/core/-/core-0.5.1.tgz#bb38e2f5451753cea1d3a73b1d407255af02c4ed"
integrity sha512-ywwFw6wwiMft3A994Y91LAm8CrEg2G7CJQRyLD8UzneU4coMWZTeED63thAEX6XK/tyDmv2MAcrO04hE3KQPcA==
<<<<<<< HEAD
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
>>>>>>> 81e66a3... merge: develop to main (#98)
dependencies:
"@digitalcredentials/jsonld" "^6.0.0"
"@digitalcredentials/jsonld-signatures" "^9.4.0"
Expand Down Expand Up @@ -727,6 +793,7 @@
varint "^6.0.0"
web-did-resolver "^2.0.21"

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"@credo-ts/[email protected]":
Expand All @@ -751,11 +818,16 @@
resolved "https://registry.yarnpkg.com/@credo-ts/indy-vdr/-/indy-vdr-0.5.0.tgz#1799b2a90599d000a43c5dc59e7bd1e1eda68fe1"
integrity sha512-hW7xDdL6fVIgTIclmJRfVz3mlpo87Cwk6hCiRY1/lWV62bsKs6RHGLv6RUp+WPwTIpPpbBs6T1Dm85ditBbxpA==
=======
=======
>>>>>>> 81e66a3... merge: develop to main (#98)
"@credo-ts/[email protected]":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@credo-ts/indy-vdr/-/indy-vdr-0.5.1.tgz#1fe4719235f3e586e770e57aa46bba7182d53c10"
integrity sha512-pXRAKzLlwijaNaCOPheV9dHeZm0FAfiJw9kYEvpjBn+d/ARygb92kr9lJizUGK3cPtF9dbhrNBuLWwskM39fCw==
<<<<<<< HEAD
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
>>>>>>> 81e66a3... merge: develop to main (#98)
dependencies:
"@credo-ts/anoncreds" "0.5.1"
"@credo-ts/core" "0.5.1"
Expand All @@ -767,12 +839,16 @@
dependencies:
"@2060.io/ffi-napi" "^4.0.8"
"@2060.io/ref-napi" "^3.0.6"
<<<<<<< HEAD
<<<<<<< HEAD
"@credo-ts/core" "0.5.0"
>>>>>>> 1374790... feat: upgrade credo to 0.5.0 (#78)
=======
"@credo-ts/core" "0.5.1"
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
"@credo-ts/core" "0.5.1"
>>>>>>> 81e66a3... merge: develop to main (#98)
"@types/express" "^4.17.15"
express "^4.17.1"
ws "^8.13.0"
Expand All @@ -786,6 +862,7 @@
class-validator "0.14.1"
tsyringe "^4.6.0"

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"@credo-ts/[email protected]":
Expand All @@ -810,10 +887,19 @@
dependencies:
"@credo-ts/core" "0.5.1"
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
"@credo-ts/[email protected]":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@credo-ts/question-answer/-/question-answer-0.5.1.tgz#538dbfec8fc866de188c11ede9860bf0ef712937"
integrity sha512-yPjOl3tUfK5GT9BvX70hiTq86Fi5WTxB0pL42e17evq7+puBOMqhwQ1nv7dhDSWC2Oy+r0D0mF7Lz2hGulrJJg==
dependencies:
"@credo-ts/core" "0.5.1"
>>>>>>> 81e66a3... merge: develop to main (#98)
class-transformer "0.5.1"
class-validator "0.14.1"
rxjs "^7.8.0"

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"@credo-ts/[email protected]":
Expand All @@ -838,6 +924,14 @@
dependencies:
"@credo-ts/core" "0.5.1"
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
"@credo-ts/[email protected]":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@credo-ts/tenants/-/tenants-0.5.1.tgz#63ca79eb0a6c7d4bdf43ea00ed712d7399c25421"
integrity sha512-+wJ+Wd3rThY6eP9e3WYFeFlJKQEUrmJPhN5t+vr4zyhB5T7pM5Nsg53pzugWoCeWsMUNCqmHo12Tc9edQTH0bg==
dependencies:
"@credo-ts/core" "0.5.1"
>>>>>>> 81e66a3... merge: develop to main (#98)
async-mutex "^0.4.0"

"@cspotcode/source-map-support@^0.8.0":
Expand Down Expand Up @@ -2010,6 +2104,23 @@
buffer "*"
>>>>>>> 1374790... feat: upgrade credo to 0.5.0 (#78)

"@sideway/address@^4.1.5":
version "4.1.5"
resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
dependencies:
"@hapi/hoek" "^9.0.0"

"@sideway/formula@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==

"@sideway/pinpoint@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==

"@sideway/address@^4.1.5":
version "4.1.5"
resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
Expand Down Expand Up @@ -5901,6 +6012,7 @@ joi@^17.12.3:
"@sideway/formula" "^3.0.1"
"@sideway/pinpoint" "^2.0.0"

<<<<<<< HEAD
<<<<<<< HEAD
js-base64@^3.7.6:
version "3.7.7"
Expand All @@ -5909,6 +6021,8 @@ js-base64@^3.7.6:

=======
>>>>>>> 5dc99ac... feat: migrated to amoy (#96)
=======
>>>>>>> 81e66a3... merge: develop to main (#98)
[email protected]:
version "0.8.0"
resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
Expand Down

0 comments on commit 541fcd4

Please sign in to comment.