diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-01-02 00:29:35 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-01-02 00:29:36 +0200 |
commit | eb617be8f4d3aabcc36ab561887aa9313773a05d (patch) | |
tree | 66ea57cda256cafe9b96f0629380e29538eca24e /src/wallet/wallet2.h | |
parent | Merge pull request #2956 (diff) | |
parent | wallet: support for multisig seeds (diff) | |
download | monero-eb617be8f4d3aabcc36ab561887aa9313773a05d.tar.xz |
Merge pull request #2960
5cbcf0aa wallet: support for multisig seeds (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r-- | src/wallet/wallet2.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index b1115f67b..2fbe05f89 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -436,6 +436,15 @@ namespace tools typedef std::tuple<uint64_t, crypto::public_key, rct::key> get_outs_entry; /*! + * \brief Generates a wallet or restores one. + * \param wallet_ Name of wallet file + * \param password Password of wallet file + * \param multisig_data The multisig restore info and keys + */ + void generate(const std::string& wallet_, const epee::wipeable_string& password, + const std::string& multisig_data); + + /*! * \brief Generates a wallet or restores one. * \param wallet_ Name of wallet file * \param password Password of wallet file @@ -610,6 +619,7 @@ namespace tools bool watch_only() const { return m_watch_only; } bool multisig(bool *ready = NULL, uint32_t *threshold = NULL, uint32_t *total = NULL) const; bool has_multisig_partial_key_images() const; + bool get_multisig_seed(std::string& seed, const epee::wipeable_string &passphrase = std::string(), bool raw = true) const; // locked & unlocked balance of given or current subaddress account uint64_t balance(uint32_t subaddr_index_major) const; |