Merge pull request #1 from bitpay/master

rebase master

README.md

@@ -28,7 +28,7 @@ var xpriv = code.toHDPrivateKey();
 
 ## Contributing
 
-See [CONTRIBUTING.md](https://github.com/bitpay/bitcore) on the main bitcore repo for information about how to contribute.
+See [CONTRIBUTING.md](https://github.com/bitpay/bitcore/blob/master/CONTRIBUTING.md) on the main bitcore repo for information about how to contribute.
 
 ## License
 

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bitcore-mnemonic",
   "main": "./bitcore-mnemonic.min.js",
-  "version": "0.11.0",
+  "version": "0.13.2",
   "homepage": "https://github.com/bitpay/bitcore-mnemonic",
   "authors": [
     "BitPay"

docs/index.md

@@ -36,7 +36,7 @@ code.toString(); // 'select scout crash enforce riot rival spring whale hollow r
 
 ## Multi-language support
 
-The `Mnemonic` class can use any list of 2048 unique words to generate the mnemonic code. For convenience the class provides default word lists for the following languages: English (default), Chinese, Japanese and Spanish. Those word list are published under `Mnemonic.Words.LANGUAGE`, take a look at the following example:
+The `Mnemonic` class can use any list of 2048 unique words to generate the mnemonic code. For convenience the class provides default word lists for the following languages: English (default), Chinese, French, Japanese and Spanish. Those word list are published under `Mnemonic.Words.LANGUAGE`, take a look at the following example:
 
 ```javascript
 var Mnemonic = require('bitcore-mnemonic');

lib/mnemonic.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var bitcore = require('bitcore');
+var BN = bitcore.crypto.BN;
 var unorm = require('unorm');
 var _ = bitcore.deps._;
 
@@ -107,7 +108,7 @@ Mnemonic.Words = require('./words');
  * @returns {boolean}
  */
 Mnemonic.isValid = function(mnemonic, wordlist) {
-  mnemonic = unorm.nfkd(mnemonic)
+  mnemonic = unorm.nfkd(mnemonic);
   wordlist = wordlist || Mnemonic._getDictionary(mnemonic);
 
   if (!wordlist) {
@@ -141,8 +142,12 @@ Mnemonic.isValid = function(mnemonic, wordlist) {
  * @returns {boolean}
  */
 Mnemonic._belongsToWordlist = function(mnemonic, wordlist) {
-  var word = unorm.nfkd(mnemonic).split(' ')[0];
-  return wordlist.indexOf(word) !== -1; // only checks for a word
+  var words = unorm.nfkd(mnemonic).split(' ');
+  for (var i = 0; i < words.length; i++) {
+    var ind = wordlist.indexOf(words[i]);
+    if (ind < 0) return false;
+  }
+  return true;
 };
 
 /**
@@ -254,10 +259,11 @@ Mnemonic._entropy2mnemonic = function(entropy, wordlist) {
     var wi = parseInt(bin.slice(i * 11, (i + 1) * 11), 2);
     mnemonic.push(wordlist[wi]);
   }
-  if (wordlist == Mnemonic.Words.JAPANESE) {
-    var ret = mnemonic.join('\u3000');
+  var ret;
+  if (wordlist === Mnemonic.Words.JAPANESE) {
+    ret = mnemonic.join('\u3000');
   } else {
-    var ret = mnemonic.join(' ');
+    ret = mnemonic.join(' ');
   }
   return ret;
 };
@@ -274,11 +280,16 @@ Mnemonic._entropyChecksum = function(entropy) {
   var bits = entropy.length * 8;
   var cs = bits / 32;
 
-  var hashbits = parseInt(hash.toString('hex'), 16).toString(2);
+  var hashbits = new BN(hash.toString('hex'), 16).toString(2);
+
   // zero pad the hash bits
-  hashbits = (new Array(256).join('0') + hashbits).slice(-256).slice(0, cs);
+  while (hashbits.length % 256 !== 0) {
+    hashbits = '0' + hashbits;
+  }
+
+  var checksum = hashbits.slice(0, cs);
 
-  return hashbits;
+  return checksum;
 };
 
 module.exports = Mnemonic;

lib/words/index.js

@@ -1,6 +1,7 @@
 module.exports = {
   'CHINESE': require('./chinese'),
   'ENGLISH': require('./english'),
+  'FRENCH': require('./french'),
   'JAPANESE': require('./japanese'),
   'SPANISH': require('./spanish')
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcore-mnemonic",
-  "version": "0.11.0",
+  "version": "0.13.2",
   "description": "BIP39 Mnemonics implemented for Bitcore.",
   "author": "BitPay <[email protected]>",
   "main": "index.js",
@@ -37,7 +37,7 @@
     "gulp": "^3.8.10"
   },
   "dependencies": {
-    "bitcore": "^0.12.0",
+    "bitcore": "^0.13.0",
     "unorm": "^1.3.3"
   }
 }

test/mnemonic.unit.js

@@ -30,7 +30,7 @@ describe('Mnemonic', function() {
 
       it('should fail with unknown word list', function() {
         (function() {
-          return new Mnemonic('pilote foster august tomorrow kit daughter unknown awesome model town village master');
+          return new Mnemonic('pilots foster august tomorrow kit daughter unknown awesome model town village master');
         }).should.throw(errors.Mnemonic.UnknownWordlist);
       });
 
@@ -90,6 +90,11 @@ describe('Mnemonic', function() {
       Mnemonic.Words.CHINESE[0].should.equal('的');
     });
 
+    it('french wordlist is complete', function() {
+      Mnemonic.Words.FRENCH.length.should.equal(2048);
+      Mnemonic.Words.FRENCH[0].should.equal('abaisser');
+    });
+
     it('allows use different phrase lengths', function() {
       var mnemonic;
 
@@ -121,6 +126,9 @@ describe('Mnemonic', function() {
 
       var invalid3 = Mnemonic.isValid('totally invalid phrase');
       invalid3.should.equal(false);
+
+      var valid2 = Mnemonic.isValid('caution opprimer époque belote devenir ficeler filleul caneton apologie nectar frapper fouiller');
+      valid2.should.equal(true);
     });
 
     it('has a toString method', function() {