Merge pull request #2012

bbf4c210 Wallet API: add spend/view key getters (Jaquee)

3 files changed, 41 insertions, 5 deletions

diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 21760ac49..611c1819f 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -618,11 +618,26 @@ std::string WalletImpl::integratedAddress(const std::string &payment_id) const
     return m_wallet->get_account().get_public_integrated_address_str(pid, m_wallet->testnet());
 }
 
-std::string WalletImpl::privateViewKey() const
+std::string WalletImpl::secretViewKey() const
 {
     return epee::string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_view_secret_key);
 }
 
+std::string WalletImpl::publicViewKey() const
+{
+    return epee::string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_account_address.m_view_public_key);
+}
+
+std::string WalletImpl::secretSpendKey() const
+{
+    return epee::string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_spend_secret_key);
+}
+
+std::string WalletImpl::publicSpendKey() const
+{
+    return epee::string_tools::pod_to_hex(m_wallet->get_account().get_keys().m_account_address.m_spend_public_key);
+}
+
 std::string WalletImpl::path() const
 {
     return m_wallet->path();
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index c376dd6c1..e9e2cc580 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -73,7 +73,10 @@ public:
     bool setPassword(const std::string &password);
     std::string address() const;
     std::string integratedAddress(const std::string &payment_id) const;
-    std::string privateViewKey() const;
+    std::string secretViewKey() const;
+    std::string publicViewKey() const;
+    std::string secretSpendKey() const;
+    std::string publicSpendKey() const;
     std::string path() const;
     bool store(const std::string &path);
     std::string filename() const;
diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h
index 17d0caf7d..a136954f0 100644
--- a/src/wallet/wallet2_api.h
+++ b/src/wallet/wallet2_api.h
@@ -312,10 +312,28 @@ struct Wallet
     virtual std::string integratedAddress(const std::string &payment_id) const = 0;
     
    /*!
-    * \brief privateViewKey    - returns private view key
-    * \return                  - private view key
+    * \brief secretViewKey     - returns secret view key
+    * \return                  - secret view key
     */
-    virtual std::string privateViewKey() const = 0;
+    virtual std::string secretViewKey() const = 0;
+
+   /*!
+    * \brief publicViewKey     - returns public view key
+    * \return                  - public view key
+    */
+    virtual std::string publicViewKey() const = 0;
+
+   /*!
+    * \brief secretSpendKey    - returns secret spend key
+    * \return                  - secret spend key
+    */
+    virtual std::string secretSpendKey() const = 0;
+
+   /*!
+    * \brief publicSpendKey    - returns public spend key
+    * \return                  - public spend key
+    */
+    virtual std::string publicSpendKey() const = 0;
 
     /*!
      * \brief store - stores wallet to file.