Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

precheck session #1874

Merged
merged 2 commits into from
Dec 11, 2023
Merged

precheck session #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e25529d
fix precheck
turuslan Nov 21, 2023
0a3fb9d
Merge remote-tracking branch 'origin/master' into fix/precheck
turuslan Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 56 additions & 36 deletions core/parachain/pvf/precheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include <libp2p/common/final_action.hpp>

#include "blockchain/block_tree.hpp"
#include "metrics/histogram_timer.hpp"
#include "offchain/offchain_worker_factory.hpp"
#include "offchain/offchain_worker_pool.hpp"
Expand All @@ -16,6 +17,8 @@
#include "runtime/module_factory.hpp"

namespace kagome::parachain {
constexpr size_t kSessions = 3;

metrics::HistogramTimer metric_pvf_preparation_time{
"kagome_pvf_preparation_time",
"Time spent in preparing PVF artifacts in seconds",
Expand All @@ -38,13 +41,15 @@ namespace kagome::parachain {

PvfPrecheck::PvfPrecheck(
std::shared_ptr<crypto::Hasher> hasher,
std::shared_ptr<blockchain::BlockTree> block_tree,
std::shared_ptr<ValidatorSignerFactory> signer_factory,
std::shared_ptr<runtime::ParachainHost> parachain_api,
std::shared_ptr<runtime::ModuleFactory> module_factory,
std::shared_ptr<runtime::Executor> executor,
std::shared_ptr<offchain::OffchainWorkerFactory> offchain_worker_factory,
std::shared_ptr<offchain::OffchainWorkerPool> offchain_worker_pool)
: hasher_{std::move(hasher)},
block_tree_{std::move(block_tree)},
signer_factory_{std::move(signer_factory)},
parachain_api_{std::move(parachain_api)},
module_factory_{std::move(module_factory)},
Expand All @@ -66,54 +71,66 @@ namespace kagome::parachain {
primitives::events::ChainEventType,
const primitives::events::ChainEventParams &event) {
if (auto self = weak.lock()) {
self->thread_.io_context()->post(
[weak,
header{boost::get<primitives::events::HeadsEventParams>(event)
.get()}] {
if (auto self = weak.lock()) {
auto r = self->onBlock(header.hash(), header);
if (r.has_error()) {
SL_DEBUG(self->logger_, "onBlock error {}", r.error());
}
}
});
self->thread_.io_context()->post([weak] {
if (auto self = weak.lock()) {
auto r = self->onBlock();
if (r.has_error()) {
SL_DEBUG(self->logger_, "onBlock error {}", r.error());
}
}
});
}
});
}

outcome::result<void> PvfPrecheck::onBlock(
const BlockHash &block_hash, const primitives::BlockHeader &header) {
OUTCOME_TRY(signer, signer_factory_->at(block_hash));
outcome::result<void> PvfPrecheck::onBlock() {
auto block = block_tree_->bestBlock();
OUTCOME_TRY(signer, signer_factory_->at(block.hash));
if (not signer.has_value()) {
return outcome::success();
}
OUTCOME_TRY(need, parachain_api_->pvfs_require_precheck(block_hash));
if (not session_code_accept_.empty()
and signer->getSessionIndex() < session_code_accept_.begin()->first) {
SL_WARN(logger_, "past session");
return outcome::success();
}
auto &session = session_code_accept_[signer->getSessionIndex()];
OUTCOME_TRY(need, parachain_api_->pvfs_require_precheck(block.hash));
for (auto &code_hash : need) {
if (not seen_.emplace(code_hash).second) {
if (session.contains(code_hash)) {
continue;
}
auto code_zstd_res =
parachain_api_->validation_code_by_hash(block_hash, code_hash);
if (not code_zstd_res or not code_zstd_res.value()) {
seen_.erase(code_hash);
continue;
std::optional<bool> accepted;
for (auto &p : session_code_accept_) {
if (auto it = p.second.find(code_hash); it != p.second.end()) {
accepted = it->second;
break;
}
}
auto &code_zstd = *code_zstd_res.value();
ParachainRuntime code;
auto timer = metric_pvf_preparation_time.timer();
auto res = [&]() -> outcome::result<void> {
OUTCOME_TRY(runtime::uncompressCodeIfNeeded(code_zstd, code));
OUTCOME_TRY(module_factory_->make(code));
return outcome::success();
}();
timer.reset();
if (res) {
SL_VERBOSE(logger_, "approve {}", code_hash);
} else {
SL_WARN(logger_, "reject {}: {}", code_hash, res.error());
if (not accepted) {
auto code_zstd_res =
parachain_api_->validation_code_by_hash(block.hash, code_hash);
if (not code_zstd_res or not code_zstd_res.value()) {
continue;
}
auto &code_zstd = *code_zstd_res.value();
ParachainRuntime code;
auto timer = metric_pvf_preparation_time.timer();
auto res = [&]() -> outcome::result<void> {
OUTCOME_TRY(runtime::uncompressCodeIfNeeded(code_zstd, code));
OUTCOME_TRY(module_factory_->make(code));
return outcome::success();
}();
timer.reset();
if (res) {
SL_VERBOSE(logger_, "approve {}", code_hash);
} else {
SL_WARN(logger_, "reject {}: {}", code_hash, res.error());
}
accepted = res.has_value();
}
PvfCheckStatement statement{
res.has_value(),
*accepted,
code_hash,
signer->getSessionIndex(),
signer->validatorIndex(),
Expand All @@ -123,7 +140,10 @@ namespace kagome::parachain {
::libp2p::common::FinalAction remove(
[&] { offchain_worker_pool_->removeWorker(); });
OUTCOME_TRY(parachain_api_->submit_pvf_check_statement(
block_hash, statement, signature));
block_tree_->bestBlock().hash, statement, signature));
}
while (session_code_accept_.size() > kSessions) {
session_code_accept_.erase(session_code_accept_.begin());
}
return outcome::success();
}
Expand Down
15 changes: 11 additions & 4 deletions core/parachain/pvf/precheck.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

#pragma once

#include <unordered_set>
#include <map>
#include <unordered_map>

#include "crypto/hasher.hpp"
#include "log/logger.hpp"
Expand All @@ -15,6 +16,10 @@
#include "runtime/runtime_api/parachain_host.hpp"
#include "utils/thread_pool.hpp"

namespace kagome::blockchain {
class BlockTree;
} // namespace kagome::blockchain

namespace kagome::offchain {
class OffchainWorkerFactory;
class OffchainWorkerPool;
Expand All @@ -35,6 +40,7 @@ namespace kagome::parachain {

PvfPrecheck(
std::shared_ptr<crypto::Hasher> hasher,
std::shared_ptr<blockchain::BlockTree> block_tree,
std::shared_ptr<ValidatorSignerFactory> signer_factory,
std::shared_ptr<runtime::ParachainHost> parachain_api,
std::shared_ptr<runtime::ModuleFactory> module_factory,
Expand All @@ -50,18 +56,19 @@ namespace kagome::parachain {
private:
using BlockHash = primitives::BlockHash;

outcome::result<void> onBlock(const BlockHash &block_hash,
const primitives::BlockHeader &header);
outcome::result<void> onBlock();

std::shared_ptr<crypto::Hasher> hasher_;
std::shared_ptr<blockchain::BlockTree> block_tree_;
std::shared_ptr<ValidatorSignerFactory> signer_factory_;
std::shared_ptr<runtime::ParachainHost> parachain_api_;
std::shared_ptr<runtime::ModuleFactory> module_factory_;
std::shared_ptr<runtime::Executor> executor_;
std::shared_ptr<offchain::OffchainWorkerFactory> offchain_worker_factory_;
std::shared_ptr<offchain::OffchainWorkerPool> offchain_worker_pool_;
std::shared_ptr<primitives::events::ChainEventSubscriber> chain_sub_;
std::unordered_set<ValidationCodeHash> seen_;
std::map<SessionIndex, std::unordered_map<ValidationCodeHash, bool>>
session_code_accept_;
ThreadPool thread_{"PvfPrecheck", 1};
log::Logger logger_ = log::createLogger("PvfPrecheck", "parachain");
};
Expand Down
Loading