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/multisig/multisig_account.cpp | |
| 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 'src/multisig/multisig_account.cpp')
| -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 |