Merge pull request #688

c2a1fee simplewallet: prompt for private keys when generating wallets (moneromooo-monero)
4513b4c simplewallet: add a new --restore-from-keys option (moneromooo-monero)

1 files changed, 10 insertions, 0 deletions

diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index c9f00bfc9..ceeef492e 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -185,6 +185,16 @@ namespace tools
       const crypto::secret_key& recovery_param = crypto::secret_key(), bool recover = false,
       bool two_random = false);
     /*!
+     * \brief Creates a wallet from a public address and a spend/view secret key pair.
+     * \param  wallet_        Name of wallet file
+     * \param  password       Password of wallet file
+     * \param  viewkey        view secret key
+     * \param  spendkey       spend secret key
+     */
+    void generate(const std::string& wallet, const std::string& password,
+      const cryptonote::account_public_address &account_public_address,
+      const crypto::secret_key& spendkey, const crypto::secret_key& viewkey);
+    /*!
      * \brief Creates a watch only wallet from a public address and a view secret key.
      * \param  wallet_        Name of wallet file
      * \param  password       Password of wallet file