Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-15 11:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set the tx depth fields whilst loading 0.5 era wallets if the chain height is provided before load. This does NOT migrate workDone as that'd involve scanning potentially the entire block store and nobody uses this data much today. Resolves issue 240.

Browse Source
This commit is contained in:
Mike Hearn
2012-09-06 18:50:35 +02:00
parent 572f2a4f4e
commit 8003266a66
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.encoders.Hex;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -298,7 +299,16 @@ public class WalletTool {
}
try {
wallet = Wallet.loadFromFile(walletFile);
WalletProtobufSerializer loader = new WalletProtobufSerializer();
if (chainFileName.exists()) {
// TEMPORARY MIGRATION CODE FOR 0.5 -> 0.6 TRANSITION. This will ensure the depth (but NOT workDone)
// fields gets set correctly for older wallets.
store = new BoundedOverheadBlockStore(params, chainFileName);
loader.setChainHeight(store.getChainHead().getHeight());
System.out.println("Setting chain height for import to " + store.getChainHead().getHeight());
store = null;
}
wallet = loader.readWallet(new BufferedInputStream(new FileInputStream(walletFile)));
if (!wallet.getParams().equals(params)) {
System.err.println("Wallet does not match requested network parameters: " +
wallet.getParams().getId() + " vs " + params.getId());