Skip to content

Commit 1a4f834

Browse files
author
Gleb N
committed
fixes
1 parent 834276c commit 1a4f834

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/node/txreconciliation.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ class TxReconciliationState
157157
*/
158158
bool ConsiderInitResponseAndTrack()
159159
{
160+
return true;
160161
auto current_time = GetTime<std::chrono::seconds>();
161162
if (m_last_init_recon_respond <= current_time - RECON_RESPONSE_INTERVAL) {
162163
m_last_init_recon_respond = current_time;
@@ -264,7 +265,7 @@ class TxReconciliationState
264265
const uint16_t set_size_diff = std::abs(uint16_t(local_set_size) - m_remote_set_size);
265266
const uint16_t min_size = std::min(uint16_t(local_set_size), m_remote_set_size);
266267
const uint16_t weighted_min_size = m_remote_q * min_size;
267-
const uint32_t estimated_diff = 1 + weighted_min_size + set_size_diff;
268+
const uint32_t estimated_diff = 1 + weighted_min_size + set_size_diff + 25;
268269
return minisketch_compute_capacity(RECON_FIELD_SIZE, estimated_diff, RECON_FALSE_POSITIVE_COEF);
269270
}
270271

@@ -485,7 +486,7 @@ class TxReconciliationTracker::Impl
485486
});
486487

487488
Assert(we_initiate_to_count != 0);
488-
m_next_recon_request = now + (RECON_REQUEST_INTERVAL / we_initiate_to_count);
489+
m_next_recon_request = now + 1s;//(RECON_REQUEST_INTERVAL / we_initiate_to_count);
489490
}
490491

491492
bool HandleInitialSketch(TxReconciliationState& recon_state, const NodeId peer_id,
@@ -823,8 +824,10 @@ class TxReconciliationTracker::Impl
823824
//
824825
// This doesn't prevent from a malicious peer gaming this by staying in this state
825826
// all the time somehow.
826-
if (recon_state.m_phase == Phase::NONE) UpdateNextReconRequest(now);
827-
return true;
827+
if (recon_state.m_phase == Phase::NONE) {
828+
UpdateNextReconRequest(now);
829+
return true;
830+
}
828831
}
829832

830833
return false;

test/.DS_Store

6 KB
Binary file not shown.

0 commit comments

Comments
 (0)