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/wallet/wallet2.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/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 83c22d5f8..115651e3b 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -817,7 +817,8 @@ private: }; /*! - * \brief Generates a wallet or restores one. + * \brief Generates a wallet or restores one. Assumes the multisig setup + * has already completed for the provided multisig info. * \param wallet_ Name of wallet file * \param password Password of wallet file * \param multisig_data The multisig restore info and keys |