void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 22:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incorrect waiting blocks applying.

Browse source
This commit is contained in:
John Preston 2025-03-29 00:21:18 +05:00
parent a300a25419
commit 1d32e5267c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Telegram/SourceFiles/tde2e/tde2e_api.cpp
View file

@ -195,6 +195,7 @@ void Call::apply(int subchain, const Block &last) {
}); });
if (subchain) { if (subchain) {
auto &entry = _subchains[subchain];
auto result = tde2e_api::call_receive_inbound_message( auto result = tde2e_api::call_receive_inbound_message(
libId(), libId(),
Slice(last.data)); Slice(last.data));
@ -299,7 +300,7 @@ void Call::apply(
} else if (!_id || entry.height == index) { } else if (!_id || entry.height == index) {
apply(subchain, block); apply(subchain, block);
} }
entry.height = index + 1; entry.height = std::max(entry.height, index + 1);
checkWaitingBlocks(subchain); checkWaitingBlocks(subchain);
} }
@ -320,15 +321,15 @@ void Call::checkWaitingBlocks(int subchain, bool waited) {
auto &waiting = entry.waiting; auto &waiting = entry.waiting;
entry.shortPollTimer.cancel(); entry.shortPollTimer.cancel();
while (!waiting.empty()) { while (!waiting.empty()) {
const auto level = waiting.begin()->first; const auto index = waiting.begin()->first;
if (level > entry.height + 1) { if (index > entry.height) {
if (waited) { if (waited) {
shortPoll(subchain); shortPoll(subchain);
} else { } else {
entry.waitingTimer.callOnce(kShortPollChainBlocksWaitFor); entry.waitingTimer.callOnce(kShortPollChainBlocksWaitFor);
} }
return; return;
} else if (level == entry.height + 1) { } else if (index == entry.height) {
const auto slice = Slice(waiting.begin()->second.data); const auto slice = Slice(waiting.begin()->second.data);
if (subchain) { if (subchain) {
auto result = tde2e_api::call_receive_inbound_message( auto result = tde2e_api::call_receive_inbound_message(
@ -352,7 +353,7 @@ void Call::checkWaitingBlocks(int subchain, bool waited) {
} }
_participantsSet = ParseParticipantsSet(result.value()); _participantsSet = ParseParticipantsSet(result.value());
} }
entry.height = level; entry.height = std::max(entry.height, index + 1);
} }
waiting.erase(waiting.begin()); waiting.erase(waiting.begin());
} }