Merge pull request #9525

e1876ab tests: remove unlock_time argument from trezor_tests (0xFFFC0000)
This commit is contained in:
luigi1111 2024-12-23 10:43:38 -05:00
commit 77471ecd3f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -1709,7 +1709,7 @@ tsx_builder * tsx_builder::construct_pending_tx(tools::wallet2::pending_tx &ptx,
auto sources_copy = m_sources; auto sources_copy = m_sources;
auto change_addr = m_from->get_account().get_keys().m_account_address; auto change_addr = m_from->get_account().get_keys().m_account_address;
bool r = construct_tx_and_get_tx_key(m_from->get_account().get_keys(), subaddresses, m_sources, destinations_copy, bool r = construct_tx_and_get_tx_key(m_from->get_account().get_keys(), subaddresses, m_sources, destinations_copy,
change_addr, extra ? extra.get() : std::vector<uint8_t>(), tx, 0, tx_key, change_addr, extra ? extra.get() : std::vector<uint8_t>(), tx, tx_key,
additional_tx_keys, true, m_rct_config, this->m_tester->cur_hf() >= HF_VERSION_VIEW_TAGS); additional_tx_keys, true, m_rct_config, this->m_tester->cur_hf() >= HF_VERSION_VIEW_TAGS);
CHECK_AND_ASSERT_THROW_MES(r, "Transaction construction failed"); CHECK_AND_ASSERT_THROW_MES(r, "Transaction construction failed");