diff options
| author | m2049r <30435443+m2049r@users.noreply.github.com> | 2018-01-11 16:12:27 +0100 |
|---|---|---|
| committer | m2049r <30435443+m2049r@users.noreply.github.com> | 2018-01-17 18:46:31 +0100 |
| commit | 939629e837d744118acd1191bd08f8627c704402 (patch) | |
| tree | 4c70094a7e8cf407383c5963fbfd801a25a434f9 /src/wallet/api/wallet_manager.h | |
| parent | Merge pull request #3091 (diff) | |
| download | monero-939629e837d744118acd1191bd08f8627c704402.tar.xz | |
Wallet API: all recover options with password
also renamed memo => mnemonic in api method parms
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/api/wallet_manager.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h index ef5b8f91b..8b20a64b3 100644 --- a/src/wallet/api/wallet_manager.h +++ b/src/wallet/api/wallet_manager.h @@ -40,7 +40,22 @@ public: Wallet * createWallet(const std::string &path, const std::string &password, const std::string &language, bool testnet); Wallet * openWallet(const std::string &path, const std::string &password, bool testnet); - virtual Wallet * recoveryWallet(const std::string &path, const std::string &memo, bool testnet, uint64_t restoreHeight); + virtual Wallet * recoveryWallet(const std::string &path, + const std::string &password, + const std::string &mnemonic, + bool testnet, + uint64_t restoreHeight); + virtual Wallet * createWalletFromKeys(const std::string &path, + const std::string &password, + const std::string &language, + bool testnet, + uint64_t restoreHeight, + const std::string &addressString, + const std::string &viewKeyString, + const std::string &spendKeyString = ""); + // next two methods are deprecated - use the above version which allow setting of a password + virtual Wallet * recoveryWallet(const std::string &path, const std::string &mnemonic, bool testnet, uint64_t restoreHeight); + // deprecated: use createWalletFromKeys(..., password, ...) instead virtual Wallet * createWalletFromKeys(const std::string &path, const std::string &language, bool testnet, |