Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

removed unlock_time parameter for safity reasons

Browse source
This commit is contained in:
cryptozoidberg 2019-05-17 15:24:52 +02:00
parent 544c1f67a0
commit bee05a126e
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/currency_core/blockchain_storage.cpp
View file

@ -919,7 +919,7 @@ wide_difficulty_type blockchain_storage::get_next_diff_conditional(bool pos) con
wide_difficulty_type& dif = pos ? m_cached_next_pos_difficulty : m_cached_next_pow_difficulty;
TIME_MEASURE_FINISH_PD(target_calculating_enum_blocks);
TIME_MEASURE_START_PD(target_calculating_calc);
dif = next_difficulty(timestamps, commulative_difficulties, pos ? DIFFICULTY_POS_TARGET : DIFFICULTY_POW_TARGET);
dif = next_difficulty(timestamps, commulative_difficulties, pos ? DIFFICULTY_POS_TARGET : DIFFICULTY_POW_TARGET, pos);
TIME_MEASURE_FINISH_PD(target_calculating_calc);
return dif;
}
@ -947,7 +947,7 @@ wide_difficulty_type blockchain_storage::get_next_diff_conditional2(bool pos, co
return true;
};
enum_blockchain(cb, alt_chain, split_height);
return next_difficulty(timestamps, commulative_difficulties, pos ? DIFFICULTY_POS_TARGET : DIFFICULTY_POW_TARGET);
return next_difficulty(timestamps, commulative_difficulties, pos ? DIFFICULTY_POS_TARGET : DIFFICULTY_POW_TARGET, pos);
}
//------------------------------------------------------------------
wide_difficulty_type blockchain_storage::get_cached_next_difficulty(bool pos) const

2
src/wallet/wallet_rpc_server.cpp
View file

@ -163,7 +163,7 @@ namespace tools
currency::transaction tx;
std::vector<currency::extra_v> extra;
std::string signed_tx_blob_str;
m_wallet.transfer(dsts, req.mixin, req.unlock_time, req.fee, extra, attachments, detail::ssi_digit, tx_dust_policy(DEFAULT_DUST_THRESHOLD), tx, CURRENCY_TO_KEY_OUT_RELAXED, true, 0, true, &signed_tx_blob_str);
m_wallet.transfer(dsts, req.mixin, 0/*req.unlock_time*/, req.fee, extra, attachments, detail::ssi_digit, tx_dust_policy(DEFAULT_DUST_THRESHOLD), tx, CURRENCY_TO_KEY_OUT_RELAXED, true, 0, true, &signed_tx_blob_str);
if (m_wallet.is_watch_only())
{
res.tx_unsigned_hex = epee::string_tools::buff_to_hex_nodelimer(signed_tx_blob_str); // watch-only wallets can't sign and relay transactions

4
src/wallet/wallet_rpc_server_commans_defs.h
View file

@ -214,7 +214,7 @@ namespace wallet_rpc
std::list<trnsfer_destination> destinations;
uint64_t fee;
uint64_t mixin;
uint64_t unlock_time;
//uint64_t unlock_time;
std::string payment_id; // hex-encoded
std::string comment;
@ -222,7 +222,7 @@ namespace wallet_rpc
KV_SERIALIZE(destinations)
KV_SERIALIZE(fee)
KV_SERIALIZE(mixin)
KV_SERIALIZE(unlock_time)
//KV_SERIALIZE(unlock_time)
KV_SERIALIZE(payment_id)
KV_SERIALIZE(comment)
END_KV_SERIALIZE_MAP()