Compare commits
No commits in common. "6c781accb0de7e480faf8c64d49125610ccbda3e" and "f167b704bf716119e39ffea7ba5af1cdda86dd92" have entirely different histories.
6c781accb0
...
f167b704bf
148
src/main/java/io/rudefox/burrow/Dice8EntropyGenerator.java
Normal file
148
src/main/java/io/rudefox/burrow/Dice8EntropyGenerator.java
Normal file
|
@ -0,0 +1,148 @@
|
|||
package io.rudefox.burrow;
|
||||
|
||||
import com.bjdweck.bitcoin.mnemonic.Entropy;
|
||||
import com.diogonunes.jcolor.AnsiFormat;
|
||||
|
||||
import java.util.Scanner;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import static com.diogonunes.jcolor.Attribute.*;
|
||||
|
||||
public class Dice8EntropyGenerator {
|
||||
|
||||
public static final AnsiFormat RED_STYLE = new AnsiFormat(WHITE_TEXT(), RED_BACK(), BOLD());
|
||||
public static final AnsiFormat GREEN_STYLE = new AnsiFormat(BLACK_TEXT(), GREEN_BACK(), BOLD());
|
||||
public static final AnsiFormat BLUE_STYLE = new AnsiFormat(WHITE_TEXT(), BLUE_BACK(), BOLD());
|
||||
|
||||
public static final int DICE_PER_ROLL = 11;
|
||||
|
||||
private final int targetBitsOfEntropy;
|
||||
private final Scanner inputScanner;
|
||||
private final boolean ansiColorOutput;
|
||||
|
||||
private Entropy entropy = new Entropy();
|
||||
|
||||
public Dice8EntropyGenerator(int targetBitsOfEntropy, Scanner inputScanner, boolean ansiColorOutput) {
|
||||
|
||||
this.targetBitsOfEntropy = targetBitsOfEntropy;
|
||||
this.inputScanner = inputScanner;
|
||||
this.ansiColorOutput = ansiColorOutput;
|
||||
}
|
||||
|
||||
Entropy generate() {
|
||||
|
||||
entropy = new Entropy();
|
||||
|
||||
for (int rollSetCount = 0; entropy.getBitLength() < targetBitsOfEntropy; rollSetCount++)
|
||||
doDiceRoll(rollSetCount);
|
||||
|
||||
return entropy.truncate(targetBitsOfEntropy).appendChecksum();
|
||||
}
|
||||
|
||||
private void doDiceRoll(int currentRollSet) {
|
||||
|
||||
String eventString = scanNextRollSetString();
|
||||
|
||||
StringBuilder rollValuesLine = new StringBuilder("|");
|
||||
|
||||
for (int rollNumber = 0; rollNumber < DICE_PER_ROLL; rollNumber++) {
|
||||
|
||||
int rollValue = Integer.parseInt(eventString.charAt(rollNumber) + "");
|
||||
|
||||
String formatString =
|
||||
rollNumber == 3 || rollNumber == 7 ? " %d |" : " %d |";
|
||||
|
||||
rollValuesLine.append(String.format(formatString, rollValue));
|
||||
|
||||
entropy = entropy.appendBits(rollValue - 1, 3);
|
||||
}
|
||||
|
||||
System.out.printf("%n%s%n%s%n%s%n%n",
|
||||
rollValuesLine,
|
||||
getBitsLine(),
|
||||
getSeedWordsLine(currentRollSet)
|
||||
);
|
||||
}
|
||||
|
||||
private String scanNextRollSetString() {
|
||||
|
||||
String rollSetString = "";
|
||||
Pattern rollSetPattern = Pattern.compile(String.format("[1-8]{%d}", DICE_PER_ROLL));
|
||||
|
||||
while (!rollSetPattern.matcher(rollSetString).matches()) {
|
||||
System.out.print("Input 11 x 8-sided dice rolls [1-8]: ");
|
||||
rollSetString = inputScanner.next();
|
||||
}
|
||||
|
||||
return rollSetString;
|
||||
}
|
||||
|
||||
private StringBuilder getBitsLine() {
|
||||
|
||||
String entropyBitString = entropy.toString();
|
||||
|
||||
String currentRollSetBitString =
|
||||
entropyBitString.substring(entropyBitString.length() - (DICE_PER_ROLL * 3));
|
||||
|
||||
StringBuilder rollSetBitsLine = new StringBuilder("|");
|
||||
for (int rollSetBitIndex = 0; rollSetBitIndex < currentRollSetBitString.length(); rollSetBitIndex++) {
|
||||
|
||||
int entropyBitIndex = entropyBitString.length() - currentRollSetBitString.length() + rollSetBitIndex;
|
||||
|
||||
if (entropyBitIndex < targetBitsOfEntropy)
|
||||
rollSetBitsLine.append(styleBit("" + currentRollSetBitString.charAt(rollSetBitIndex), entropyBitIndex, rollSetBitIndex));
|
||||
else
|
||||
rollSetBitsLine.append("-");
|
||||
|
||||
if (rollSetBitIndex == 32)
|
||||
rollSetBitsLine.append("|");
|
||||
else if (rollSetBitIndex % 3 == 2)
|
||||
rollSetBitsLine.append(styleBit(" ", entropyBitIndex, rollSetBitIndex));
|
||||
else if (rollSetBitIndex % 11 == 10)
|
||||
rollSetBitsLine.append(" | ");
|
||||
}
|
||||
|
||||
return rollSetBitsLine;
|
||||
}
|
||||
|
||||
private String styleBit(String bit, int globalEntropyBitIndex, int currentRollSetBitIndex) {
|
||||
|
||||
if (!ansiColorOutput || globalEntropyBitIndex >= targetBitsOfEntropy)
|
||||
return bit;
|
||||
|
||||
return getBitFormat(currentRollSetBitIndex).format(bit);
|
||||
}
|
||||
|
||||
private AnsiFormat getBitFormat(int rollSetBitIndex) {
|
||||
|
||||
int wordBitIndex = rollSetBitIndex % 11;
|
||||
|
||||
if (wordBitIndex == 0)
|
||||
return RED_STYLE;
|
||||
|
||||
if (wordBitIndex <= 6)
|
||||
return GREEN_STYLE;
|
||||
|
||||
return BLUE_STYLE;
|
||||
}
|
||||
|
||||
private String getSeedWordsLine(int rollSet) {
|
||||
|
||||
int baseIndex = rollSet * 3;
|
||||
|
||||
return String.format(
|
||||
"|%-15s|%-17s|%-15s|",
|
||||
getFormattedSeedWord(baseIndex),
|
||||
getFormattedSeedWord(baseIndex + 1),
|
||||
getFormattedSeedWord(baseIndex + 2));
|
||||
}
|
||||
|
||||
private String getFormattedSeedWord(int index) {
|
||||
|
||||
int lastWordIndex = (3 * targetBitsOfEntropy / 32) - 1;
|
||||
|
||||
String seedWord = index != lastWordIndex ? entropy.getWord(index) : "CHECKWORD";
|
||||
|
||||
return String.format(" %2d. %s", index + 1, seedWord);
|
||||
}
|
||||
}
|
|
@ -3,43 +3,31 @@ package io.rudefox.burrow;
|
|||
import com.bjdweck.bitcoin.mnemonic.Entropy;
|
||||
import com.bjdweck.math.UnsignedInt;
|
||||
|
||||
class EventBuffer {
|
||||
class DiceEventBuffer {
|
||||
|
||||
private final int eventBase;
|
||||
private final int diceBase;
|
||||
private final StringBuilder buffer;
|
||||
private final int targetBitsOfEntropy;
|
||||
|
||||
EventBuffer(int targetBitsOfEntropy, int eventBase) {
|
||||
DiceEventBuffer(int targetBitsOfEntropy, int diceBase) {
|
||||
|
||||
this.eventBase = eventBase;
|
||||
this.diceBase = diceBase;
|
||||
this.targetBitsOfEntropy = targetBitsOfEntropy;
|
||||
this.buffer = new StringBuilder(getRequiredEvents());
|
||||
}
|
||||
|
||||
int getRequiredEvents() {
|
||||
return (int) Math.ceil(this.targetBitsOfEntropy * Math.log(2) / Math.log(eventBase));
|
||||
return (int) Math.ceil(this.targetBitsOfEntropy * Math.log(2) / Math.log(diceBase));
|
||||
}
|
||||
|
||||
void appendBinaryEvents(String eventString) {
|
||||
for (char inChar : eventString.toCharArray())
|
||||
if (inChar >= '0' && inChar <= '1' && events() < getRequiredEvents())
|
||||
append(inChar);
|
||||
}
|
||||
|
||||
void appendD6Events(String eventString) {
|
||||
void appendEvents(String eventString) {
|
||||
for (char inChar : eventString.toCharArray())
|
||||
if (inChar >= '1' && inChar <= '6' && events() < getRequiredEvents())
|
||||
append((char) (inChar - 1));
|
||||
}
|
||||
|
||||
void appendD8Events(String eventString) {
|
||||
for (char inChar : eventString.toCharArray())
|
||||
if (inChar >= '1' && inChar <= '8' && events() < getRequiredEvents())
|
||||
append((char) (inChar - 1));
|
||||
}
|
||||
|
||||
Entropy toEntropy() {
|
||||
UnsignedInt entropy = new UnsignedInt(toString(), eventBase);
|
||||
UnsignedInt entropy = new UnsignedInt(toString(), diceBase);
|
||||
byte[] entropyBytes = entropy.getLowestOrderBits(this.targetBitsOfEntropy).toBigEndianByteArray();
|
||||
return Entropy.fromRawEntropy(entropyBytes);
|
||||
}
|
|
@ -1,74 +0,0 @@
|
|||
package io.rudefox.burrow;
|
||||
|
||||
import java.util.Scanner;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class InteractiveBinaryEntropyGenerator extends InteractiveEntropyGenerator {
|
||||
|
||||
public InteractiveBinaryEntropyGenerator(int targetBitsOfEntropy, Scanner inputScanner, boolean ansiColorOutput) {
|
||||
super(inputScanner, ansiColorOutput, targetBitsOfEntropy, 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String readNextEventSetString() {
|
||||
|
||||
StringBuilder eventSetBuffer = new StringBuilder();
|
||||
int remainingEvents = eventsPerEventSet;
|
||||
Pattern eventSetPattern = Pattern.compile("[01]+");
|
||||
|
||||
while (remainingEvents > 0) {
|
||||
|
||||
System.out.printf("Input %d coin tosses [0-1]: ", remainingEvents);
|
||||
|
||||
String nextInput = inputScanner.next();
|
||||
|
||||
if (!eventSetPattern.matcher(nextInput).matches()) {
|
||||
System.out.printf(
|
||||
"Invalid input! Enter %d-digit sequence of 1's and 0's (for example, 1011101010)" + System.lineSeparator(),
|
||||
remainingEvents);
|
||||
continue;
|
||||
}
|
||||
|
||||
eventSetBuffer.append(nextInput);
|
||||
remainingEvents -= nextInput.length();
|
||||
}
|
||||
|
||||
if (remainingEvents < 0)
|
||||
System.out.printf("NOTE: Discarding the %d extra coin toss(es) entered" + System.lineSeparator(), -remainingEvents);
|
||||
|
||||
return eventSetBuffer.substring(0, eventsPerEventSet);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getEventValueFormatString(int eventIndexWithinSet) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int toZeroBasedInteger(int eventDecimalValue) {
|
||||
return eventDecimalValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void outputEventValuesLine(StringBuilder eventValuesLine) { }
|
||||
|
||||
@Override
|
||||
protected StringBuilder getInitialBitsLine() {
|
||||
return new StringBuilder("| ");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void padBitsLine(StringBuilder eventSetBitsLine, int bitIndexWithinEventSet, int bitIndexWithinEntropy) {
|
||||
if (bitIndexWithinEventSet == BITS_PER_EVENT_SET - 1)
|
||||
eventSetBitsLine.append(" |");
|
||||
else if (bitIndexWithinEventSet % BITS_PER_WORD == 0 || bitIndexWithinEventSet % BITS_PER_WORD == 6)
|
||||
eventSetBitsLine.append(styleBit(" ", bitIndexWithinEntropy, bitIndexWithinEventSet));
|
||||
else if (bitIndexWithinEventSet % BITS_PER_WORD == BITS_PER_WORD - 1)
|
||||
eventSetBitsLine.append(" | ");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getSeedWordLineFormatString() {
|
||||
return "|%-15s|%-15s|%-15s|";
|
||||
}
|
||||
}
|
|
@ -1,76 +0,0 @@
|
|||
package io.rudefox.burrow;
|
||||
|
||||
import java.util.Scanner;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class InteractiveDice8EntropyGenerator extends InteractiveEntropyGenerator {
|
||||
|
||||
public InteractiveDice8EntropyGenerator(int targetBitsOfEntropy, Scanner inputScanner, boolean ansiColorOutput) {
|
||||
super(inputScanner, ansiColorOutput, targetBitsOfEntropy, 3);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String readNextEventSetString() {
|
||||
|
||||
StringBuilder eventSetBuffer = new StringBuilder();
|
||||
int remainingEvents = eventsPerEventSet;
|
||||
Pattern eventSetPattern = Pattern.compile("[1-8]+");
|
||||
|
||||
while (remainingEvents > 0) {
|
||||
|
||||
System.out.printf("Input %d x 8-sided dice rolls [1-8]: ", remainingEvents);
|
||||
|
||||
String nextInput = inputScanner.next();
|
||||
|
||||
if (!eventSetPattern.matcher(nextInput).matches()) {
|
||||
System.out.printf(
|
||||
"Invalid input! Enter %d-digit sequence of digits from 1 to 8 (for example, 8765375812)" + System.lineSeparator(),
|
||||
remainingEvents);
|
||||
continue;
|
||||
}
|
||||
|
||||
eventSetBuffer.append(nextInput);
|
||||
remainingEvents -= nextInput.length();
|
||||
}
|
||||
|
||||
if (remainingEvents < 0)
|
||||
System.out.printf("NOTE: Discarding the %d extra dice roll(s) entered" + System.lineSeparator(), -remainingEvents);
|
||||
|
||||
return eventSetBuffer.substring(0, eventsPerEventSet);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getEventValueFormatString(int eventIndexWithinSet) {
|
||||
return eventIndexWithinSet == bitsPerEvent || eventIndexWithinSet == 7 ? " %d |" : " %d |";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int toZeroBasedInteger(int eventDecimalValue) {
|
||||
return eventDecimalValue - 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void outputEventValuesLine(StringBuilder eventValuesLine) {
|
||||
System.out.println(eventValuesLine);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected StringBuilder getInitialBitsLine() {
|
||||
return new StringBuilder("|");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void padBitsLine(StringBuilder eventSetBitsLine, int bitIndexWithinEventSet, int bitIndexWithinEntropy) {
|
||||
if (bitIndexWithinEventSet == BITS_PER_EVENT_SET - 1)
|
||||
eventSetBitsLine.append("|");
|
||||
else if (bitIndexWithinEventSet % bitsPerEvent == bitsPerEvent - 1)
|
||||
eventSetBitsLine.append(styleBit(" ", bitIndexWithinEntropy, bitIndexWithinEventSet));
|
||||
else if (bitIndexWithinEventSet % BITS_PER_WORD == BITS_PER_WORD - 1)
|
||||
eventSetBitsLine.append(" | ");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getSeedWordLineFormatString() {
|
||||
return "|%-15s|%-17s|%-15s|";
|
||||
}
|
||||
}
|
|
@ -1,154 +0,0 @@
|
|||
package io.rudefox.burrow;
|
||||
|
||||
import com.bjdweck.bitcoin.mnemonic.Entropy;
|
||||
import com.diogonunes.jcolor.AnsiFormat;
|
||||
|
||||
import java.util.Scanner;
|
||||
|
||||
import static com.diogonunes.jcolor.Attribute.*;
|
||||
|
||||
public abstract class InteractiveEntropyGenerator {
|
||||
|
||||
public static final int WORDS_PER_EVENT_SET = 3;
|
||||
public static final int BITS_PER_WORD = 11;
|
||||
public static final int BITS_PER_EVENT_SET = WORDS_PER_EVENT_SET * BITS_PER_WORD;
|
||||
|
||||
public static final AnsiFormat RED_STYLE = new AnsiFormat(WHITE_TEXT(), RED_BACK(), BOLD());
|
||||
public static final AnsiFormat GREEN_STYLE = new AnsiFormat(BLACK_TEXT(), GREEN_BACK(), BOLD());
|
||||
public static final AnsiFormat BLUE_STYLE = new AnsiFormat(WHITE_TEXT(), BLUE_BACK(), BOLD());
|
||||
|
||||
private Entropy entropy = new Entropy();
|
||||
|
||||
protected final int targetBitsOfEntropy;
|
||||
protected final int bitsPerEvent;
|
||||
protected final int eventsPerEventSet;
|
||||
|
||||
protected final Scanner inputScanner;
|
||||
protected final boolean ansiColorOutput;
|
||||
|
||||
protected InteractiveEntropyGenerator(Scanner inputScanner, boolean ansiColorOutput, int targetBitsOfEntropy, int bitsPerEvent) {
|
||||
|
||||
this.targetBitsOfEntropy = targetBitsOfEntropy;
|
||||
this.bitsPerEvent = bitsPerEvent;
|
||||
this.eventsPerEventSet = BITS_PER_EVENT_SET / this.bitsPerEvent;
|
||||
|
||||
this.inputScanner = inputScanner;
|
||||
this.ansiColorOutput = ansiColorOutput;
|
||||
}
|
||||
|
||||
Entropy generate() {
|
||||
|
||||
entropy = new Entropy();
|
||||
|
||||
for (int eventSetIndex = 0; entropy.getBitLength() < targetBitsOfEntropy; eventSetIndex++) {
|
||||
|
||||
String eventString = readNextEventSetString();
|
||||
StringBuilder eventValuesLine = processEventSetString(eventString);
|
||||
|
||||
System.out.println();
|
||||
|
||||
outputEventValuesLine(eventValuesLine);
|
||||
|
||||
System.out.println(getBitsLine());
|
||||
System.out.println(getSeedWordsLine(eventSetIndex));
|
||||
System.out.println();
|
||||
}
|
||||
|
||||
Entropy truncatedEntropy = entropy.truncate(targetBitsOfEntropy);
|
||||
return truncatedEntropy.appendChecksum();
|
||||
}
|
||||
|
||||
private StringBuilder processEventSetString(String eventString) {
|
||||
|
||||
StringBuilder eventValuesLine = new StringBuilder("|");
|
||||
|
||||
for (int eventIndexWithinSet = 0; eventIndexWithinSet < eventsPerEventSet; eventIndexWithinSet++) {
|
||||
|
||||
int eventDecimalValue = Integer.parseInt(eventString.charAt(eventIndexWithinSet) + "");
|
||||
|
||||
eventValuesLine.append(String.format(getEventValueFormatString(eventIndexWithinSet), eventDecimalValue));
|
||||
|
||||
entropy = entropy.appendBits(toZeroBasedInteger(eventDecimalValue), bitsPerEvent);
|
||||
}
|
||||
|
||||
return eventValuesLine;
|
||||
}
|
||||
|
||||
private StringBuilder getBitsLine() {
|
||||
|
||||
String entropyBitString = entropy.toString();
|
||||
|
||||
String eventSetBitString = entropyBitString.substring(entropyBitString.length() - BITS_PER_EVENT_SET);
|
||||
|
||||
StringBuilder bitsLine = getInitialBitsLine();
|
||||
|
||||
for (int bitIndexWithinEventSet = 0; bitIndexWithinEventSet < eventSetBitString.length(); bitIndexWithinEventSet++) {
|
||||
|
||||
int binIndexWithinEntropy = entropyBitString.length() - eventSetBitString.length() + bitIndexWithinEventSet;
|
||||
|
||||
if (binIndexWithinEntropy < targetBitsOfEntropy)
|
||||
bitsLine.append(styleBit("" + eventSetBitString.charAt(bitIndexWithinEventSet), binIndexWithinEntropy, bitIndexWithinEventSet));
|
||||
else
|
||||
bitsLine.append("-");
|
||||
|
||||
padBitsLine(bitsLine, bitIndexWithinEventSet, binIndexWithinEntropy);
|
||||
}
|
||||
|
||||
return bitsLine;
|
||||
}
|
||||
|
||||
String styleBit(String bit, int bitIndexWithinEntropy, int bitIndexWithinEventSet) {
|
||||
|
||||
if (!ansiColorOutput || bitIndexWithinEntropy >= targetBitsOfEntropy)
|
||||
return bit;
|
||||
|
||||
return getBitColor(bitIndexWithinEventSet).format(bit);
|
||||
}
|
||||
|
||||
private AnsiFormat getBitColor(int bitIndexWithinEventSet) {
|
||||
|
||||
int bitIndexWithinWord = bitIndexWithinEventSet % BITS_PER_WORD;
|
||||
|
||||
if (bitIndexWithinWord == 0)
|
||||
return RED_STYLE;
|
||||
|
||||
if (bitIndexWithinWord <= 6)
|
||||
return GREEN_STYLE;
|
||||
|
||||
return BLUE_STYLE;
|
||||
}
|
||||
|
||||
private String getSeedWordsLine(int eventSetIndex) {
|
||||
|
||||
int firstWordIndex = eventSetIndex * WORDS_PER_EVENT_SET;
|
||||
|
||||
return String.format(
|
||||
getSeedWordLineFormatString(),
|
||||
getFormattedSeedWord(firstWordIndex),
|
||||
getFormattedSeedWord(firstWordIndex + 1),
|
||||
getFormattedSeedWord(firstWordIndex + 2));
|
||||
}
|
||||
|
||||
private String getFormattedSeedWord(int wordIndex) {
|
||||
|
||||
int lastWordIndex = WORDS_PER_EVENT_SET * targetBitsOfEntropy / (BITS_PER_EVENT_SET - 1) - 1;
|
||||
|
||||
String seedWord = wordIndex != lastWordIndex ? entropy.getWord(wordIndex) : "CHECKWORD";
|
||||
|
||||
return String.format(" %2d. %s", wordIndex + 1, seedWord);
|
||||
}
|
||||
|
||||
protected abstract String readNextEventSetString();
|
||||
|
||||
protected abstract String getEventValueFormatString(int eventIndexWithinSet);
|
||||
|
||||
protected abstract int toZeroBasedInteger(int eventDecimalValue);
|
||||
|
||||
protected abstract void outputEventValuesLine(StringBuilder eventValuesLine);
|
||||
|
||||
protected abstract void padBitsLine(StringBuilder eventSetBitsLine, int bitIndexWithinEventSet, int bitIndexWithinEntropy);
|
||||
|
||||
protected abstract StringBuilder getInitialBitsLine();
|
||||
|
||||
protected abstract String getSeedWordLineFormatString();
|
||||
}
|
|
@ -11,19 +11,14 @@ public class MnemonicCommand implements Runnable {
|
|||
|
||||
private static final int DEFAULT_BITS_OF_ENTROPY = 256;
|
||||
|
||||
private boolean isCustomEntropy() {
|
||||
return entropyOptions != null &&
|
||||
(entropyOptions.isDice6Entropy || entropyOptions.isDice8Entropy || entropyOptions.isBinaryEntropy);
|
||||
private boolean isDiceEntropy() {
|
||||
return entropyOptions != null && (entropyOptions.isDice6Entropy || entropyOptions.isDice8Entropy);
|
||||
}
|
||||
|
||||
private boolean isInteractiveMode() {
|
||||
return entropyOptions != null && entropyOptions.eventMethod.isInteractiveMode;
|
||||
}
|
||||
|
||||
private boolean isBinaryInteractiveMode() {
|
||||
return isInteractiveMode() && entropyOptions.isBinaryEntropy;
|
||||
}
|
||||
|
||||
private boolean isDice6InteractiveMode() {
|
||||
return isInteractiveMode() && entropyOptions.isDice6Entropy;
|
||||
}
|
||||
|
@ -37,10 +32,6 @@ public class MnemonicCommand implements Runnable {
|
|||
|
||||
static class EntropyOptions {
|
||||
|
||||
@CommandLine.Option(names = {"-2", "--binary-entropy"},
|
||||
description = "use a coin or other binary entropy source")
|
||||
boolean isBinaryEntropy;
|
||||
|
||||
@CommandLine.Option(names = {"-6", "--dice6-entropy"},
|
||||
description = "use 6-sided dice entropy source")
|
||||
boolean isDice6Entropy;
|
||||
|
@ -54,7 +45,7 @@ public class MnemonicCommand implements Runnable {
|
|||
|
||||
static class EventMethod {
|
||||
|
||||
@CommandLine.Option(names = {"-e", "--events"}, paramLabel = "[0-1]{256} | [1-6]{100} | [1-8]{86}",
|
||||
@CommandLine.Option(names = {"-e", "--events"}, paramLabel = "[1-6]{100}|[1-8]{86}",
|
||||
description = "string representing events from entropy source",
|
||||
required = true)
|
||||
String getEventString;
|
||||
|
@ -80,58 +71,50 @@ public class MnemonicCommand implements Runnable {
|
|||
|
||||
Entropy getEntropy() {
|
||||
|
||||
if (!isCustomEntropy())
|
||||
return generateEntropy();
|
||||
if (!isDiceEntropy())
|
||||
return getGeneratedEntropy();
|
||||
|
||||
if (isBinaryInteractiveMode())
|
||||
return new InteractiveBinaryEntropyGenerator(targetBitsOfEntropy, new Scanner(System.in), CommandLine.Help.Ansi.AUTO.enabled()).generate();
|
||||
DiceEventBuffer diceEventBuffer;
|
||||
|
||||
if (entropyOptions.isDice6Entropy)
|
||||
diceEventBuffer = new DiceEventBuffer(this.targetBitsOfEntropy, 6);
|
||||
else
|
||||
diceEventBuffer = new DiceEventBuffer(this.targetBitsOfEntropy, 8);
|
||||
|
||||
if (isDice6InteractiveMode())
|
||||
return getDice6EntropyInteractive(new EventBuffer(this.targetBitsOfEntropy, 6));
|
||||
return getDice6EntropyInteractive(diceEventBuffer);
|
||||
|
||||
if (isDice8InteractiveMode())
|
||||
return new InteractiveDice8EntropyGenerator(targetBitsOfEntropy, new Scanner(System.in), CommandLine.Help.Ansi.AUTO.enabled()).generate();
|
||||
return new Dice8EntropyGenerator(targetBitsOfEntropy, new Scanner(System.in), CommandLine.Help.Ansi.AUTO.enabled()).generate();
|
||||
|
||||
EventBuffer eventBuffer;
|
||||
|
||||
if (entropyOptions.isBinaryEntropy) {
|
||||
eventBuffer = new EventBuffer(this.targetBitsOfEntropy, 2);
|
||||
eventBuffer.appendBinaryEvents(entropyOptions.eventMethod.getEventString);
|
||||
} else if (entropyOptions.isDice6Entropy) {
|
||||
eventBuffer = new EventBuffer(this.targetBitsOfEntropy, 6);
|
||||
eventBuffer.appendD6Events(entropyOptions.eventMethod.getEventString);
|
||||
} else {
|
||||
eventBuffer = new EventBuffer(this.targetBitsOfEntropy, 8);
|
||||
eventBuffer.appendD8Events(entropyOptions.eventMethod.getEventString);
|
||||
diceEventBuffer.appendEvents(entropyOptions.eventMethod.getEventString);
|
||||
return diceEventBuffer.toEntropy();
|
||||
}
|
||||
|
||||
return eventBuffer.toEntropy();
|
||||
}
|
||||
private Entropy getDice6EntropyInteractive(DiceEventBuffer diceEventBuffer) {
|
||||
|
||||
private Entropy getDice6EntropyInteractive(EventBuffer eventBuffer) {
|
||||
|
||||
int requiredEvents = eventBuffer.getRequiredEvents();
|
||||
int requiredEvents = diceEventBuffer.getRequiredEvents();
|
||||
|
||||
Scanner scanner = new Scanner(System.in);
|
||||
|
||||
boolean firstIteration = true;
|
||||
|
||||
while (eventBuffer.events() < requiredEvents) {
|
||||
while (diceEventBuffer.events() < requiredEvents) {
|
||||
|
||||
int remainingEvents = requiredEvents - eventBuffer.events();
|
||||
System.out.printf("Input %d %sdice rolls [1-6]: ", remainingEvents, (firstIteration ? "" : "more "));
|
||||
int remainingEvents = requiredEvents - diceEventBuffer.events();
|
||||
System.out.print(String.format("Input %d %sdice rolls [1-6]: ", remainingEvents, (firstIteration ? "" : "more ")));
|
||||
|
||||
String inputString = scanner.next();
|
||||
|
||||
eventBuffer.appendD6Events(inputString);
|
||||
diceEventBuffer.appendEvents(inputString);
|
||||
|
||||
firstIteration = false;
|
||||
}
|
||||
|
||||
return eventBuffer.toEntropy();
|
||||
return diceEventBuffer.toEntropy();
|
||||
}
|
||||
|
||||
private Entropy generateEntropy() {
|
||||
private Entropy getGeneratedEntropy() {
|
||||
|
||||
SecureRandom random = new SecureRandom();
|
||||
int byteLength = targetBitsOfEntropy / 8;
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
package io.rudefox.burrow;
|
||||
|
||||
import com.bjdweck.test.CliTestFixture;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
||||
class coin_entropy_tests extends CliTestFixture {
|
||||
|
||||
@Test
|
||||
void with_arguments_interactive_coin_should_generate_mnemonic_sentence() throws UnsupportedEncodingException {
|
||||
|
||||
System.setProperty("picocli.ansi", "false");
|
||||
|
||||
withArgs("mnemonic -i2 --bits 128");
|
||||
|
||||
expectedOutput("Input 33 coin tosses [0-1]: ");
|
||||
provideInput("000001010011100101110111000001010" + EOL);
|
||||
|
||||
expectedOutput(EOL);
|
||||
expectedOutput("| 0 000010 1001 | 1 100101 1101 | 1 100000 1010 |" + EOL);
|
||||
expectedOutput("| 1. ahead | 2. slight | 3. scout |" + EOL);
|
||||
expectedOutput(EOL);
|
||||
|
||||
expectedOutput("Input 33 coin tosses [0-1]: ");
|
||||
provideInput("000001010011100101110111000001010" + EOL);
|
||||
|
||||
expectedOutput(EOL);
|
||||
expectedOutput("| 0 000010 1001 | 1 100101 1101 | 1 100000 1010 |" + EOL);
|
||||
expectedOutput("| 4. ahead | 5. slight | 6. scout |" + EOL);
|
||||
expectedOutput(EOL);
|
||||
|
||||
expectedOutput("Input 33 coin tosses [0-1]: ");
|
||||
provideInput("000001010011100101110111000001010" + EOL);
|
||||
|
||||
expectedOutput(EOL);
|
||||
expectedOutput("| 0 000010 1001 | 1 100101 1101 | 1 100000 1010 |" + EOL);
|
||||
expectedOutput("| 7. ahead | 8. slight | 9. scout |" + EOL);
|
||||
expectedOutput(EOL);
|
||||
|
||||
expectedOutput("Input 33 coin tosses [0-1]: ");
|
||||
provideInput("000001010011100101110111000001010" + EOL);
|
||||
|
||||
expectedOutput(EOL);
|
||||
expectedOutput("| 0 000010 1001 | 1 100101 1101 | 1 100000 ---- |" + EOL);
|
||||
expectedOutput("| 10. ahead | 11. slight | 12. CHECKWORD |" + EOL);
|
||||
expectedOutput(EOL);
|
||||
|
||||
expectedOutput("ahead slight scout ahead slight scout ahead slight scout ahead slight scan" + EOL);
|
||||
|
||||
doMain();
|
||||
|
||||
verifyOutput();
|
||||
}
|
||||
|
||||
private void doMain() {
|
||||
|
||||
setInput();
|
||||
|
||||
RudefoxBurrow.main(getArgs());
|
||||
}
|
||||
}
|
|
@ -49,18 +49,6 @@ class mnemonic_command_tests extends CliTestFixture {
|
|||
verifyOutput();
|
||||
}
|
||||
|
||||
@Test
|
||||
void with_arguments_non_interactive_binary_entropy_should_generate_mnemonic_sentence() throws UnsupportedEncodingException {
|
||||
|
||||
withArgs("mnemonic --binary-entropy --events 10100101010010101010101000101010101001010100101010101010001010101010010101001010101010100010101010100101010010101010101000101010 --bits 128");
|
||||
|
||||
expectedOutput("pipe fetch melt enhance primary best news fetch click clean pride feed" + EOL);
|
||||
|
||||
doMain();
|
||||
|
||||
verifyOutput();
|
||||
}
|
||||
|
||||
@Test
|
||||
void with_arguments_without_interactive_dice_should_generate_mnemonic_sentence() throws UnsupportedEncodingException {
|
||||
|
||||
|
@ -74,18 +62,6 @@ class mnemonic_command_tests extends CliTestFixture {
|
|||
verifyOutput();
|
||||
}
|
||||
|
||||
@Test
|
||||
void with_arguments_without_interactive_d8_dice_should_generate_mnemonic_sentence() throws UnsupportedEncodingException {
|
||||
|
||||
withArgs("mnemonic --dice8-entropy --events 23438688738737812541514768125415147632873218 --bits 128");
|
||||
|
||||
expectedOutput("fashion wave tourist notice alert marine vote alert marine vocal dish aware" + EOL);
|
||||
|
||||
doMain();
|
||||
|
||||
verifyOutput();
|
||||
}
|
||||
|
||||
private void doMain() {
|
||||
|
||||
setInput();
|
||||
|
|
Loading…
Reference in New Issue
Block a user