external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-02-15 04:32:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #913 from ton-blockchain/testnet

Browse source 
Fix checking ext message broadcasts (#912)
This commit is contained in:
EmelyanenkoK 2024-02-19 21:19:25 +03:00 committed by GitHub
commit 17c3477f71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
validator/full-node-shard.cpp
View file

@ -109,7 +109,8 @@ void FullNodeShardImpl::check_broadcast(PublicKeyHash src, td::BufferSlice broad
} }
auto q = B.move_as_ok(); auto q = B.move_as_ok();
if (!processed_ext_msg_broadcasts_.insert(td::sha256_bits256(q->message_->data_)).second) { auto hash = td::sha256_bits256(q->message_->data_);
if (!processed_ext_msg_broadcasts_.insert(hash).second) {
return promise.set_error(td::Status::Error("duplicate external message broadcast")); return promise.set_error(td::Status::Error("duplicate external message broadcast"));
} }
if (config_.ext_messages_broadcast_disabled_) { if (config_.ext_messages_broadcast_disabled_) {
@ -120,6 +121,11 @@ void FullNodeShardImpl::check_broadcast(PublicKeyHash src, td::BufferSlice broad
} }
}; };
} }
if (my_ext_msg_broadcasts_.count(hash)) {
// Don't re-check messages that were sent by us
promise.set_result(td::Unit());
return;
}
td::actor::send_closure(validator_manager_, &ValidatorManagerInterface::check_external_message, td::actor::send_closure(validator_manager_, &ValidatorManagerInterface::check_external_message,
std::move(q->message_->data_), std::move(q->message_->data_),
promise.wrap([](td::Ref<ExtMessage>) { return td::Unit(); })); promise.wrap([](td::Ref<ExtMessage>) { return td::Unit(); }));
@ -706,9 +712,11 @@ void FullNodeShardImpl::send_external_message(td::BufferSlice data) {
}); });
return; return;
} }
if (!processed_ext_msg_broadcasts_.insert(td::sha256_bits256(data)).second) { td::Bits256 hash = td::sha256_bits256(data);
if (processed_ext_msg_broadcasts_.count(hash)) {
return; return;
} }
my_ext_msg_broadcasts_.insert(hash);
auto B = create_serialize_tl_object<ton_api::tonNode_externalMessageBroadcast>( auto B = create_serialize_tl_object<ton_api::tonNode_externalMessageBroadcast>(
create_tl_object<ton_api::tonNode_externalMessage>(std::move(data))); create_tl_object<ton_api::tonNode_externalMessage>(std::move(data)));
if (B.size() <= overlay::Overlays::max_simple_broadcast_size()) { if (B.size() <= overlay::Overlays::max_simple_broadcast_size()) {
@ -860,6 +868,7 @@ void FullNodeShardImpl::alarm() {
} }
if (cleanup_processed_ext_msg_at_ && cleanup_processed_ext_msg_at_.is_in_past()) { if (cleanup_processed_ext_msg_at_ && cleanup_processed_ext_msg_at_.is_in_past()) {
processed_ext_msg_broadcasts_.clear(); processed_ext_msg_broadcasts_.clear();
my_ext_msg_broadcasts_.clear();
cleanup_processed_ext_msg_at_ = td::Timestamp::in(60.0); cleanup_processed_ext_msg_at_ = td::Timestamp::in(60.0);
} }
alarm_timestamp().relax(sync_completed_at_); alarm_timestamp().relax(sync_completed_at_);

1
validator/full-node-shard.hpp
View file

@ -252,6 +252,7 @@ class FullNodeShardImpl : public FullNodeShard {
FullNodeConfig config_; FullNodeConfig config_;
std::set<td::Bits256> my_ext_msg_broadcasts_;
std::set<td::Bits256> processed_ext_msg_broadcasts_; std::set<td::Bits256> processed_ext_msg_broadcasts_;
td::Timestamp cleanup_processed_ext_msg_at_; td::Timestamp cleanup_processed_ext_msg_at_;
}; };