aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/account.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-06-11 09:44:13 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-06-12 16:48:41 +0100
commit63741d82644944f236c93e9f44cb988a38df1993 (patch)
tree067e2c60d2205ef97f7732ba9ebe0b586b456af2 /src/cryptonote_core/account.cpp
parentMerge pull request #312 (diff)
downloadmonero-63741d82644944f236c93e9f44cb988a38df1993.tar.xz
Integrated addresses (standard address plus payment id)
Diffstat (limited to 'src/cryptonote_core/account.cpp')
-rw-r--r--src/cryptonote_core/account.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index 55e368836..b68103dda 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -104,4 +104,10 @@ DISABLE_VS_WARNINGS(4244 4345)
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)
+ {
+ //TODO: change this code into base 58
+ return get_account_integrated_address_as_str(testnet, m_keys.m_account_address, payment_id);
+ }
+ //-----------------------------------------------------------------
}