Merge branch 'master' into feature/docs

CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.14](https://github.com/uport-project/daf/compare/v2.3.13...v2.3.14) (2020-03-02)
+
+
+### Bug Fixes
+
+* TG findEdges fromDID ([dc63238](https://github.com/uport-project/daf/commit/dc63238b34d8d448ded854c7635a55750d02f122))
+
+
+
+
+
+## [2.3.13](https://github.com/uport-project/daf/compare/v2.3.12...v2.3.13) (2020-02-26)
+
+
+### Bug Fixes
+
+* Ethr-did identity provider web3Provider ([a5d6af2](https://github.com/uport-project/daf/commit/a5d6af2032130a7eff1722bc47b758a824906be6))
+* Remove unused ws ([55e0fcb](https://github.com/uport-project/daf/commit/55e0fcb1a68e86c7003909fb03f92ee1b357026c)), closes [#91](https://github.com/uport-project/daf/issues/91)
+
+
+
+
+
 ## [2.3.12](https://github.com/uport-project/daf/compare/v2.3.11...v2.3.12) (2020-02-25)
 
 **Note:** Version bump only for package daf

examples/expressjs-ethr/src/framework.ts

@@ -45,7 +45,6 @@ const identityProviders = [
     kms: new DafLibSodium.KeyManagementSystem(new DafFs.KeyStore(defaultPath + '/rinkeby-kms.json')),
     network: 'rinkeby',
     rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
-    resolver: didResolver,
   }),
 ]
 const serviceControllers: any[] = []

examples/expressjs-ethr/yarn.lock

@@ -474,72 +474,72 @@ cross-fetch@^3.0.4:
     node-fetch "2.6.0"
     whatwg-fetch "3.0.0"
 
-daf-core@../../packages/daf-core, daf-core@^2.1.0:
-  version "2.1.0"
+daf-core@../../packages/daf-core, daf-core@^2.3.10:
+  version "2.3.10"
   dependencies:
     blakejs "^1.1.0"
     debug "^4.1.1"
     events "^3.0.0"
 
-daf-data-store@../../packages/daf-data-store, daf-data-store@^2.1.0:
-  version "2.1.0"
+daf-data-store@../../packages/daf-data-store, daf-data-store@^2.3.11:
+  version "2.3.11"
   dependencies:
     blakejs "^1.1.0"
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     sql-bricks-sqlite "^0.1.0"
 
 daf-debug@../../packages/daf-debug:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
 
 daf-did-comm@../../packages/daf-did-comm:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     uuid "^3.3.3"
 
-daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^2.1.0:
-  version "2.1.0"
+daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^2.3.10:
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     did-resolver "^1.1.0"
 
 daf-ethr-did@../../packages/daf-ethr-did:
-  version "2.3.8"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     ethjs-provider-signer "^0.1.4"
     ethr-did "^1.1.0"
     js-sha3 "^0.8.0"
 
 daf-fs@../../packages/daf-fs:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
 
 daf-libsodium@../../packages/daf-libsodium:
-  version "2.3.8"
+  version "2.3.10"
   dependencies:
     base-58 "^0.0.1"
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     elliptic "^6.5.2"
     ethjs-signer "^0.1.1"
     libsodium-wrappers "^0.7.6"
 
 daf-node-sqlite3@../../packages/daf-node-sqlite3:
-  version "2.1.0"
+  version "2.3.11"
   dependencies:
-    daf-data-store "^2.1.0"
+    daf-data-store "^2.3.11"
     debug "^4.1.1"
     sqlite3 "^4.1.0"
 
@@ -559,25 +559,25 @@ daf-resolver@../../packages/daf-resolver:
     web-did-resolver "^1.2.0"
 
 daf-selective-disclosure@../../packages/daf-selective-disclosure:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
-    daf-did-jwt "^2.1.0"
+    daf-core "^2.3.10"
+    daf-did-jwt "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
 
 daf-url@../../packages/daf-url:
-  version "2.1.0"
+  version "2.3.12"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     url-parse "^1.4.7"
 
 daf-w3c@../../packages/daf-w3c:
-  version "2.1.0"
+  version "2.3.12"
   dependencies:
-    daf-core "^2.1.0"
-    daf-did-jwt "^2.1.0"
+    daf-core "^2.3.10"
+    daf-did-jwt "^2.3.10"
     debug "^4.1.1"
     did-jwt-vc "^0.1.3"
     did-resolver "^1.1.0"

examples/react-app/src/setup.ts

@@ -28,7 +28,6 @@ const identityProviders: Daf.AbstractIdentityProvider[] = [
     identityStore: new DafLocalStorage.IdentityStore('localIdentities'),
     network: 'rinkeby',
     rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
-    resolver: didResolver,
   }),
 ]
 

examples/react-app/yarn.lock

@@ -3497,51 +3497,51 @@ d@1, d@^1.0.1:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
-daf-core@../../packages/daf-core, daf-core@^2.1.0:
-  version "2.1.0"
+daf-core@../../packages/daf-core, daf-core@^2.3.10:
+  version "2.3.10"
   dependencies:
     blakejs "^1.1.0"
     debug "^4.1.1"
     events "^3.0.0"
 
 daf-debug@../../packages/daf-debug:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
 
-daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^2.1.0:
-  version "2.1.0"
+daf-did-jwt@../../packages/daf-did-jwt, daf-did-jwt@^2.3.10:
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     did-resolver "^1.1.0"
 
 daf-ethr-did@../../packages/daf-ethr-did:
-  version "2.3.8"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     ethjs-provider-signer "^0.1.4"
     ethr-did "^1.1.0"
     js-sha3 "^0.8.0"
 
 daf-libsodium@../../packages/daf-libsodium:
-  version "2.3.8"
+  version "2.3.10"
   dependencies:
     base-58 "^0.0.1"
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     elliptic "^6.5.2"
     ethjs-signer "^0.1.1"
     libsodium-wrappers "^0.7.6"
 
 daf-local-storage@../../packages/daf-local-storage:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
 
 daf-resolver-universal@../../packages/daf-resolver-universal:
@@ -3551,7 +3551,7 @@ daf-resolver-universal@../../packages/daf-resolver-universal:
     debug "^4.1.1"
 
 daf-trust-graph@../../packages/daf-trust-graph:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
     apollo-cache-inmemory "^1.6.3"
     apollo-client "^2.6.4"
@@ -3560,18 +3560,18 @@ daf-trust-graph@../../packages/daf-trust-graph:
     apollo-link-ws "^1.0.19"
     apollo-utilities "^1.3.2"
     cross-fetch "^3.0.4"
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     graphql "^14.0.0"
     graphql-tag "^2.10.1"
     subscriptions-transport-ws "^0.9.0"
 
 daf-w3c@../../packages/daf-w3c:
-  version "2.1.0"
+  version "2.3.12"
   dependencies:
-    daf-core "^2.1.0"
-    daf-did-jwt "^2.1.0"
+    daf-core "^2.3.10"
+    daf-did-jwt "^2.3.10"
     debug "^4.1.1"
     did-jwt-vc "^0.1.3"
     did-resolver "^1.1.0"

examples/react-graphql/server/index.ts

@@ -26,7 +26,6 @@ const identityProviders = [
     identityStore: new DafFs.IdentityStore('./identity-store.json'),
     network: 'rinkeby',
     rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
-    resolver: didResolver,
   }),
 ]
 const serviceControllers = [TG.ServiceController]

examples/react-graphql/server/yarn.lock

@@ -805,65 +805,65 @@ cross-fetch@^3.0.4:
     node-fetch "2.6.0"
     whatwg-fetch "3.0.0"
 
-daf-core@../../../packages/daf-core, daf-core@^2.1.0:
-  version "2.1.0"
+daf-core@../../../packages/daf-core, daf-core@^2.3.10:
+  version "2.3.10"
   dependencies:
     blakejs "^1.1.0"
     debug "^4.1.1"
     events "^3.0.0"
 
-daf-data-store@../../../packages/daf-data-store, daf-data-store@^2.1.0:
-  version "2.1.0"
+daf-data-store@../../../packages/daf-data-store, daf-data-store@^2.3.11:
+  version "2.3.11"
   dependencies:
     blakejs "^1.1.0"
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     sql-bricks-sqlite "^0.1.0"
 
 daf-debug@../../../packages/daf-debug:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
 
-daf-did-jwt@../../../packages/daf-did-jwt, daf-did-jwt@^2.1.0:
-  version "2.1.0"
+daf-did-jwt@../../../packages/daf-did-jwt, daf-did-jwt@^2.3.10:
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     did-resolver "^1.1.0"
 
 daf-ethr-did@../../../packages/daf-ethr-did:
-  version "2.3.8"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     ethjs-provider-signer "^0.1.4"
     ethr-did "^1.1.0"
     js-sha3 "^0.8.0"
 
 daf-fs@../../../packages/daf-fs:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
 
 daf-libsodium@../../../packages/daf-libsodium:
-  version "2.3.8"
+  version "2.3.10"
   dependencies:
     base-58 "^0.0.1"
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     elliptic "^6.5.2"
     ethjs-signer "^0.1.1"
     libsodium-wrappers "^0.7.6"
 
 daf-node-sqlite3@../../../packages/daf-node-sqlite3:
-  version "2.1.0"
+  version "2.3.11"
   dependencies:
-    daf-data-store "^2.1.0"
+    daf-data-store "^2.3.11"
     debug "^4.1.1"
     sqlite3 "^4.1.0"
 
@@ -877,7 +877,7 @@ daf-resolver@../../../packages/daf-resolver:
     web-did-resolver "^1.2.0"
 
 daf-trust-graph@../../../packages/daf-trust-graph:
-  version "2.1.0"
+  version "2.3.10"
   dependencies:
     apollo-cache-inmemory "^1.6.3"
     apollo-client "^2.6.4"
@@ -886,18 +886,18 @@ daf-trust-graph@../../../packages/daf-trust-graph:
     apollo-link-ws "^1.0.19"
     apollo-utilities "^1.3.2"
     cross-fetch "^3.0.4"
-    daf-core "^2.1.0"
+    daf-core "^2.3.10"
     debug "^4.1.1"
     did-jwt "^4.0.0"
     graphql "^14.0.0"
     graphql-tag "^2.10.1"
     subscriptions-transport-ws "^0.9.0"
 
 daf-w3c@../../../packages/daf-w3c:
-  version "2.1.0"
+  version "2.3.12"
   dependencies:
-    daf-core "^2.1.0"
-    daf-did-jwt "^2.1.0"
+    daf-core "^2.3.10"
+    daf-did-jwt "^2.3.10"
     debug "^4.1.1"
     did-jwt-vc "^0.1.3"
     did-resolver "^1.1.0"