@ -8127,14 +8127,6 @@ bool wallet2::get_ring(const crypto::chacha_key &key, const crypto::key_image &k
catch ( const std : : exception & e ) { return false ; }
}
bool wallet2 : : get_rings ( const crypto : : chacha_key & key , const std : : vector < crypto : : key_image > & key_images , std : : vector < std : : vector < uint64_t > > & outs )
{
if ( ! m_ringdb )
return false ;
try { return m_ringdb - > get_rings ( key , key_images , outs ) ; }
catch ( const std : : exception & e ) { return false ; }
}
bool wallet2 : : get_rings ( const crypto : : hash & txid , std : : vector < std : : pair < crypto : : key_image , std : : vector < uint64_t > > > & outs )
{
for ( auto i : m_confirmed_txs )
@ -8173,15 +8165,6 @@ bool wallet2::set_ring(const crypto::key_image &key_image, const std::vector<uin
catch ( const std : : exception & e ) { return false ; }
}
bool wallet2 : : set_rings ( const std : : vector < std : : pair < crypto : : key_image , std : : vector < uint64_t > > > & rings , bool relative )
{
if ( ! m_ringdb )
return false ;
try { return m_ringdb - > set_rings ( get_ringdb_key ( ) , rings , relative ) ; }
catch ( const std : : exception & e ) { return false ; }
}
bool wallet2 : : unset_ring ( const std : : vector < crypto : : key_image > & key_images )
{
if ( ! m_ringdb )
@ -8356,7 +8339,7 @@ bool wallet2::is_keys_file_locked() const
return m_keys_file_locker - > locked ( ) ;
}
bool wallet2 : : tx_add_fake_output ( std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , uint64_t global_index , const crypto : : public_key & output_public_key , const rct : : key & mask , uint64_t real_index , bool unlocked , std : : unordered_set < crypto : : public_key > & valid_public_keys_cache ) const
bool wallet2 : : tx_add_fake_output ( std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , uint64_t global_index , const crypto : : public_key & output_public_key , const rct : : key & mask , uint64_t real_index , bool unlocked const
{
if ( ! unlocked ) // don't add locked outs
return false ;
@ -8367,18 +8350,16 @@ bool wallet2::tx_add_fake_output(std::vector<std::vector<tools::wallet2::get_out
if ( std : : find ( outs . back ( ) . begin ( ) , outs . back ( ) . end ( ) , item ) ! = outs . back ( ) . end ( ) ) // don't add duplicates
return false ;
// check the keys are valid
if ( valid_public_keys_cache . find ( output_public_key ) = = valid_public_keys_cache . end ( ) & & ! rct : : isInMainSubgroup ( rct : : pk2rct ( output_public_key ) ) )
if ( ! rct : : isInMainSubgroup ( rct : : pk2rct ( output_public_key ) ) )
{
MWARNING ( " Key " < < output_public_key < < " at index " < < global_index < < " is not in the main subgroup " ) ;
return false ;
}
valid_public_keys_cache . insert ( output_public_key ) ;
if ( valid_public_keys_cache . find ( rct : : rct2pk ( mask ) ) = = valid_public_keys_cache . end ( ) & & ! rct : : isInMainSubgroup ( mask ) )
if ( ! rct : : isInMainSubgroup ( mask ) )
{
MWARNING ( " Commitment " < < mask < < " at index " < < global_index < < " is not in the main subgroup " ) ;
return false ;
}
valid_public_keys_cache . insert ( rct : : rct2pk ( mask ) ) ;
// if (is_output_blackballed(output_public_key)) // don't add blackballed outputs
// return false;
outs . back ( ) . push_back ( item ) ;
@ -8423,7 +8404,6 @@ void wallet2::light_wallet_get_outs(std::vector<std::vector<tools::wallet2::get_
MDEBUG ( " selected transfers size: " < < selected_transfers . size ( ) ) ;
std : : unordered_set < crypto : : public_key > valid_public_keys_cache ;
for ( size_t idx : selected_transfers )
{
// Create new index
@ -8475,7 +8455,7 @@ void wallet2::light_wallet_get_outs(std::vector<std::vector<tools::wallet2::get_
if ( ! light_wallet_parse_rct_str ( ores . amount_outs [ amount_key ] . outputs [ i ] . rct , tx_public_key , 0 , mask , rct_commit , false ) )
rct_commit = rct : : zeroCommit ( td . amount ( ) ) ;
if ( tx_add_fake_output ( outs , global_index , tx_public_key , rct_commit , td . m_global_output_index , true , valid_public_keys_cache )) {
if ( tx_add_fake_output ( outs , global_index , tx_public_key , rct_commit , td . m_global_output_index , true ) {
MDEBUG ( " added fake output " < < ores . amount_outs [ amount_key ] . outputs [ i ] . public_key ) ;
MDEBUG ( " index " < < global_index ) ;
}
@ -8512,12 +8492,12 @@ std::pair<std::set<uint64_t>, size_t> outs_unique(const std::vector<std::vector<
return std : : make_pair ( std : : move ( unique ) , total ) ;
}
void wallet2 : : get_outs ( std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , const std : : vector < size_t > & selected_transfers , size_t fake_outputs_count , bool rct , std : : unordered_set < crypto : : public_key > & valid_public_keys_cache )
void wallet2 : : get_outs ( std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , const std : : vector < size_t > & selected_transfers , size_t fake_outputs_count , bool rct
{
std : : vector < uint64_t > rct_offsets ;
for ( size_t attempts = 3 ; attempts > 0 ; - - attempts )
{
get_outs ( outs , selected_transfers , fake_outputs_count , rct_offsets , valid_public_keys_cache );
get_outs ( outs , selected_transfers , fake_outputs_count , rct_offsets ;
if ( ! rct )
return ;
@ -8539,7 +8519,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
THROW_WALLET_EXCEPTION ( error : : wallet_internal_error , tr ( " Transaction sanity check failed " ) ) ;
}
void wallet2 : : get_outs ( std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , const std : : vector < size_t > & selected_transfers , size_t fake_outputs_count , std : : vector < uint64_t > & rct_offsets , std : : unordered_set < crypto : : public_key > & valid_public_keys_cache )
void wallet2 : : get_outs ( std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , const std : : vector < size_t > & selected_transfers , size_t fake_outputs_count , std : : vector < uint64_t > & rct_offsets
{
LOG_PRINT_L2 ( " fake_outputs_count: " < < fake_outputs_count ) ;
outs . clear ( ) ;
@ -8583,7 +8563,6 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
cryptonote : : COMMAND_RPC_GET_OUTPUT_HISTOGRAM : : request req_t = AUTO_VAL_INIT ( req_t ) ;
cryptonote : : COMMAND_RPC_GET_OUTPUT_HISTOGRAM : : response resp_t = AUTO_VAL_INIT ( resp_t ) ;
// request histogram for all outputs, except 0 if we have the rct distribution
req_t . amounts . reserve ( selected_transfers . size ( ) ) ;
for ( size_t idx : selected_transfers )
if ( ! m_transfers [ idx ] . is_rct ( ) | | ! has_rct_distribution )
req_t . amounts . push_back ( m_transfers [ idx ] . is_rct ( ) ? 0 : m_transfers [ idx ] . amount ( ) ) ;
@ -8611,7 +8590,6 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
{
cryptonote : : COMMAND_RPC_GET_OUTPUT_DISTRIBUTION : : request req_t = AUTO_VAL_INIT ( req_t ) ;
cryptonote : : COMMAND_RPC_GET_OUTPUT_DISTRIBUTION : : response resp_t = AUTO_VAL_INIT ( resp_t ) ;
req_t . amounts . reserve ( req_t . amounts . size ( ) + selected_transfers . size ( ) ) ;
for ( size_t idx : selected_transfers )
req_t . amounts . push_back ( m_transfers [ idx ] . is_rct ( ) ? 0 : m_transfers [ idx ] . amount ( ) ) ;
std : : sort ( req_t . amounts . begin ( ) , req_t . amounts . end ( ) ) ;
@ -8658,25 +8636,6 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
}
}
std : : vector < crypto : : key_image > ring_key_images ;
ring_key_images . reserve ( selected_transfers . size ( ) ) ;
std : : unordered_map < crypto : : key_image , std : : vector < uint64_t > > existing_rings ;
for ( size_t idx : selected_transfers )
{
const transfer_details & td = m_transfers [ idx ] ;
if ( td . m_key_image_known & & ! td . m_key_image_partial )
ring_key_images . push_back ( td . m_key_image ) ;
}
if ( ! ring_key_images . empty ( ) )
{
std : : vector < std : : vector < uint64_t > > all_outs ;
if ( get_rings ( get_ringdb_key ( ) , ring_key_images , all_outs ) )
{
for ( size_t i = 0 ; i < ring_key_images . size ( ) ; + + i )
existing_rings [ ring_key_images [ i ] ] = std : : move ( all_outs [ i ] ) ;
}
}
// we ask for more, to have spares if some outputs are still locked
size_t base_requested_outputs_count = ( size_t ) ( ( fake_outputs_count + 1 ) * 1.5 + 1 ) ;
LOG_PRINT_L2 ( " base_requested_outputs_count: " < < base_requested_outputs_count ) ;
@ -8690,8 +8649,6 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
gamma . reset ( new gamma_picker ( rct_offsets ) ) ;
size_t num_selected_transfers = 0 ;
req . outputs . reserve ( selected_transfers . size ( ) * ( base_requested_outputs_count + CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW ) ) ;
daemon_resp . outs . reserve ( selected_transfers . size ( ) * ( base_requested_outputs_count + CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW ) ) ;
for ( size_t idx : selected_transfers )
{
+ + num_selected_transfers ;
@ -8801,12 +8758,9 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
// if we have a known ring, use it
if ( td . m_key_image_known & & ! td . m_key_image_partial )
{
const auto it = existing_rings . find ( td . m_key_image ) ;
const bool has_ring = it ! = existing_rings . end ( ) ;
if ( has_ring )
std : : vector < uint64_t > ring ;
if ( get_ring ( get_ringdb_key ( ) , td . m_key_image , ring ) )
{
const std : : vector < uint64_t > & ring = it - > second ;
MINFO ( " This output has a known ring, reusing (size " < < ring . size ( ) < < " ) " ) ;
THROW_WALLET_EXCEPTION_IF ( ring . size ( ) > fake_outputs_count + 1 , error : : wallet_internal_error ,
" An output in this transaction was previously spent on another chain with ring size " +
@ -9064,10 +9018,9 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
// then pick outs from an existing ring, if any
if ( td . m_key_image_known & & ! td . m_key_image_partial )
{
const auto it = existing_rings . find ( td . m_key_image ) ;
if ( it ! = existing_rings . end ( ) )
std : : vector < uint64_t > ring ;
if ( get_ring( get_ringdb_key ( ) , td . m_key_image , ring ) )
{
const std : : vector < uint64_t > & ring = it - > second ;
for ( uint64_t out : ring )
{
if ( out < num_outs )
@ -9081,7 +9034,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
if ( req . outputs [ i ] . index = = out )
{
LOG_PRINT_L2 ( " Index " < < i < < " / " < < requested_outputs_count < < " : idx " < < req . outputs [ i ] . index < < " (real " < < td . m_global_output_index < < " ), unlocked " < < daemon_resp . outs [ i ] . unlocked < < " , key " < < daemon_resp . outs [ i ] . key < < " (from existing ring) " ) ;
tx_add_fake_output ( outs , req . outputs [ i ] . index , daemon_resp . outs [ i ] . key , daemon_resp . outs [ i ] . mask , td . m_global_output_index , daemon_resp . outs [ i ] . unlocked , valid_public_keys_cache );
tx_add_fake_output ( outs , req . outputs [ i ] . index , daemon_resp . outs [ i ] . key , daemon_resp . outs [ i ] . mask , td . m_global_output_index , daemon_resp . outs [ i ] . unlocked ;
found = true ;
break ;
}
@ -9106,7 +9059,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
{
size_t i = base + order [ o ] ;
LOG_PRINT_L2 ( " Index " < < i < < " / " < < requested_outputs_count < < " : idx " < < req . outputs [ i ] . index < < " (real " < < td . m_global_output_index < < " ), unlocked " < < daemon_resp . outs [ i ] . unlocked < < " , key " < < daemon_resp . outs [ i ] . key ) ;
tx_add_fake_output ( outs , req . outputs [ i ] . index , daemon_resp . outs [ i ] . key , daemon_resp . outs [ i ] . mask , td . m_global_output_index , daemon_resp . outs [ i ] . unlocked , valid_public_keys_cache );
tx_add_fake_output ( outs , req . outputs [ i ] . index , daemon_resp . outs [ i ] . key , daemon_resp . outs [ i ] . mask , td . m_global_output_index , daemon_resp . outs [ i ] . unlocked ;
}
if ( outs . back ( ) . size ( ) < fake_outputs_count + 1 )
{
@ -9134,8 +9087,6 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
}
// save those outs in the ringdb for reuse
std : : vector < std : : pair < crypto : : key_image , std : : vector < uint64_t > > > rings ;
rings . reserve ( selected_transfers . size ( ) ) ;
for ( size_t i = 0 ; i < selected_transfers . size ( ) ; + + i )
{
const size_t idx = selected_transfers [ i ] ;
@ -9145,15 +9096,14 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
ring . reserve ( outs [ i ] . size ( ) ) ;
for ( const auto & e : outs [ i ] )
ring . push_back ( std : : get < 0 > ( e ) ) ;
rings . push_back ( std : : make_pair ( td . m_key_image , std : : move ( ring ) ) ) ;
if ( ! set_ring ( td . m_key_image , ring , false ) )
MERROR ( " Failed to set ring for " < < td . m_key_image ) ;
}
if ( ! set_rings ( rings , false ) )
MERROR ( " Failed to set rings " ) ;
}
template < typename T >
void wallet2 : : transfer_selected ( const std : : vector < cryptonote : : tx_destination_entry > & dsts , const std : : vector < size_t > & selected_transfers , size_t fake_outputs_count ,
std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , std : : unordered_set < crypto : : public_key > & valid_public_keys_cache ,
std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs ,
uint64_t unlock_time , uint64_t fee , const std : : vector < uint8_t > & extra , T destination_split_strategy , const tx_dust_policy & dust_policy , cryptonote : : transaction & tx , pending_tx & ptx )
{
using namespace cryptonote ;
@ -9190,7 +9140,7 @@ void wallet2::transfer_selected(const std::vector<cryptonote::tx_destination_ent
THROW_WALLET_EXCEPTION_IF ( subaddr_account ! = m_transfers [ * i ] . m_subaddr_index . major , error : : wallet_internal_error , " the tx uses funds from multiple accounts " ) ;
if ( outs . empty ( ) )
get_outs ( outs , selected_transfers , fake_outputs_count , false , valid_public_keys_cache ); // may throw
get_outs ( outs , selected_transfers , fake_outputs_count , false ; // may throw
//prepare inputs
LOG_PRINT_L2 ( " preparing outputs " ) ;
@ -9313,7 +9263,7 @@ void wallet2::transfer_selected(const std::vector<cryptonote::tx_destination_ent
}
void wallet2 : : transfer_selected_rct ( std : : vector < cryptonote : : tx_destination_entry > dsts , const std : : vector < size_t > & selected_transfers , size_t fake_outputs_count ,
std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs , std : : unordered_set < crypto : : public_key > & valid_public_keys_cache ,
std : : vector < std : : vector < tools : : wallet2 : : get_outs_entry > > & outs ,
uint64_t unlock_time , uint64_t fee , const std : : vector < uint8_t > & extra , cryptonote : : transaction & tx , pending_tx & ptx , const rct : : RCTConfig & rct_config )
{
using namespace cryptonote ;
@ -9407,7 +9357,7 @@ void wallet2::transfer_selected_rct(std::vector<cryptonote::tx_destination_entry
THROW_WALLET_EXCEPTION_IF ( subaddr_account ! = m_transfers [ * i ] . m_subaddr_index . major , error : : wallet_internal_error , " the tx uses funds from multiple accounts " ) ;
if ( outs . empty ( ) )
get_outs ( outs , selected_transfers , fake_outputs_count , all_rct , valid_public_keys_cache ); // may throw
get_outs ( outs , selected_transfers , fake_outputs_count , all_rct ; // may throw
//prepare inputs
LOG_PRINT_L2 ( " preparing outputs " ) ;
@ -10290,7 +10240,6 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
rct : : RangeProofPaddedBulletproof ,
bulletproof_plus ? 4 : 3
} ;
std : : unordered_set < crypto : : public_key > valid_public_keys_cache ;
const uint64_t base_fee = get_base_fee ( ) ;
const uint64_t fee_multiplier = get_fee_multiplier ( priority , get_fee_algorithm ( ) ) ;
@ -10636,10 +10585,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
LOG_PRINT_L2 ( " Trying to create a tx now, with " < < tx . dsts . size ( ) < < " outputs and " < <
tx . selected_transfers . size ( ) < < " inputs " ) ;
if ( use_rct )
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
test_tx , test_ptx , rct_config ) ;
else
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
detail : : digit_split_strategy , tx_dust_policy ( : : config : : DEFAULT_DUST_THRESHOLD ) , test_tx , test_ptx ) ;
auto txBlob = t_serializable_object_to_blob ( test_ptx . tx ) ;
needed_fee = calculate_fee ( use_per_byte_fee , test_ptx . tx , txBlob . size ( ) , base_fee , fee_multiplier , fee_quantization_mask ) ;
@ -10679,10 +10628,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
LOG_PRINT_L2 ( " We made a tx, adjusting fee and saving it, we need " < < print_money ( needed_fee ) < < " and we have " < < print_money ( test_ptx . fee ) ) ;
while ( needed_fee > test_ptx . fee ) {
if ( use_rct )
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
test_tx , test_ptx , rct_config ) ;
else
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
detail : : digit_split_strategy , tx_dust_policy ( : : config : : DEFAULT_DUST_THRESHOLD ) , test_tx , test_ptx ) ;
txBlob = t_serializable_object_to_blob ( test_ptx . tx ) ;
needed_fee = calculate_fee ( use_per_byte_fee , test_ptx . tx , txBlob . size ( ) , base_fee , fee_multiplier , fee_quantization_mask ) ;
@ -10748,7 +10697,6 @@ skip_tx:
tx . selected_transfers , /* const std::list<size_t> selected_transfers */
fake_outs_count , /* CONST size_t fake_outputs_count, */
tx . outs , /* MOD std::vector<std::vector<tools::wallet2::get_outs_entry>> &outs, */
valid_public_keys_cache ,
unlock_time , /* CONST uint64_t unlock_time, */
tx . needed_fee , /* CONST uint64_t fee, */
extra , /* const std::vector<uint8_t>& extra, */
@ -10760,7 +10708,6 @@ skip_tx:
tx . selected_transfers ,
fake_outs_count ,
tx . outs ,
valid_public_keys_cache ,
unlock_time ,
tx . needed_fee ,
extra ,
@ -10880,7 +10827,6 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_all(uint64_t below
THROW_WALLET_EXCEPTION_IF ( tx_weight_one_ring > tx_weight_two_rings , error : : wallet_internal_error , " Estimated tx weight with 1 input is larger than with 2 inputs! " ) ;
const size_t tx_weight_per_ring = tx_weight_two_rings - tx_weight_one_ring ;
const uint64_t fractional_threshold = ( fee_multiplier * base_fee * tx_weight_per_ring ) / ( use_per_byte_fee ? 1 : 1024 ) ;
std : : unordered_set < crypto : : public_key > valid_public_keys_cache ;
THROW_WALLET_EXCEPTION_IF ( unlocked_balance ( subaddr_account , false ) = = 0 , error : : wallet_internal_error , " No unlocked balance in the specified account " ) ;
@ -10962,7 +10908,6 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_from(const crypton
hw : : device & hwdev = m_account . get_device ( ) ;
boost : : unique_lock < hw : : device > hwdev_lock ( hwdev ) ;
hw : : reset_mode rst ( hwdev ) ;
std : : unordered_set < crypto : : public_key > valid_public_keys_cache ;
uint64_t accumulated_fee , accumulated_outputs , accumulated_change ;
struct TX {
@ -11065,10 +11010,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_from(const crypton
LOG_PRINT_L2 ( " Trying to create a tx now, with " < < tx . dsts . size ( ) < < " destinations and " < <
tx . selected_transfers . size ( ) < < " outputs " ) ;
if ( use_rct )
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
test_tx , test_ptx , rct_config ) ;
else
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
detail : : digit_split_strategy , tx_dust_policy ( : : config : : DEFAULT_DUST_THRESHOLD ) , test_tx , test_ptx ) ;
auto txBlob = t_serializable_object_to_blob ( test_ptx . tx ) ;
needed_fee = calculate_fee ( use_per_byte_fee , test_ptx . tx , txBlob . size ( ) , base_fee , fee_multiplier , fee_quantization_mask ) ;
@ -11102,10 +11047,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_from(const crypton
dt . amount = dt_amount + dt_residue ;
}
if ( use_rct )
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
test_tx , test_ptx , rct_config ) ;
else
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , valid_public_keys_cache, unlock_time, needed_fee , extra ,
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , outs , , needed_fee , extra ,
detail : : digit_split_strategy , tx_dust_policy ( : : config : : DEFAULT_DUST_THRESHOLD ) , test_tx , test_ptx ) ;
txBlob = t_serializable_object_to_blob ( test_ptx . tx ) ;
needed_fee = calculate_fee ( use_per_byte_fee , test_ptx . tx , txBlob . size ( ) , base_fee , fee_multiplier , fee_quantization_mask ) ;
@ -11141,10 +11086,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_from(const crypton
cryptonote : : transaction test_tx ;
pending_tx test_ptx ;
if ( use_rct ) {
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , tx . outs , valid_public_keys_cache, unlock_time, tx . needed_fee , extra ,
transfer_selected_rct ( tx . dsts , tx . selected_transfers , fake_outs_count , tx . outs , , tx . needed_fee , extra ,
test_tx , test_ptx , rct_config ) ;
} else {
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , tx . outs , valid_public_keys_cache, unlock_time, tx . needed_fee , extra ,
transfer_selected ( tx . dsts , tx . selected_transfers , fake_outs_count , tx . outs , , tx . needed_fee , extra ,
detail : : digit_split_strategy , tx_dust_policy ( : : config : : DEFAULT_DUST_THRESHOLD ) , test_tx , test_ptx ) ;
}
auto txBlob = t_serializable_object_to_blob ( test_ptx . tx ) ;
dsc