diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-09-15 00:34:05 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-09-15 00:34:05 -0500 |
| commit | df37c148d47611b173e75ae858fe51395175b21d (patch) | |
| tree | 1438c6203e9f5a55bc296907d8c316e9352639a3 /src/wallet/wallet2.h | |
| parent | Merge pull request #8554 (diff) | |
| parent | Fix segfault restoring encrypted multisig seed (diff) | |
| download | monero-df37c148d47611b173e75ae858fe51395175b21d.tar.xz | |
Merge pull request #8551
eca7f6a Fix segfault restoring encrypted multisig seed (j-berman)
f713c3c Require user ack multisig is experimental to restore (j-berman)
564a7a3 multisig: fix #8537 seed restore (suggestions by @UkoeHB) (j-berman)
Diffstat (limited to '')
| -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 1f84458a6..38b3b2e72 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 |