nexus/bip39
2
0
Fork 0
mirror of https://github.com/OneKeyHQ/bip39.git synced 2026-04-05 18:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow manual override for entropy type

Browse Source
This commit is contained in:
Ian Coleman
2019-12-17 13:42:44 +11:00
parent f7e9fdf002
commit 516c16d721
5 changed files with 110 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/css/app.css
View File

@@ -106,3 +106,6 @@ body {
.visual-privacy .private-data {
display: none;
}
.text-weight-normal {
font-weight: normal !important;
}

42
src/index.html
View File

@@ -123,12 +123,42 @@
<div class="col-sm-3">
<p>Valid entropy values include:</p>
<ul>
<li><strong>Binary</strong> [0-1]<br>101010011</li>
<li><strong>Base 6</strong> [0-5]<br>123434014</li>
<li><strong>Dice</strong> [1-6]<br>62535634</li>
<li><strong>Base 10</strong> [0-9]<br>90834528</li>
<li><strong>Hex</strong> [0-9A-F]<br>4187a8bfd9</li>
<li><strong>Card</strong> [A2-9TJQK][CDHS]<br>ahqs9dtc</li>
<li>
<label>
<input type="radio" name="entropy-type" value="binary">
<strong>Binary</strong> [0-1]<br>101010011
</label>
</li>
<li>
<label>
<input type="radio" name="entropy-type" value="base 6">
<strong>Base 6</strong> [0-5]<br>123434014
</label>
</li>
<li>
<label>
<input type="radio" name="entropy-type" value="dice">
<strong>Dice</strong> [1-6]<br>62535634
</label>
</li>
<li>
<label>
<input type="radio" name="entropy-type" value="base 10">
<strong>Base 10</strong> [0-9]<br>90834528
</label>
</li>
<li>
<label>
<input type="radio" name="entropy-type" value="hexadecimal" checked>
<strong>Hex</strong> [0-9A-F]<br>4187a8bfd9
</label>
</li>
<li>
<label>
<input type="radio" name="entropy-type" value="card">
<strong>Card</strong> [A2-9TJQK][CDHS]<br>ahqs9dtc
</label>
</li>
</ul>
</div>
</div>

17
src/js/entropy.js
View File

@@ -67,9 +67,9 @@ window.Entropy = new (function() {
return ints;
}
this.fromString = function(rawEntropyStr) {
this.fromString = function(rawEntropyStr, baseStr) {
// Find type of entropy being used (binary, hex, dice etc)
var base = getBase(rawEntropyStr);
var base = getBase(rawEntropyStr, baseStr);
// Convert dice to base6 entropy (ie 1-6 to 0-5)
// This is done by changing all 6s to 0s
if (base.str == "dice") {
@@ -166,13 +166,14 @@ window.Entropy = new (function() {
return s;
}
function getBase(str) {
function getBase(str, baseStr) {
// Need to get the lowest base for the supplied entropy.
// This prevents interpreting, say, dice rolls as hexadecimal.
var binaryMatches = matchers.binary(str);
var hexMatches = matchers.hex(str);
var autodetect = baseStr === undefined;
// Find the lowest base that can be used, whilst ignoring any irrelevant chars
if (binaryMatches.length == hexMatches.length && hexMatches.length > 0) {
if ((binaryMatches.length == hexMatches.length && hexMatches.length > 0 && autodetect) || baseStr === "binary") {
var ints = binaryMatches.map(function(i) { return parseInt(i, 2) });
return {
ints: ints,
@@ -183,7 +184,7 @@ window.Entropy = new (function() {
}
}
var cardMatches = matchers.card(str);
if (cardMatches.length >= hexMatches.length / 2) {
if ((cardMatches.length >= hexMatches.length / 2 && autodetect) || baseStr === "card") {
var ints = convertCardsToInts(cardMatches);
return {
ints: ints,
@@ -194,7 +195,7 @@ window.Entropy = new (function() {
}
}
var diceMatches = matchers.dice(str);
if (diceMatches.length == hexMatches.length && hexMatches.length > 0) {
if ((diceMatches.length == hexMatches.length && hexMatches.length > 0 && autodetect) || baseStr === "dice") {
var ints = diceMatches.map(function(i) { return parseInt(i) });
return {
ints: ints,
@@ -205,7 +206,7 @@ window.Entropy = new (function() {
}
}
var base6Matches = matchers.base6(str);
if (base6Matches.length == hexMatches.length && hexMatches.length > 0) {
if ((base6Matches.length == hexMatches.length && hexMatches.length > 0 && autodetect) || baseStr === "base 6") {
var ints = base6Matches.map(function(i) { return parseInt(i) });
return {
ints: ints,
@@ -216,7 +217,7 @@ window.Entropy = new (function() {
}
}
var base10Matches = matchers.base10(str);
if (base10Matches.length == hexMatches.length && hexMatches.length > 0) {
if ((base10Matches.length == hexMatches.length && hexMatches.length > 0 && autodetect) || baseStr === "base 10") {
var ints = base10Matches.map(function(i) { return parseInt(i) });
return {
ints: ints,

19
src/js/index.js
View File

@@ -16,6 +16,7 @@
var showQr = false;
var litecoinUseLtub = true;
var entropyTypeAutoDetect = true;
var entropyChangeTimeoutEvent = null;
var phraseChangeTimeoutEvent = null;
var rootKeyChangedTimeoutEvent = null;
@@ -32,6 +33,7 @@
DOM.entropy = $(".entropy");
DOM.entropyFiltered = DOM.entropyContainer.find(".filtered");
DOM.entropyType = DOM.entropyContainer.find(".type");
DOM.entropyTypeInputs = DOM.entropyContainer.find("input[name='entropy-type']");
DOM.entropyCrackTime = DOM.entropyContainer.find(".crack-time");
DOM.entropyEventCount = DOM.entropyContainer.find(".event-count");
DOM.entropyBits = DOM.entropyContainer.find(".bits");
@@ -128,6 +130,7 @@
DOM.useEntropy.on("change", setEntropyVisibility);
DOM.entropy.on("input", delayedEntropyChanged);
DOM.entropyMnemonicLength.on("change", entropyChanged);
DOM.entropyTypeInputs.on("change", entropyTypeChanged);
DOM.phrase.on("input", delayedPhraseChanged);
DOM.passphrase.on("input", delayedPhraseChanged);
DOM.generate.on("click", generateClicked);
@@ -330,6 +333,11 @@
}
}
function entropyTypeChanged() {
entropyTypeAutoDetect = false;
entropyChanged();
}
function delayedRootKeyChanged() {
// Warn if there is an existing mnemonic or passphrase.
if (DOM.phrase.val().length > 0 || DOM.passphrase.val().length > 0) {
@@ -1551,7 +1559,14 @@
// Get entropy value
var entropyStr = DOM.entropy.val();
// Work out minimum base for entropy
var entropy = Entropy.fromString(entropyStr);
var entropy = null;
if (entropyTypeAutoDetect) {
entropy = Entropy.fromString(entropyStr);
}
else {
let base = DOM.entropyTypeInputs.filter(":checked").val();
entropy = Entropy.fromString(entropyStr, base);
}
if (entropy.binaryStr.length == 0) {
return;
}
@@ -1632,6 +1647,8 @@
console.log(e);
}
var entropyTypeStr = getEntropyTypeStr(entropy);
DOM.entropyTypeInputs.attr("checked", false);
DOM.entropyTypeInputs.filter("[value='" + entropyTypeStr + "']").attr("checked", true);
var wordCount = Math.floor(numberOfBits / 32) * 3;
var bitsPerEvent = entropy.bitsPerEvent.toFixed(2);
var spacedBinaryStr = addSpacesEveryElevenBits(entropy.binaryStr);

44
tests/spec/tests.js
View File

@@ -4285,4 +4285,48 @@ it('Shows split prase cards', function(done) {
});
});
// It allows manually specifying the entropy type
it('Allows entropy type to be manually selected', function(done) {
driver.findElement(By.css('.use-entropy'))
.click();
// use decimal entropy
driver.findElement(By.css('.entropy'))
.sendKeys("91");
// manually change to binary entropy
driver.executeScript(function() {
$(".entropy-container input[value='binary']").click();
});
driver.sleep(entropyFeedbackDelay).then(function() {
driver.findElement(By.css('.entropy-container'))
.getText()
.then(function(text) {
// overide 91 to be just 1
var key = "Filtered Entropy";
var value = "1";
var reText = key + "\\s+" + value;
var re = new RegExp(reText);
expect(text).toMatch(re);
// overide automatic decimal to binary
var key = "Entropy Type";
var value = "binary";
var reText = key + "\\s+" + value;
var re = new RegExp(reText);
expect(text).toMatch(re);
// overide 2 events to 1
var key = "Event Count";
var value = 1;
var reText = key + "\\s+" + value;
var re = new RegExp(reText);
expect(text).toMatch(re);
// overide log2(10)*2 bits to 1 bit
var key = "Total Bits";
var value = 1;
var reText = key + "\\s+" + value;
var re = new RegExp(reText);
expect(text).toMatch(re);
done();
});
});
});
});