-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #409 from Tonomy-Foundation/fix/resolve-conflicts
Fix/resolve conflicts
- Loading branch information
Showing
2 changed files
with
2 additions
and
2 deletions.
There are no files selected for viewing
Submodule Tonomy-Communication
updated
26 files
| +0 −43 | .eslintrc.js | |
| +3 −2 | .github/workflows/check-sdk-version.yaml | |
| +9 −9 | .github/workflows/test.yaml | |
| +6 −0 | .vscode/settings.json | |
| +8 −4 | README.md | |
| +53 −0 | eslint.config.js | |
| +41 −0 | jest.config.ts | |
| +27 −36 | package.json | |
| +3 −3 | src/accounts/accounts.controller.ts | |
| +1 −1 | src/accounts/accounts.service.ts | |
| +12 −13 | src/communication/communication.service.ts | |
| +26 −9 | src/communication/transform-vc/transform-vc.pipe.spec.ts | |
| +9 −4 | src/communication/ws-exception/ws-exception.filter.ts | |
| +2 −2 | src/config/config.production.ts | |
| +2 −2 | src/config/config.staging.ts | |
| +2 −2 | src/config/config.testnet.ts | |
| +2 −2 | src/config/config.ts | |
| +30 −0 | src/main.ts | |
| +29 −24 | src/settings.ts | |
| +1 −1 | start-dev.js | |
| +1 −1 | test/communication.e2e-spec.ts | |
| +0 −9 | test/jest-e2e.json | |
| +31 −0 | test/veramo.e2e-spec.ts | |
| +7 −2 | tsconfig.json | |
| +1 −1 | update_sdk_version.sh | |
| +11,708 −8,494 | yarn.lock |
Submodule Tonomy-Contracts
updated
3 files
| +1 −5 | .github/workflows/test.yaml | |
| +7 −1 | .vscode/settings.json | |
| +2 −2 | blockchain/Dockerfile |