mirror of https://github.com/status-im/bip39.git
Refactor entropyToMnemonic to use buffer and crypto
This commit is contained in:
parent
e625e4defc
commit
9593d0b287
22
index.js
22
index.js
|
@ -2,7 +2,7 @@ var Crypto = require('crypto-js')
|
||||||
var path = require('path')
|
var path = require('path')
|
||||||
var includeFolder = require('include-folder')
|
var includeFolder = require('include-folder')
|
||||||
var Wordlists = includeFolder(path.join(__dirname, 'wordlists'))
|
var Wordlists = includeFolder(path.join(__dirname, 'wordlists'))
|
||||||
var randomBytes = require('crypto').randomBytes
|
var crypto = require('crypto')
|
||||||
|
|
||||||
module.exports = BIP39
|
module.exports = BIP39
|
||||||
|
|
||||||
|
@ -17,14 +17,14 @@ BIP39.prototype.mnemonicToSeed = function(mnemonic, password){
|
||||||
}
|
}
|
||||||
|
|
||||||
BIP39.prototype.entropyToMnemonic = function(entropy){
|
BIP39.prototype.entropyToMnemonic = function(entropy){
|
||||||
var entropyBytes = hexToBytes(entropy)
|
var entropyBuffer = new Buffer(entropy, 'hex')
|
||||||
var bits = bytesToBinary(entropyBytes)
|
var hash = crypto.createHash('sha256').update(entropyBuffer).digest()
|
||||||
|
|
||||||
var hash = Crypto.SHA256(bytesToWordArray(entropyBytes))
|
var combined = Buffer.concat([entropyBuffer, hash])
|
||||||
var checksumBits = bytesToBinary(wordsToBytes(hash.words))
|
var bitLength = entropyBuffer.length * 8 + entropyBuffer.length / 4
|
||||||
var checksum = checksumBits.substr(0, bits.length / 32)
|
var bits = bytesToBinary([].slice.call(combined)).substr(0, bitLength)
|
||||||
|
|
||||||
var chunks = (bits + checksum).match(/(.{1,11})/g)
|
var chunks = (bits).match(/(.{1,11})/g)
|
||||||
return chunks.map(function(binary){
|
return chunks.map(function(binary){
|
||||||
var index = parseInt(binary, 2)
|
var index = parseInt(binary, 2)
|
||||||
return this.wordlist[index]
|
return this.wordlist[index]
|
||||||
|
@ -33,7 +33,7 @@ BIP39.prototype.entropyToMnemonic = function(entropy){
|
||||||
|
|
||||||
BIP39.prototype.generateMnemonic = function(strength){
|
BIP39.prototype.generateMnemonic = function(strength){
|
||||||
strength = strength || 128
|
strength = strength || 128
|
||||||
var entropy = randomBytes(strength/8).toString('hex')
|
var entropy = crypto.randomBytes(strength/8).toString('hex')
|
||||||
return this.entropyToMnemonic(entropy)
|
return this.entropyToMnemonic(entropy)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,12 +79,6 @@ function encode_utf8(s){
|
||||||
|
|
||||||
//=========== helper methods from bitcoinjs-lib ========
|
//=========== helper methods from bitcoinjs-lib ========
|
||||||
|
|
||||||
function hexToBytes(hex) {
|
|
||||||
return hex.match(/../g).map(function(x) {
|
|
||||||
return parseInt(x,16)
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function bytesToBinary(bytes) {
|
function bytesToBinary(bytes) {
|
||||||
return bytes.map(function(x) {
|
return bytes.map(function(x) {
|
||||||
return lpad(x.toString(2), '0', 8)
|
return lpad(x.toString(2), '0', 8)
|
||||||
|
|
Loading…
Reference in New Issue