diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-01-27 17:24:07 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-01-27 17:24:08 -0800 |
| commit | 087a77324770e512eaa8417fb30b9110639783c9 (patch) | |
| tree | b14c597ff76e97d22c835c78abf9c2add878e6e1 /src/wallet/api/wallet_manager.h | |
| parent | Merge pull request #3102 (diff) | |
| parent | Wallet API: all recover options with password (diff) | |
| download | monero-087a77324770e512eaa8417fb30b9110639783c9.tar.xz | |
Merge pull request #3104
939629e8 Wallet API: all recover options with password (m2049r)
Diffstat (limited to 'src/wallet/api/wallet_manager.h')
| -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 0eca9e483..6a4d9de2e 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, |