diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-02-29 17:30:29 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-02-29 17:30:29 -0500 |
| commit | bf09285443fef9c5d7752fd2731ae6e942c8a27f (patch) | |
| tree | 37d41ecd6acb403c702a19d09d1873f0bf77eeef /src/cryptonote_core/account.h | |
| parent | Merge pull request #687 (diff) | |
| parent | simplewallet: prompt for private keys when generating wallets (diff) | |
| download | monero-bf09285443fef9c5d7752fd2731ae6e942c8a27f.tar.xz | |
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)
Diffstat (limited to 'src/cryptonote_core/account.h')
| -rw-r--r-- | src/cryptonote_core/account.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptonote_core/account.h b/src/cryptonote_core/account.h index 38f61ebd4..41a119b07 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_keys(const cryptonote::account_public_address& address, const crypto::secret_key& spendkey, const crypto::secret_key& viewkey); 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; |