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

fixed multisig issues from monero_c integration

Browse Source
This commit is contained in:
Some Random Crypto Guy
2025-06-02 17:40:10 +01:00
parent 1adc1b0f8d
commit a958bdb0e0
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/wallet/api/wallet.cpp
View File

@@ -82,7 +82,8 @@ using namespace cryptonote;
setStatusError(tr("View only wallet cannot use background sync")); \
return false; \
} \
if (m_wallet->multisig()) \
const multisig::multisig_account_status ms_status{m_wallet->get_multisig_status()}; \
if (ms_status.multisig_is_active) \
{ \
setStatusError(tr("Multisig wallet cannot use background sync")); \
return false; \
@@ -119,12 +120,12 @@ namespace {
throw runtime_error("Wallet is not initialized yet");
}
bool ready;
if (!wallet->multisig(&ready)) {
const multisig::multisig_account_status ms_status{wallet->get_multisig_status()};
if (!ms_status.is_active) {
throw runtime_error("Wallet is not multisig");
}
if (!ready) {
if (!ms_status.is_ready) {
throw runtime_error("Multisig wallet is not finalized yet");
}
}
@@ -137,12 +138,12 @@ namespace {
throw runtime_error("Wallet is not initialized yet");
}
bool ready;
if (!wallet->multisig(&ready)) {
const multisig::multisig_account_status ms_status{wallet->get_multisig_status()};
if (!ms_status.is_active) {
throw runtime_error("Wallet is not multisig");
}
if (ready) {
if (ms_status.is_ready) {
throw runtime_error("Multisig wallet is already finalized");
}
}
@@ -1441,7 +1442,11 @@ MultisigState WalletImpl::multisig() const {
MultisigState state;
if (checkBackgroundSync("cannot use multisig"))
return state;
state.isMultisig = m_wallet->multisig(&state.isReady, &state.threshold, &state.total);
const multisig::multisig_account_status ms_status{m_wallet->get_multisig_status()};
state.isMultisig = ms_status.multisig_is_active;
state.isReady = ms_status.is_ready;
state.threshold = ms_status.threshold;
state.total = ms_status.total;
return state;
}
@@ -1466,7 +1471,8 @@ string WalletImpl::makeMultisig(const vector<string>& info, const uint32_t thres
try {
clearStatus();
if (m_wallet->multisig()) {
const multisig::multisig_account_status ms_status{m_wallet->get_multisig_status()};
if (ms_status.multisig_is_active) {
throw runtime_error("Wallet is already multisig");
}
@@ -2307,8 +2313,8 @@ std::string WalletImpl::signMultisigParticipant(const std::string &message) cons
{
clearStatus();
bool ready = false;
if (!m_wallet->multisig(&ready) || !ready) {
const multisig::multisig_account_status ms_status{m_wallet->get_multisig_status()};
if (!ms_status.multisig_is_active || !ms_status.is_ready) {
m_status = Status_Error;
m_errorString = tr("The wallet must be in multisig ready state");
return {};