mirror of
https://github.com/monero-project/monero.git
synced 2025-12-09 00:21:28 +09:00
Merge pull request #9698
861437c add do_not_relay option to submit_multisig_main command in simplewallet (SNeedlewoods)
This commit is contained in:
commit
61b8c09f83
@ -1639,13 +1639,8 @@ bool simple_wallet::submit_multisig_main(const std::vector<std::string> &args, b
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// actually commit the transactions
|
// actually commit or save the transactions
|
||||||
for (auto &ptx: txs.m_ptx)
|
commit_or_save(txs.m_ptx, m_do_not_relay);
|
||||||
{
|
|
||||||
m_wallet->commit_tx(ptx);
|
|
||||||
success_msg_writer(true) << tr("Transaction successfully submitted, transaction ") << get_transaction_hash(ptx.tx) << ENDL
|
|
||||||
<< tr("You can check its status by using the `show_transfers` command.");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (const std::exception &e)
|
catch (const std::exception &e)
|
||||||
{
|
{
|
||||||
@ -7439,7 +7434,6 @@ bool simple_wallet::sweep_single(const std::vector<std::string> &args_)
|
|||||||
}
|
}
|
||||||
|
|
||||||
commit_or_save(signed_tx.ptx, m_do_not_relay);
|
commit_or_save(signed_tx.ptx, m_do_not_relay);
|
||||||
success_msg_writer(true) << tr("Money successfully sent, transaction: ") << get_transaction_hash(ptx_vector[0].tx);
|
|
||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::exception& e)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user