From d7d6c3de0961701ba2ef704b3d5063c4f20f2d21 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 19 Feb 2019 10:54:07 +0100 Subject: [PATCH] Wallet-tool: Allow comma, semicolon and double colon as separator for seed words to work around the inability of Gradle to pass proper command line arguments. --- tools/src/main/java/org/bitcoinj/tools/WalletTool.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java index 0007c995..1b4d67e7 100644 --- a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java +++ b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java @@ -35,6 +35,8 @@ import org.bitcoinj.uri.BitcoinURIParseException; import org.bitcoinj.utils.BriefLogFormatter; import org.bitcoinj.wallet.DeterministicKeyChain; import org.bitcoinj.wallet.DeterministicSeed; + +import com.google.common.base.CharMatcher; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.io.BaseEncoding; @@ -1346,7 +1348,8 @@ public class WalletTool { String seedStr = options.valueOf(seedFlag); DeterministicSeed seed; // Parse as mnemonic code. - final List split = ImmutableList.copyOf(Splitter.on(" ").omitEmptyStrings().split(seedStr)); + final List split = ImmutableList + .copyOf(Splitter.on(CharMatcher.anyOf(" :;,")).omitEmptyStrings().split(seedStr)); String passphrase = ""; // TODO allow user to specify a passphrase seed = new DeterministicSeed(split, null, passphrase, creationTimeSecs); try {