From f5ddd57faf69b979aa80dd8922c09436342daa15 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Tue, 17 Aug 2021 09:53:40 +0100
Subject: [PATCH 1/2] fix: use correct datastores

- keys is a fs datastore
- mfs uses the root datastore though it should really use the datastore datastore
---
 .../ipfs-core/src/components/files/utils/with-mfs-root.js   | 6 +++---
 packages/ipfs-core/src/runtime/repo-nodejs.js               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ipfs-core/src/components/files/utils/with-mfs-root.js b/packages/ipfs-core/src/components/files/utils/with-mfs-root.js
index f9b66146de..6b77c84d60 100644
--- a/packages/ipfs-core/src/components/files/utils/with-mfs-root.js
+++ b/packages/ipfs-core/src/components/files/utils/with-mfs-root.js
@@ -25,13 +25,13 @@ const loadMfsRoot = async (context, options) => {
   }
 
   // Open the repo if it's been closed
-  await context.repo.datastore.open()
+  await context.repo.root.open()
 
   // Load the MFS root CID
   let cid
 
   try {
-    const buf = await context.repo.datastore.get(MFS_ROOT_KEY)
+    const buf = await context.repo.root.get(MFS_ROOT_KEY)
 
     cid = CID.decode(buf)
   } catch (err) {
@@ -52,7 +52,7 @@ const loadMfsRoot = async (context, options) => {
       throw errCode(new Error('Request aborted'), 'ERR_ABORTED', { name: 'Aborted' })
     }
 
-    await context.repo.datastore.put(MFS_ROOT_KEY, cid.bytes)
+    await context.repo.root.put(MFS_ROOT_KEY, cid.bytes)
   }
 
   log(`Loaded MFS root /ipfs/${cid}`)
diff --git a/packages/ipfs-core/src/runtime/repo-nodejs.js b/packages/ipfs-core/src/runtime/repo-nodejs.js
index e160bb204d..9fd7d9ab4a 100644
--- a/packages/ipfs-core/src/runtime/repo-nodejs.js
+++ b/packages/ipfs-core/src/runtime/repo-nodejs.js
@@ -53,7 +53,7 @@ module.exports = (print, codecs, options = {}) => {
       )
     ),
     datastore: new DatastoreLevel(`${repoPath}/datastore`),
-    keys: new DatastoreLevel(`${repoPath}/keys`),
+    keys: new DatastoreFS(`${repoPath}/keys`),
     pins: new DatastoreLevel(`${repoPath}/pins`)
   }, {
     autoMigrate: options.autoMigrate != null ? options.autoMigrate : true,

From 772ecbae91eb5bd48aa54972544551dee2ea18e7 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Tue, 17 Aug 2021 10:30:39 +0100
Subject: [PATCH 2/2] chore: fix up tests

---
 .../ipfs-core/src/components/files/utils/update-mfs-root.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ipfs-core/src/components/files/utils/update-mfs-root.js b/packages/ipfs-core/src/components/files/utils/update-mfs-root.js
index 47ba7e8abc..1b3b649ecf 100644
--- a/packages/ipfs-core/src/components/files/utils/update-mfs-root.js
+++ b/packages/ipfs-core/src/components/files/utils/update-mfs-root.js
@@ -22,7 +22,7 @@ const updateMfsRoot = async (context, cid, options) => {
 
   log(`New MFS root will be ${cid}`)
 
-  await context.repo.datastore.put(MFS_ROOT_KEY, cid.bytes)
+  await context.repo.root.put(MFS_ROOT_KEY, cid.bytes)
 
   return cid
 }