From fe824b4f5b0fbf2b69386e3cd8299d9955073eb5 Mon Sep 17 00:00:00 2001
From: camelmasa <camelmasa@gmail.com>
Date: Sat, 21 Apr 2018 16:47:06 +0900
Subject: [PATCH 1/3] Update libp2p-crypto npm from 0.12.0 to 0.13.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f04b5c8..f63d0ff 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "async": "^2.6.0",
     "deepmerge": "^1.5.2",
     "interface-datastore": "~0.4.2",
-    "libp2p-crypto": "~0.12.0",
+    "libp2p-crypto": "~0.13.0",
     "pull-stream": "^3.6.1",
     "sanitize-filename": "^1.6.1"
   },

From 00cc456135d8db42aeda6d7b74cd83fefa37d88b Mon Sep 17 00:00:00 2001
From: camelmasa <camelmasa@gmail.com>
Date: Sat, 21 Apr 2018 17:06:55 +0900
Subject: [PATCH 2/3] Update aegir npm from 12.4.0 to 13.0.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f63d0ff..aef2f08 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "sanitize-filename": "^1.6.1"
   },
   "devDependencies": {
-    "aegir": "^12.4.0",
+    "aegir": "^13.0.7",
     "chai": "^4.1.2",
     "chai-string": "^1.4.0",
     "datastore-fs": "~0.4.2",

From 4c47a66f35ce73b3303a1268787a2c704be02694 Mon Sep 17 00:00:00 2001
From: camelmasa <camelmasa@gmail.com>
Date: Mon, 23 Apr 2018 11:06:47 +0900
Subject: [PATCH 3/3] Replace deepmerge to lodash.merge

---
 package.json    | 2 +-
 src/keychain.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index aef2f08..453027c 100644
--- a/package.json
+++ b/package.json
@@ -43,9 +43,9 @@
   "homepage": "https://github.com/libp2p/js-libp2p-keychain#readme",
   "dependencies": {
     "async": "^2.6.0",
-    "deepmerge": "^1.5.2",
     "interface-datastore": "~0.4.2",
     "libp2p-crypto": "~0.13.0",
+    "lodash.merge": "^4.6.1",
     "pull-stream": "^3.6.1",
     "sanitize-filename": "^1.6.1"
   },
diff --git a/src/keychain.js b/src/keychain.js
index 41f5c1c..0ec392a 100644
--- a/src/keychain.js
+++ b/src/keychain.js
@@ -2,7 +2,7 @@
 'use strict'
 
 const sanitize = require('sanitize-filename')
-const deepmerge = require('deepmerge')
+const deepmerge = require('lodash.merge')
 const crypto = require('libp2p-crypto')
 const DS = require('interface-datastore')
 const pull = require('pull-stream')
@@ -104,7 +104,8 @@ class Keychain {
     }
     this.store = store
 
-    const opts = deepmerge(defaultOptions, options)
+    const opts = {}
+    deepmerge(opts, defaultOptions, options)
 
     // Enforce NIST SP 800-132
     if (!opts.passPhrase || opts.passPhrase.length < 20) {