Merge pull request #317

6f8a6dc Add RPC commands to manipulate integrated addresses (moneromooo-monero)
67be2e4 simplewallet: allow integrated_address to generate a random payment id (moneromooo-monero)
7bd6efe account: add a couple consts (moneromooo-monero)
63741d8 Integrated addresses (standard address plus payment id) (moneromooo-monero)

1 files changed, 7 insertions, 1 deletions

diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index 55e368836..313d803a5 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -98,10 +98,16 @@ DISABLE_VS_WARNINGS(4244 4345)
     return m_keys;
   }
   //-----------------------------------------------------------------
-  std::string account_base::get_public_address_str(bool testnet)
+  std::string account_base::get_public_address_str(bool testnet) const
   {
     //TODO: change this code into base 58
     return get_account_address_as_str(testnet, m_keys.m_account_address);
   }
   //-----------------------------------------------------------------
+  std::string account_base::get_public_integrated_address_str(const crypto::hash &payment_id, bool testnet) const
+  {
+    //TODO: change this code into base 58
+    return get_account_integrated_address_as_str(testnet, m_keys.m_account_address, payment_id);
+  }
+  //-----------------------------------------------------------------
 }