external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

Don't request queue size if not needed in validate-query

Browse source
This commit is contained in:
SpyCheese 2024-06-28 12:46:08 +03:00
parent 81b7993d66
commit 7f263b8b11
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
validator/impl/validate-query.cpp
View file

@ -2297,9 +2297,14 @@ bool ValidateQuery::prepare_out_msg_queue_size() {
if (ps_.out_msg_queue_size_) { if (ps_.out_msg_queue_size_) {
// if after_split then out_msg_queue_size is always present, since it is calculated during split // if after_split then out_msg_queue_size is always present, since it is calculated during split
old_out_msg_queue_size_ = ps_.out_msg_queue_size_.value(); old_out_msg_queue_size_ = ps_.out_msg_queue_size_.value();
out_msg_queue_size_known_ = true;
return true;
}
if (!store_out_msg_queue_size_) { // Don't need it
return true; return true;
} }
old_out_msg_queue_size_ = 0; old_out_msg_queue_size_ = 0;
out_msg_queue_size_known_ = true;
for (size_t i = 0; i < prev_blocks.size(); ++i) { for (size_t i = 0; i < prev_blocks.size(); ++i) {
++pending; ++pending;
send_closure_later(manager, &ValidatorManager::get_out_msg_queue_size, prev_blocks[i], send_closure_later(manager, &ValidatorManager::get_out_msg_queue_size, prev_blocks[i],
@ -3363,7 +3368,9 @@ bool ValidateQuery::precheck_message_queue_update() {
return reject_query("invalid OutMsgQueue dictionary difference between the old and the new state: "s + return reject_query("invalid OutMsgQueue dictionary difference between the old and the new state: "s +
err.get_msg()); err.get_msg());
} }
LOG(INFO) << "outbound message queue size: " << old_out_msg_queue_size_ << " -> " << new_out_msg_queue_size_; if (out_msg_queue_size_known_) {
LOG(INFO) << "outbound message queue size: " << old_out_msg_queue_size_ << " -> " << new_out_msg_queue_size_;
}
if (store_out_msg_queue_size_) { if (store_out_msg_queue_size_) {
if (!ns_.out_msg_queue_size_) { if (!ns_.out_msg_queue_size_) {
return reject_query(PSTRING() << "outbound message queue size in the new state is not correct (expected: " return reject_query(PSTRING() << "outbound message queue size in the new state is not correct (expected: "

1
validator/impl/validate-query.hpp
View file

@ -236,6 +236,7 @@ class ValidateQuery : public td::actor::Actor {
std::map<std::pair<StdSmcAddress, td::uint64>, Ref<vm::Cell>> new_dispatch_queue_messages_; std::map<std::pair<StdSmcAddress, td::uint64>, Ref<vm::Cell>> new_dispatch_queue_messages_;
std::set<StdSmcAddress> account_expected_defer_all_messages_; std::set<StdSmcAddress> account_expected_defer_all_messages_;
td::uint64 old_out_msg_queue_size_ = 0, new_out_msg_queue_size_ = 0; td::uint64 old_out_msg_queue_size_ = 0, new_out_msg_queue_size_ = 0;
bool out_msg_queue_size_known_ = false;
bool msg_metadata_enabled_ = false; bool msg_metadata_enabled_ = false;
bool deferring_messages_enabled_ = false; bool deferring_messages_enabled_ = false;