diff --git a/package-lock.json b/package-lock.json
index 2858122..7981b38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -490,7 +490,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.0.1.tgz",
       "integrity": "sha512-aO8EaEgbgqq77IEw+1jfx5c9zTbzvkfuRBuZsSsPnTHMkmd5AI4J6OtITLZFa381jReeaQL67J0GBTUu0+ZTVw==",
-      "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
@@ -1366,6 +1365,14 @@
       "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
+      },
+      "dependencies": {
+        "tweetnacl": {
+          "version": "0.14.5",
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+          "dev": true
+        }
       }
     },
     "bech32": {
@@ -1446,7 +1453,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
       "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -1658,7 +1664,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
       "requires": {
         "buffer-xor": "^1.0.3",
         "cipher-base": "^1.0.0",
@@ -1807,8 +1812,7 @@
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
     },
     "buffers": {
       "version": "0.1.1",
@@ -2118,7 +2122,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -2479,7 +2482,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
       "requires": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -2492,7 +2494,6 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
       "requires": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -2960,7 +2961,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
       "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=",
-      "dev": true,
       "requires": {
         "browserify-aes": "^1.0.6",
         "create-hash": "^1.1.2",
@@ -3432,9 +3432,9 @@
       }
     },
     "ethers": {
-      "version": "4.0.25",
-      "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.25.tgz",
-      "integrity": "sha512-nxpszD7e1+cXwi/DuaBFmAit0M/+9Suy8nImpiv41nT3tNg8bBKA9mz8VdQbg0X/NT6e5icqdeQpz3FHcy58wg==",
+      "version": "4.0.26",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-4.0.26.tgz",
+      "integrity": "sha512-3hK4S8eAGhuWZ/feip5z17MswjGgjb4lEPJqWO/O0dNqToYLSHhvu6gGQPs8d9f+XfpEB2EYexfF0qjhWiZjUA==",
       "requires": {
         "@types/node": "^10.3.2",
         "aes-js": "3.0.0",
@@ -3475,7 +3475,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
       "requires": {
         "md5.js": "^1.3.4",
         "safe-buffer": "^5.1.1"
@@ -5685,7 +5684,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -5791,9 +5789,9 @@
       }
     },
     "homedir-polyfill": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-      "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
       "requires": {
         "parse-passwd": "^1.0.0"
@@ -6543,7 +6541,7 @@
       }
     },
     "ipfs-log": {
-      "version": "github:orbitdb/ipfs-log#4ca500a39dac057d78bc98222cdb59100196147f",
+      "version": "github:orbitdb/ipfs-log#e4ecb01218ad9e0e1dbe5263204c32e664866892",
       "from": "github:orbitdb/ipfs-log",
       "requires": {
         "cids": "^0.5.7",
@@ -6553,6 +6551,40 @@
         "p-map": "^1.1.1",
         "p-whilst": "^1.0.0",
         "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "elliptic": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+          "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+          "requires": {
+            "bn.js": "^4.4.0",
+            "brorand": "^1.0.1",
+            "hash.js": "^1.0.0",
+            "hmac-drbg": "^1.0.0",
+            "inherits": "^2.0.1",
+            "minimalistic-assert": "^1.0.0",
+            "minimalistic-crypto-utils": "^1.0.0"
+          }
+        },
+        "orbit-db-identity-provider": {
+          "version": "github:orbitdb/orbit-db-identity-provider#ec87a645292325d178537a98ed7bb1c67c0ac234",
+          "from": "github:orbitdb/orbit-db-identity-provider",
+          "requires": {
+            "ethers": "^4.0.20",
+            "orbit-db-keystore": "github:orbitdb/orbit-db-keystore"
+          }
+        },
+        "orbit-db-keystore": {
+          "version": "github:orbitdb/orbit-db-keystore#5ce19d597a5bff7505ede82d20ec8638baa77b1f",
+          "from": "github:orbitdb/orbit-db-keystore",
+          "requires": {
+            "elliptic": "^6.4.0",
+            "lru": "^3.1.0",
+            "mkdirp": "^0.5.1",
+            "node-localstorage": "^1.3.0"
+          }
+        }
       }
     },
     "ipfs-mfs": {
@@ -6948,6 +6980,19 @@
             }
           }
         },
+        "libp2p-crypto-secp256k1": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.2.3.tgz",
+          "integrity": "sha512-DFrK89VdboacqM3vqWV8yt8FH9Ni181JJAOU2tRkJfUN9tNEV7VfZEg390NJxEQQbLsyH4HZ7on3QTpPHMHQZQ==",
+          "dev": true,
+          "requires": {
+            "async": "^2.6.1",
+            "multihashing-async": "~0.5.1",
+            "nodeify": "^1.0.1",
+            "safe-buffer": "^5.1.2",
+            "secp256k1": "^3.6.1"
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -6985,12 +7030,6 @@
             "xtend": "~4.0.1"
           }
         },
-        "tweetnacl": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz",
-          "integrity": "sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A==",
-          "dev": true
-        },
         "xtend": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -7571,8 +7610,7 @@
     "iso-random-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/iso-random-stream/-/iso-random-stream-1.1.0.tgz",
-      "integrity": "sha512-ywSWt0KrWcsaK0jVoVJIR30rLyjg9Rw3k2Sm/qp+3tdtSV0SNH7L7KilKnENcENOSoJxDFvpt2idvuMMQohdCQ==",
-      "dev": true
+      "integrity": "sha512-ywSWt0KrWcsaK0jVoVJIR30rLyjg9Rw3k2Sm/qp+3tdtSV0SNH7L7KilKnENcENOSoJxDFvpt2idvuMMQohdCQ=="
     },
     "iso-url": {
       "version": "0.4.6",
@@ -7762,8 +7800,7 @@
     "keypair": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/keypair/-/keypair-1.0.1.tgz",
-      "integrity": "sha1-dgNxknCvtlZO04oiCHoG/Jqk6hs=",
-      "dev": true
+      "integrity": "sha1-dgNxknCvtlZO04oiCHoG/Jqk6hs="
     },
     "kind-of": {
       "version": "3.2.2",
@@ -8238,7 +8275,6 @@
       "version": "0.16.0",
       "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.16.0.tgz",
       "integrity": "sha512-Msu7PIumcVRO8LajSGs6uVZpC7bOiJVWu0a8iFMZ6mdbasI+A6accAmP/NjJ5WBcEdxzwjzQGNP23bQQzPoqqg==",
-      "dev": true,
       "requires": {
         "asn1.js": "^5.0.1",
         "async": "^2.6.1",
@@ -8256,21 +8292,27 @@
         "ursa-optional": "~0.9.10"
       },
       "dependencies": {
-        "tweetnacl": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz",
-          "integrity": "sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A==",
-          "dev": true
+        "libp2p-crypto-secp256k1": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.2.3.tgz",
+          "integrity": "sha512-DFrK89VdboacqM3vqWV8yt8FH9Ni181JJAOU2tRkJfUN9tNEV7VfZEg390NJxEQQbLsyH4HZ7on3QTpPHMHQZQ==",
+          "requires": {
+            "async": "^2.6.1",
+            "multihashing-async": "~0.5.1",
+            "nodeify": "^1.0.1",
+            "safe-buffer": "^5.1.2",
+            "secp256k1": "^3.6.1"
+          }
         }
       }
     },
     "libp2p-crypto-secp256k1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.2.3.tgz",
-      "integrity": "sha512-DFrK89VdboacqM3vqWV8yt8FH9Ni181JJAOU2tRkJfUN9tNEV7VfZEg390NJxEQQbLsyH4HZ7on3QTpPHMHQZQ==",
-      "dev": true,
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.3.0.tgz",
+      "integrity": "sha512-+rF3S5p2pzS4JLDwVE6gLWZeaKkpl4NkYwG+0knV6ot29UcRSb73OyCWl07r1h5+g9E3KZC3wpsu+RIK5w8zQA==",
       "requires": {
         "async": "^2.6.1",
+        "bs58": "^4.0.1",
         "multihashing-async": "~0.5.1",
         "nodeify": "^1.0.1",
         "safe-buffer": "^5.1.2",
@@ -8540,40 +8582,18 @@
       }
     },
     "libp2p-record": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/libp2p-record/-/libp2p-record-0.6.1.tgz",
-      "integrity": "sha512-GUZ0kQTHFpxeljJhW5f1PnmwW2A0qU9NmF3TP4xkZDmJs3HqawrYovVr9ROGNEPI4ovwjZkJSuG+an3QCQxXWA==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/libp2p-record/-/libp2p-record-0.6.2.tgz",
+      "integrity": "sha512-b+RQc4l6AzYtQq0kAyDYV2Eth1DDsB2TQoQfvQtyJy/iVeKz8Q1RZxLTo7lhwS78LMwcVCGrdlx5H5luONjhjg==",
       "dev": true,
       "requires": {
-        "async": "^2.5.0",
+        "async": "^2.6.2",
         "buffer-split": "^1.0.0",
         "err-code": "^1.1.2",
-        "left-pad": "^1.1.3",
+        "left-pad": "^1.3.0",
         "multihashes": "~0.4.14",
-        "multihashing-async": "~0.4.6",
-        "protons": "^1.0.0"
-      },
-      "dependencies": {
-        "js-sha3": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.7.0.tgz",
-          "integrity": "sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA==",
-          "dev": true
-        },
-        "multihashing-async": {
-          "version": "0.4.8",
-          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.4.8.tgz",
-          "integrity": "sha512-LCc4lfxmTJOHKIjZjFNgvmfB6nXS/ErLInT9uwU8udFrRm2PH+aTPk3mfCREKmCiSHOlCWiv2O8rlnBx+OjlMw==",
-          "dev": true,
-          "requires": {
-            "async": "^2.6.0",
-            "blakejs": "^1.1.0",
-            "js-sha3": "^0.7.0",
-            "multihashes": "~0.4.13",
-            "murmurhash3js": "^3.0.1",
-            "nodeify": "^1.0.1"
-          }
-        }
+        "multihashing-async": "~0.5.2",
+        "protons": "^1.0.1"
       }
     },
     "libp2p-secio": {
@@ -9248,7 +9268,6 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -9942,8 +9961,7 @@
     "node-forge": {
       "version": "0.7.6",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz",
-      "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==",
-      "dev": true
+      "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="
     },
     "node-libs-browser": {
       "version": "2.2.0",
@@ -10213,7 +10231,6 @@
       "version": "0.3.7",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
       "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-      "dev": true,
       "requires": {
         "wordwrap": "~0.0.2"
       }
@@ -10288,11 +10305,11 @@
       }
     },
     "orbit-db-identity-provider": {
-      "version": "github:orbitdb/orbit-db-identity-provider#ec87a645292325d178537a98ed7bb1c67c0ac234",
-      "from": "github:orbitdb/orbit-db-identity-provider",
+      "version": "github:orbitdb/orbit-db-identity-provider#3a5da7943d1bb3a1844dfde714a4ae4477a3dfc8",
+      "from": "github:orbitdb/orbit-db-identity-provider#libp2p",
       "requires": {
         "ethers": "^4.0.20",
-        "orbit-db-keystore": "github:orbitdb/orbit-db-keystore"
+        "orbit-db-keystore": "github:orbitdb/orbit-db-keystore#libp2p"
       }
     },
     "orbit-db-io": {
@@ -10306,29 +10323,14 @@
       }
     },
     "orbit-db-keystore": {
-      "version": "github:orbitdb/orbit-db-keystore#5ce19d597a5bff7505ede82d20ec8638baa77b1f",
-      "from": "github:orbitdb/orbit-db-keystore",
+      "version": "github:orbitdb/orbit-db-keystore#2fba38ba7b0160c348ef7bf7f0c7d2adfebb8836",
+      "from": "github:orbitdb/orbit-db-keystore#libp2p",
       "requires": {
-        "elliptic": "^6.4.0",
+        "libp2p-crypto": "^0.16.0",
+        "libp2p-crypto-secp256k1": "^0.3.0",
         "lru": "^3.1.0",
         "mkdirp": "^0.5.1",
-        "node-localstorage": "^1.3.0"
-      },
-      "dependencies": {
-        "elliptic": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-          "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
-          "requires": {
-            "bn.js": "^4.4.0",
-            "brorand": "^1.0.1",
-            "hash.js": "^1.0.0",
-            "hmac-drbg": "^1.0.0",
-            "inherits": "^2.0.1",
-            "minimalistic-assert": "^1.0.0",
-            "minimalistic-crypto-utils": "^1.0.0"
-          }
-        }
+        "node-localstorage": "^1.3.1"
       }
     },
     "orbit-db-kvstore": {
@@ -10349,7 +10351,7 @@
       }
     },
     "orbit-db-store": {
-      "version": "github:orbitdb/orbit-db-store#44971a3f4afb347353def6cfae9d5cf84f2fecac",
+      "version": "github:orbitdb/orbit-db-store#5e12c7e65848a380e7bd0baeb7200190c40b3922",
       "from": "github:orbitdb/orbit-db-store",
       "requires": {
         "ipfs-log": "github:orbitdb/ipfs-log",
@@ -10732,7 +10734,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pem-jwk/-/pem-jwk-2.0.0.tgz",
       "integrity": "sha512-rFxu7rVoHgQ5H9YsP50dDWf0rHjreVA2z0yPiWr5WdH/UHb29hKtF7h6l8vNd1cbYR1t0QL+JKhW55a2ZV4KtA==",
-      "dev": true,
       "requires": {
         "asn1.js": "^5.0.1"
       }
@@ -12190,7 +12191,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -12210,7 +12210,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/rsa-pem-to-jwk/-/rsa-pem-to-jwk-1.1.3.tgz",
       "integrity": "sha1-JF52vbfnI0z+58oDLTG1TDj6uY4=",
-      "dev": true,
       "requires": {
         "object-assign": "^2.0.0",
         "rsa-unpack": "0.0.6"
@@ -12219,8 +12218,7 @@
         "object-assign": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
-          "dev": true
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
         }
       }
     },
@@ -12228,7 +12226,6 @@
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/rsa-unpack/-/rsa-unpack-0.0.6.tgz",
       "integrity": "sha1-9Q69VqYoN45jHylxYQJs6atO3bo=",
-      "dev": true,
       "requires": {
         "optimist": "~0.3.5"
       }
@@ -12315,7 +12312,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.6.2.tgz",
       "integrity": "sha512-90nYt7yb0LmI4A2jJs1grglkTAXrBwxYAjP9bpeKjvJKOjG2fOeH/YI/lchDMIvjrOasd5QXwvV2jwN168xNng==",
-      "dev": true,
       "requires": {
         "bindings": "^1.2.1",
         "bip66": "^1.1.3",
@@ -12388,7 +12384,6 @@
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -12934,6 +12929,14 @@
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
+      },
+      "dependencies": {
+        "tweetnacl": {
+          "version": "0.14.5",
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+          "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+          "dev": true
+        }
       }
     },
     "ssri": {
@@ -13834,10 +13837,9 @@
       }
     },
     "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz",
+      "integrity": "sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A=="
     },
     "typedarray": {
       "version": "0.0.6",
@@ -14326,7 +14328,6 @@
       "version": "0.9.10",
       "resolved": "https://registry.npmjs.org/ursa-optional/-/ursa-optional-0.9.10.tgz",
       "integrity": "sha512-RvEbhnxlggX4MXon7KQulTFiJQtLJZpSb9ZSa7ZTkOW0AzqiVTaLjI4vxaSzJBDH9dwZ3ltZadFiBaZslp6haA==",
-      "dev": true,
       "requires": {
         "bindings": "^1.3.0",
         "nan": "^2.11.1"
@@ -14335,8 +14336,7 @@
         "nan": {
           "version": "2.12.1",
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
-          "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
-          "dev": true
+          "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
         }
       }
     },
@@ -15398,8 +15398,7 @@
     "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-      "dev": true
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
     },
     "worker-farm": {
       "version": "1.6.0",
diff --git a/package.json b/package.json
index 5591aa6..d25eed3 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,9 @@
     "orbit-db-docstore": "github:orbitdb/orbit-db-docstore",
     "orbit-db-eventstore": "github:orbitdb/orbit-db-eventstore",
     "orbit-db-feedstore": "github:orbitdb/orbit-db-feedstore",
-    "orbit-db-identity-provider": "github:orbitdb/orbit-db-identity-provider",
+    "orbit-db-identity-provider": "github:orbitdb/orbit-db-identity-provider#libp2p",
     "orbit-db-io": "~0.0.1",
-    "orbit-db-keystore": "github:orbitdb/orbit-db-keystore",
+    "orbit-db-keystore": "github:orbitdb/orbit-db-keystore#libp2p",
     "orbit-db-kvstore": "github:orbitdb/orbit-db-kvstore",
     "orbit-db-pubsub": "~0.5.5",
     "orbit-db-store": "github:orbitdb/orbit-db-store",
diff --git a/test/utils/custom-test-keystore.js b/test/utils/custom-test-keystore.js
index 7b4717c..ce03c1a 100644
--- a/test/utils/custom-test-keystore.js
+++ b/test/utils/custom-test-keystore.js
@@ -17,12 +17,14 @@ class CustomTestKeystore {
 
   createKey (id) {
     const key = ec.genKeyPair()
-    const keyPair = ec.keyPair({
-      pub:  key.getPublic('hex'),
+    const keyPair = {
+      public:  {
+        marshal: () => key.getPublic('hex')
+      },
       priv: key.getPrivate('hex'),
       privEnc: 'hex',
       pubEnc: 'hex',
-    })
+    }
 
     return keyPair
   }
@@ -33,8 +35,6 @@ class CustomTestKeystore {
 
   sign (key, data) {
     return Promise.resolve('<signature>')
-    const sig = ec.sign(data, key)
-    return Promise.resolve(sig.toDER('hex'))
   }
 
   verify (signature, publicKey, data) {