mirror of
https://github.com/monero-project/monero.git
synced 2025-08-12 22:05:31 -04:00
Merge pull request #4787
3dba7f25
protocol: option to pad transaction relay to the next kB (moneromooo-monero)
This commit is contained in:
commit
dde1e69723
6 changed files with 52 additions and 1 deletions
|
@ -160,6 +160,11 @@ namespace cryptonote
|
|||
, "Relay blocks as normal blocks"
|
||||
, false
|
||||
};
|
||||
static const command_line::arg_descriptor<bool> arg_pad_transactions = {
|
||||
"pad-transactions"
|
||||
, "Pad relayed transactions to help defend against traffic volume analysis"
|
||||
, false
|
||||
};
|
||||
static const command_line::arg_descriptor<size_t> arg_max_txpool_weight = {
|
||||
"max-txpool-weight"
|
||||
, "Set maximum txpool weight in bytes."
|
||||
|
@ -185,7 +190,8 @@ namespace cryptonote
|
|||
m_disable_dns_checkpoints(false),
|
||||
m_update_download(0),
|
||||
m_nettype(UNDEFINED),
|
||||
m_update_available(false)
|
||||
m_update_available(false),
|
||||
m_pad_transactions(false)
|
||||
{
|
||||
m_checkpoints_updating.clear();
|
||||
set_cryptonote_protocol(pprotocol);
|
||||
|
@ -279,6 +285,7 @@ namespace cryptonote
|
|||
command_line::add_arg(desc, arg_offline);
|
||||
command_line::add_arg(desc, arg_disable_dns_checkpoints);
|
||||
command_line::add_arg(desc, arg_max_txpool_weight);
|
||||
command_line::add_arg(desc, arg_pad_transactions);
|
||||
command_line::add_arg(desc, arg_block_notify);
|
||||
|
||||
miner::init_options(desc);
|
||||
|
@ -317,6 +324,7 @@ namespace cryptonote
|
|||
set_enforce_dns_checkpoints(command_line::get_arg(vm, arg_dns_checkpoints));
|
||||
test_drop_download_height(command_line::get_arg(vm, arg_test_drop_download_height));
|
||||
m_fluffy_blocks_enabled = !get_arg(vm, arg_no_fluffy_blocks);
|
||||
m_pad_transactions = get_arg(vm, arg_pad_transactions);
|
||||
m_offline = get_arg(vm, arg_offline);
|
||||
m_disable_dns_checkpoints = get_arg(vm, arg_disable_dns_checkpoints);
|
||||
if (!command_line::is_arg_defaulted(vm, arg_fluffy_blocks))
|
||||
|
|
|
@ -754,6 +754,13 @@ namespace cryptonote
|
|||
*/
|
||||
bool fluffy_blocks_enabled() const { return m_fluffy_blocks_enabled; }
|
||||
|
||||
/**
|
||||
* @brief get whether transaction relay should be padded
|
||||
*
|
||||
* @return whether transaction relay should be padded
|
||||
*/
|
||||
bool pad_transactions() const { return m_pad_transactions; }
|
||||
|
||||
/**
|
||||
* @brief check a set of hashes against the precompiled hash set
|
||||
*
|
||||
|
@ -1013,6 +1020,7 @@ namespace cryptonote
|
|||
|
||||
bool m_fluffy_blocks_enabled;
|
||||
bool m_offline;
|
||||
bool m_pad_transactions;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue