Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-24 03:05:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8551

Browse source 
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)
This commit is contained in:
luigi1111 2022-09-15 00:34:05 -05:00
commit df37c148d4
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
8 changed files with 56 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/wallet/wallet2.h
View file

@ -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