From 1ea064dabf8d7875c060411283d2d80c04d9c801 Mon Sep 17 00:00:00 2001 From: Simonas Karuzas Date: Tue, 11 Feb 2020 13:22:36 +0200 Subject: [PATCH] fix: Removing daf-sodium-fs and encryptionmanager --- examples/expressjs-ethr/package.json | 1 - examples/expressjs-ethr/tsconfig.json | 1 - packages/daf-cli/package.json | 1 - packages/daf-cli/tsconfig.json | 1 - packages/daf-core/src/core.ts | 5 - packages/daf-core/src/encryption-manager.ts | 16 -- packages/daf-core/src/index.ts | 1 - packages/daf-sodium-fs/CHANGELOG.md | 179 ---------------- packages/daf-sodium-fs/LICENSE | 201 ------------------ packages/daf-sodium-fs/README.md | 1 - packages/daf-sodium-fs/package.json | 31 --- .../src/__tests__/default.test.ts | 6 - .../src/encryption-key-manager.ts | 88 -------- packages/daf-sodium-fs/src/index.ts | 1 - packages/daf-sodium-fs/tsconfig.json | 8 - packages/tsconfig.json | 1 - yarn.lock | 11 +- 17 files changed, 9 insertions(+), 544 deletions(-) delete mode 100644 packages/daf-core/src/encryption-manager.ts delete mode 100644 packages/daf-sodium-fs/CHANGELOG.md delete mode 100644 packages/daf-sodium-fs/LICENSE delete mode 100644 packages/daf-sodium-fs/README.md delete mode 100644 packages/daf-sodium-fs/package.json delete mode 100644 packages/daf-sodium-fs/src/__tests__/default.test.ts delete mode 100644 packages/daf-sodium-fs/src/encryption-key-manager.ts delete mode 100644 packages/daf-sodium-fs/src/index.ts delete mode 100644 packages/daf-sodium-fs/tsconfig.json diff --git a/examples/expressjs-ethr/package.json b/examples/expressjs-ethr/package.json index 8a2234e03..5c94fb503 100644 --- a/examples/expressjs-ethr/package.json +++ b/examples/expressjs-ethr/package.json @@ -24,7 +24,6 @@ "daf-resolver": "^1.1.0", "daf-resolver-universal": "^1.1.0", "daf-selective-disclosure": "^1.5.1", - "daf-sodium-fs": "^1.4.1", "daf-trust-graph": "^1.4.1", "daf-url": "^1.4.1", "daf-w3c": "^1.4.1", diff --git a/examples/expressjs-ethr/tsconfig.json b/examples/expressjs-ethr/tsconfig.json index b470b6bd9..b0638f59c 100644 --- a/examples/expressjs-ethr/tsconfig.json +++ b/examples/expressjs-ethr/tsconfig.json @@ -26,7 +26,6 @@ { "path": "../../packages/daf-resolver" }, { "path": "../../packages/daf-resolver-universal" }, { "path": "../../packages/daf-selective-disclosure" }, - { "path": "../../packages/daf-sodium-fs" }, { "path": "../../packages/daf-trust-graph" }, { "path": "../../packages/daf-url" }, { "path": "../../packages/daf-w3c" } diff --git a/packages/daf-cli/package.json b/packages/daf-cli/package.json index c06800b29..a5b57295e 100644 --- a/packages/daf-cli/package.json +++ b/packages/daf-cli/package.json @@ -25,7 +25,6 @@ "daf-resolver": "^1.1.0", "daf-resolver-universal": "^1.1.0", "daf-selective-disclosure": "^1.5.1", - "daf-sodium-fs": "^1.4.1", "daf-trust-graph": "^1.4.1", "daf-url": "^1.4.1", "daf-w3c": "^1.4.1", diff --git a/packages/daf-cli/tsconfig.json b/packages/daf-cli/tsconfig.json index 6202bb7b5..a4967b0b6 100644 --- a/packages/daf-cli/tsconfig.json +++ b/packages/daf-cli/tsconfig.json @@ -15,7 +15,6 @@ { "path": "../daf-resolver" }, { "path": "../daf-resolver-universal" }, { "path": "../daf-selective-disclosure" }, - { "path": "../daf-sodium-fs" }, { "path": "../daf-trust-graph" }, { "path": "../daf-url" }, { "path": "../daf-w3c" } diff --git a/packages/daf-core/src/core.ts b/packages/daf-core/src/core.ts index a06bffec8..4be755a1c 100644 --- a/packages/daf-core/src/core.ts +++ b/packages/daf-core/src/core.ts @@ -7,7 +7,6 @@ import { ServiceControllerDerived } from './service/abstract-service-controller' import { MessageValidator, unsupportedMessageTypeError } from './message/abstract-message-validator' import { ActionHandler } from './action/action-handler' import { Action } from './types' -import { EncryptionKeyManager } from './encryption-manager' import { Message } from './message/message' import Debug from 'debug' @@ -28,12 +27,10 @@ interface Config { serviceControllers: ServiceControllerDerived[] messageValidator: MessageValidator actionHandler?: ActionHandler - encryptionKeyManager?: EncryptionKeyManager } export class Core extends EventEmitter { public identityManager: IdentityManager - public encryptionKeyManager?: EncryptionKeyManager public didResolver: Resolver private serviceManager: ServiceManager private messageValidator: MessageValidator @@ -46,8 +43,6 @@ export class Core extends EventEmitter { identityProviders: config.identityProviders, }) - this.encryptionKeyManager = config.encryptionKeyManager - this.didResolver = config.didResolver this.serviceManager = new ServiceManager({ diff --git a/packages/daf-core/src/encryption-manager.ts b/packages/daf-core/src/encryption-manager.ts deleted file mode 100644 index c747148ae..000000000 --- a/packages/daf-core/src/encryption-manager.ts +++ /dev/null @@ -1,16 +0,0 @@ -export type KeyType = 'curve25519' | 'ed25519' | 'x25519' - -export interface KeyPair { - keyType: KeyType - privateKey: Uint8Array - privateKeyHex: string - publicKey: Uint8Array - publicKeyHex: string -} - -export interface EncryptionKeyManager { - getKeyPairForDid(did: string): Promise - getKeyPairForPublicKey(publicKey: Uint8Array): Promise - createKeyPairForDid(did: string): Promise - listKeyPairs(): Promise -} diff --git a/packages/daf-core/src/index.ts b/packages/daf-core/src/index.ts index c6adda262..a6a4d2df4 100644 --- a/packages/daf-core/src/index.ts +++ b/packages/daf-core/src/index.ts @@ -1,6 +1,5 @@ export { Core, EventTypes, Resolver } from './core' export { AbstractActionHandler } from './action/action-handler' -export { EncryptionKeyManager, KeyPair } from './encryption-manager' export { IdentityManager } from './identity/identity-manager' export { AbstractIdentity } from './identity/abstract-identity' export { AbstractIdentityProvider, IdentityProviderDerived } from './identity/abstract-identity-provider' diff --git a/packages/daf-sodium-fs/CHANGELOG.md b/packages/daf-sodium-fs/CHANGELOG.md deleted file mode 100644 index 549d92e3f..000000000 --- a/packages/daf-sodium-fs/CHANGELOG.md +++ /dev/null @@ -1,179 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [1.4.1](https://github.com/uport-project/daf/compare/v1.4.0...v1.4.1) (2020-01-14) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [1.4.0](https://github.com/uport-project/daf/compare/v1.3.7...v1.4.0) (2020-01-14) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [1.3.3](https://github.com/uport-project/daf/compare/v1.3.2...v1.3.3) (2019-12-20) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [1.3.2](https://github.com/uport-project/daf/compare/v1.3.1...v1.3.2) (2019-12-20) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [1.2.0](https://github.com/uport-project/daf/compare/v1.1.1...v1.2.0) (2019-12-16) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [1.1.1](https://github.com/uport-project/daf/compare/v1.1.0...v1.1.1) (2019-12-16) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [1.1.0](https://github.com/uport-project/daf/compare/v0.10.3...v1.1.0) (2019-12-16) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [0.10.3](https://github.com/uport-project/daf/compare/v0.10.2...v0.10.3) (2019-12-12) - - -### Bug Fixes - -* Unifying debug messages ([efb4f3b](https://github.com/uport-project/daf/commit/efb4f3bf9f6d3f0d412eb80da7bb4ae92ce8ca72)) - - - - - -# [0.10.0](https://github.com/uport-project/daf/compare/v0.9.0...v0.10.0) (2019-12-10) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.9.0](https://github.com/uport-project/daf/compare/v0.8.0...v0.9.0) (2019-12-05) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.8.0](https://github.com/uport-project/daf/compare/v0.7.8...v0.8.0) (2019-12-04) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.7.0](https://github.com/uport-project/daf/compare/v0.6.1...v0.7.0) (2019-11-29) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.6.0](https://github.com/uport-project/daf/compare/v0.5.2...v0.6.0) (2019-11-27) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [0.5.1](https://github.com/uport-project/daf/compare/v0.5.0...v0.5.1) (2019-11-26) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.5.0](https://github.com/uport-project/daf/compare/v0.4.0...v0.5.0) (2019-11-26) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.4.0](https://github.com/uport-project/daf/compare/v0.3.0...v0.4.0) (2019-11-25) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.3.0](https://github.com/uport-project/daf/compare/v0.2.0...v0.3.0) (2019-11-24) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.2.0](https://github.com/uport-project/daf/compare/v0.1.0...v0.2.0) (2019-11-23) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -# [0.1.0](https://github.com/uport-project/daf/compare/v0.0.26...v0.1.0) (2019-11-22) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [0.0.26](https://github.com/uport-project/daf/compare/v0.0.25...v0.0.26) (2019-11-22) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [0.0.25](https://github.com/uport-project/daf/compare/v0.0.24...v0.0.25) (2019-11-21) - -**Note:** Version bump only for package daf-sodium-fs - - - - - -## [0.0.24](https://github.com/uport-project/daf/compare/v0.0.23...v0.0.24) (2019-11-19) - -**Note:** Version bump only for package daf-sodium-fs diff --git a/packages/daf-sodium-fs/LICENSE b/packages/daf-sodium-fs/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/packages/daf-sodium-fs/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/packages/daf-sodium-fs/README.md b/packages/daf-sodium-fs/README.md deleted file mode 100644 index 098c97df2..000000000 --- a/packages/daf-sodium-fs/README.md +++ /dev/null @@ -1 +0,0 @@ -# DAF sodium encryption key manager \ No newline at end of file diff --git a/packages/daf-sodium-fs/package.json b/packages/daf-sodium-fs/package.json deleted file mode 100644 index c69f01ed4..000000000 --- a/packages/daf-sodium-fs/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "daf-sodium-fs", - "description": "DAF sodium fs encryption key manager", - "version": "1.4.1", - "main": "build/index.js", - "types": "build/index.d.ts", - "scripts": { - "build": "tsc" - }, - "dependencies": { - "daf-core": "^1.4.1", - "debug": "^4.1.1", - "libsodium-wrappers": "^0.7.6" - }, - "devDependencies": { - "@types/debug": "^4.1.5", - "@types/libsodium-wrappers": "^0.7.7", - "typescript": "^3.7.2" - }, - "files": [ - "build/**/*", - "src/**/*", - "README.md", - "LICENSE" - ], - "repository": "git@github.com:uport-project/daf.git", - "author": "Simonas Karuzas ", - "license": "Apache-2.0", - "keywords": [], - "gitHead": "ec317e0f10cffe731648a8c2d8f58def3d3c85ff" -} diff --git a/packages/daf-sodium-fs/src/__tests__/default.test.ts b/packages/daf-sodium-fs/src/__tests__/default.test.ts deleted file mode 100644 index 687c5a2ee..000000000 --- a/packages/daf-sodium-fs/src/__tests__/default.test.ts +++ /dev/null @@ -1,6 +0,0 @@ -describe('daf-sodium-fs', () => { - const a = 100 - it('should run a dummy test', () => { - expect(a).toEqual(100) - }) -}) diff --git a/packages/daf-sodium-fs/src/encryption-key-manager.ts b/packages/daf-sodium-fs/src/encryption-key-manager.ts deleted file mode 100644 index aee57522d..000000000 --- a/packages/daf-sodium-fs/src/encryption-key-manager.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { EncryptionKeyManager, KeyPair } from 'daf-core' -import sodium from 'libsodium-wrappers' -const fs = require('fs') - -import Debug from 'debug' -const debug = Debug('daf:sodium-fs-encryption-key-manager') - -interface DidKeyPairMap { - [did: string]: KeyPair -} - -export class SodiumFsEncryptionKeyManager implements EncryptionKeyManager { - private didKeyPairMap: DidKeyPairMap = {} - private fileName: string - - constructor(fileName: string) { - this.fileName = fileName - this.readFromFile() - } - - private readFromFile(): void { - try { - if (fs.existsSync(this.fileName)) { - const raw = fs.readFileSync(this.fileName) - const parsed = JSON.parse(raw) - - Object.keys(parsed).forEach(did => { - const i = parsed[did] - this.didKeyPairMap[did] = { - keyType: i.keyType, - privateKeyHex: i.privateKeyHex, - publicKeyHex: i.publicKeyHex, - privateKey: Uint8Array.from(Buffer.from(i.privateKeyHex, 'hex')), - publicKey: Uint8Array.from(Buffer.from(i.publicKeyHex, 'hex')), - } - }) - } - } catch (e) { - debug(e) - } - } - - private writeToFile() { - try { - fs.writeFileSync(this.fileName, JSON.stringify(this.didKeyPairMap)) - } catch (e) { - debug(e) - } - } - - async createKeyPairForDid(did: string): Promise { - await sodium.ready - const keyPair = sodium.crypto_sign_keypair() as KeyPair - keyPair.privateKeyHex = Buffer.from(keyPair.privateKey).toString('hex') - keyPair.publicKeyHex = Buffer.from(keyPair.publicKey).toString('hex') - this.didKeyPairMap[did] = keyPair - this.writeToFile() - debug('Created keyPair for %s', did) - return keyPair - } - - async getKeyPairForDid(did: string): Promise { - const keyPair = this.didKeyPairMap[did] - if (!keyPair) { - return null - } - return keyPair - } - - async getKeyPairForPublicKey(publicKey: Uint8Array): Promise { - Object.keys(this.didKeyPairMap).forEach(did => { - if (this.didKeyPairMap[did].publicKey === publicKey) { - return this.didKeyPairMap[did] - } - }) - - return null - } - - async listKeyPairs(): Promise { - const list: KeyPair[] = [] - Object.keys(this.didKeyPairMap).forEach(did => { - list.push(this.didKeyPairMap[did]) - }) - - return list - } -} diff --git a/packages/daf-sodium-fs/src/index.ts b/packages/daf-sodium-fs/src/index.ts deleted file mode 100644 index c31824664..000000000 --- a/packages/daf-sodium-fs/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { SodiumFsEncryptionKeyManager } from './encryption-key-manager' diff --git a/packages/daf-sodium-fs/tsconfig.json b/packages/daf-sodium-fs/tsconfig.json deleted file mode 100644 index 166b53ace..000000000 --- a/packages/daf-sodium-fs/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../tsconfig.settings.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build" - }, - "references": [{ "path": "../daf-core" }] -} diff --git a/packages/tsconfig.json b/packages/tsconfig.json index ac2281a87..b28fb4e08 100644 --- a/packages/tsconfig.json +++ b/packages/tsconfig.json @@ -17,7 +17,6 @@ { "path": "daf-resolver" }, { "path": "daf-resolver-universal" }, { "path": "daf-selective-disclosure" }, - { "path": "daf-sodium-fs" }, { "path": "daf-trust-graph" }, { "path": "daf-url" }, { "path": "daf-w3c" } diff --git a/yarn.lock b/yarn.lock index 8dd0c99b5..a9e5b8f6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2710,7 +2710,7 @@ "@types/koa-compose" "*" "@types/node" "*" -"@types/libsodium-wrappers@^0.7.5", "@types/libsodium-wrappers@^0.7.7": +"@types/libsodium-wrappers@^0.7.5": version "0.7.7" resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.7.tgz#cdb25e85458612ec80f0157c3815fac187d0b6d2" integrity sha512-Li91pVKcLvQJK3ZolwCPo85oxf2gKBCApgnesRxYg4OVYchLXcJB2eivX8S87vfQVv6ZRnyCO1lLDosZGJfpRg== @@ -5739,9 +5739,16 @@ d@1, d@^1.0.1: daf-ethr-did-local-storage@../daf/packages/daf-ethr-did-local-storage: version "1.4.1" dependencies: + "@types/ethjs-signer" "^0.1.0" + DIDComm-js "github:decentralized-identity/DIDComm-js" + base64url "^3.0.1" daf-core "^1.4.1" debug "^4.1.1" + elliptic "^6.5.2" + ethjs-provider-signer "^0.1.4" + ethjs-signer "^0.1.1" ethr-did "^1.1.0" + js-sha3 "^0.8.0" daf-ethr-did-metamask@../daf/packages/daf-ethr-did-metamask: version "1.4.1" @@ -10057,7 +10064,7 @@ libnpx@^10.2.0: y18n "^4.0.0" yargs "^11.0.0" -libsodium-wrappers@^0.7.5, libsodium-wrappers@^0.7.6: +libsodium-wrappers@^0.7.5: version "0.7.6" resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.6.tgz#baed4c16d4bf9610104875ad8a8e164d259d48fb" integrity sha512-OUO2CWW5bHdLr6hkKLHIKI4raEkZrf3QHkhXsJ1yCh6MZ3JDA7jFD3kCATNquuGSG6MjjPHQIQms0y0gBDzjQg==