From f3bc8192ff7f5418544ea44a8d4d86bff7b8fd1e Mon Sep 17 00:00:00 2001
From: Simonas Karuzas <simonas@not.cat>
Date: Thu, 16 Apr 2020 13:14:41 +0300
Subject: [PATCH] fix: Remove daf-data-store from packages

---
 packages/daf-cli/package.json                 |   1 -
 packages/daf-cli/src/credential.ts            |  26 +-
 packages/daf-cli/src/data-explorer.ts         |  69 ++---
 packages/daf-cli/src/graphql.ts               |   4 +-
 packages/daf-cli/src/msg.ts                   |   2 +-
 packages/daf-cli/src/services.ts              |   6 +-
 packages/daf-cli/src/setup.ts                 |   3 -
 packages/daf-cli/tsconfig.json                |   1 -
 packages/daf-data-store/CHANGELOG.md          | 237 ------------------
 packages/daf-data-store/LICENSE               | 201 ---------------
 packages/daf-data-store/README.md             |   1 -
 packages/daf-data-store/api-extractor.json    |   5 -
 packages/daf-data-store/package.json          |  31 ---
 .../src/__tests__/data-store.test.ts          |   6 -
 packages/daf-data-store/src/data-store.ts     | 224 -----------------
 packages/daf-data-store/src/graphql.ts        | 160 ------------
 packages/daf-data-store/src/index.ts          |   3 -
 packages/daf-data-store/tsconfig.json         |   9 -
 .../daf-data-store/types/blakejs/index.d.ts   |   1 -
 .../types/sql-bricks-sqlite/index.d.ts        |   1 -
 .../daf-selective-disclosure/package.json     |   1 -
 .../daf-selective-disclosure/tsconfig.json    |   2 +-
 packages/tsconfig.json                        |   1 -
 yarn.lock                                     |  20 --
 24 files changed, 59 insertions(+), 956 deletions(-)
 delete mode 100644 packages/daf-data-store/CHANGELOG.md
 delete mode 100644 packages/daf-data-store/LICENSE
 delete mode 100644 packages/daf-data-store/README.md
 delete mode 100644 packages/daf-data-store/api-extractor.json
 delete mode 100644 packages/daf-data-store/package.json
 delete mode 100644 packages/daf-data-store/src/__tests__/data-store.test.ts
 delete mode 100644 packages/daf-data-store/src/data-store.ts
 delete mode 100644 packages/daf-data-store/src/graphql.ts
 delete mode 100644 packages/daf-data-store/src/index.ts
 delete mode 100644 packages/daf-data-store/tsconfig.json
 delete mode 100644 packages/daf-data-store/types/blakejs/index.d.ts
 delete mode 100644 packages/daf-data-store/types/sql-bricks-sqlite/index.d.ts

diff --git a/packages/daf-cli/package.json b/packages/daf-cli/package.json
index b2cbdbe84..1437378eb 100644
--- a/packages/daf-cli/package.json
+++ b/packages/daf-cli/package.json
@@ -16,7 +16,6 @@
     "commander": "^4.0.1",
     "console-table-printer": "^1.1.15",
     "daf-core": "^4.0.0-beta.45",
-    "daf-data-store": "^4.0.0-beta.45",
     "daf-did-comm": "^4.0.0-beta.45",
     "daf-did-jwt": "^4.0.0-beta.45",
     "daf-ethr-did": "^4.0.0-beta.45",
diff --git a/packages/daf-cli/src/credential.ts b/packages/daf-cli/src/credential.ts
index e7f563552..2116d62e5 100644
--- a/packages/daf-cli/src/credential.ts
+++ b/packages/daf-cli/src/credential.ts
@@ -1,7 +1,7 @@
 import * as Daf from 'daf-core'
 import * as W3c from 'daf-w3c'
 import * as DIDComm from 'daf-did-comm'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import program from 'commander'
 import inquirer from 'inquirer'
 import qrcode from 'qrcode-terminal'
@@ -98,7 +98,7 @@ program
       process.exit()
     }
 
-    const dids = await dataStore.allIdentities()
+    const ids = await Daf.Identity.find()
 
     const identities = [
       {
@@ -106,11 +106,11 @@ program
         value: 'manual',
       },
     ]
-    for (const did of dids) {
-      const shortId = await dataStore.shortId(did.did)
+    for (const id of ids) {
+      const name = await id.getLatestClaimValue(agent.dbConnection, { type: 'name'})
       identities.push({
-        value: did.did,
-        name: `${did.did} - ${shortId}`,
+        value: id.did,
+        name: `${id.did} - ${name}`,
       })
     }
 
@@ -148,19 +148,21 @@ program
       aud = answers.aud
     }
 
-    const credentials = await dataStore.findCredentials({ sub: answers.iss })
+    const credentials = await Daf.Credential.find({ 
+      where: { subject: answers.iss}, 
+      relations: ['claims'] 
+    })
     const list: any = []
     if (credentials.length > 0) {
       for (const credential of credentials) {
-        const fields = await dataStore.credentialsFieldsForClaimHash(credential.hash)
-        const issuer = await dataStore.shortId(credential.iss.did)
+        const issuer = credential.issuer.shortDid()
         const claims = []
-        for (const field of fields) {
-          claims.push(field.type + ' = ' + field.value)
+        for (const claim of credential.claims) {
+          claims.push(claim.type + ' = ' + claim.value)
         }
         list.push({
           name: claims.join(', ') + ' | Issuer: ' + issuer,
-          value: credential.jwt,
+          value: credential.raw,
         })
       }
 
diff --git a/packages/daf-cli/src/data-explorer.ts b/packages/daf-cli/src/data-explorer.ts
index 8ec314d9b..f90fc0490 100644
--- a/packages/daf-cli/src/data-explorer.ts
+++ b/packages/daf-cli/src/data-explorer.ts
@@ -1,4 +1,5 @@
-import { agent, dataStore } from './setup'
+import * as Daf from 'daf-core'
+import { agent } from './setup'
 import program from 'commander'
 import inquirer from 'inquirer'
 import { formatDistanceToNow } from 'date-fns'
@@ -11,18 +12,19 @@ program
   .option('-m, --messages', 'List messages')
   .action(async cmd => {
     if (cmd.identities) {
-      const dids = await dataStore.allIdentities()
-      if (dids.length === 0) {
+      const dbConnection = await agent.dbConnection
+      const ids = await dbConnection.getRepository(Daf.Identity).find()
+      if (ids.length === 0) {
         console.error('No dids')
         process.exit()
       }
 
       const identities = []
-      for (const did of dids) {
-        const shortId = await dataStore.shortId(did.did)
+      for (const id of ids) {
+        const name = await id.getLatestClaimValue(agent.dbConnection, {type: 'name'})
         identities.push({
-          value: did.did,
-          name: `${did.did} - ${shortId}`,
+          value: id.did,
+          name: `${id.did} - ${name || id.shortDid()}`,
         })
       }
 
@@ -43,10 +45,10 @@ program
 
       switch (answers.type) {
         case 'Sent Messages':
-          showMessageList(await dataStore.findMessages({ sender: answers.did }))
+          showMessageList(await Daf.Message.find({ where: { from: answers.did } }))
           break
         case 'Received Messages':
-          showMessageList(await dataStore.findMessages({ receiver: answers.did }))
+          showMessageList(await Daf.Message.find({ where: { to: answers.did } }))
           break
         case 'Credentials':
           showCredentials(answers.did)
@@ -55,11 +57,12 @@ program
     }
 
     if (cmd.messages) {
-      showMessageList(await dataStore.findMessages({}))
+      const dbConnection = await agent.dbConnection
+      showMessageList(await dbConnection.getRepository(Daf.Message).find())
     }
   })
 
-const showMessageList = async (messages: any) => {
+const showMessageList = async (messages: Daf.Message[]) => {
   if (messages.length === 0) {
     console.error('No messages')
     process.exit()
@@ -69,9 +72,9 @@ const showMessageList = async (messages: any) => {
     {
       type: 'list',
       name: 'id',
-      choices: messages.map((item: any) => ({
-        name: `${formatDistanceToNow(item.timestamp * 1000)} ${item.type} from: ${item.sender?.did} to: ${
-          item.receiver?.did
+      choices: messages.map((item: Daf.Message) => ({
+        name: `${formatDistanceToNow(item.createdAt)} ${item.type} from: ${item.from?.did} to: ${
+          item.to?.did
         }`,
         value: item.id,
       })),
@@ -82,22 +85,23 @@ const showMessageList = async (messages: any) => {
 }
 
 const showMessage = async (id: string) => {
-  const message = await dataStore.findMessage(id)
+  const dbConnection = await agent.dbConnection
+  const message = await dbConnection.getRepository(Daf.Message)
+    .findOne(id, {relations: ['credentials', 'credentials.claims']})
   console.log(message)
 
   const table = []
-  const credentials = await dataStore.credentialsForMessageId(id)
-  if (credentials.length > 0) {
-    for (const credential of credentials) {
-      const fields = await dataStore.credentialsFieldsForClaimHash(credential.hash)
-      const issuer = await dataStore.shortId(credential.iss.did)
-      const subject = await dataStore.shortId(credential.sub.did)
-      for (const field of fields) {
+  
+  if (message.credentials.length > 0) {
+    for (const credential of message.credentials) {
+      const issuer = credential.issuer.shortDid()
+      const subject = credential.subject.shortDid()
+      for (const claim of credential.claims) {
         table.push({
           from: issuer,
           to: subject,
-          type: field.type,
-          value: field.value,
+          type: claim.type,
+          value: claim.value,
         })
       }
     }
@@ -108,18 +112,21 @@ const showMessage = async (id: string) => {
 
 const showCredentials = async (did: string) => {
   const table = []
-  const credentials = await dataStore.findCredentials({ sub: did })
+  const dbConnection = await agent.dbConnection
+
+  const credentials = await dbConnection.getRepository(Daf.Credential)
+    .find({ where: { subject: did } })
+
   if (credentials.length > 0) {
     for (const credential of credentials) {
-      const fields = await dataStore.credentialsFieldsForClaimHash(credential.hash)
-      const issuer = await dataStore.shortId(credential.iss.did)
-      const subject = await dataStore.shortId(credential.sub.did)
-      for (const field of fields) {
+      const issuer = credential.issuer.shortDid()
+      const subject = credential.subject.shortDid()
+      for (const claim of credential.claims) {
         table.push({
           from: issuer,
           to: subject,
-          type: field.type,
-          value: field.value,
+          type: claim.type,
+          value: claim.value,
         })
       }
     }
diff --git a/packages/daf-cli/src/graphql.ts b/packages/daf-cli/src/graphql.ts
index 7d6e16927..eb35a977c 100644
--- a/packages/daf-cli/src/graphql.ts
+++ b/packages/daf-cli/src/graphql.ts
@@ -6,7 +6,7 @@ import { TrustGraphGql } from 'daf-trust-graph'
 import { DIDCommGql } from 'daf-did-comm'
 import { SdrGql } from 'daf-selective-disclosure'
 import merge from 'lodash.merge'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import { listen } from './services'
 program
   .command('graphql')
@@ -33,7 +33,7 @@ program
         W3cGql.resolvers,
         SdrGql.resolvers,
       ),
-      context: () => ({ dataStore, agent }),
+      context: () => ({ agent }),
       introspection: true,
     })
     // await core.setupServices()
diff --git a/packages/daf-cli/src/msg.ts b/packages/daf-cli/src/msg.ts
index 11dcc4ff3..ddf78a8a9 100644
--- a/packages/daf-cli/src/msg.ts
+++ b/packages/daf-cli/src/msg.ts
@@ -1,5 +1,5 @@
 import * as Daf from 'daf-core'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import program from 'commander'
 
 program
diff --git a/packages/daf-cli/src/services.ts b/packages/daf-cli/src/services.ts
index cb08a08f2..fc9a76035 100644
--- a/packages/daf-cli/src/services.ts
+++ b/packages/daf-cli/src/services.ts
@@ -1,5 +1,5 @@
 import { EventTypes, Message } from 'daf-core'
-import { agent, dataStore } from './setup'
+import { agent } from './setup'
 import program from 'commander'
 import { setInterval } from 'timers'
 
@@ -18,11 +18,11 @@ export const listen = async (pollSeconds?: number) => {
 
   await agent.setupServices()
   await agent.listen()
-  await agent.getMessagesSince(await dataStore.latestMessageTimestamps())
+  await agent.getMessagesSince([])
 
   if (pollSeconds) {
     setInterval(async () => {
-      await agent.getMessagesSince(await dataStore.latestMessageTimestamps())
+      await agent.getMessagesSince([])
     }, pollSeconds * 1000)
   }
 }
diff --git a/packages/daf-cli/src/setup.ts b/packages/daf-cli/src/setup.ts
index 1cbfc8477..a054541eb 100644
--- a/packages/daf-cli/src/setup.ts
+++ b/packages/daf-cli/src/setup.ts
@@ -13,7 +13,6 @@ import { DIDCommActionHandler, DIDCommMessageHandler } from 'daf-did-comm'
 import { UrlMessageHandler } from 'daf-url'
 import { createConnection } from 'typeorm'
 
-import { DataStore } from 'daf-data-store'
 import ws from 'ws'
 
 const defaultPath = process.env.HOME + '/.daf/'
@@ -82,5 +81,3 @@ export const agent = new Daf.Agent({
   messageHandler,
   actionHandler,
 })
-
-export const dataStore = new DataStore()
diff --git a/packages/daf-cli/tsconfig.json b/packages/daf-cli/tsconfig.json
index b29f33301..a1b5693ea 100644
--- a/packages/daf-cli/tsconfig.json
+++ b/packages/daf-cli/tsconfig.json
@@ -6,7 +6,6 @@
   },
   "references": [
     { "path": "../daf-core" },
-    { "path": "../daf-data-store" },
     { "path": "../daf-did-comm" },
     { "path": "../daf-did-jwt" },
     { "path": "../daf-ethr-did" },
diff --git a/packages/daf-data-store/CHANGELOG.md b/packages/daf-data-store/CHANGELOG.md
deleted file mode 100644
index 8ac7eb156..000000000
--- a/packages/daf-data-store/CHANGELOG.md
+++ /dev/null
@@ -1,237 +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.
-
-# [4.0.0-beta.45](https://github.com/uport-project/daf/compare/v4.0.0-beta.44...v4.0.0-beta.45) (2020-04-16)
-
-**Note:** Version bump only for package daf-data-store
-
-# [4.0.0-beta.44](https://github.com/uport-project/daf/compare/v4.0.0-beta.43...v4.0.0-beta.44) (2020-04-15)
-
-**Note:** Version bump only for package daf-data-store
-
-# [4.0.0-beta.43](https://github.com/uport-project/daf/compare/v4.0.0-beta.42...v4.0.0-beta.43) (2020-04-15)
-
-**Note:** Version bump only for package daf-data-store
-
-# [4.0.0-beta.42](https://github.com/uport-project/daf/compare/v3.4.0...v4.0.0-beta.42) (2020-04-09)
-
-**Note:** Version bump only for package daf-data-store
-
-# [3.4.0](https://github.com/uport-project/daf/compare/v3.3.0...v3.4.0) (2020-03-19)
-
-**Note:** Version bump only for package daf-data-store
-
-# [3.3.0](https://github.com/uport-project/daf/compare/v3.2.0...v3.3.0) (2020-03-19)
-
-**Note:** Version bump only for package daf-data-store
-
-# [3.2.0](https://github.com/uport-project/daf/compare/v3.1.4...v3.2.0) (2020-03-19)
-
-**Note:** Version bump only for package daf-data-store
-
-## [3.1.4](https://github.com/uport-project/daf/compare/v3.1.3...v3.1.4) (2020-03-19)
-
-### Bug Fixes
-
-- Fetching credentials for SDR ([e91668e](https://github.com/uport-project/daf/commit/e91668e664fca7d9826fd45e179cafe1b3cbe975))
-
-## [3.1.3](https://github.com/uport-project/daf/compare/v3.1.2...v3.1.3) (2020-03-18)
-
-**Note:** Version bump only for package daf-data-store
-
-## [3.0.2](https://github.com/uport-project/daf/compare/v3.0.1...v3.0.2) (2020-03-16)
-
-### Bug Fixes
-
-- Returning newMessage sender & receiver ([72bfb60](https://github.com/uport-project/daf/commit/72bfb60e95e2195b4f17c05b16878bfa4050b427))
-
-## [3.0.1](https://github.com/uport-project/daf/compare/v3.0.0...v3.0.1) (2020-03-16)
-
-**Note:** Version bump only for package daf-data-store
-
-# [3.0.0](https://github.com/uport-project/daf/compare/v2.5.0...v3.0.0) (2020-03-13)
-
-### Bug Fixes
-
-- Building ([60f3777](https://github.com/uport-project/daf/commit/60f3777510514051e75822ae8f350e28e1f64e54))
-- Examples ([e4581e1](https://github.com/uport-project/daf/commit/e4581e148ee1fdf19efd4f3506a6eb8e2a6789f9))
-- Find Messages ([5234c54](https://github.com/uport-project/daf/commit/5234c541257271010ebf3e70bb620e3fcc02ff14))
-- Latest message timestamps ([048974b](https://github.com/uport-project/daf/commit/048974b7016a1deb990aacf2b84a09a172bd3f6d))
-- Removing MessageMetaData entity ([353449c](https://github.com/uport-project/daf/commit/353449c5a2f9a9c0919b4e38a44012fdf98ec8a9))
-
-### Features
-
-- Data-store upgrade ([c4c0810](https://github.com/uport-project/daf/commit/c4c081023fb331bf7cb8c19ca2e5c79e8db6b506))
-- Updating examples to the new API ([13c7e3b](https://github.com/uport-project/daf/commit/13c7e3b625ed1924f2ff9346ff0ab40337fcc8d4))
-
-# [2.5.0](https://github.com/uport-project/daf/compare/v2.4.1...v2.5.0) (2020-03-13)
-
-**Note:** Version bump only for package daf-data-store
-
-## [2.3.19](https://github.com/uport-project/daf/compare/v2.3.18...v2.3.19) (2020-03-11)
-
-**Note:** Version bump only for package daf-data-store
-
-## [2.3.18](https://github.com/uport-project/daf/compare/v2.3.17...v2.3.18) (2020-03-10)
-
-**Note:** Version bump only for package daf-data-store
-
-## [2.3.16](https://github.com/uport-project/daf/compare/v2.3.15...v2.3.16) (2020-03-03)
-
-**Note:** Version bump only for package daf-data-store
-
-## [2.3.15](https://github.com/uport-project/daf/compare/v2.3.14...v2.3.15) (2020-03-02)
-
-### Bug Fixes
-
-- GQL export ([eacc969](https://github.com/uport-project/daf/commit/eacc9697e87bbf6a91db8d9bd5195aea096a13c4))
-- Typescript types ([72c1899](https://github.com/uport-project/daf/commit/72c18993ddba6a7a75ae8397e6549cdd29dccb31))
-
-## [2.3.11](https://github.com/uport-project/daf/compare/v2.3.10...v2.3.11) (2020-02-25)
-
-### Bug Fixes
-
-- Data store await for meta data ([5d96401](https://github.com/uport-project/daf/commit/5d96401530025b76007669e7d28a394378a4fbe9))
-
-## [2.3.10](https://github.com/uport-project/daf/compare/v2.3.9...v2.3.10) (2020-02-25)
-
-**Note:** Version bump only for package daf-data-store
-
-# [2.1.0](https://github.com/uport-project/daf/compare/v2.0.0...v2.1.0) (2020-02-17)
-
-**Note:** Version bump only for package daf-data-store
-
-# [2.0.0](https://github.com/uport-project/daf/compare/v1.5.1...v2.0.0) (2020-02-17)
-
-**Note:** Version bump only for package daf-data-store
-
-# [1.5.0](https://github.com/uport-project/daf/compare/v1.4.1...v1.5.0) (2020-01-24)
-
-### Features
-
-- Query for single credential by id(hash) ([1283ce5](https://github.com/uport-project/daf/commit/1283ce528695d179b4b1cad7075c3b34e647fdb0))
-
-## [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-data-store
-
-# [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-data-store
-
-## [1.3.3](https://github.com/uport-project/daf/compare/v1.3.2...v1.3.3) (2019-12-20)
-
-### Bug Fixes
-
-- Return empty array for empty threads ([fdb1e54](https://github.com/uport-project/daf/commit/fdb1e54fbd43657dd42180926cc160da7245db31))
-
-## [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-data-store
-
-# [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-data-store
-
-## [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-data-store
-
-# [1.1.0](https://github.com/uport-project/daf/compare/v0.10.3...v1.1.0) (2019-12-16)
-
-### Bug Fixes
-
-- Catching edge case ([3c1a935](https://github.com/uport-project/daf/commit/3c1a9357b36c51f6ee586726008e7e5c00a177d4))
-
-## [0.10.3](https://github.com/uport-project/daf/compare/v0.10.2...v0.10.3) (2019-12-12)
-
-### Bug Fixes
-
-- EventEmmiter ([dc52b55](https://github.com/uport-project/daf/commit/dc52b55aad6c612266ce136636f6aa65e524b59b))
-- Unifying debug messages ([efb4f3b](https://github.com/uport-project/daf/commit/efb4f3bf9f6d3f0d412eb80da7bb4ae92ce8ca72))
-
-## [0.10.1](https://github.com/uport-project/daf/compare/v0.10.0...v0.10.1) (2019-12-10)
-
-### Bug Fixes
-
-- Ordering in latestMessageTimestamps ([fca9995](https://github.com/uport-project/daf/commit/fca9995f1fd9c1fa09ba024f8d0eeb417d97b9ee))
-
-# [0.10.0](https://github.com/uport-project/daf/compare/v0.9.0...v0.10.0) (2019-12-10)
-
-### Bug Fixes
-
-- Renaming to sender and receiver ([bf33a2d](https://github.com/uport-project/daf/commit/bf33a2de268cf07b06faa04283ec066573c37ffc))
-
-### Features
-
-- Data deduplication ([c5c10b1](https://github.com/uport-project/daf/commit/c5c10b17eebd1d6f82a43f0d5cc46da9b9270c3e))
-- Message object with validation ([8bf6a9d](https://github.com/uport-project/daf/commit/8bf6a9d47e73d6e2be9003854718b67f59c636dd))
-- Saving message and VC meta data ([1928125](https://github.com/uport-project/daf/commit/1928125e3c3ff17e86e838a9c84ddfadb2631a48))
-
-# [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-data-store
-
-# [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-data-store
-
-## [0.7.5](https://github.com/uport-project/daf/compare/v0.7.4...v0.7.5) (2019-12-02)
-
-### Bug Fixes
-
-- W3C VP subject is aud ([991e64b](https://github.com/uport-project/daf/commit/991e64b3189405ddf2c3a43acc15c2ffe652380a))
-
-## [0.7.3](https://github.com/uport-project/daf/compare/v0.7.2...v0.7.3) (2019-11-30)
-
-### Bug Fixes
-
-- Message sub can be null ([6599296](https://github.com/uport-project/daf/commit/6599296b2560fddbd63aaa4b45bb920e3fcd0b41))
-
-# [0.7.0](https://github.com/uport-project/daf/compare/v0.6.1...v0.7.0) (2019-11-29)
-
-### Features
-
-- Selective Disclosure Request ([9afe0c5](https://github.com/uport-project/daf/commit/9afe0c5a2fae7e3f778fe99ff4f88f44f61d3b94))
-
-# [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-data-store
-
-## [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-data-store
-
-# [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-data-store
-
-# [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-data-store
-
-# [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-data-store
-
-# [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-data-store
-
-# [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-data-store
-
-## [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-data-store
-
-## [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-data-store
-
-## [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-data-store
diff --git a/packages/daf-data-store/LICENSE b/packages/daf-data-store/LICENSE
deleted file mode 100644
index 261eeb9e9..000000000
--- a/packages/daf-data-store/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-data-store/README.md b/packages/daf-data-store/README.md
deleted file mode 100644
index 7ab2211c0..000000000
--- a/packages/daf-data-store/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# DID Agent Framework Data Store
diff --git a/packages/daf-data-store/api-extractor.json b/packages/daf-data-store/api-extractor.json
deleted file mode 100644
index 433f2b77c..000000000
--- a/packages/daf-data-store/api-extractor.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "extends": "../../api-extractor-base.json",
-  "mainEntryPointFilePath": "<projectFolder>/build/index.d.ts"
-}
diff --git a/packages/daf-data-store/package.json b/packages/daf-data-store/package.json
deleted file mode 100644
index a99ffc2de..000000000
--- a/packages/daf-data-store/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "daf-data-store",
-  "description": "DID Agent Framework Data Store",
-  "version": "4.0.0-beta.45",
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "build": "tsc"
-  },
-  "dependencies": {
-    "blakejs": "^1.1.0",
-    "daf-core": "^4.0.0-beta.45",
-    "debug": "^4.1.1",
-    "sql-bricks-sqlite": "^0.1.0"
-  },
-  "devDependencies": {
-    "@types/debug": "^4.1.5",
-    "typescript": "^3.8.3"
-  },
-  "files": [
-    "build/**/*",
-    "src/**/*",
-    "README.md",
-    "LICENSE"
-  ],
-  "repository": "git@github.com:uport-project/daf.git",
-  "author": "Simonas Karuzas <simonas.karuzas@consensys.net>",
-  "license": "Apache-2.0",
-  "keywords": [],
-  "gitHead": "63dd12da63b2245d32379b435a7a774a56a1f019"
-}
diff --git a/packages/daf-data-store/src/__tests__/data-store.test.ts b/packages/daf-data-store/src/__tests__/data-store.test.ts
deleted file mode 100644
index 52606eb9b..000000000
--- a/packages/daf-data-store/src/__tests__/data-store.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-describe('daf-data-store', () => {
-  const a = 100
-  it('should run a dummy test', () => {
-    expect(a).toEqual(100)
-  })
-})
diff --git a/packages/daf-data-store/src/data-store.ts b/packages/daf-data-store/src/data-store.ts
deleted file mode 100644
index 5078c3569..000000000
--- a/packages/daf-data-store/src/data-store.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import { Identity, Message, Credential, Presentation, Claim } from 'daf-core'
-import { In } from 'typeorm'
-import Debug from 'debug'
-
-const debug = Debug('daf:data-store')
-
-export class DataStore {
-  async findCredential(id: string) {
-    const credential = await Credential.findOne(id, { relations: ['issuer', 'subject'] })
-    return credential
-  }
-
-  async findCredentials({ iss, sub }: { iss?: string; sub?: string }) {
-    let where
-
-    if (iss && sub) {
-      where = [{ issuer: iss }, { subject: sub }]
-    } else {
-      if (iss) where = { issuer: iss }
-      if (sub) where = { subject: sub }
-    }
-
-    const credentials = await Credential.find({
-      relations: ['issuer', 'subject'],
-      where,
-    })
-
-    return credentials.map(this.credentialToLegacyFormat)
-  }
-
-  async credentialsForMessageId(id: string) {
-    const message = await Message.findOne(id, {
-      relations: ['credentials', 'credentials.issuer', 'credentials.subject'],
-    })
-
-    return message?.credentials.map(this.credentialToLegacyFormat)
-  }
-
-  async credentialsFieldsForClaimHash(hash: string) {
-    const credential = new Credential()
-    credential.hash = hash
-
-    const claims = await Claim.find({
-      relations: ['issuer', 'subject'],
-      where: { credential },
-    })
-
-    return claims.map(claim => ({
-      rowId: `${claim.hash}`,
-      hash: claim.hash,
-      parentHash: hash,
-      iss: { did: claim.issuer.did },
-      sub: { did: claim.subject.did },
-      type: claim.type,
-      value: claim.value,
-      isObj: claim.isObj,
-    }))
-  }
-
-  async findCredentialsByFields({
-    iss,
-    sub,
-    claim_type,
-  }: {
-    iss?: string[]
-    sub?: string[]
-    claim_type: string
-  }) {
-    let where = {}
-    
-    if (iss && iss.length > 0) {
-      where['issuer'] = In(iss)
-    }
-    if (sub && iss.length > 0) {
-      where['subject'] = In(sub)
-    }
-
-    if (claim_type) {
-      where['type'] = claim_type
-    }
-
-    const claims = await Claim.find({
-      relations: ['credential', 'credential.issuer', 'credential.subject'],
-      where,
-    })
-
-    return claims.map(claim => this.credentialToLegacyFormat(claim.credential))
-  }
-
-  credentialToLegacyFormat(credential: Credential) {
-    return {
-      rowId: `${credential.hash}`,
-      hash: credential.hash,
-      iss: { did: credential.issuer.did },
-      sub: { did: credential.subject.did },
-      jwt: credential.raw,
-      nbf: credential.issuanceDate?.getTime() / 1000,
-      exp: credential.expirationDate?.getTime() / 1000,
-    }
-  }
-
-  async findMessages({
-    sender,
-    receiver,
-    threadId,
-    limit,
-  }: {
-    sender?: string
-    receiver?: string
-    threadId?: string
-    limit?: number
-  }) {
-    let where = []
-
-    if (threadId) {
-      where.push({ threadId: threadId })
-    }
-
-    if (sender) {
-      where.push({ from: sender })
-    }
-
-    if (receiver) {
-      where.push({ to: receiver })
-    }
-
-    if (sender || receiver) {
-      // SDR can have empty to field
-      where.push({ to: null })
-    }
-
-    const messages = await Message.find({
-      where,
-      order: { saveDate: 'DESC' },
-      relations: ['from', 'to'],
-    })
-
-    return messages.map(this.messageToLegacyFormat)
-  }
-
-  async findMessage(id: string) {
-    const message = await Message.findOne(id, { relations: ['from', 'to'] })
-    return this.messageToLegacyFormat(message)
-  }
-
-  async allIdentities() {
-    const identities = await Identity.find()
-    return identities.map(identity => ({ did: identity.did }))
-  }
-
-  async findIdentityByDid(did: string) {
-    return { did }
-  }
-
-  async popularClaimForDid(did: string, claimType: string) {
-    // This should be using public profile VP.
-    // For MVP purposes we will return any claim
-    const claim = await Claim.findOne({
-      where: {
-        subject: did,
-        type: claimType,
-      },
-    })
-
-    return claim?.value
-  }
-
-  async latestMessageTimestamps() {
-    // FIXME
-    return []
-  }
-
-  async shortId(did: string) {
-    const name = await this.popularClaimForDid(did, 'name')
-    if (name) {
-      return name
-    }
-    const firstName = await this.popularClaimForDid(did, 'firstName')
-    const lastName = await this.popularClaimForDid(did, 'lastName')
-    let shortId = firstName
-    shortId = lastName ? `${firstName && firstName + ' '}${lastName}` : shortId
-    shortId = !shortId ? `${did.slice(0, 15)}...${did.slice(-4)}` : shortId
-    return shortId
-  }
-
-  async saveMessage(message: Message) {
-    await message.save()
-
-    return { hash: message.id, iss: { did: message.from.did } }
-  }
-
-  async findMessagesByVC(hash: string) {
-    const credential = await Credential.findOne(hash, {
-      relations: ['messages', 'messages.from', 'messages.to'],
-    })
-
-    return credential.messages.map(this.messageToLegacyFormat)
-  }
-
-  async metaData(id: string) {
-    const message = await Message.findOne(id)
-    return message.metaData
-  }
-
-  async deleteMessage(id: string) {
-    const message = new Message()
-    message.id = id
-    return await message.remove()
-  }
-
-  private messageToLegacyFormat(message: Message) {
-    return {
-      rowId: message.id,
-      id: message.id,
-      sender: message.from ? { did: message.from.did } : null,
-      receiver: message.to ? { did: message.to.did } : null,
-      type: message.type,
-      threadId: message.threadId,
-      data: JSON.stringify(message.data),
-      raw: message.raw,
-      timestamp: message.createdAt?.getTime() / 1000,
-    }
-  }
-}
diff --git a/packages/daf-data-store/src/graphql.ts b/packages/daf-data-store/src/graphql.ts
deleted file mode 100644
index 3aa8309d2..000000000
--- a/packages/daf-data-store/src/graphql.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { DataStore } from './data-store'
-
-export interface Context {
-  dataStore: DataStore
-}
-
-export const resolvers = {
-  Message: {
-    vc: async (message: any, {}, { dataStore }: Context) => dataStore.credentialsForMessageId(message.id),
-    metaData: async (message: any, {}, { dataStore }: Context) => dataStore.metaData(message.id),
-    thread: async (message: any, {}, { dataStore }: Context) => {
-      if (!message.threadId) {
-        return []
-      }
-      const messages = await dataStore.findMessages({ threadId: message.threadId })
-      return messages.filter((item: any) => item.id !== message.id)
-    },
-  },
-  VerifiableClaim: {
-    fields: async (vc: any, {}, { dataStore }: Context) => dataStore.credentialsFieldsForClaimHash(vc.hash),
-    inMessages: async (vc: any, {}, { dataStore }: Context) => dataStore.findMessagesByVC(vc.hash),
-  },
-  Identity: {
-    shortId: async (identity: any, {}, { dataStore }: Context) => dataStore.shortId(identity.did),
-    firstName: async (identity: any, {}, { dataStore }: Context) =>
-      dataStore.popularClaimForDid(identity.did, 'firstName'),
-    lastName: async (identity: any, {}, { dataStore }: Context) =>
-      dataStore.popularClaimForDid(identity.did, 'lastName'),
-    profileImage: async (identity: any, {}, { dataStore }: Context) => {
-      let url = await dataStore.popularClaimForDid(identity.did, 'profileImage')
-      if (url) {
-        try {
-          const ipfs = JSON.parse(url)
-          if (ipfs['/']) {
-            url = 'https://cloudflare-ipfs.com' + ipfs['/']
-          }
-        } catch (e) {
-          // do nothing
-        }
-      }
-      return typeof url === 'string' ? url : ''
-    },
-    url: async (identity: any, {}, { dataStore }: Context) =>
-      dataStore.popularClaimForDid(identity.did, 'url'),
-    description: async (identity: any, {}, { dataStore }: Context) =>
-      dataStore.popularClaimForDid(identity.did, 'description'),
-    credentialsIssued: async (identity: any, args: any, { dataStore }: Context) => {
-      return dataStore.findCredentials({ iss: identity.did })
-    },
-    credentialsReceived: async (identity: any, args: any, { dataStore }: Context) => {
-      return dataStore.findCredentials({ sub: identity.did })
-    },
-    credentialsAll: async (identity: any, args: any, { dataStore }: Context) => {
-      return dataStore.findCredentials({ iss: identity.did, sub: identity.did })
-    },
-    messagesSent: async (identity: any, args: any, { dataStore }: Context) => {
-      return dataStore.findMessages({ sender: identity.did })
-    },
-    messagesReceived: async (identity: any, args: any, { dataStore }: Context) => {
-      return dataStore.findMessages({ receiver: identity.did })
-    },
-    messagesAll: async (identity: any, args: any, { dataStore }: Context) => {
-      return dataStore.findMessages({ sender: identity.did, receiver: identity.did })
-    },
-  },
-  Query: {
-    identity: async (_: any, { did }: { did: string }, { dataStore }: Context) =>
-      dataStore.findIdentityByDid(did),
-    identities: async (_: any, { dids }: { dids: string[] }, { dataStore }: Context) => {
-      return dids ? dids.map(did => ({ did })) : dataStore.allIdentities()
-    },
-    messages: async (
-      _: any,
-      {
-        sender,
-        receiver,
-        threadId,
-        limit,
-      }: { sender: string; receiver: string; threadId: string; limit: number },
-      { dataStore }: Context,
-    ) => {
-      return dataStore.findMessages({ sender, receiver, threadId, limit })
-    },
-    message: async (_: any, { id }: { id: string }, { dataStore }: Context) => dataStore.findMessage(id),
-    credentials: async (_: any, { iss, sub }: { iss: string; sub: string }, { dataStore }: Context) => {
-      const res = await dataStore.findCredentials({ iss, sub })
-      return res
-    },
-    credential: async (_: any, { id }: { id: string }, { dataStore }: Context) =>
-      dataStore.findCredential(id),
-  },
-  Mutation: {
-    deleteMessage: async (_: any, { id }: { id: string }, { dataStore }: Context) =>
-      dataStore.deleteMessage(id),
-  },
-}
-
-export const typeDefs = `
-  extend type Query {
-    identity(did: ID!): Identity
-    identities(dids: [ID!]): [Identity]
-    messages(sender: ID, reveiver: ID, threadId: String, limit: Int): [Message]
-    message(id: ID!): Message!
-    credentials(iss: ID, sub: ID): [VerifiableClaim]
-    credential(id:ID!): VerifiableClaim!
-  }
-
-  extend type Mutation {
-    deleteMessage(hash: ID!): Boolean
-  }
-
-  extend type Identity {
-    shortId: String
-    firstName: String
-    lastName: String
-    profileImage: String
-    url: String
-    description: String
-    messagesSent: [Message]
-    messagesReceived: [Message]
-    messagesAll: [Message]
-    credentialsIssued: [VerifiableClaim]
-    credentialsReceived: [VerifiableClaim]
-    credentialsAll: [VerifiableClaim]
-  }
-  
-  extend type Message {
-    vc: [VerifiableClaim]
-  }
-
-  type VerifiableClaim {
-    hash: ID!
-    rowId: String!
-    iss: Identity!
-    sub: Identity!
-    json: String!
-    jwt: String!
-    nbf: Int
-    iat: Int
-    exp: Int
-    fields: [VerifiableClaimField]
-    inMessages: [Message]
-  }
-
-  type VerifiableClaimField {
-    rowId: String!
-    hash: ID!
-    parentHash: ID!
-    iss: Identity!
-    sub: Identity!
-    type: String!
-    value: String!
-    isObj: Boolean!
-  }
-
-`
-export default {
-  resolvers,
-  typeDefs,
-}
diff --git a/packages/daf-data-store/src/index.ts b/packages/daf-data-store/src/index.ts
deleted file mode 100644
index 8477c8a11..000000000
--- a/packages/daf-data-store/src/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { DataStore } from './data-store'
-import Gql from './graphql'
-export { Gql }
diff --git a/packages/daf-data-store/tsconfig.json b/packages/daf-data-store/tsconfig.json
deleted file mode 100644
index 53e51212f..000000000
--- a/packages/daf-data-store/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "../tsconfig.settings.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "build",
-    "declarationDir": "build"
-  },
-  "references": [{ "path": "../daf-core" }]
-}
diff --git a/packages/daf-data-store/types/blakejs/index.d.ts b/packages/daf-data-store/types/blakejs/index.d.ts
deleted file mode 100644
index 3e2266527..000000000
--- a/packages/daf-data-store/types/blakejs/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'blakejs';
\ No newline at end of file
diff --git a/packages/daf-data-store/types/sql-bricks-sqlite/index.d.ts b/packages/daf-data-store/types/sql-bricks-sqlite/index.d.ts
deleted file mode 100644
index 7d0cf45b3..000000000
--- a/packages/daf-data-store/types/sql-bricks-sqlite/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'sql-bricks-sqlite';
\ No newline at end of file
diff --git a/packages/daf-selective-disclosure/package.json b/packages/daf-selective-disclosure/package.json
index d9d6da64b..f2c6811fe 100644
--- a/packages/daf-selective-disclosure/package.json
+++ b/packages/daf-selective-disclosure/package.json
@@ -10,7 +10,6 @@
   "dependencies": {
     "blakejs": "^1.1.0",
     "daf-core": "^4.0.0-beta.45",
-    "daf-data-store": "^4.0.0-beta.45",
     "daf-did-jwt": "^4.0.0-beta.45",
     "debug": "^4.1.1",
     "did-jwt": "^4.0.0",
diff --git a/packages/daf-selective-disclosure/tsconfig.json b/packages/daf-selective-disclosure/tsconfig.json
index a2528a1e0..b7587fe0b 100644
--- a/packages/daf-selective-disclosure/tsconfig.json
+++ b/packages/daf-selective-disclosure/tsconfig.json
@@ -5,5 +5,5 @@
     "outDir": "build",
     "declarationDir": "build"
   },
-  "references": [{ "path": "../daf-core" }, { "path": "../daf-did-jwt" }, { "path": "../daf-data-store" }]
+  "references": [{ "path": "../daf-core" }, { "path": "../daf-did-jwt" }]
 }
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
index 2a861eb22..def12f207 100644
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@@ -3,7 +3,6 @@
   "references": [
     { "path": "daf-cli" },
     { "path": "daf-core" },
-    { "path": "daf-data-store" },
     { "path": "daf-did-comm" },
     { "path": "daf-did-jwt" },
     { "path": "daf-ethr-did" },
diff --git a/yarn.lock b/yarn.lock
index 979919721..56e84e6f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9899,21 +9899,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sql-bricks-sqlite@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/sql-bricks-sqlite/-/sql-bricks-sqlite-0.1.0.tgz#5d193589e512e8f8176fdecf19c5bdae5f352550"
-  integrity sha1-XRk1ieUS6PgXb97PGcW9rl81JVA=
-  dependencies:
-    sql-bricks "1.0.0-beta.2"
-    underscore "1.4.x"
-
-sql-bricks@1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/sql-bricks/-/sql-bricks-1.0.0-beta.2.tgz#c5b180b943c189f9fe40a71431459b625141b2c0"
-  integrity sha1-xbGAuUPBifn+QKcUMUWbYlFBssA=
-  dependencies:
-    underscore "1.4.x"
-
 sqlite3@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.1.tgz#539a42e476640796578e22d589b3283c28055242"
@@ -10667,11 +10652,6 @@ umask@^1.1.0, umask@~1.1.0:
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
   integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
-underscore@1.4.x:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
-  integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
-
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"