chore: release version v0.8.8

feat: set privKey pubKey

.travis.yml

@@ -7,19 +7,19 @@ matrix:
     env: CXX=g++-4.8
   - node_js: 6
     env:
-      - SAUCE=true
       - CXX=g++-4.8
   - node_js: stable
     env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
-  - npm install -g npm
+  - npm install -g npm@4
 
 script:
   - npm run lint
   - npm test
   - npm run coverage
+  - make test
 
 before_script:
   - export DISPLAY=:99.0
@@ -29,7 +29,7 @@ after_success:
   - npm run coverage-publish
 
 addons:
-  firefox: latest
+  firefox: 'latest'
   apt:
     sources:
       - ubuntu-toolchain-r-test

README.md

@@ -9,8 +9,6 @@
 ![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
 ![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
 
-[![Sauce Test Status](https://saucelabs.com/browser-matrix/ipfs-js-peer-id.svg)](https://saucelabs.com/u/ipfs-js-peer-id)
-
 > [IPFS](https://github.com/ipfs/ipfs) Peer ID implementation in JavaScript.
 
 - [Description](#description)
@@ -44,25 +42,21 @@
 
 Generate, import, and export PeerIDs, for use with [IPFS](https://github.com/ipfs/ipfs).
 
-*A Peer ID is the SHA-256 [multihash](https://github.com/multiformats/multihash) of a
+A Peer ID is the SHA-256 [multihash](https://github.com/multiformats/multihash) of a public key.
-public key.*
 
-*The public key is a base64 encoded string of a protobuf containing an RSA DER
+The public key is a base64 encoded string of a protobuf containing an RSA DER buffer. This uses a node buffer to pass the base64 encoded public key protobuf to the multihash for ID generation.
-buffer. This uses a node buffer to pass the base64 encoded public key protobuf
-to the multihash for ID generation.*
 
 # Example
 
-```js
+```JavaScript
-var PeerId = require('peer-id')
+const PeerId = require('peer-id')
-var bs58 = require('bs58')
 
 PeerId.create({ bits: 1024 }, (err, id) => {
+  if (err) { throw err }
   console.log(JSON.stringify(id.toJSON(), null, 2))
 })
 ```
-
+```bash
-```
 {
   "id": "Qma9T5YraSnpRDZqRR4krcSJabThc8nwZuJV3LercPHufi",
   "privKey": "CAAS4AQwggJcAgEAAoGBAMBgbIqyOL26oV3nGPBYrdpbv..",
@@ -83,7 +77,7 @@ PeerId.create({ bits: 1024 }, (err, id) => {
 ## Node.js
 
 ```js
-var PeerId = require('peer-id')
+const PeerId = require('peer-id')
 ```
 
 ## Browser: Browserify, Webpack, other bundlers
@@ -94,7 +88,7 @@ it and use with your favourite bundler without having to adjust asset management
 process.
 
 ```js
-var PeerId = require('peer-id')
+const PeerId = require('peer-id')
 ```
 
 ## Browser: `<script>` Tag

circle.yml

@@ -5,8 +5,10 @@ machine:
 dependencies:
   pre:
     - google-chrome --version
-    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - sudo dpkg -i google-chrome.deb || true
     - sudo apt-get update
-    - sudo apt-get --only-upgrade install google-chrome-stable
+    - sudo apt-get install -f
+    - sudo apt-get install --only-upgrade lsb-base
+    - sudo dpkg -i google-chrome.deb
     - google-chrome --version

package.json

@@ -1,6 +1,6 @@
 {
   "name": "peer-id",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "IPFS Peer Id implementation in Node.js",
   "main": "src/index.js",
   "bin": "src/bin.js",
@@ -34,14 +34,14 @@
   },
   "homepage": "https://github.com/libp2p/js-peer-id",
   "devDependencies": {
-    "aegir": "^11.0.1",
+    "aegir": "^11.0.2",
-    "chai": "^3.5.0",
+    "chai": "^4.1.0",
-    "dirty-chai": "^1.2.2",
+    "dirty-chai": "^2.0.1",
     "pre-commit": "^1.2.2"
   },
   "dependencies": {
-    "async": "^2.2.0",
+    "async": "^2.5.0",
-    "libp2p-crypto": "~0.8.7",
+    "libp2p-crypto": "~0.8.8",
     "lodash": "^4.17.4",
     "multihashes": "~0.4.5"
   },

src/index.js

@@ -35,26 +35,32 @@ class PeerId {
     return this._privKey
   }
 
+  set privKey (privKey) {
+    this._privKey = privKey
+  }
+
   get pubKey () {
     if (this._pubKey) {
       return this._pubKey
     }
 
-    if (this.privKey) {
+    if (this._privKey) {
-      return this.privKey.public
+      return this._privKey.public
     }
   }
 
-  // Return the protobuf version of the public key,
+  set pubKey (pubKey) {
-  // matching go ipfs formatting
+    this._pubKey = pubKey
+  }
+
+  // Return the protobuf version of the public key, matching go ipfs formatting
   marshalPubKey () {
     if (this.pubKey) {
       return crypto.marshalPublicKey(this.pubKey)
     }
   }
 
-  // Return the protobuf version of the private key,
+  // Return the protobuf version of the private key, matching go ipfs formatting
-  // matching go ipfs formatting
   marshalPrivKey () {
     if (this.privKey) {
       return crypto.marshalPrivateKey(this.privKey)
@@ -98,6 +104,22 @@ class PeerId {
       throw new Error('not valid Id')
     }
   }
+
+  /*
+   * Check if this PeerId instance is valid (privKey -> pubKey -> Id)
+   */
+  isValid (callback) {
+    // TODO Needs better checking
+    if (this.privKey &&
+      this.privKey.public &&
+      this.privKey.public.bytes &&
+      Buffer.isBuffer(this.pubKey.bytes) &&
+      this.privKey.public.bytes.equals(this.pubKey.bytes)) {
+      callback()
+    } else {
+      callback(new Error('Keys not match'))
+    }
+  }
 }
 
 exports = module.exports = PeerId
@@ -139,16 +161,17 @@ exports.createFromB58String = function (str) {
 
 // Public Key input will be a buffer
 exports.createFromPubKey = function (key, callback) {
+  if (typeof callback !== 'function') {
+    throw new Error('callback is required')
+  }
+
   let buf = key
   if (typeof buf === 'string') {
     buf = new Buffer(key, 'base64')
   }
 
-  if (typeof callback !== 'function') {
-    throw new Error('callback is required')
-  }
-
   const pubKey = crypto.unmarshalPublicKey(buf)
+
   pubKey.hash((err, digest) => {
     if (err) {
       return callback(err)

test/peer-id.spec.js

@@ -197,17 +197,56 @@ describe('PeerId', () => {
     })
   })
 
+  it('set privKey (valid)', (done) => {
+    PeerId.create((err, peerId) => {
+      expect(err).to.not.exist()
+      peerId.privKey = peerId._privKey
+      peerId.isValid(done)
+    })
+  })
+
+  it('set pubKey (valid)', (done) => {
+    PeerId.create((err, peerId) => {
+      expect(err).to.not.exist()
+      peerId.pubKey = peerId._pubKey
+      peerId.isValid(done)
+    })
+  })
+
+  it('set privKey (invalid)', (done) => {
+    PeerId.create((err, peerId) => {
+      expect(err).to.not.exist()
+      peerId.privKey = new Buffer('bufff')
+      peerId.isValid((err) => {
+        expect(err).to.exist()
+        done()
+      })
+    })
+  })
+
+  it('set pubKey (invalid)', (done) => {
+    PeerId.create((err, peerId) => {
+      expect(err).to.not.exist()
+      peerId.pubKey = new Buffer('buffff')
+      peerId.isValid((err) => {
+        expect(err).to.exist()
+        done()
+      })
+    })
+  })
+
   describe('throws on inconsistent data', () => {
-    let k1, k2, k3
+    let k1
+    let k2
+    let k3
+
     before((done) => {
       parallel([
         (cb) => crypto.generateKeyPair('RSA', 1024, cb),
         (cb) => crypto.generateKeyPair('RSA', 1024, cb),
         (cb) => crypto.generateKeyPair('RSA', 1024, cb)
       ], (err, keys) => {
-        if (err) {
+        expect(err).to.not.exist()
-          return done(err)
-        }
 
         k1 = keys[0]
         k2 = keys[1]
@@ -219,11 +258,8 @@ describe('PeerId', () => {
     it('missmatch private - public key', (done) => {
       k1.public.hash((err, digest) => {
         expect(err).to.not.exist()
-        expect(
+        expect(() => new PeerId(digest, k1, k2.public))
-          () => new PeerId(digest, k1, k2.public)
+          .to.throw(/inconsistent arguments/)
-        ).to.throw(
-            /inconsistent arguments/
-        )
         done()
       })
     })
@@ -231,11 +267,8 @@ describe('PeerId', () => {
     it('missmatch id - private - public key', (done) => {
       k1.public.hash((err, digest) => {
         expect(err).to.not.exist()
-        expect(
+        expect(() => new PeerId(digest, k1, k3.public))
-          () => new PeerId(digest, k1, k3.public)
+          .to.throw(/inconsistent arguments/)
-        ).to.throw(
-            /inconsistent arguments/
-        )
         done()
       })
     })