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.

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

Feature/nix support #2257

Draft
wants to merge 46 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3584be3
refactor notifications
turuslan Nov 11, 2024
168f6aa
fix moved
turuslan Nov 11, 2024
347cc84
fix null
turuslan Nov 11, 2024
995b910
fix metric
turuslan Nov 12, 2024
a2513af
parachain if validator
turuslan Nov 12, 2024
75bca79
sub
turuslan Nov 12, 2024
ebbf73c
view
turuslan Nov 12, 2024
9ddd406
fix sub
turuslan Nov 12, 2024
976d395
merge master, skip parachain_processor.{hpp,cpp}
turuslan Nov 13, 2024
8e5821c
rebase parachain_processor.{hpp,cpp}
turuslan Nov 13, 2024
c130a41
fix injector
turuslan Nov 13, 2024
376f45a
Merge branch 'master' into refactor/notifications
kamilsa Nov 14, 2024
15fb5c0
fix thread
turuslan Nov 14, 2024
192b29d
Merge remote-tracking branch 'origin/master' into refactor/notifications
turuslan Nov 14, 2024
d273fac
close duplicate connection
turuslan Nov 14, 2024
951df62
fix grandpa seen
turuslan Nov 14, 2024
bd96c29
fix fwd
turuslan Nov 14, 2024
6b3cfcd
clang-tidy
turuslan Nov 15, 2024
39b1191
clang-tidy
turuslan Nov 15, 2024
d73848b
comments
turuslan Nov 15, 2024
d71878a
Merge branch 'master' into refactor/notifications
turuslan Nov 15, 2024
b583472
Merge branch 'master' into refactor/notifications
kamilsa Nov 15, 2024
e087202
minimal shell stub
Lederstrumpf Oct 29, 2024
fc48b23
add missing pieces
Lederstrumpf Oct 31, 2024
620ea95
add flake boilerplate
Lederstrumpf Nov 1, 2024
84e6c2f
add cmakels
Lederstrumpf Nov 1, 2024
b587828
move to cmake 3.25.3 release (kagome pin)
Lederstrumpf Nov 1, 2024
c7b5d79
remove incompatible tooling
Lederstrumpf Nov 1, 2024
5b7d155
add rust support & inline relevant init.sh
Lederstrumpf Nov 1, 2024
9f59903
only use laggard nixpkgs for cmake
Lederstrumpf Nov 2, 2024
fc47520
add seccomp & ncurses
Lederstrumpf Nov 2, 2024
b7aab3c
temp hack: correct curses linking
Lederstrumpf Nov 2, 2024
5feb4bc
cmake config overrides
Lederstrumpf Nov 2, 2024
404d458
cmake add erasure_coding_crust override
Lederstrumpf Nov 4, 2024
556bbb8
check if initiated via flake
Lederstrumpf Nov 4, 2024
d888687
use standard cargo path :/
Lederstrumpf Nov 4, 2024
9a41ecb
scripts/build.sh executable by default
Lederstrumpf Nov 4, 2024
e2e9354
Revert "use standard cargo path :/"
Lederstrumpf Nov 4, 2024
2644dbd
segregate out rust vars
Lederstrumpf Nov 4, 2024
9fc8530
update .gitignore
Lederstrumpf Nov 4, 2024
3058757
add readme explainer
Lederstrumpf Nov 4, 2024
643f94a
fmt
Lederstrumpf Nov 4, 2024
d26ebb5
reduce to minimal pkgs
Lederstrumpf Nov 4, 2024
d273c22
update flake description
Lederstrumpf Nov 4, 2024
7d3e45c
trim superfluous exports
Lederstrumpf Nov 4, 2024
430a61d
remove shell.nix
Lederstrumpf Nov 4, 2024
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
Prev Previous commit
Next Next commit
fix injector
Signed-off-by: turuslan <[email protected]>
  • Loading branch information
turuslan committed Nov 13, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit c130a41866c00b4356cfe947ba4c0b6e969d11ff
2 changes: 1 addition & 1 deletion core/dispute_coordinator/impl/dispute_coordinator_impl.hpp
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ namespace kagome::network {
} // namespace kagome::network

namespace kagome::parachain {
struct ApprovalDistribution;
class ApprovalDistribution;
class Recovery;
class Pvf;
} // namespace kagome::parachain
4 changes: 2 additions & 2 deletions core/injector/application_injector.cpp
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include "injector/application_injector.hpp"

#define BOOST_DI_CFG_DIAGNOSTICS_LEVEL 2
#define BOOST_DI_CFG_CTOR_LIMIT_SIZE \
32 // TODO(Harrm): #2104 check how it influences on compilation time

#include "injector/application_injector.hpp"

#include <rocksdb/filter_policy.h>
#include <rocksdb/table.h>
#include <boost/di.hpp>
4 changes: 2 additions & 2 deletions core/injector/application_injector.hpp
Original file line number Diff line number Diff line change
@@ -59,10 +59,10 @@ namespace kagome {
namespace parachain {
class ParachainObserver;
class ParachainProcessorImpl;
struct ApprovalDistribution;
class ApprovalDistribution;

namespace statement_distribution {
struct StatementDistribution;
class StatementDistribution;
}
} // namespace parachain

3 changes: 2 additions & 1 deletion core/parachain/approval/approval_distribution.hpp
Original file line number Diff line number Diff line change
@@ -79,9 +79,10 @@ namespace kagome::parachain {
* approvals for valid candidates, respectively disputes for invalid
* candidates.
*/
struct ApprovalDistribution final
class ApprovalDistribution final
: public std::enable_shared_from_this<ApprovalDistribution>,
public IApprovedAncestor {
public:
struct OurAssignment {
SCALE_TIE(4);
approval::AssignmentCertV2 cert;
2 changes: 1 addition & 1 deletion core/parachain/validator/impl/parachain_observer_impl.hpp
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ namespace kagome::crypto {

namespace kagome::parachain {
class ParachainProcessorImpl;
struct ApprovalDistribution;
class ApprovalDistribution;
} // namespace kagome::parachain

namespace kagome::parachain {
4 changes: 2 additions & 2 deletions core/parachain/validator/parachain_processor.hpp
Original file line number Diff line number Diff line change
@@ -118,8 +118,8 @@ struct std::hash<kagome::parachain::BlockedCollationId> {

namespace kagome::parachain {
class ParachainProcessorImpl
: BackedCandidatesSource,
std::enable_shared_from_this<ParachainProcessorImpl> {
: public std::enable_shared_from_this<ParachainProcessorImpl>,
public BackedCandidatesSource {
public:
enum class Error {
RESPONSE_ALREADY_RECEIVED = 1,
Original file line number Diff line number Diff line change
@@ -32,9 +32,10 @@ namespace kagome::parachain {

namespace kagome::parachain::statement_distribution {

struct StatementDistribution
: std::enable_shared_from_this<StatementDistribution>,
network::CanDisconnect {
class StatementDistribution
: public std::enable_shared_from_this<StatementDistribution>,
public network::CanDisconnect {
public:
enum class Error : uint8_t {
RESPONSE_ALREADY_RECEIVED = 1,
COLLATION_NOT_FOUND,
Loading