wallet-utility: extract addresses and private keys

usage: ./wallet-utility -datadir=<directory>
help: ./wallet-utility -h

Author: Chethan Krishna

Makefile.am

@@ -12,6 +12,7 @@ endif
 BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
 BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
 BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
+WALLET_UTILITY_BIN=$(top_builddir)/src/wallet-utility$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
 
 OSX_APP=Bitcoin-Qt.app
@@ -63,6 +64,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
+	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(WALLET_UTILITY_BIN) $(top_builddir)/release
 	@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
 	  echo error: could not build $@
 	@echo built $@
@@ -145,6 +147,9 @@ $(BITCOIND_BIN): FORCE
 $(BITCOIN_CLI_BIN): FORCE
 	$(MAKE) -C src $(@F)
 
+$(WALLET_UTILITY_BIN): FORCE
+	$(MAKE) -C src $(@F)
+
 if USE_LCOV
 
 baseline.info:

configure.ac

@@ -191,7 +191,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
 
 AC_ARG_WITH([utils],
   [AS_HELP_STRING([--with-utils],
-  [build bitcoin-cli bitcoin-tx (default=yes)])],
+  [build bitcoin-cli bitcoin-tx wallet-utility (default=yes)])],
   [build_bitcoin_utils=$withval],
   [build_bitcoin_utils=yes])
 
@@ -766,7 +766,7 @@ AC_MSG_CHECKING([whether to build bitcoind])
 AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
 AC_MSG_RESULT($build_bitcoind)
 
-AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
+AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx wallet-utility)])
 AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
 AC_MSG_RESULT($build_bitcoin_utils)
 

src/Makefile.am

@@ -74,6 +74,9 @@ endif
 
 if BUILD_BITCOIN_UTILS
   bin_PROGRAMS += bitcoin-cli bitcoin-tx
+if ENABLE_WALLET
+  bin_PROGRAMS += wallet-utility
+endif
 endif
 
 .PHONY: FORCE check-symbols check-security
@@ -367,6 +370,14 @@ bitcoin_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
 bitcoin_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
+# wallet-utility binary #
+if ENABLE_WALLET
+wallet_utility_SOURCES = wallet-utility.cpp
+wallet_utility_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAG)
+wallet_utility_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+wallet_utility_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+endif
+
 if TARGET_WINDOWS
 bitcoin_cli_SOURCES += bitcoin-cli-res.rc
 endif
@@ -377,6 +388,10 @@ bitcoin_cli_LDADD = \
   $(LIBBITCOIN_UTIL)
 
 bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
+if ENABLE_WALLET
+wallet_utility_LDADD = libbitcoin_wallet.a $(LIBBITCOIN_COMMON) $(LIBBITCOIN_CRYPTO) $(LIBSECP256K1) $(LIBBITCOIN_UTIL) $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS)
+endif
+
 #
 
 # bitcoin-tx binary #

src/Makefile.test.include

@@ -92,7 +92,8 @@ if ENABLE_WALLET
 BITCOIN_TESTS += \
   test/accounting_tests.cpp \
   wallet/test/wallet_tests.cpp \
-  test/rpc_wallet_tests.cpp
+  test/rpc_wallet_tests.cpp \
+  test/walletutil_tests.cpp
 endif
 
 test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)

src/test/test_bitcoin.cpp

@@ -96,6 +96,41 @@ TestingSetup::~TestingSetup()
         boost::filesystem::remove_all(pathTemp);
 }
 
+WalletSetup::WalletSetup(const std::string& chainName) : BasicTestingSetup(chainName)
+{
+	ClearDatadirCache();
+	pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
+	boost::filesystem::create_directories(pathTemp);
+	mapArgs["-datadir"] = pathTemp.string();
+#ifdef ENABLE_WALLET
+	bool fFirstRun;
+	pwalletMain = new CWallet("wallet.dat");
+	pwalletMain->LoadWallet(fFirstRun);
+	pwalletMain->TopUpKeyPool(5);
+	RegisterValidationInterface(pwalletMain);
+#endif
+}
+
+WalletSetup::~WalletSetup()
+{
+#ifdef ENABLE_WALLET
+	UnregisterValidationInterface(pwalletMain);
+	delete pwalletMain;
+	pwalletMain = NULL;
+	bitdb.Flush(true);
+	bitdb.Reset();
+#endif
+
+	/*
+	 * Attempting to remove Berkeley DB related files in windows
+	 * errors while running wallet tests. Delete only on
+	 * non windows platforms for now (files are created in tmp)
+	 */
+#ifndef WIN32
+	boost::filesystem::remove_all(pathTemp);
+#endif
+}
+
 TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST)
 {
     // Generate a 100-block chain:

src/test/test_bitcoin.h

@@ -33,6 +33,17 @@ struct TestingSetup: public BasicTestingSetup {
     ~TestingSetup();
 };
 
+/** Wallet setup that configures a complete environment.
+ * Included are data directory, coins database, script check threads
+ * and wallet with 5 unused keys.
+ */
+struct WalletSetup: public BasicTestingSetup {
+	boost::filesystem::path pathTemp;
+
+	WalletSetup(const std::string& chainName = CBaseChainParams::MAIN);
+	~WalletSetup();
+};
+
 class CBlock;
 struct CMutableTransaction;
 class CScript;

src/test/walletutil_tests.cpp

@@ -0,0 +1,30 @@
+#include "main.h"
+#include "test/test_bitcoin.h"
+#include <boost/test/unit_test.hpp>
+
+#ifdef ENABLE_WALLET
+#include "wallet/db.h"
+#include "wallet/wallet.h"
+extern CWallet* pwalletMain;
+#endif
+
+using namespace std;
+
+BOOST_FIXTURE_TEST_SUITE(walletutil_tests, WalletSetup)
+
+BOOST_AUTO_TEST_CASE(walletutil_test)
+{
+#ifdef WIN32
+	string strCmd = "wallet-utility -datadir="+mapArgs["-datadir"];
+#else
+	string strCmd = "./wallet-utility -datadir="+mapArgs["-datadir"];
+#endif
+	int ret = system(strCmd.c_str());
+	BOOST_CHECK(ret == 0);
+
+	strCmd += " -dumppass";
+	ret = system(strCmd.c_str());
+	BOOST_CHECK(ret == 0);
+}
+
+BOOST_AUTO_TEST_SUITE_END()