mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #1951
0a7885bf
Wallet API: fix Cold signing split tx (Jaquee)
This commit is contained in:
commit
4be94be168
1 changed files with 10 additions and 4 deletions
|
@ -104,6 +104,7 @@ bool UnsignedTransactionImpl::checkLoadedTx(const std::function<size_t()> get_nu
|
|||
size_t min_mixin = ~0;
|
||||
std::unordered_map<std::string, uint64_t> dests;
|
||||
const std::string wallet_address = m_wallet.m_wallet->get_account().get_public_address_str(m_wallet.m_wallet->testnet());
|
||||
int first_known_non_zero_change_index = -1;
|
||||
for (size_t n = 0; n < get_num_txes(); ++n)
|
||||
{
|
||||
const tools::wallet2::tx_construction_data &cd = get_tx(n);
|
||||
|
@ -140,12 +141,17 @@ bool UnsignedTransactionImpl::checkLoadedTx(const std::function<size_t()> get_nu
|
|||
m_errorString = tr("Claimed change is larger than payment to the change address");
|
||||
return false;
|
||||
}
|
||||
if (memcmp(&cd.change_dts.addr, &get_tx(0).change_dts.addr, sizeof(cd.change_dts.addr)))
|
||||
if (cd.change_dts.amount > 0)
|
||||
{
|
||||
if (first_known_non_zero_change_index == -1)
|
||||
first_known_non_zero_change_index = n;
|
||||
if (memcmp(&cd.change_dts.addr, &get_tx(first_known_non_zero_change_index).change_dts.addr, sizeof(cd.change_dts.addr)))
|
||||
{
|
||||
m_status = Status_Error;
|
||||
m_errorString = tr("Change does to more than one address");
|
||||
m_errorString = tr("Change goes to more than one address");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
change += cd.change_dts.amount;
|
||||
it->second -= cd.change_dts.amount;
|
||||
if (it->second == 0)
|
||||
|
|
Loading…
Reference in a new issue