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/multisig/multisig_account.cpp | |
| parent | Merge pull request #8544 (diff) | |
| parent | Merge pull request #5 from j-berman/restore-msig-encrypted-seed (diff) | |
| download | monero-0.18.1.1.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 '')
| -rw-r--r-- | src/multisig/multisig_account.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/multisig/multisig_account.cpp b/src/multisig/multisig_account.cpp index 9bdcf2dbc..f3e78da18 100644 --- a/src/multisig/multisig_account.cpp +++ b/src/multisig/multisig_account.cpp @@ -127,7 +127,7 @@ namespace multisig bool multisig_account::multisig_is_ready() const { if (main_kex_rounds_done()) - return m_kex_rounds_complete >= multisig_kex_rounds_required(m_signers.size(), m_threshold) + 1; + return m_kex_rounds_complete >= multisig_setup_rounds_required(m_signers.size(), m_threshold); else return false; } @@ -200,4 +200,11 @@ namespace multisig return num_signers - threshold + 1; } //---------------------------------------------------------------------------------------------------------------------- + // EXTERNAL + //---------------------------------------------------------------------------------------------------------------------- + std::uint32_t multisig_setup_rounds_required(const std::uint32_t num_signers, const std::uint32_t threshold) + { + return multisig_kex_rounds_required(num_signers, threshold) + 1; + } + //---------------------------------------------------------------------------------------------------------------------- } //namespace multisig |