tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upstream: sync against wallet_keys_unlocker PR #9860

Browse Source
This commit is contained in:
jeffro256
2025-04-24 00:03:19 -05:00
committed by akildemir
parent 66552f14ca
commit 638034c35f
10 changed files with 551 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gen_multisig/gen_multisig.cpp
+4 -5
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2022, The Monero Project
// Copyright (c) 2017-2024, The Monero Project
//
// All rights reserved.
//
@@ -121,16 +121,15 @@ static bool generate_multisig(uint32_t threshold, uint32_t total, const std::str
}
// exchange keys until the wallets are done
bool ready{false};
wallets[0]->multisig(&ready);
while (!ready)
multisig::multisig_account_status ms_status{wallets[0]->get_multisig_status()};
while (!ms_status.is_ready)
{
for (size_t n = 0; n < total; ++n)
{
kex_msgs_intermediate[n] = wallets[n]->exchange_multisig_keys(pwd_container->password(), kex_msgs_intermediate);
}
wallets[0]->multisig(&ready);
ms_status = wallets[0]->get_multisig_status();
}
std::string address = wallets[0]->get_account().get_public_address_str(wallets[0]->nettype());