Add a RAW_DUMP command to wallet tool.

core/src/main/java/com/google/bitcoin/store/WalletProtobufSerializer.java

@@ -233,7 +233,7 @@ public class WalletProtobufSerializer {
     public Wallet readWallet(InputStream input) throws IOException {
         // TODO: This method should throw more specific exception types than IllegalArgumentException.
         WalletProtobufSerializer serializer = new WalletProtobufSerializer();
-        Protos.Wallet walletProto = Protos.Wallet.parseFrom(input);
+        Protos.Wallet walletProto = parseToProto(input);
 
         // System.out.println(TextFormat.printToString(walletProto));
 
@@ -280,6 +280,14 @@ public class WalletProtobufSerializer {
         return wallet;
     }
 
+    /**
+     * Returns the loaded protocol buffer from the given byte stream. You normally want
+     * {@link Wallet#loadFromFile(java.io.File)} instead - this method is designed for low level work involving the
+     * wallet file format itself.
+     */
+    public static Protos.Wallet parseToProto(InputStream input) throws IOException {
+        return Protos.Wallet.parseFrom(input);
+    }
 
     private void readTransaction(Protos.Transaction txProto, NetworkParameters params) {
         Transaction tx = new Transaction(params);

tools/src/main/java/com/google/bitcoin/tools/WalletTool.java

@@ -22,16 +22,19 @@ import com.google.bitcoin.discovery.IrcDiscovery;
 import com.google.bitcoin.discovery.PeerDiscovery;
 import com.google.bitcoin.store.BlockStoreException;
 import com.google.bitcoin.store.BoundedOverheadBlockStore;
+import com.google.bitcoin.store.WalletProtobufSerializer;
 import com.google.bitcoin.utils.BriefLogFormatter;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import joptsimple.util.DateConverter;
+import org.bitcoinj.wallet.Protos;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongycastle.util.encoders.Hex;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.net.InetAddress;
@@ -66,7 +69,8 @@ public class WalletTool {
             "                       For example --condition=\">5.10\" or --condition=\"<=1\"\n" +
 
             "\n>>> ACTIONS\n" +
-            "  --action=DUMP        Prints the given wallet in textual form to stdout.\n" +
+            "  --action=DUMP        Loads and prints the given wallet in textual form to stdout.\n" +
+            "  --action=RAW_DUMP    Prints the wallet as a raw protobuf with no parsing or sanity checking applied.\n" +
             "  --action=CREATE      Makes a new wallet in the file specified by --wallet.\n" +
             "                       Will complain and require --force if the wallet already exists.\n" +
             "  --action=ADD_KEY     Adds a new key to the wallet, either specified or freshly generated.\n" +
@@ -173,6 +177,7 @@ public class WalletTool {
     public enum ActionEnum {
         NONE,
         DUMP,
+        RAW_DUMP,
         CREATE,
         ADD_KEY,
         DELETE_KEY,
@@ -276,6 +281,20 @@ public class WalletTool {
             System.err.println("Specified wallet file " + walletFile + " does not exist. Try --action=CREATE");
             return;
         }
+
+        if (action == ActionEnum.RAW_DUMP) {
+            // Just parse the protobuf and print, then bail out. Don't try and do a real deserialization. This is
+            // useful mostly for investigating corrupted wallets.
+            FileInputStream stream = new FileInputStream(walletFile);
+            try {
+                Protos.Wallet proto = WalletProtobufSerializer.parseToProto(stream);
+                System.out.println(proto.toString());
+                return;
+            } finally {
+                stream.close();
+            }
+        }
+
         try {
             wallet = Wallet.loadFromFile(walletFile);
             if (!wallet.getParams().equals(params)) {