diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-09-15 16:25:22 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-09-15 16:25:22 -0500 |
| commit | 7cbae6ca988dedbe358ee5edbf9bdd610673a8ee (patch) | |
| tree | 7087c8405264f60dc0bc0e4aa238df82f6554fac /src/simplewallet/simplewallet.h | |
| parent | Merge pull request #8544 (diff) | |
| parent | Merge pull request #5 from j-berman/restore-msig-encrypted-seed (diff) | |
| download | monero-7cbae6ca988dedbe358ee5edbf9bdd610673a8ee.tar.xz | |
Merge pull request #8545v0.18.1.1
12e7c41 Merge pull request #5 from j-berman/restore-msig-encrypted-seed (Justin Berman)
848a0c0 Fix segfault restoring encrypted multisig seed (j-berman)
401f5d9 Require user ack multisig is experimental to restore (j-berman)
fc8a5d6 multisig: fix #8537 seed restore (suggestions by @UkoeHB) (j-berman)
Diffstat (limited to 'src/simplewallet/simplewallet.h')
| -rw-r--r-- | src/simplewallet/simplewallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index cd8e51987..0f2fe7bc6 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -101,7 +101,7 @@ namespace cryptonote boost::optional<epee::wipeable_string> new_wallet(const boost::program_options::variables_map& vm, const cryptonote::account_public_address& address, const boost::optional<crypto::secret_key>& spendkey, const crypto::secret_key& viewkey); boost::optional<epee::wipeable_string> new_wallet(const boost::program_options::variables_map& vm, - const epee::wipeable_string &multisig_keys, const std::string &old_language); + const epee::wipeable_string &multisig_keys, const epee::wipeable_string &seed_pass, const std::string &old_language); boost::optional<epee::wipeable_string> new_wallet(const boost::program_options::variables_map& vm); boost::optional<epee::wipeable_string> open_wallet(const boost::program_options::variables_map& vm); bool close_wallet(); |