Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Integrate Apollo in Single branch. #94

Merged
merged 22 commits into from
Oct 17, 2023
Merged

Conversation

elribonazo
Copy link
Contributor

@elribonazo elribonazo commented Oct 9, 2023

Description

We want to make sure that Apollo is integrated and merged into main from a single branch, with the objective of ensuring proper documentation is in place. The Apollo interface in the SDK’s should have not changes at all but any test should be working, etc.

Jira link

ATL-5872

Integrates Apollo 1.0.2 into the Typescript SDK.

Checklist

  • Self-reviewed the diff
  • New code has inline documentation
  • New code has proper comments/tests
  • Any changes not covered by tests have been tested manually

elribonazo and others added 10 commits September 19, 2023 17:37
* master:
  chore(release): release 2.4.1 ## [2.4.1](v2.4.0...v2.4.1) (2023-10-03)
  fix: Improve package json licence and specs. (#93)
  fix: Improve the Typescript demo and make it easier to go through the qsg (#92)
  ci: update contribution files (#91)
  fix: add Mediator Peer did field to the sample application (#90)
  ci: add license and contributing files (#89)
  ci: changes from secret to vars (#87)
* feature/ATL-5688:
  feat(Apollo): updating X25519 keys for use with KMM-Apollo
  feat(Apollo): updating Ed25519 keys for use with KMM-Apollo

# Conflicts:
#	package.json
@elribonazo elribonazo marked this pull request as ready for review October 9, 2023 16:49
@github-actions
Copy link

github-actions bot commented Oct 9, 2023

Lines Statements Branches Functions
Coverage: 35%
35.01% (1333/3807) 24.66% (616/2497) 36.56% (403/1102)

JUnit

Tests Skipped Failures Errors Time
289 0 💤 0 ❌ 0 🔥 1m 5s ⏱️

@elribonazo elribonazo force-pushed the feature/ATL-5872 branch 2 times, most recently from 681ebdf to e7a83d0 Compare October 11, 2023 11:49
* master:
  feat: adding anoncreds for ZKP (#69)

# Conflicts:
#	babel.config.js
#	integration-tests/e2e-tests/yarn.lock
#	package-lock.json
#	package.json
#	rollup/base.mjs
#	tests/pluto/Pluto.test.ts
#	tests/pluto/PlutoInMemory.ts
@elribonazo elribonazo merged commit bdc26e6 into master Oct 17, 2023
@elribonazo elribonazo deleted the feature/ATL-5872 branch October 17, 2023 15:33
atala-dev added a commit that referenced this pull request Oct 31, 2023
# [2.5.0](v2.4.1...v2.5.0) (2023-10-31)

### Bug Fixes

* adding resolution for yarn ([#108](#108)) ([da60285](da60285))
* Integrate Apollo in Single branch. ([#94](#94)) ([bdc26e6](bdc26e6))
* remove unused packages and fix node demo ([#99](#99)) ([f9406d7](f9406d7))
* rollup config to handle anoncreds in node ([#109](#109)) ([0aa7fbc](0aa7fbc))

### Features

* adding anoncreds for ZKP ([#69](#69)) ([d57be19](d57be19))
* Rollback Apollo integration ([#106](#106)) ([854379a](854379a))
github-actions bot pushed a commit that referenced this pull request Oct 31, 2023
# [2.5.0](v2.4.1...v2.5.0) (2023-10-31)

### Bug Fixes

* adding resolution for yarn ([#108](#108)) ([da60285](da60285))
* Integrate Apollo in Single branch. ([#94](#94)) ([bdc26e6](bdc26e6))
* remove unused packages and fix node demo ([#99](#99)) ([f9406d7](f9406d7))
* rollup config to handle anoncreds in node ([#109](#109)) ([0aa7fbc](0aa7fbc))

### Features

* adding anoncreds for ZKP ([#69](#69)) ([d57be19](d57be19))
* Rollback Apollo integration ([#106](#106)) ([854379a](854379a))
mixmix pushed a commit to mixmix/atala-prism-wallet-sdk-ts that referenced this pull request May 6, 2024
Co-authored-by: Curtish <[email protected]>
Co-authored-by: Allain Magyar <[email protected]>
Signed-off-by: Francisco Javier Ribó Labrador <[email protected]>
mixmix pushed a commit to mixmix/atala-prism-wallet-sdk-ts that referenced this pull request May 6, 2024
# [2.5.0](hyperledger-identus/sdk-ts@v2.4.1...v2.5.0) (2023-10-31)

### Bug Fixes

* adding resolution for yarn ([hyperledger-identus#108](hyperledger-identus#108)) ([da60285](hyperledger-identus@da60285))
* Integrate Apollo in Single branch. ([hyperledger-identus#94](hyperledger-identus#94)) ([bdc26e6](hyperledger-identus@bdc26e6))
* remove unused packages and fix node demo ([hyperledger-identus#99](hyperledger-identus#99)) ([f9406d7](hyperledger-identus@f9406d7))
* rollup config to handle anoncreds in node ([hyperledger-identus#109](hyperledger-identus#109)) ([0aa7fbc](hyperledger-identus@0aa7fbc))

### Features

* adding anoncreds for ZKP ([hyperledger-identus#69](hyperledger-identus#69)) ([d57be19](hyperledger-identus@d57be19))
* Rollback Apollo integration ([hyperledger-identus#106](hyperledger-identus#106)) ([854379a](hyperledger-identus@854379a))

Signed-off-by: Francisco Javier Ribó Labrador <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants