Skip to content

Commit

Permalink
Merge branch 'master' into feature/ATL-5398.2
Browse files Browse the repository at this point in the history
* master:
  chore(release): release 2.3.0 # [2.3.0](v2.2.0...v2.3.0) (2023-08-28)
  feat(Mercury): adding return_route: all to didcomm Message (#80)
  fix(docs): Add static reference to the docs. (#82)
  chore(release): release 2.2.0 # [2.2.0](v2.1.0...v2.2.0) (2023-08-23)
  test: update github pipelines (#77)
  • Loading branch information
elribonazo committed Aug 30, 2023
2 parents fc1f5ca + afcb0b4 commit 8f72a8b
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 29 deletions.
19 changes: 15 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ concurrency:
cancel-in-progress: true
on:
pull_request:
push:
branches:
- "master"

Expand Down Expand Up @@ -40,7 +39,19 @@ jobs:
- name: Build
run: npm run build

- name: Publish coverage
uses: ArtiomTr/jest-coverage-report-action@v2
- name: Run coverage test
run: npm run coverage

- name: Jest Coverage Comment
uses: MishaKav/[email protected]
with:
coverage-summary-path: coverage/coverage-summary.json
junitxml-path: coverage/junit.xml
junitxml-title: JUnit

- name: Publish lcov report
uses: actions/upload-artifact@v3
with:
threshold: 30
name: lcov-report.zip
path: coverage/lcov-report
if-no-files-found: error
7 changes: 5 additions & 2 deletions .releaserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@ plugins:
'package.json',
'package-lock.json',
'CHANGELOG.md',
'integration-tests/e2e-tests/**/*'
'integration-tests/e2e-tests/package.json',
'integration-tests/e2e-tests/yarn.lock'
],
message: 'chore(release): release ${nextRelease.version}\n\n${nextRelease.notes}'
message: 'chore(release): release ${nextRelease.version}
${nextRelease.notes}'
}
]
- [ "semantic-release-slack-bot",
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
# [2.3.0](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/compare/v2.2.0...v2.3.0) (2023-08-28)


### Bug Fixes

* **docs:** Add static reference to the docs. ([#82](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/issues/82)) ([3dda29d](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/commit/3dda29d13efd2c44f9d87ffa1ab3c7467e5a8088))


### Features

* **Mercury:** adding return_route: all to didcomm Message ([#80](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/issues/80)) ([1972a9e](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/commit/1972a9e708bbad5a2d39fcd5763f46bba5313d1a))

# [2.2.0](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/compare/v2.1.0...v2.2.0) (2023-08-23)


### Bug Fixes

* **Pluto:** encoding / decoding PrivateKeys ([#78](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/issues/78)) ([b9133ac](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/commit/b9133acbcb9cbd883fffec05feb58ecbe24600fc))


### Features

* **Castor:** extending createPrismDID to accept a KeyPair or PublicKey ([#70](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/issues/70)) ([d06871c](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/commit/d06871caadaf1b1f43cedfb1390ea58558b3fce8))
* **Demo:** Update Mediator DID for demo apps ([#73](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/issues/73)) ([7f3c98e](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/commit/7f3c98ec77d2cd8cf862d91515c139ff76270f03))

# [2.1.0](https://github.com/input-output-hk/atala-prism-wallet-sdk-ts/compare/v2.0.3...v2.1.0) (2023-08-17)


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ To run Node.js demo app, run `npm run dev:node` to build the demo app and then r

2. To see how the step by steps examples can guide you refer to each section inside docs folder, Apollo, Castor, Pollux, Mercury, Pluto, Agent

3. Jump straight into the [SDK-REFERENCE](modules.html)
3. Jump straight into the [SDK-REFERENCE](https://input-output-hk.github.io/atala-prism-wallet-sdk-ts/modules.html)
2 changes: 1 addition & 1 deletion integration-tests/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"homepage": "https://github.com/amagyar-iohk/atala-prism-wallet-sdk-ts-e2e#readme",
"dependencies": {
"@cucumber/cucumber": "^9.3.0",
"@input-output-hk/atala-prism-wallet-sdk": "^2.1.0",
"@input-output-hk/atala-prism-wallet-sdk": "^2.3.0",
"@input-output-hk/prism-typescript-client": "^1.9.2",
"@serenity-js/assertions": "^3.8.0",
"@serenity-js/console-reporter": "^3.8.0",
Expand Down
25 changes: 12 additions & 13 deletions integration-tests/e2e-tests/tests/sdk/src/SdkAgentWorkflow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,20 @@ export class SdkAgentWorkflow {
static async verifyNewCredential(edgeAgent: Actor) {
await edgeAgent.attemptsTo(
Wait.upTo(Duration.ofSeconds(30))
.until(
Questions.getArraySize('credential offer stack',this.credentialOfferStack),
equals(1)
)
.until(
Questions.getArraySize('credential offer stack',this.credentialOfferStack),
equals(1)
)
)
}

static async waitToReceiveIssuedCredential(edgeAgent: Actor) {
await edgeAgent.attemptsTo(
Wait.upTo(Duration.ofSeconds(30))
.until(
Questions.getArraySize('issued credential stack',this.issuedCredentialStack),
equals(1)
)
.until(
Questions.getArraySize('issued credential stack',this.issuedCredentialStack),
equals(1)
)
)
}

Expand All @@ -137,10 +137,10 @@ export class SdkAgentWorkflow {
static async waitForProofRequest(edgeAgent: Actor) {
await edgeAgent.attemptsTo(
Wait.upTo(Duration.ofSeconds(30))
.until(
Questions.getArraySize('proof of request stack', this.proofRequestStack),
equals(1)
)
.until(
Questions.getArraySize('proof of request stack', this.proofRequestStack),
equals(1)
)
)
}

Expand All @@ -159,5 +159,4 @@ export class SdkAgentWorkflow {
static async stop() {
await this.edgeAgent.stop()
}

}
8 changes: 4 additions & 4 deletions integration-tests/e2e-tests/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,10 @@
resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==

"@input-output-hk/atala-prism-wallet-sdk@^2.1.0":
version "2.1.0"
resolved "https://npm.pkg.github.com/download/@input-output-hk/atala-prism-wallet-sdk/2.1.0/ab28d233ce7ce1d132e8cca21e667fd9a5cfb499#ab28d233ce7ce1d132e8cca21e667fd9a5cfb499"
integrity sha512-JDfeN5g33ko/eTbDi745mRpMz8cwo82cWF8Rr9PVMNmOwE/rShfI1dsj7gj8DFSc0g/Q5f9Sd0bPigxTnrz2NQ==
"@input-output-hk/atala-prism-wallet-sdk@^2.3.0":
version "2.3.0"
resolved "https://npm.pkg.github.com/download/@input-output-hk/atala-prism-wallet-sdk/2.3.0/5c3e5551a31a6b57589558819d8f31404ad2264d#5c3e5551a31a6b57589558819d8f31404ad2264d"
integrity sha512-uq8Kmu0bSa5SJT2S2EDV4Wiv6bmw2KgVUS1NTDzNGNumZfOIJ2xBFfHOc4t9rcMmvVkI5LWauEVzsnvtb384Mg==
dependencies:
"@scure/bip32" "^1.3.0"
"@scure/bip39" "^1.1.1"
Expand Down
35 changes: 33 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 25 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@input-output-hk/atala-prism-wallet-sdk",
"version": "2.1.0",
"version": "2.3.0",
"description": "PRISM typescript SDK",
"main": "build/node/index.js",
"browser": "build/browser/index.js",
Expand Down Expand Up @@ -100,6 +100,7 @@
"html-webpack-plugin": "^5.5.0",
"inversify": "^6.0.1",
"jest": "^29.5.0",
"jest-junit": "^16.0.0",
"json-loader": "^0.5.7",
"mini-css-extract-plugin": "^2.7.3",
"path-browserify": "^1.0.1",
Expand Down Expand Up @@ -139,7 +140,29 @@
"moduleFileExtensions": [
"js",
"ts"
]
],
"coverageReporters": [
"json-summary",
"lcov",
"text"
],
"reporters": [
"default",
"jest-junit"
],
"coverageThreshold": {
"global": {
"branches": 22,
"functions": 33,
"lines": 34,
"statements": 34
}
},
"coverageDirectory": "coverage"
},
"jest-junit": {
"outputDirectory": "coverage",
"outputName": "junit.xml"
},
"dependencies": {
"@scure/bip32": "^1.3.0",
Expand Down

0 comments on commit 8f72a8b

Please sign in to comment.