Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 23:32:16 +00:00
Code Issues Projects Releases Wiki Activity

WalletTool: allow use of regtest mode, fix unixtime flag, make address printed by ADD_KEY double clickable.

Browse Source
This commit is contained in:
Mike Hearn 2013-06-12 11:13:01 +02:00
parent 5b50e52842
commit 1d9ebf5a5f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/src/main/java/com/google/bitcoin/tools/WalletTool.java
View File

@ -21,6 +21,7 @@ import com.google.bitcoin.crypto.KeyCrypterException;
import com.google.bitcoin.discovery.DnsDiscovery; import com.google.bitcoin.discovery.DnsDiscovery;
import com.google.bitcoin.discovery.PeerDiscovery; import com.google.bitcoin.discovery.PeerDiscovery;
import com.google.bitcoin.params.MainNetParams; import com.google.bitcoin.params.MainNetParams;
import com.google.bitcoin.params.RegTestParams;
import com.google.bitcoin.params.TestNet3Params; import com.google.bitcoin.params.TestNet3Params;
import com.google.bitcoin.store.*; import com.google.bitcoin.store.*;
import com.google.bitcoin.utils.BriefLogFormatter; import com.google.bitcoin.utils.BriefLogFormatter;
@ -61,7 +62,7 @@ public class WalletTool {
"Usage:\n" + "Usage:\n" +
">>> GENERAL OPTIONS\n" + ">>> GENERAL OPTIONS\n" +
" --debuglog Enables logging from the core library.\n" + " --debuglog Enables logging from the core library.\n" +
" --net=PROD/TEST Which network to connect to, defaults to PROD.\n" + " --net=XXX Which network to connect to, defaults to PROD, can also be TEST or REGTEST.\n" +
" --mode=FULL/SPV Whether to do full verification of the chain or just light mode.\n" + " --mode=FULL/SPV Whether to do full verification of the chain or just light mode.\n" +
" --wallet=<file> Specifies what wallet file to load and save.\n" + " --wallet=<file> Specifies what wallet file to load and save.\n" +
" --chain=<file> Specifies the name of the file that stores the block chain.\n" + " --chain=<file> Specifies the name of the file that stores the block chain.\n" +
@ -210,7 +211,8 @@ public class WalletTool {
public enum NetworkEnum { public enum NetworkEnum {
PROD, PROD,
TEST TEST,
REGTEST
} }
public enum ValidationMode { public enum ValidationMode {
@ -253,7 +255,7 @@ public class WalletTool {
OptionSpec<String> outputFlag = parser.accepts("output").withRequiredArg(); OptionSpec<String> outputFlag = parser.accepts("output").withRequiredArg();
parser.accepts("value").withRequiredArg(); parser.accepts("value").withRequiredArg();
parser.accepts("fee").withRequiredArg(); parser.accepts("fee").withRequiredArg();
parser.accepts("unixtime").withRequiredArg().ofType(Integer.class); unixtimeFlag = parser.accepts("unixtime").withRequiredArg().ofType(Integer.class);
conditionFlag = parser.accepts("condition").withRequiredArg(); conditionFlag = parser.accepts("condition").withRequiredArg();
parser.accepts("locktime").withRequiredArg(); parser.accepts("locktime").withRequiredArg();
parser.accepts("allow-unconfirmed"); parser.accepts("allow-unconfirmed");
@ -277,12 +279,15 @@ public class WalletTool {
case PROD: case PROD:
params = MainNetParams.get(); params = MainNetParams.get();
chainFileName = new File("prodnet.chain"); chainFileName = new File("prodnet.chain");
break; break;
case TEST: case TEST:
params = TestNet3Params.get(); params = TestNet3Params.get();
chainFileName = new File("testnet.chain"); chainFileName = new File("testnet.chain");
break; break;
case REGTEST:
params = RegTestParams.get();
chainFileName = new File("regtest.chain");
break;
default: default:
throw new RuntimeException("Unreachable."); throw new RuntimeException("Unreachable.");
} }
@ -715,7 +720,7 @@ public class WalletTool {
} catch (KeyCrypterException kce) { } catch (KeyCrypterException kce) {
System.err.println("There was an encryption related error when adding the key. The error was '" + kce.getMessage() + "'."); System.err.println("There was an encryption related error when adding the key. The error was '" + kce.getMessage() + "'.");
} }
System.out.println("addr:" + key.toAddress(params) + " " + key); System.out.println(key.toAddress(params) + " " + key);
} }
private static void deleteKey() { private static void deleteKey() {