From 0d6ecb113651ac99abd25a04fe4ddb9ac0a73c3e Mon Sep 17 00:00:00 2001 From: koe Date: Fri, 29 Apr 2022 14:04:59 -0500 Subject: multisig: add post-kex verification round to check that all participants have completed the multisig address --- src/simplewallet/simplewallet.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/simplewallet') diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 891253830..e767da8aa 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1091,7 +1091,9 @@ bool simple_wallet::make_multisig_main(const std::vector &args, boo auto local_args = args; local_args.erase(local_args.begin()); std::string multisig_extra_info = m_wallet->make_multisig(orig_pwd_container->password(), local_args, threshold); - if (!multisig_extra_info.empty()) + bool ready; + m_wallet->multisig(&ready); + if (!ready) { success_msg_writer() << tr("Another step is needed"); success_msg_writer() << multisig_extra_info; @@ -1152,7 +1154,7 @@ bool simple_wallet::exchange_multisig_keys_main(const std::vector & return false; } - if (args.size() < 2) + if (args.size() < 1) { PRINT_USAGE(USAGE_EXCHANGE_MULTISIG_KEYS); return false; @@ -1161,7 +1163,9 @@ bool simple_wallet::exchange_multisig_keys_main(const std::vector & try { std::string multisig_extra_info = m_wallet->exchange_multisig_keys(orig_pwd_container->password(), args); - if (!multisig_extra_info.empty()) + bool ready; + m_wallet->multisig(&ready); + if (!ready) { message_writer() << tr("Another step is needed"); message_writer() << multisig_extra_info; -- cgit v1.2.3