Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion crates/commonware-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ workspace = true

[dependencies]
tempo-alloy.workspace = true
tempo-chainspec.workspace = true
tempo-commonware-node-config.workspace = true
tempo-dkg-onchain-artifacts.workspace = true
tempo-node.workspace = true
Expand Down Expand Up @@ -45,8 +46,10 @@ eyre.workspace = true
futures.workspace = true
governor.workspace = true
indexmap.workspace = true
itertools.workspace = true
jiff = { workspace = true, features = ["std"] }
parking_lot.workspace = true
pin-project = "1.1.10"
prometheus-client.workspace = true
rand_08.workspace = true

Expand All @@ -63,4 +66,3 @@ reth-rpc-convert.workspace = true

tokio = { workspace = true, features = ["macros", "sync"] }
tracing.workspace = true
pin-project = "1.1.10"
6 changes: 5 additions & 1 deletion crates/commonware-node/src/consensus/application/actor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,10 @@ impl Inner<Init> {
);
info!(
%outcome.epoch,
outcome.network_identity = %outcome.network_identity(),
outcome.dealers = ?outcome.dealers(),
outcome.players = ?outcome.players(),
outcome.next_players = ?outcome.next_players(),
"received DKG outcome; will include in payload builder attributes",
);
outcome.encode().into()
Expand Down Expand Up @@ -822,7 +826,7 @@ async fn verify_block<TContext: Pacer>(
PayloadStatusEnum::Syncing => {
bail!(
"failed validating block because payload is still syncing, \
this means the parent block was available to the consensus
this means the parent block was available to the consensus \
layer but not the execution layer"
)
}
Expand Down
23 changes: 12 additions & 11 deletions crates/commonware-node/src/consensus/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,22 @@ where
)
.await;

let (executor, executor_mailbox) = crate::executor::init(
context.with_label("executor"),
crate::executor::Config {
execution_node: execution_node.clone(),
last_finalized_height,
marshal: marshal_mailbox.clone(),
fcu_heartbeat_interval: self.fcu_heartbeat_interval,
},
)
.wrap_err("failed initialization executor actor")?;

let (peer_manager, peer_manager_mailbox) = peer_manager::init(
context.with_label("peer_manager"),
peer_manager::Config {
execution_node: execution_node.clone(),
executor: executor_mailbox.clone(),
oracle: self.peer_manager.clone(),
epoch_strategy: epoch_strategy.clone(),
last_finalized_height,
Expand Down Expand Up @@ -324,17 +336,6 @@ where
self.feed_state,
);

let (executor, executor_mailbox) = crate::executor::init(
context.with_label("executor"),
crate::executor::Config {
execution_node: execution_node.clone(),
last_finalized_height,
marshal: marshal_mailbox.clone(),
fcu_heartbeat_interval: self.fcu_heartbeat_interval,
},
)
.wrap_err("failed initialization executor actor")?;

let (application, application_mailbox) = application::init(super::application::Config {
context: context.with_label("application"),
fee_recipient: self.fee_recipient,
Expand Down
Loading
Loading