aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-06-20 12:31:02 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-06-20 17:33:06 +0100
commit6a0f61d80087259d7fa2e62df0e6cf68764dc3a4 (patch)
tree5c91d4962664db039a964ff7238e56ab70f5de7d /src
parentwallet2: fix write_watch_only_wallet comment description (diff)
downloadmonero-6a0f61d80087259d7fa2e62df0e6cf68764dc3a4.tar.xz
account: allow creating an account from a public address and view secret key
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/account.cpp16
-rw-r--r--src/cryptonote_core/account.h1
2 files changed, 17 insertions, 0 deletions
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp
index 313d803a5..eb79f5949 100644
--- a/src/cryptonote_core/account.cpp
+++ b/src/cryptonote_core/account.cpp
@@ -93,6 +93,22 @@ DISABLE_VS_WARNINGS(4244 4345)
return first;
}
//-----------------------------------------------------------------
+ void account_base::create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey)
+ {
+ m_keys.m_account_address = address;
+ m_keys.m_view_secret_key = viewkey;
+
+ struct tm timestamp;
+ timestamp.tm_year = 2014 - 1900; // year 2014
+ timestamp.tm_mon = 4 - 1; // month april
+ timestamp.tm_mday = 15; // 15th of april
+ timestamp.tm_hour = 0;
+ timestamp.tm_min = 0;
+ timestamp.tm_sec = 0;
+
+ m_creation_timestamp = mktime(&timestamp);
+ }
+ //-----------------------------------------------------------------
const account_keys& account_base::get_keys() const
{
return m_keys;
diff --git a/src/cryptonote_core/account.h b/src/cryptonote_core/account.h
index 909fa7ef6..088363bf1 100644
--- a/src/cryptonote_core/account.h
+++ b/src/cryptonote_core/account.h
@@ -58,6 +58,7 @@ namespace cryptonote
public:
account_base();
crypto::secret_key generate(const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false, bool two_random = false);
+ void create_from_viewkey(const cryptonote::account_public_address& address, const crypto::secret_key& viewkey);
const account_keys& get_keys() const;
std::string get_public_address_str(bool testnet) const;
std::string get_public_integrated_address_str(const crypto::hash &payment_id, bool testnet) const;