R) {
if (attempt != attempt_) {
return;
}
@@ -543,7 +524,39 @@ void CoreActor::got_ping_result(td::uint32 idx, td::int32 attempt, td::Result| promise) {
+void CoreActor::send_query(td::uint32 idx) {
+ if (!ready_[idx]) {
+ return;
+ }
+ waiting_++;
+ auto query = ton::create_tl_object();
+ auto q = ton::create_tl_object(serialize_tl_object(query, true));
+
+ auto P =
+ td::PromiseCreator::lambda([SelfId = actor_id(this), idx, attempt = attempt_](td::Result R) {
+ td::actor::send_closure(SelfId, &CoreActor::got_result, idx, attempt, std::move(R));
+ });
+ td::actor::send_closure(clients_[idx], &ton::adnl::AdnlExtClient::send_query, "query", serialize_tl_object(q, true),
+ td::Timestamp::in(10.0), std::move(P));
+}
+
+void CoreActor::run_queries() {
+ waiting_ = 0;
+ new_result_ = std::make_shared(ready_.size(), td::Timestamp::at_unix(attempt_ * 60));
+ for (td::uint32 i = 0; i < ready_.size(); i++) {
+ send_query(i);
+ }
+ CHECK(waiting_ >= 0);
+ if (waiting_ == 0) {
+ add_result();
+ }
+}
+
+void CoreActor::send_lite_query(td::uint32 idx, td::BufferSlice query, td::Promise promise) {
+ if (!ready_[idx]) {
+ promise.set_error(td::Status::Error(ton::ErrorCode::notready, "ext conn not ready"));
+ return;
+ }
auto P = td::PromiseCreator::lambda([promise = std::move(promise)](td::Result R) mutable {
if (R.is_error()) {
promise.set_error(R.move_as_error());
@@ -561,7 +574,7 @@ void CoreActor::send_lite_query(td::BufferSlice query, td::Promise(std::move(query));
- td::actor::send_closure(client_, &liteclient::ExtClient::send_query, "query", serialize_tl_object(q, true),
+ td::actor::send_closure(clients_[idx], &ton::adnl::AdnlExtClient::send_query, "query", serialize_tl_object(q, true),
td::Timestamp::in(10.0), std::move(P));
}
diff --git a/catchain/CMakeLists.txt b/catchain/CMakeLists.txt
index 3f766688..8ab9525d 100644
--- a/catchain/CMakeLists.txt
+++ b/catchain/CMakeLists.txt
@@ -34,5 +34,6 @@ target_include_directories(overlay PUBLIC
$/..
${OPENSSL_INCLUDE_DIR}
)
-target_link_libraries(catchain PRIVATE tdutils tdactor adnl tl_api dht tdfec overlay)
+target_link_libraries(catchain PRIVATE tdutils tdactor adnl tl_api dht tdfec
+ overlay)
diff --git a/catchain/catchain-receiver-source.h b/catchain/catchain-receiver-source.h
index 136906a0..55035e77 100644
--- a/catchain/catchain-receiver-source.h
+++ b/catchain/catchain-receiver-source.h
@@ -61,7 +61,7 @@ class CatChainReceiverSource {
virtual td::BufferSlice fork_proof() const = 0;
virtual bool fork_is_found() const = 0;
- // One block can be sent to one node in catchain.getDifference only a limited number of times to prevent DoS
+ // One block can be sent to one node only a limited number of times to prevent DoS
virtual bool allow_send_block(CatChainBlockHash hash) = 0;
static td::Result> create(CatChainReceiver *chain, PublicKey pub_key,
diff --git a/catchain/catchain-receiver.cpp b/catchain/catchain-receiver.cpp
index a6160383..482cfb43 100644
--- a/catchain/catchain-receiver.cpp
+++ b/catchain/catchain-receiver.cpp
@@ -27,8 +27,6 @@
#include "catchain-receiver.hpp"
-#include "td/utils/ThreadSafeCounter.h"
-
namespace ton {
namespace catchain {
@@ -289,9 +287,7 @@ void CatChainReceiverImpl::add_block_cont_3(tl_object_ptrdelivered())
- << "source=" << last_sent_block_->get_source_id() << " ill=" << last_sent_block_->is_ill()
- << " height=" << last_sent_block_->get_height();
+ CHECK(last_sent_block_->delivered());
}
active_send_ = false;
@@ -370,12 +366,6 @@ void CatChainReceiverImpl::add_block(td::BufferSlice payload, std::vectorheight_ + 1;
- auto max_block_height = get_max_block_height(opts_, sources_.size());
- if (td::narrow_cast(height) > max_block_height) {
- VLOG(CATCHAIN_WARNING) << this << ": cannot create block: max height exceeded (" << max_block_height << ")";
- active_send_ = false;
- return;
- }
auto block_data = create_tl_object(std::move(prev), std::move(deps_arr));
auto block = create_tl_object(incarnation_, local_idx_, height, std::move(block_data),
td::BufferSlice());
@@ -526,12 +516,9 @@ void CatChainReceiverImpl::start_up() {
for (td::uint32 i = 0; i < get_sources_cnt(); i++) {
root_keys.emplace(get_source(i)->get_hash(), OVERLAY_MAX_ALLOWED_PACKET_SIZE);
}
- overlay::OverlayOptions overlay_options;
- overlay_options.broadcast_speed_multiplier_ = opts_.broadcast_speed_multiplier;
- td::actor::send_closure(overlay_manager_, &overlay::Overlays::create_private_overlay_ex,
+ td::actor::send_closure(overlay_manager_, &overlay::Overlays::create_private_overlay,
get_source(local_idx_)->get_adnl_id(), overlay_full_id_.clone(), std::move(ids),
- make_callback(), overlay::OverlayPrivacyRules{0, 0, std::move(root_keys)},
- R"({ "type": "catchain" })", std::move(overlay_options));
+ make_callback(), overlay::OverlayPrivacyRules{0, 0, std::move(root_keys)});
CHECK(root_block_);
@@ -689,7 +676,6 @@ void CatChainReceiverImpl::receive_query_from_overlay(adnl::AdnlNodeIdShort src,
promise.set_error(td::Status::Error(ErrorCode::notready, "db not read"));
return;
}
- TD_PERF_COUNTER(catchain_query_process);
td::PerfWarningTimer t{"catchain query process", 0.05};
auto F = fetch_tl_object(data.clone(), true);
if (F.is_error()) {
@@ -708,8 +694,12 @@ void CatChainReceiverImpl::process_query(adnl::AdnlNodeIdShort src, ton_api::cat
} else {
CatChainReceiverSource *S = get_source_by_adnl_id(src);
CHECK(S != nullptr);
- promise.set_value(serialize_tl_object(create_tl_object(it->second->export_tl()),
- true, it->second->get_payload().as_slice()));
+ if (S->allow_send_block(it->second->get_hash())) {
+ promise.set_value(serialize_tl_object(create_tl_object(it->second->export_tl()),
+ true, it->second->get_payload().as_slice()));
+ } else {
+ promise.set_error(td::Status::Error("block was requested too many times"));
+ }
}
}
diff --git a/catchain/catchain.h b/catchain/catchain.h
index c5c8af28..912957e5 100644
--- a/catchain/catchain.h
+++ b/catchain/catchain.h
@@ -96,7 +96,6 @@ class CatChain : public td::actor::Actor {
virtual void send_query_via(const PublicKeyHash &dst, std::string name, td::Promise promise,
td::Timestamp timeout, td::BufferSlice query, td::uint64 max_answer_size,
td::actor::ActorId via) = 0;
- virtual void get_source_heights(td::Promise> promise) = 0;
virtual void destroy() = 0;
static td::actor::ActorOwn create(std::unique_ptr callback, const CatChainOptions &opts,
diff --git a/catchain/catchain.hpp b/catchain/catchain.hpp
index 586cf474..8c8bb99a 100644
--- a/catchain/catchain.hpp
+++ b/catchain/catchain.hpp
@@ -115,15 +115,6 @@ class CatChainImpl : public CatChain {
td::actor::send_closure(receiver_, &CatChainReceiverInterface::send_custom_query_data_via, dst, name,
std::move(promise), timeout, std::move(query), max_answer_size, via);
}
- void get_source_heights(td::Promise> promise) override {
- std::vector heights(top_source_blocks_.size(), 0);
- for (size_t i = 0; i < top_source_blocks_.size(); ++i) {
- if (top_source_blocks_[i]) {
- heights[i] = top_source_blocks_[i]->height();
- }
- }
- promise.set_result(std::move(heights));
- }
void destroy() override;
CatChainImpl(std::unique_ptr callback, const CatChainOptions &opts,
td::actor::ActorId keyring, td::actor::ActorId adnl,
diff --git a/common/delay.h b/common/delay.h
index 3df8e7d8..9b98c58e 100644
--- a/common/delay.h
+++ b/common/delay.h
@@ -49,29 +49,4 @@ template
void delay_action(T promise, td::Timestamp timeout) {
DelayedAction::create(std::move(promise), timeout);
}
-
-template
-class AsyncApply : public td::actor::Actor {
- public:
- AsyncApply(PromiseT promise, ValueT value) : promise_(std::move(promise)), value_(std::move(value)){
- }
-
- void start_up() override {
- promise_(std::move(value_));
- stop();
- }
-
- static void create(td::Slice name, PromiseT promise, ValueT value ) {
- td::actor::create_actor(PSLICE() << "async:" << name, std::move(promise), std::move(value)).release();
- }
-
- private:
- PromiseT promise_;
- ValueT value_;
-};
-
-template
-void async_apply(td::Slice name, PromiseT &&promise, ValueT &&value) {
- AsyncApply::create(name, std::forward(promise), std::forward(value));
-}
} // namespace ton
diff --git a/common/global-version.h b/common/global-version.h
index 2308ce3e..01c1795d 100644
--- a/common/global-version.h
+++ b/common/global-version.h
@@ -19,6 +19,6 @@
namespace ton {
// See doc/GlobalVersions.md
-constexpr int SUPPORTED_VERSION = 10;
+const int SUPPORTED_VERSION = 4;
}
diff --git a/create-hardfork/CMakeLists.txt b/create-hardfork/CMakeLists.txt
index 3024603c..41b94b52 100644
--- a/create-hardfork/CMakeLists.txt
+++ b/create-hardfork/CMakeLists.txt
@@ -10,7 +10,8 @@ set(CREATE_HARDFORK_SOURCE
)
add_executable(create-hardfork ${CREATE_HARDFORK_SOURCE})
-target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht rldp catchain validatorsession full-node validator-hardfork ton_validator
+target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht
+ rldp catchain validatorsession full-node validator-hardfork ton_validator
validator-hardfork fift-lib memprof git ${JEMALLOC_LIBRARIES})
install(TARGETS create-hardfork RUNTIME DESTINATION bin)
diff --git a/create-hardfork/create-hardfork.cpp b/create-hardfork/create-hardfork.cpp
index 72bffae5..5f0b93be 100644
--- a/create-hardfork/create-hardfork.cpp
+++ b/create-hardfork/create-hardfork.cpp
@@ -213,7 +213,7 @@ class HardforkCreator : public td::actor::Actor {
ton::validator::ValidatorManagerHardforkFactory::create(opts, shard_, shard_top_block_id_, db_root_);
for (auto &msg : ext_msgs_) {
td::actor::send_closure(validator_manager_, &ton::validator::ValidatorManager::new_external_message,
- std::move(msg), 0);
+ std::move(msg));
}
for (auto &topmsg : top_shard_descrs_) {
td::actor::send_closure(validator_manager_, &ton::validator::ValidatorManager::new_shard_block, ton::BlockIdExt{},
@@ -236,8 +236,9 @@ class HardforkCreator : public td::actor::Actor {
td::actor::send_closure(id_, &ton::validator::ValidatorManager::sync_complete,
td::PromiseCreator::lambda([](td::Unit) {}));
}
- void on_new_masterchain_block(td::Ref state,
- std::set shards_to_monitor) override {
+ void add_shard(ton::ShardIdFull) override {
+ }
+ void del_shard(ton::ShardIdFull) override {
}
void send_ihr_message(ton::AccountIdPrefixFull dst, td::BufferSlice data) override {
}
@@ -245,10 +246,7 @@ class HardforkCreator : public td::actor::Actor {
}
void send_shard_block_info(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno, td::BufferSlice data) override {
}
- void send_block_candidate(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno, td::uint32 validator_set_hash,
- td::BufferSlice data) override {
- }
- void send_broadcast(ton::BlockBroadcast broadcast, int mode) override {
+ void send_broadcast(ton::BlockBroadcast broadcast) override {
}
void download_block(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
td::Promise promise) override {
@@ -269,19 +267,13 @@ class HardforkCreator : public td::actor::Actor {
void get_next_key_blocks(ton::BlockIdExt block_id, td::Timestamp timeout,
td::Promise> promise) override {
}
- void download_archive(ton::BlockSeqno masterchain_seqno, ton::ShardIdFull shard_prefix, std::string tmp_dir,
- td::Timestamp timeout, td::Promise promise) override {
- }
- void download_out_msg_queue_proof(
- ton::ShardIdFull dst_shard, std::vector blocks, block::ImportedMsgQueueLimits limits,
- td::Timestamp timeout, td::Promise>> promise) override {
+ void download_archive(ton::BlockSeqno masterchain_seqno, std::string tmp_dir, td::Timestamp timeout,
+
+ td::Promise promise) override {
}
void new_key_block(ton::validator::BlockHandle handle) override {
}
- void send_validator_telemetry(ton::PublicKeyHash key,
- ton::tl_object_ptr telemetry) override {
- }
};
td::actor::send_closure(validator_manager_, &ton::validator::ValidatorManagerInterface::install_callback,
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 06908338..62b0d216 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -151,7 +151,6 @@ set(TON_DB_SOURCE
vm/db/CellHashTable.h
vm/db/CellStorage.h
vm/db/TonDb.h
- vm/db/InMemoryBagOfCellsDb.cpp
)
set(FIFT_SOURCE
@@ -214,7 +213,6 @@ set(BLOCK_SOURCE
block/mc-config.cpp
block/output-queue-merger.cpp
block/transaction.cpp
- block/precompiled-smc/PrecompiledSmartContract.cpp
${TLB_BLOCK_AUTO}
block/block-binlog.h
@@ -225,8 +223,6 @@ set(BLOCK_SOURCE
block/check-proof.h
block/output-queue-merger.h
block/transaction.h
- block/precompiled-smc/PrecompiledSmartContract.h
- block/precompiled-smc/common.h
)
set(SMC_ENVELOPE_SOURCE
@@ -301,8 +297,9 @@ endif()
target_include_directories(ton_crypto_core SYSTEM PUBLIC $)
add_library(ton_crypto STATIC ${TON_CRYPTO_SOURCE})
-target_include_directories(ton_crypto PUBLIC $ $)
-target_link_libraries(ton_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} ton_crypto_core ton_block)
+target_include_directories(ton_crypto PUBLIC $
+ $)
+target_link_libraries(ton_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} tdutils tddb_utils ton_crypto_core ton_block)
if (USE_EMSCRIPTEN)
target_link_options(ton_crypto PRIVATE -fexceptions)
target_compile_options(ton_crypto PRIVATE -fexceptions)
@@ -318,30 +315,33 @@ endif()
target_include_directories(ton_crypto SYSTEM PUBLIC $)
add_dependencies(ton_crypto blst)
-add_dependencies(ton_crypto_core secp256k1)
-
target_include_directories(ton_crypto PRIVATE ${BLST_INCLUDE_DIR})
target_link_libraries(ton_crypto PRIVATE ${BLST_LIB})
-target_include_directories(ton_crypto_core PUBLIC $)
+if (NOT USE_EMSCRIPTEN)
+ find_package(Secp256k1 REQUIRED)
+endif()
if (MSVC)
find_package(Sodium REQUIRED)
target_compile_definitions(ton_crypto PUBLIC SODIUM_STATIC)
- target_link_libraries(ton_crypto_core PUBLIC ${SECP256K1_LIBRARY})
- target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARY})
-elseif (EMSCRIPTEN)
- target_link_libraries(ton_crypto_core PUBLIC $)
+ target_include_directories(ton_crypto_core PUBLIC $)
+ target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARIES})
+elseif (ANDROID)
+ target_include_directories(ton_crypto_core PUBLIC $)
target_link_libraries(ton_crypto PUBLIC $)
else()
- if (NOT SODIUM_FOUND)
+ if (NOT USE_EMSCRIPTEN)
find_package(Sodium REQUIRED)
+ target_include_directories(ton_crypto_core PUBLIC $)
+ target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARIES})
else()
- message(STATUS "Using Sodium ${SODIUM_LIBRARY_RELEASE}")
+ target_include_directories(ton_crypto_core PUBLIC $)
+ target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARY})
+ endif()
+ if (NOT APPLE AND NOT USE_EMSCRIPTEN)
+ target_link_libraries(ton_crypto_core PUBLIC secp256k1)
endif()
- target_compile_definitions(ton_crypto PUBLIC SODIUM_STATIC)
- target_link_libraries(ton_crypto_core PUBLIC ${SECP256K1_LIBRARY})
- target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARY})
endif()
target_include_directories(ton_crypto_core PUBLIC $)
@@ -356,10 +356,9 @@ add_executable(test-ed25519-crypto test/test-ed25519-crypto.cpp)
target_include_directories(test-ed25519-crypto PUBLIC $)
target_link_libraries(test-ed25519-crypto PUBLIC ton_crypto)
-add_library(fift-lib STATIC ${FIFT_SOURCE})
+add_library(fift-lib ${FIFT_SOURCE})
target_include_directories(fift-lib PUBLIC $ | 
-
-
- 
-
-
- 
-
-
- 
-
-
- 
- 
-