Merge pull request #86 from noffle/upgrade-peer-id

upgrades peer-id to 0.6.0
ipfs · Mar 15, 2016 · 8b4dab0 · 8b4dab0
2 parents 826eaf8 + 74f4860
commit 8b4dab0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "joi": "^8.0.2",
     "lodash.get": "^4.0.0",
     "lodash.set": "^4.0.0",
-    "peer-id": "^0.5.0",
+    "peer-id": "^0.6.0",
     "ronin": "^0.3.11",
     "temp": "^0.8.3"
   }

diff --git a/src/ipfs-core/index.js b/src/ipfs-core/index.js
@@ -56,7 +56,7 @@ function IPFS (repo) {
         var pid = peerId.createFromPrivKey(config.Identity.PrivKey)
         callback(null, {
           ID: config.Identity.PeerID,
-          PublicKey: pid.pubKey,
+          PublicKey: pid.pubKey.toString('base64'),
           Addresses: config.Addresses,
           AgentVersion: 'js-ipfs',
           ProtocolVersion: '9000'