Added --onion-address command line option to support incoming TOR connections
This commit is contained in:
@@ -235,27 +235,24 @@ void MergeMiningClientTari::on_external_block(const PoolBlock& block)
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<std::pair<hash, std::vector<uint8_t>>> mm_extra;
|
||||
mm_extra.reserve(block.m_mergeMiningExtra.size());
|
||||
|
||||
// Filter aux chain data only
|
||||
for (const auto& i : block.m_mergeMiningExtra) {
|
||||
if ((i.first != keccak_subaddress_viewpub) &&
|
||||
(i.first != keccak_onion_address_v3)) {
|
||||
mm_extra.emplace_back(i.first, i.second);
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<hash> aux_ids;
|
||||
std::vector<AuxChainData> aux_chains;
|
||||
|
||||
// All aux chains in this block + the P2Pool sidechain
|
||||
aux_ids.reserve(mm_extra.size() + 1);
|
||||
std::vector<hash> aux_ids;
|
||||
|
||||
// All aux chains in this block
|
||||
aux_chains.reserve(mm_extra.size());
|
||||
std::vector<AuxChainData> aux_chains;
|
||||
|
||||
aux_ids.reserve(block.m_mergeMiningExtra.size() + 1);
|
||||
aux_chains.reserve(block.m_mergeMiningExtra.size() + 1);
|
||||
|
||||
uint64_t mm_extra_size = 0;
|
||||
|
||||
for (const auto& i : block.m_mergeMiningExtra) {
|
||||
// Filter aux chain data only
|
||||
if ((i.first == keccak_subaddress_viewpub) || (i.first == keccak_onion_address_v3)) {
|
||||
continue;
|
||||
}
|
||||
++mm_extra_size;
|
||||
|
||||
for (const auto& i : mm_extra) {
|
||||
hash data;
|
||||
difficulty_type diff;
|
||||
{
|
||||
@@ -383,7 +380,7 @@ void MergeMiningClientTari::on_external_block(const PoolBlock& block)
|
||||
uint32_t aux_merkle_proof_path = 0;
|
||||
|
||||
const hash sidechain_id = block.m_sidechainId;
|
||||
const uint32_t n_aux_chains = static_cast<uint32_t>(mm_extra.size() + 1);
|
||||
const uint32_t n_aux_chains = static_cast<uint32_t>(mm_extra_size + 1);
|
||||
|
||||
std::vector<hash> hashes(n_aux_chains);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user