mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #547
8ea7af1
Allow the wallet to access hard fork information (moneromooo-monero)760331b
epee: make log macros behave like statements (moneromooo-monero)3f2970f
Add missing semicolons after log statements (moneromooo-monero)
This commit is contained in:
commit
aa7d6c5412
16 changed files with 97 additions and 42 deletions
|
@ -1316,52 +1316,52 @@ POP_WARNINGS
|
||||||
|
|
||||||
#if defined(ENABLE_LOGGING_INTERNAL)
|
#if defined(ENABLE_LOGGING_INTERNAL)
|
||||||
|
|
||||||
#define LOG_PRINT_NO_PREFIX2(log_name, x, y) {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
#define LOG_PRINT_NO_PREFIX2(log_name, x, y) do {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
||||||
{std::stringstream ss________; ss________ << x << std::endl; epee::log_space::log_singletone::do_log_message(ss________.str() , y, epee::log_space::console_color_default, false, log_name);}}
|
{std::stringstream ss________; ss________ << x << std::endl; epee::log_space::log_singletone::do_log_message(ss________.str() , y, epee::log_space::console_color_default, false, log_name);}} while(0)
|
||||||
|
|
||||||
#define LOG_PRINT_NO_PREFIX_NO_POSTFIX2(log_name, x, y) {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
#define LOG_PRINT_NO_PREFIX_NO_POSTFIX2(log_name, x, y) do {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
||||||
{std::stringstream ss________; ss________ << x; epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, false, log_name);}}
|
{std::stringstream ss________; ss________ << x; epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, false, log_name);}} while(0)
|
||||||
|
|
||||||
|
|
||||||
#define LOG_PRINT_NO_POSTFIX2(log_name, x, y) {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
#define LOG_PRINT_NO_POSTFIX2(log_name, x, y) do {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
||||||
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x; epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, false, log_name);}}
|
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x; epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, false, log_name);}} while(0)
|
||||||
|
|
||||||
|
|
||||||
#define LOG_PRINT2(log_name, x, y) {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
#define LOG_PRINT2(log_name, x, y) do {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
||||||
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x << std::endl;epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, false, log_name);}}
|
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x << std::endl;epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, false, log_name);}} while(0)
|
||||||
|
|
||||||
#define LOG_PRINT_COLOR2(log_name, x, y, color) {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
#define LOG_PRINT_COLOR2(log_name, x, y, color) do {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
||||||
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x << std::endl;epee::log_space::log_singletone::do_log_message(ss________.str(), y, color, false, log_name);}}
|
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x << std::endl;epee::log_space::log_singletone::do_log_message(ss________.str(), y, color, false, log_name);}} while(0)
|
||||||
|
|
||||||
|
|
||||||
#define LOG_PRINT2_JORNAL(log_name, x, y) {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
#define LOG_PRINT2_JORNAL(log_name, x, y) do {if ( y <= epee::log_space::log_singletone::get_log_detalisation_level() )\
|
||||||
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x << std::endl;epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, true, log_name);}}
|
{std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << x << std::endl;epee::log_space::log_singletone::do_log_message(ss________.str(), y, epee::log_space::console_color_default, true, log_name);}} while(0)
|
||||||
|
|
||||||
|
|
||||||
#define LOG_ERROR2(log_name, x) { \
|
#define LOG_ERROR2(log_name, x) do { \
|
||||||
std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << "ERROR " << __FILE__ << ":" << __LINE__ << " " << x << std::endl; epee::log_space::log_singletone::do_log_message(ss________.str(), LOG_LEVEL_0, epee::log_space::console_color_red, true, log_name);LOCAL_ASSERT(0); epee::log_space::log_singletone::get_set_err_count(true, epee::log_space::log_singletone::get_set_err_count()+1);}
|
std::stringstream ss________; ss________ << epee::log_space::log_singletone::get_prefix_entry() << "ERROR " << __FILE__ << ":" << __LINE__ << " " << x << std::endl; epee::log_space::log_singletone::do_log_message(ss________.str(), LOG_LEVEL_0, epee::log_space::console_color_red, true, log_name);LOCAL_ASSERT(0); epee::log_space::log_singletone::get_set_err_count(true, epee::log_space::log_singletone::get_set_err_count()+1);} while(0)
|
||||||
|
|
||||||
#define LOG_FRAME2(log_name, x, y) epee::log_space::log_frame frame(x, y, log_name)
|
#define LOG_FRAME2(log_name, x, y) epee::log_space::log_frame frame(x, y, log_name)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
|
||||||
#define LOG_PRINT_NO_PREFIX2(log_name, x, y)
|
#define LOG_PRINT_NO_PREFIX2(log_name, x, y) ((void)0)
|
||||||
|
|
||||||
#define LOG_PRINT_NO_PREFIX_NO_POSTFIX2(log_name, x, y)
|
#define LOG_PRINT_NO_PREFIX_NO_POSTFIX2(log_name, x, y) ((void)0)
|
||||||
|
|
||||||
#define LOG_PRINT_NO_POSTFIX2(log_name, x, y)
|
#define LOG_PRINT_NO_POSTFIX2(log_name, x, y) ((void)0)
|
||||||
|
|
||||||
#define LOG_PRINT_COLOR2(log_name, x, y, color)
|
#define LOG_PRINT_COLOR2(log_name, x, y, color) ((void)0)
|
||||||
|
|
||||||
#define LOG_PRINT2_JORNAL(log_name, x, y)
|
#define LOG_PRINT2_JORNAL(log_name, x, y) ((void)0)
|
||||||
|
|
||||||
#define LOG_PRINT2(log_name, x, y)
|
#define LOG_PRINT2(log_name, x, y) ((void)0)
|
||||||
|
|
||||||
#define LOG_ERROR2(log_name, x)
|
#define LOG_ERROR2(log_name, x) ((void)0)
|
||||||
|
|
||||||
|
|
||||||
#define LOG_FRAME2(log_name, x, y)
|
#define LOG_FRAME2(log_name, x, y) ((void)0)
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2176,7 +2176,7 @@ uint8_t BlockchainBDB::get_hard_fork_version(uint64_t height) const
|
||||||
|
|
||||||
void BlockchainBDB::checkpoint_worker() const
|
void BlockchainBDB::checkpoint_worker() const
|
||||||
{
|
{
|
||||||
LOG_PRINT_L0("Entering BDB checkpoint thread.")
|
LOG_PRINT_L0("Entering BDB checkpoint thread.");
|
||||||
int count = 0;
|
int count = 0;
|
||||||
while(m_run_checkpoint && m_open)
|
while(m_run_checkpoint && m_open)
|
||||||
{
|
{
|
||||||
|
@ -2188,12 +2188,12 @@ void BlockchainBDB::checkpoint_worker() const
|
||||||
count = 0;
|
count = 0;
|
||||||
if(m_env->txn_checkpoint(0, 0, 0) != 0)
|
if(m_env->txn_checkpoint(0, 0, 0) != 0)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L0("BDB txn_checkpoint failed.")
|
LOG_PRINT_L0("BDB txn_checkpoint failed.");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LOG_PRINT_L0("Leaving BDB checkpoint thread.")
|
LOG_PRINT_L0("Leaving BDB checkpoint thread.");
|
||||||
}
|
}
|
||||||
|
|
||||||
void BlockchainBDB::fixup()
|
void BlockchainBDB::fixup()
|
||||||
|
|
|
@ -515,7 +515,7 @@ int import_from_file(FakeCore& simple_core, const std::string& import_file_path,
|
||||||
#if !defined(BLOCKCHAIN_DB) || (BLOCKCHAIN_DB == DB_LMDB)
|
#if !defined(BLOCKCHAIN_DB) || (BLOCKCHAIN_DB == DB_LMDB)
|
||||||
simple_core.m_storage.get_db().show_stats();
|
simple_core.m_storage.get_db().show_stats();
|
||||||
#endif
|
#endif
|
||||||
LOG_PRINT_L0("Number of blocks imported: " << num_imported)
|
LOG_PRINT_L0("Number of blocks imported: " << num_imported);
|
||||||
if (h > 0)
|
if (h > 0)
|
||||||
// TODO: if there was an error, the last added block is probably at zero-based height h-2
|
// TODO: if there was an error, the last added block is probably at zero-based height h-2
|
||||||
LOG_PRINT_L0("Finished at block: " << h-1 << " total blocks: " << h);
|
LOG_PRINT_L0("Finished at block: " << h-1 << " total blocks: " << h);
|
||||||
|
|
|
@ -397,7 +397,7 @@ uint64_t BootstrapFile::seek_to_first_chunk(std::ifstream& import_file)
|
||||||
throw std::runtime_error("Error in deserialization of bootstrap::file_info");
|
throw std::runtime_error("Error in deserialization of bootstrap::file_info");
|
||||||
LOG_PRINT_L0("bootstrap file v" << unsigned(bfi.major_version) << "." << unsigned(bfi.minor_version));
|
LOG_PRINT_L0("bootstrap file v" << unsigned(bfi.major_version) << "." << unsigned(bfi.minor_version));
|
||||||
LOG_PRINT_L0("bootstrap magic size: " << sizeof(file_magic));
|
LOG_PRINT_L0("bootstrap magic size: " << sizeof(file_magic));
|
||||||
LOG_PRINT_L0("bootstrap header size: " << bfi.header_size)
|
LOG_PRINT_L0("bootstrap header size: " << bfi.header_size);
|
||||||
|
|
||||||
uint64_t full_header_size = sizeof(file_magic) + bfi.header_size;
|
uint64_t full_header_size = sizeof(file_magic) + bfi.header_size;
|
||||||
import_file.seekg(full_header_size);
|
import_file.seekg(full_header_size);
|
||||||
|
|
|
@ -88,7 +88,7 @@ public:
|
||||||
{
|
{
|
||||||
m_flush = false;
|
m_flush = false;
|
||||||
|
|
||||||
LOG_PRINT(m_oss.str(), m_log_level)
|
LOG_PRINT(m_oss.str(), m_log_level);
|
||||||
|
|
||||||
if (epee::log_space::console_color_default == m_color)
|
if (epee::log_space::console_color_default == m_color)
|
||||||
{
|
{
|
||||||
|
|
|
@ -394,7 +394,7 @@ bool Blockchain::deinit()
|
||||||
{
|
{
|
||||||
LOG_PRINT_L3("Blockchain::" << __func__);
|
LOG_PRINT_L3("Blockchain::" << __func__);
|
||||||
|
|
||||||
LOG_PRINT_L0("Closing IO Service.")
|
LOG_PRINT_L0("Closing IO Service.");
|
||||||
// stop async service
|
// stop async service
|
||||||
m_async_work_idle.reset();
|
m_async_work_idle.reset();
|
||||||
m_async_pool.join_all();
|
m_async_pool.join_all();
|
||||||
|
@ -2898,7 +2898,7 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
|
||||||
crypto::hash tophash = m_db->top_block_hash();
|
crypto::hash tophash = m_db->top_block_hash();
|
||||||
if (block.prev_id != tophash)
|
if (block.prev_id != tophash)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L1("Skipping prepare blocks. New blocks don't belong to chain.")
|
LOG_PRINT_L1("Skipping prepare blocks. New blocks don't belong to chain.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2958,7 +2958,7 @@ bool Blockchain::prepare_handle_incoming_blocks(const std::list<block_complete_e
|
||||||
|
|
||||||
if (blocks_exist)
|
if (blocks_exist)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L0("Skipping prepare blocks. Blocks exist.")
|
LOG_PRINT_L0("Skipping prepare blocks. Blocks exist.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3173,9 +3173,9 @@ HardFork::State Blockchain::get_hard_fork_state() const
|
||||||
return m_hardfork->get_state();
|
return m_hardfork->get_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Blockchain::get_hard_fork_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const
|
bool Blockchain::get_hard_fork_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint64_t &earliest_height, uint8_t &voting) const
|
||||||
{
|
{
|
||||||
return m_hardfork->get_voting_info(version, window, votes, threshold, voting);
|
return m_hardfork->get_voting_info(version, window, votes, threshold, earliest_height, voting);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Blockchain::for_all_key_images(std::function<bool(const crypto::key_image&)> f) const
|
bool Blockchain::for_all_key_images(std::function<bool(const crypto::key_image&)> f) const
|
||||||
|
|
|
@ -162,7 +162,7 @@ namespace cryptonote
|
||||||
uint8_t get_ideal_hard_fork_version() const { return m_hardfork->get_ideal_version(); }
|
uint8_t get_ideal_hard_fork_version() const { return m_hardfork->get_ideal_version(); }
|
||||||
uint8_t get_ideal_hard_fork_version(uint64_t height) const { return m_hardfork->get_ideal_version(height); }
|
uint8_t get_ideal_hard_fork_version(uint64_t height) const { return m_hardfork->get_ideal_version(height); }
|
||||||
|
|
||||||
bool get_hard_fork_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const;
|
bool get_hard_fork_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint64_t &earliest_height, uint8_t &voting) const;
|
||||||
|
|
||||||
bool for_all_key_images(std::function<bool(const crypto::key_image&)>) const;
|
bool for_all_key_images(std::function<bool(const crypto::key_image&)>) const;
|
||||||
bool for_all_blocks(std::function<bool(uint64_t, const crypto::hash&, const block&)>) const;
|
bool for_all_blocks(std::function<bool(uint64_t, const crypto::hash&, const block&)>) const;
|
||||||
|
|
|
@ -355,7 +355,16 @@ uint8_t HardFork::get_ideal_version(uint64_t height) const
|
||||||
return original_version;
|
return original_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const
|
uint64_t HardFork::get_earliest_ideal_height_for_version(uint8_t version) const
|
||||||
|
{
|
||||||
|
for (unsigned int n = heights.size() - 1; n > 0; --n) {
|
||||||
|
if (heights[n].version <= version)
|
||||||
|
return heights[n].height;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint64_t &earliest_height, uint8_t &voting) const
|
||||||
{
|
{
|
||||||
CRITICAL_REGION_LOCAL(lock);
|
CRITICAL_REGION_LOCAL(lock);
|
||||||
|
|
||||||
|
@ -367,6 +376,7 @@ bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &vote
|
||||||
votes += last_versions[n];
|
votes += last_versions[n];
|
||||||
threshold = (window * heights[current_version].threshold + 99) / 100;
|
threshold = (window * heights[current_version].threshold + 99) / 100;
|
||||||
assert((votes >= threshold) == enabled);
|
assert((votes >= threshold) == enabled);
|
||||||
|
earliest_height = get_earliest_ideal_height_for_version(version);
|
||||||
voting = heights.back().version;
|
voting = heights.back().version;
|
||||||
return enabled;
|
return enabled;
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,6 +183,11 @@ namespace cryptonote
|
||||||
*/
|
*/
|
||||||
uint8_t get_current_version() const;
|
uint8_t get_current_version() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief returns the earliest block a given version may activate
|
||||||
|
*/
|
||||||
|
uint64_t get_earliest_ideal_height_for_version(uint8_t version) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief returns information about current voting state
|
* @brief returns information about current voting state
|
||||||
*
|
*
|
||||||
|
@ -193,8 +198,9 @@ namespace cryptonote
|
||||||
* @param window the number of blocks considered in voting
|
* @param window the number of blocks considered in voting
|
||||||
* @param votes number of votes for next version
|
* @param votes number of votes for next version
|
||||||
* @param threshold number of votes needed to switch to next version
|
* @param threshold number of votes needed to switch to next version
|
||||||
|
* @param earliest_height earliest height at which the version can take effect
|
||||||
*/
|
*/
|
||||||
bool get_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const;
|
bool get_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint64_t &earliest_height, uint8_t &voting) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief returns the size of the voting window in blocks
|
* @brief returns the size of the voting window in blocks
|
||||||
|
|
|
@ -257,7 +257,7 @@ namespace cryptonote
|
||||||
m_threads.push_back(boost::thread(attrs, boost::bind(&miner::worker_thread, this)));
|
m_threads.push_back(boost::thread(attrs, boost::bind(&miner::worker_thread, this)));
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_PRINT_L0("Mining has started with " << threads_count << " threads, good luck!" )
|
LOG_PRINT_L0("Mining has started with " << threads_count << " threads, good luck!" );
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
//-----------------------------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -380,7 +380,7 @@ namespace nodetool
|
||||||
{
|
{
|
||||||
boost::thread* th = new boost::thread([=, &dns_results, &addr_str]
|
boost::thread* th = new boost::thread([=, &dns_results, &addr_str]
|
||||||
{
|
{
|
||||||
LOG_PRINT_L4("dns_threads[" << result_index << "] created for: " << addr_str)
|
LOG_PRINT_L4("dns_threads[" << result_index << "] created for: " << addr_str);
|
||||||
// TODO: care about dnssec avail/valid
|
// TODO: care about dnssec avail/valid
|
||||||
bool avail, valid;
|
bool avail, valid;
|
||||||
std::vector<std::string> addr_list;
|
std::vector<std::string> addr_list;
|
||||||
|
|
|
@ -897,7 +897,7 @@ namespace cryptonote
|
||||||
const Blockchain &blockchain = m_core.get_blockchain_storage();
|
const Blockchain &blockchain = m_core.get_blockchain_storage();
|
||||||
uint8_t version = req.version > 0 ? req.version : blockchain.get_ideal_hard_fork_version();
|
uint8_t version = req.version > 0 ? req.version : blockchain.get_ideal_hard_fork_version();
|
||||||
res.version = blockchain.get_current_hard_fork_version();
|
res.version = blockchain.get_current_hard_fork_version();
|
||||||
res.enabled = blockchain.get_hard_fork_voting_info(version, res.window, res.votes, res.threshold, res.voting);
|
res.enabled = blockchain.get_hard_fork_voting_info(version, res.window, res.votes, res.threshold, res.earliest_height, res.voting);
|
||||||
res.state = blockchain.get_hard_fork_state();
|
res.state = blockchain.get_hard_fork_state();
|
||||||
res.status = CORE_RPC_STATUS_OK;
|
res.status = CORE_RPC_STATUS_OK;
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -877,6 +877,7 @@ namespace cryptonote
|
||||||
uint32_t threshold;
|
uint32_t threshold;
|
||||||
uint8_t voting;
|
uint8_t voting;
|
||||||
uint32_t state;
|
uint32_t state;
|
||||||
|
uint64_t earliest_height;
|
||||||
std::string status;
|
std::string status;
|
||||||
|
|
||||||
BEGIN_KV_SERIALIZE_MAP()
|
BEGIN_KV_SERIALIZE_MAP()
|
||||||
|
@ -887,6 +888,7 @@ namespace cryptonote
|
||||||
KV_SERIALIZE(threshold)
|
KV_SERIALIZE(threshold)
|
||||||
KV_SERIALIZE(voting)
|
KV_SERIALIZE(voting)
|
||||||
KV_SERIALIZE(state)
|
KV_SERIALIZE(state)
|
||||||
|
KV_SERIALIZE(earliest_height)
|
||||||
KV_SERIALIZE(status)
|
KV_SERIALIZE(status)
|
||||||
END_KV_SERIALIZE_MAP()
|
END_KV_SERIALIZE_MAP()
|
||||||
};
|
};
|
||||||
|
|
|
@ -157,7 +157,7 @@ namespace
|
||||||
{
|
{
|
||||||
m_flush = false;
|
m_flush = false;
|
||||||
|
|
||||||
LOG_PRINT(m_oss.str(), m_log_level)
|
LOG_PRINT(m_oss.str(), m_log_level);
|
||||||
|
|
||||||
if (epee::log_space::console_color_default == m_color)
|
if (epee::log_space::console_color_default == m_color)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2338,10 +2338,45 @@ void wallet2::transfer_dust(size_t num_outputs, uint64_t unlock_time, uint64_t n
|
||||||
ptx.dests = dsts;
|
ptx.dests = dsts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//----------------------------------------------------------------------------------------------------
|
||||||
|
bool wallet2::use_fork_rules(uint8_t version)
|
||||||
|
{
|
||||||
|
cryptonote::COMMAND_RPC_GET_HEIGHT::request req = AUTO_VAL_INIT(req);
|
||||||
|
cryptonote::COMMAND_RPC_GET_HEIGHT::response res = AUTO_VAL_INIT(res);
|
||||||
|
epee::json_rpc::request<cryptonote::COMMAND_RPC_HARD_FORK_INFO::request> req_t = AUTO_VAL_INIT(req_t);
|
||||||
|
epee::json_rpc::response<cryptonote::COMMAND_RPC_HARD_FORK_INFO::response, std::string> resp_t = AUTO_VAL_INIT(resp_t);
|
||||||
|
|
||||||
|
m_daemon_rpc_mutex.lock();
|
||||||
|
bool r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/getheight", req, res, m_http_client);
|
||||||
|
m_daemon_rpc_mutex.unlock();
|
||||||
|
CHECK_AND_ASSERT_MES(r, false, "Failed to connect to daemon");
|
||||||
|
CHECK_AND_ASSERT_MES(res.status != CORE_RPC_STATUS_BUSY, false, "Failed to connect to daemon");
|
||||||
|
CHECK_AND_ASSERT_MES(res.status == CORE_RPC_STATUS_OK, false, "Failed to get current blockchain height");
|
||||||
|
|
||||||
|
m_daemon_rpc_mutex.lock();
|
||||||
|
req_t.jsonrpc = "2.0";
|
||||||
|
req_t.id = epee::serialization::storage_entry(0);
|
||||||
|
req_t.method = "hard_fork_info";
|
||||||
|
req_t.params.version = version;
|
||||||
|
r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/json_rpc", req_t, resp_t, m_http_client);
|
||||||
|
m_daemon_rpc_mutex.unlock();
|
||||||
|
CHECK_AND_ASSERT_MES(r, false, "Failed to connect to daemon");
|
||||||
|
CHECK_AND_ASSERT_MES(res.status != CORE_RPC_STATUS_BUSY, false, "Failed to connect to daemon");
|
||||||
|
CHECK_AND_ASSERT_MES(res.status == CORE_RPC_STATUS_OK, false, "Failed to get hard fork status");
|
||||||
|
|
||||||
|
bool close_enough = res.height >= resp_t.result.earliest_height - 10; // start using the rules a bit beforehand
|
||||||
|
if (close_enough)
|
||||||
|
LOG_PRINT_L2("Using HF1 rules");
|
||||||
|
else
|
||||||
|
LOG_PRINT_L2("Not using HF1 rules");
|
||||||
|
return close_enough;
|
||||||
|
}
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
std::vector<wallet2::pending_tx> wallet2::create_dust_sweep_transactions()
|
std::vector<wallet2::pending_tx> wallet2::create_dust_sweep_transactions()
|
||||||
{
|
{
|
||||||
tx_dust_policy dust_policy(::config::DEFAULT_DUST_THRESHOLD);
|
// From hard fork 1, we don't consider small amounts to be dust anymore
|
||||||
|
const bool hf1_rules = use_fork_rules(2); // first hard fork has version 2
|
||||||
|
tx_dust_policy dust_policy(hf1_rules ? 0 : ::config::DEFAULT_DUST_THRESHOLD);
|
||||||
|
|
||||||
size_t num_dust_outputs = 0;
|
size_t num_dust_outputs = 0;
|
||||||
for (transfer_container::const_iterator i = m_transfers.begin(); i != m_transfers.end(); ++i)
|
for (transfer_container::const_iterator i = m_transfers.begin(); i != m_transfers.end(); ++i)
|
||||||
|
|
|
@ -372,6 +372,7 @@ namespace tools
|
||||||
crypto::hash get_payment_id(const pending_tx &ptx) const;
|
crypto::hash get_payment_id(const pending_tx &ptx) const;
|
||||||
void check_acc_out(const cryptonote::account_keys &acc, const cryptonote::tx_out &o, const crypto::public_key &tx_pub_key, size_t i, uint64_t &money_transfered, bool &error) const;
|
void check_acc_out(const cryptonote::account_keys &acc, const cryptonote::tx_out &o, const crypto::public_key &tx_pub_key, size_t i, uint64_t &money_transfered, bool &error) const;
|
||||||
void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const;
|
void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const;
|
||||||
|
bool use_fork_rules(uint8_t version);
|
||||||
|
|
||||||
cryptonote::account_base m_account;
|
cryptonote::account_base m_account;
|
||||||
std::string m_daemon_address;
|
std::string m_daemon_address;
|
||||||
|
@ -552,7 +553,8 @@ namespace tools
|
||||||
// randomly select inputs for transaction
|
// randomly select inputs for transaction
|
||||||
// throw if requested send amount is greater than amount available to send
|
// throw if requested send amount is greater than amount available to send
|
||||||
std::list<transfer_container::iterator> selected_transfers;
|
std::list<transfer_container::iterator> selected_transfers;
|
||||||
uint64_t found_money = select_transfers(needed_money, 0 == fake_outputs_count, dust_policy.dust_threshold, selected_transfers);
|
const bool add_dust = (0 == fake_outputs_count) && !use_fork_rules(2); // first fork has version 2
|
||||||
|
uint64_t found_money = select_transfers(needed_money, add_dust, dust_policy.dust_threshold, selected_transfers);
|
||||||
THROW_WALLET_EXCEPTION_IF(found_money < needed_money, error::not_enough_money, found_money, needed_money - fee, fee);
|
THROW_WALLET_EXCEPTION_IF(found_money < needed_money, error::not_enough_money, found_money, needed_money - fee, fee);
|
||||||
|
|
||||||
typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry out_entry;
|
typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry out_entry;
|
||||||
|
|
Loading…
Reference in a new issue