Skip to content

Commit 7e01156

Browse files
SpyCheeseSpyCheese
committed
Use rldp2 in collator node and shard block retainer
1 parent 68b67d4 commit 7e01156

12 files changed

+41
-29
lines changed

‎validator-engine/validator-engine.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2182,7 +2182,7 @@ void ValidatorEngine::start_validator() {
21822182
load_collator_options();
21832183

21842184
validator_manager_ = ton::validator::ValidatorManagerFactory::create(
2185-
validator_options_, db_root_, keyring_.get(), adnl_.get(), rldp_.get(), overlay_manager_.get());
2185+
validator_options_, db_root_, keyring_.get(), adnl_.get(), rldp_.get(), rldp2_.get(), overlay_manager_.get());
21862186

21872187
for (auto &v : config_.validators) {
21882188
td::actor::send_closure(validator_manager_, &ton::validator::ValidatorManagerInterface::add_permanent_key, v.first,

‎validator/collation-manager.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
namespace ton::validator {
2828

2929
void CollationManager::start_up() {
30-
td::actor::send_closure(rldp_, &rldp::Rldp::add_id, local_id_);
30+
td::actor::send_closure(rldp_, &rldp2::Rldp::add_id, local_id_);
3131
update_collators_list(*opts_->get_collators_list());
3232
}
3333

@@ -187,7 +187,7 @@ void CollationManager::collate_shard_block(ShardIdFull shard, BlockIdExt min_mas
187187
<< selected_collator << ") in " << timer.elapsed() << "s";
188188
P.set_result(std::move(candidate));
189189
};
190-
td::actor::send_closure(rldp_, &rldp::Rldp::send_query_ex, local_id_, selected_collator, "collatequery",
190+
td::actor::send_closure(rldp_, &rldp2::Rldp::send_query_ex, local_id_, selected_collator, "collatequery",
191191
std::move(P2), timeout, std::move(query), max_answer_size);
192192
}
193193

@@ -339,7 +339,7 @@ void CollationManager::alarm() {
339339
td::actor::send_closure(SelfId, &CollationManager::got_pong, id, std::move(R));
340340
};
341341
LOG(DEBUG) << "sending ping to " << id;
342-
td::actor::send_closure(rldp_, &rldp::Rldp::send_query, local_id_, id, "ping", std::move(P),
342+
td::actor::send_closure(rldp_, &rldp2::Rldp::send_query, local_id_, id, "ping", std::move(P),
343343
td::Timestamp::in(2.0), std::move(query));
344344
} else {
345345
alarm_timestamp().relax(collator.ping_at);

‎validator/collation-manager.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#pragma once
1818

1919
#include "interfaces/validator-manager.h"
20-
#include "rldp/rldp.h"
20+
#include "rldp2/rldp.h"
2121
#include <map>
2222

2323
namespace ton::validator {
@@ -27,7 +27,7 @@ class ValidatorManager;
2727
class CollationManager : public td::actor::Actor {
2828
public:
2929
CollationManager(adnl::AdnlNodeIdShort local_id, td::Ref<ValidatorManagerOptions> opts,
30-
td::actor::ActorId<ValidatorManager> manager, td::actor::ActorId<rldp::Rldp> rldp)
30+
td::actor::ActorId<ValidatorManager> manager, td::actor::ActorId<rldp2::Rldp> rldp)
3131
: local_id_(local_id), opts_(opts), manager_(manager), rldp_(rldp) {
3232
}
3333

@@ -50,7 +50,7 @@ class CollationManager : public td::actor::Actor {
5050
adnl::AdnlNodeIdShort local_id_;
5151
td::Ref<ValidatorManagerOptions> opts_;
5252
td::actor::ActorId<ValidatorManager> manager_;
53-
td::actor::ActorId<rldp::Rldp> rldp_;
53+
td::actor::ActorId<rldp2::Rldp> rldp_;
5454

5555
void collate_shard_block(ShardIdFull shard, BlockIdExt min_masterchain_block_id, std::vector<BlockIdExt> prev,
5656
Ed25519_PublicKey creator, BlockCandidatePriority priority,

‎validator/collator-node.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace ton::validator {
2929

3030
CollatorNode::CollatorNode(adnl::AdnlNodeIdShort local_id, td::Ref<ValidatorManagerOptions> opts,
3131
td::actor::ActorId<ValidatorManager> manager, td::actor::ActorId<adnl::Adnl> adnl,
32-
td::actor::ActorId<rldp::Rldp> rldp)
32+
td::actor::ActorId<rldp2::Rldp> rldp)
3333
: local_id_(local_id)
3434
, opts_(std::move(opts))
3535
, manager_(std::move(manager))
@@ -58,7 +58,7 @@ void CollatorNode::start_up() {
5858
td::actor::send_closure(adnl_, &adnl::Adnl::subscribe, local_id_,
5959
adnl::Adnl::int_to_bytestring(ton_api::collatorNode_ping::ID),
6060
std::make_unique<Cb>(actor_id(this)));
61-
td::actor::send_closure(rldp_, &rldp::Rldp::add_id, adnl::AdnlNodeIdShort(local_id_));
61+
td::actor::send_closure(rldp_, &rldp2::Rldp::add_id, adnl::AdnlNodeIdShort(local_id_));
6262
}
6363

6464
void CollatorNode::tear_down() {

‎validator/collator-node.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include "interfaces/validator-manager.h"
2020
#include "rldp/rldp.h"
21+
#include "rldp2/rldp.h"
2122
#include <map>
2223
#include <optional>
2324

@@ -29,7 +30,7 @@ class CollatorNode : public td::actor::Actor {
2930
public:
3031
CollatorNode(adnl::AdnlNodeIdShort local_id, td::Ref<ValidatorManagerOptions> opts,
3132
td::actor::ActorId<ValidatorManager> manager, td::actor::ActorId<adnl::Adnl> adnl,
32-
td::actor::ActorId<rldp::Rldp> rldp);
33+
td::actor::ActorId<rldp2::Rldp> rldp);
3334
void start_up() override;
3435
void tear_down() override;
3536
void add_shard(ShardIdFull shard);
@@ -53,7 +54,7 @@ class CollatorNode : public td::actor::Actor {
5354
td::Ref<ValidatorManagerOptions> opts_;
5455
td::actor::ActorId<ValidatorManager> manager_;
5556
td::actor::ActorId<adnl::Adnl> adnl_;
56-
td::actor::ActorId<rldp::Rldp> rldp_;
57+
td::actor::ActorId<rldp2::Rldp> rldp_;
5758
std::vector<ShardIdFull> collating_shards_;
5859
std::set<adnl::AdnlNodeIdShort> validator_adnl_ids_;
5960

‎validator/manager.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,7 +2643,7 @@ td::actor::ActorOwn<ValidatorGroup> ValidatorManagerImpl::create_validator_group
26432643
td::actor::ActorId<CollationManager> ValidatorManagerImpl::get_collation_manager(adnl::AdnlNodeIdShort adnl_id) {
26442644
auto &actor = collation_managers_[adnl_id];
26452645
if (actor.empty()) {
2646-
actor = td::actor::create_actor<CollationManager>("collation", adnl_id, opts_, actor_id(this), rldp_);
2646+
actor = td::actor::create_actor<CollationManager>("collation", adnl_id, opts_, actor_id(this), rldp2_);
26472647
}
26482648
return actor.get();
26492649
}
@@ -3486,7 +3486,7 @@ void ValidatorManagerImpl::add_collator(adnl::AdnlNodeIdShort id, ShardIdFull sh
34863486
auto it = collator_nodes_.find(id);
34873487
if (it == collator_nodes_.end()) {
34883488
it = collator_nodes_.emplace(id, Collator()).first;
3489-
it->second.actor = td::actor::create_actor<CollatorNode>("collatornode", id, opts_, actor_id(this), adnl_, rldp_);
3489+
it->second.actor = td::actor::create_actor<CollatorNode>("collatornode", id, opts_, actor_id(this), adnl_, rldp2_);
34903490
if (last_masterchain_state_.not_null()) {
34913491
td::actor::send_closure(it->second.actor, &CollatorNode::new_masterchain_block_notification,
34923492
last_masterchain_state_);
@@ -3633,10 +3633,10 @@ td::Ref<PersistentStateDescription> ValidatorManagerImpl::get_block_persistent_s
36333633

36343634
td::actor::ActorOwn<ValidatorManagerInterface> ValidatorManagerFactory::create(
36353635
td::Ref<ValidatorManagerOptions> opts, std::string db_root, td::actor::ActorId<keyring::Keyring> keyring,
3636-
td::actor::ActorId<adnl::Adnl> adnl, td::actor::ActorId<rldp::Rldp> rldp,
3636+
td::actor::ActorId<adnl::Adnl> adnl, td::actor::ActorId<rldp::Rldp> rldp, td::actor::ActorId<rldp2::Rldp> rldp2,
36373637
td::actor::ActorId<overlay::Overlays> overlays) {
36383638
return td::actor::create_actor<validator::ValidatorManagerImpl>("manager", std::move(opts), db_root, keyring, adnl,
3639-
rldp, overlays);
3639+
rldp, rldp2, overlays);
36403640
}
36413641

36423642
void ValidatorManagerImpl::log_collate_query_stats(CollationStats stats) {
@@ -3783,7 +3783,7 @@ void ValidatorManagerImpl::init_shard_block_verifier(adnl::AdnlNodeIdShort local
37833783
shard_block_verifier_ = {};
37843784
} else {
37853785
shard_block_verifier_ = td::actor::create_actor<ShardBlockVerifier>(
3786-
"shardblockverifier", local_id, last_masterchain_state_, opts_, actor_id(this), adnl_, rldp_);
3786+
"shardblockverifier", local_id, last_masterchain_state_, opts_, actor_id(this), adnl_, rldp2_);
37873787
}
37883788
}
37893789
}
@@ -3799,7 +3799,7 @@ void ValidatorManagerImpl::wait_verify_shard_blocks(std::vector<BlockIdExt> bloc
37993799

38003800
void ValidatorManagerImpl::add_shard_block_retainer(adnl::AdnlNodeIdShort id) {
38013801
shard_block_retainers_[id] = td::actor::create_actor<ShardBlockRetainer>(
3802-
"shardblockretainer", id, last_masterchain_state_, opts_, actor_id(this), adnl_, rldp_);
3802+
"shardblockretainer", id, last_masterchain_state_, opts_, actor_id(this), adnl_, rldp2_);
38033803
}
38043804

38053805
void ValidatorManagerImpl::iterate_temp_block_handles(std::function<void(const BlockHandleInterface &)> f) {

‎validator/manager.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "validator/validator.h"
2121
#include "adnl/adnl.h"
2222
#include "rldp/rldp.h"
23+
#include "rldp2/rldp.h"
2324

2425
namespace ton {
2526

@@ -32,6 +33,7 @@ class ValidatorManagerFactory {
3233
td::actor::ActorId<keyring::Keyring> keyring,
3334
td::actor::ActorId<adnl::Adnl> adnl,
3435
td::actor::ActorId<rldp::Rldp> rldp,
36+
td::actor::ActorId<rldp2::Rldp> rldp2,
3537
td::actor::ActorId<overlay::Overlays> overlays);
3638
};
3739

‎validator/manager.hpp‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "manager-init.h"
3333
#include "state-serializer.hpp"
3434
#include "rldp/rldp.h"
35+
#include "rldp2/rldp.h"
3536
#include "token-manager.h"
3637
#include "queue-size-counter.hpp"
3738
#include "validator-telemetry.hpp"
@@ -595,8 +596,15 @@ class ValidatorManagerImpl : public ValidatorManager {
595596

596597
ValidatorManagerImpl(td::Ref<ValidatorManagerOptions> opts, std::string db_root,
597598
td::actor::ActorId<keyring::Keyring> keyring, td::actor::ActorId<adnl::Adnl> adnl,
598-
td::actor::ActorId<rldp::Rldp> rldp, td::actor::ActorId<overlay::Overlays> overlays)
599-
: opts_(std::move(opts)), db_root_(db_root), keyring_(keyring), adnl_(adnl), rldp_(rldp), overlays_(overlays) {
599+
td::actor::ActorId<rldp::Rldp> rldp, td::actor::ActorId<rldp2::Rldp> rldp2,
600+
td::actor::ActorId<overlay::Overlays> overlays)
601+
: opts_(std::move(opts))
602+
, db_root_(db_root)
603+
, keyring_(keyring)
604+
, adnl_(adnl)
605+
, rldp_(rldp)
606+
, rldp2_(rldp2)
607+
, overlays_(overlays) {
600608
}
601609

602610
public:
@@ -714,6 +722,7 @@ class ValidatorManagerImpl : public ValidatorManager {
714722
td::actor::ActorId<keyring::Keyring> keyring_;
715723
td::actor::ActorId<adnl::Adnl> adnl_;
716724
td::actor::ActorId<rldp::Rldp> rldp_;
725+
td::actor::ActorId<rldp2::Rldp> rldp2_;
717726
td::actor::ActorId<overlay::Overlays> overlays_;
718727

719728
td::actor::ActorOwn<AsyncStateSerializer> serializer_;

‎validator/shard-block-retainer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void ShardBlockRetainer::start_up() {
4141
td::actor::send_closure(adnl_, &adnl::Adnl::subscribe, local_id_,
4242
adnl::Adnl::int_to_bytestring(ton_api::shardBlockVerifier_subscribe::ID),
4343
std::make_unique<Callback>(actor_id(this)));
44-
td::actor::send_closure(rldp_, &rldp::Rldp::add_id, local_id_);
44+
td::actor::send_closure(rldp_, &rldp2::Rldp::add_id, local_id_);
4545
}
4646

4747
void ShardBlockRetainer::tear_down() {
@@ -154,7 +154,7 @@ void ShardBlockRetainer::send_confirmations(adnl::AdnlNodeIdShort dst, std::vect
154154
for (size_t i = l; i < r; ++i) {
155155
query->blocks_.push_back(create_tl_block_id(blocks[i]));
156156
}
157-
td::actor::send_closure(rldp_, &rldp::Rldp::send_message, local_id_, dst, serialize_tl_object(query, true));
157+
td::actor::send_closure(rldp_, &rldp2::Rldp::send_message, local_id_, dst, serialize_tl_object(query, true));
158158
}
159159
}
160160

‎validator/shard-block-retainer.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
#pragma once
1818
#include "interfaces/validator-manager.h"
19-
#include "rldp.h"
19+
#include "rldp2/rldp.h"
2020
#include <map>
2121

2222
namespace ton::validator {
@@ -25,7 +25,7 @@ class ShardBlockRetainer : public td::actor::Actor {
2525
public:
2626
ShardBlockRetainer(adnl::AdnlNodeIdShort local_id, td::Ref<MasterchainState> last_masterchain_state,
2727
td::Ref<ValidatorManagerOptions> opts, td::actor::ActorId<ValidatorManager> manager,
28-
td::actor::ActorId<adnl::Adnl> adnl, td::actor::ActorId<rldp::Rldp> rldp)
28+
td::actor::ActorId<adnl::Adnl> adnl, td::actor::ActorId<rldp2::Rldp> rldp)
2929
: local_id_(local_id)
3030
, last_masterchain_state_(last_masterchain_state)
3131
, opts_(std::move(opts))
@@ -49,7 +49,7 @@ class ShardBlockRetainer : public td::actor::Actor {
4949
td::Ref<ValidatorManagerOptions> opts_;
5050
td::actor::ActorId<ValidatorManager> manager_;
5151
td::actor::ActorId<adnl::Adnl> adnl_;
52-
td::actor::ActorId<rldp::Rldp> rldp_;
52+
td::actor::ActorId<rldp2::Rldp> rldp_;
5353

5454
bool inited_ = false;
5555
std::set<adnl::AdnlNodeIdShort> validator_adnl_ids_;

0 commit comments

Comments
 (0)