mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2024-11-19 01:40:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

WalletTool: remove validation mode option

Browse Source 
Keep only "simply payment verification" (SPV). Full validation is
utterly broken in bitcoinj, not tested, not maintained and as of
today nobody cares.
This commit is contained in:
Andreas Schildbach 2023-10-06 19:06:14 +02:00
parent d8e864fb24
commit c210fe7ba2
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wallettool/src/main/java/org/bitcoinj/wallettool/WalletTool.java
View File

@ -51,7 +51,6 @@ import org.bitcoinj.base.Coin;
import org.bitcoinj.core.Context;
import org.bitcoinj.crypto.DumpedPrivateKey;
import org.bitcoinj.crypto.ECKey;
import org.bitcoinj.core.FullPrunedBlockChain;
import org.bitcoinj.core.InsufficientMoneyException;
import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.core.NetworkParameters;
@ -188,8 +187,6 @@ public class WalletTool implements Callable<Integer> {
"BLOCK A new block that builds on the best chain.%n" +
"BALANCE Waits until the wallets balance meets the --condition.")
private WaitForEnum waitFor = null;
@CommandLine.Option(names = "--mode", description = "Whether to do full verification of the chain or just light mode. Valid values: ${COMPLETION-CANDIDATES}. Default: ${DEFAULT-VALUE}")
private ValidationMode mode = ValidationMode.SPV;
@CommandLine.Option(names = "--chain", description = "Specifies the name of the file that stores the block chain.")
private File chainFile = null;
@CommandLine.Option(names = "--pubkey", description = "Specifies a hex/base58 encoded non-compressed public key.")
@ -326,11 +323,6 @@ public class WalletTool implements Callable<Integer> {
BALANCE
}
public enum ValidationMode {
FULL,
SPV
}
public static void main(String[] args) {
int exitCode = new CommandLine(new WalletTool()).execute(args);
System.exit(exitCode);
@ -970,24 +962,19 @@ public class WalletTool implements Callable<Integer> {
System.out.println("Chain file is missing so resetting the wallet.");
reset();
}
if (mode == ValidationMode.SPV) {
store = new SPVBlockStore(params, chainFile);
if (reset) {
try {
CheckpointManager.checkpoint(params, CheckpointManager.openStream(params), store,
wallet.earliestKeyCreationTime());
StoredBlock head = store.getChainHead();
System.out.println("Skipped to checkpoint " + head.getHeight() + " at "
+ TimeUtils.dateTimeFormat(head.getHeader().time()));
} catch (IOException x) {
System.out.println("Could not load checkpoints: " + x.getMessage());
}
store = new SPVBlockStore(params, chainFile);
if (reset) {
try {
CheckpointManager.checkpoint(params, CheckpointManager.openStream(params), store,
wallet.earliestKeyCreationTime());
StoredBlock head = store.getChainHead();
System.out.println("Skipped to checkpoint " + head.getHeight() + " at "
+ TimeUtils.dateTimeFormat(head.getHeader().time()));
} catch (IOException x) {
System.out.println("Could not load checkpoints: " + x.getMessage());
}
chain = new BlockChain(net, wallet, store);
} else if (mode == ValidationMode.FULL) {
store = new MemoryFullPrunedBlockStore(params, 5000);
chain = new FullPrunedBlockChain(params, wallet, (FullPrunedBlockStore) store);
}
chain = new BlockChain(net, wallet, store);
// This will ensure the wallet is saved when it changes.
wallet.autosaveToFile(walletFile, Duration.ofSeconds(5), null);
if (peerGroup == null) {