Skip to content
Open
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
a6a6a2c
feat: integrate kona-node for in-process consensus/execution (WIP)
Mar 18, 2026
0d07334
wip
kilianglas Mar 31, 2026
7597d15
chore: merge main + cleanup
0xOsiris May 28, 2026
20ba6fc
wip: use upstream optimism
0xOsiris May 28, 2026
bd10c9b
test: integrate into the devnet
0xOsiris May 28, 2026
cef9a80
fix: wrap BeaconConsensusEngineHandle in an in process client deploye…
0xOsiris May 28, 2026
4a8604e
fix: configure add ons to launch over local node bindings to eth api
0xOsiris May 28, 2026
54a3f03
perf: communicate with l2 non-engine over IPC
0xOsiris May 28, 2026
a84ade8
fix: engine client
0xOsiris May 29, 2026
5eb3158
chore: cleanup Cargo.toml
0xOsiris May 29, 2026
2c33dfe
fix: address pr comments
0xOsiris May 29, 2026
ffbcbe8
fix: clap arg collisions
0xOsiris May 29, 2026
dd44021
chore: namespace
0xOsiris May 29, 2026
b3e547d
chore: cleanup
0xOsiris May 29, 2026
389f41e
fix: kona service
0xOsiris May 29, 2026
51a4cab
fix: default ipc fallback http
0xOsiris May 29, 2026
180a702
fix: addons
0xOsiris May 29, 2026
f7643a6
fix
0xOsiris May 29, 2026
7948d70
fix: passthrough flashblocks authorization to FlashblocksJobGenerator
0xOsiris May 29, 2026
556a793
chore: fmt
0xOsiris May 29, 2026
869710e
fix: actually sign over blocks in the devnet
0xOsiris May 29, 2026
63b1d9f
chore: update docs
0xOsiris May 29, 2026
e4e668a
chore(engine): cleanup names
0xOsiris May 29, 2026
33b4e3b
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris May 29, 2026
e94c7e4
fix: correctly load unsafe block signer
0xOsiris May 30, 2026
aedede3
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris May 30, 2026
23f2637
fix: pectra blob schedule
0xOsiris May 30, 2026
4f65572
test: add tests:
0xOsiris May 30, 2026
c144dc9
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris May 30, 2026
16d5337
chore: cleanup:
0xOsiris May 31, 2026
c274250
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 6, 2026
549f74e
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 11, 2026
cc93225
chore: merge main
0xOsiris Jun 11, 2026
6327846
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 11, 2026
fd22242
fix: dns resolution for bootnode parser (#733)
0xOsiris Jun 12, 2026
40fe4ba
fix: panic unwind on consensus failure
0xOsiris Jun 12, 2026
6f65f6b
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 12, 2026
bd35a78
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 15, 2026
d7a1d90
wip: fix comp issues
0xOsiris Jun 15, 2026
9408170
test: patch tests
0xOsiris Jun 15, 2026
e0b8f02
fix: clamp finalized head at safe head (#737)
0xOsiris Jun 15, 2026
b3e1b86
fix: clamp finalized block
0xOsiris Jun 15, 2026
422fbaa
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 15, 2026
c11d848
fix: compilation issues
0xOsiris Jun 16, 2026
084658c
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 16, 2026
d6d4900
chore: update lockfile
0xOsiris Jun 16, 2026
4615ad0
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 16, 2026
5d161dc
merge main
0xOsiris Jun 16, 2026
51e59c8
fix: kona consensus
0xOsiris Jun 16, 2026
c9a6063
chore: docs
0xOsiris Jun 16, 2026
d22cdbc
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 16, 2026
37da0a7
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 18, 2026
f071f6a
fix
0xOsiris Jun 18, 2026
342101d
Merge branch 'main' into osiris/kona-consensus-engine
0xOsiris Jun 18, 2026
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
1,376 changes: 1,328 additions & 48 deletions Cargo.lock

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ members = [
"crates/evm",
"crates/state",
"crates/pbh",
"crates/kona",
"proofs/core",
"proofs/protocol",
"proofs/nitro",
Expand Down Expand Up @@ -88,6 +89,7 @@ world-chain-evm = { path = "crates/evm", default-features = false }
world-chain-state = { path = "crates/state", default-features = false }
world-chain-devnet = { path = "crates/devnet", default-features = false }
world-chain-test-utils = { path = "crates/test-utils", default-features = false }
world-chain-kona = { path = "crates/kona", default-features = false }
world-chain-proof-core = { path = "proofs/core", default-features = false }
world-chain-proof = { path = "proofs/proof", default-features = false }
world-chain-proof-protocol = { path = "proofs/protocol", default-features = false }
Expand Down Expand Up @@ -178,6 +180,23 @@ reth-optimism-primitives = { git = "https://github.com/ethereum-optimism/optimis
reth-optimism-storage = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da", default-features = false }
reth-optimism-flashblocks = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da", default-features = false }

# kona (ethereum-optimism/optimism monorepo, same rev as op-alloy/reth-optimism)
kona-engine = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-node-service = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-rpc = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-registry = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-providers-alloy = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-interop = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-disc = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-gossip = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-peers = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-sources = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da" }
kona-cli = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da", default-features = false, features = ["secrets"] }

discv5 = "0.10.2"
libp2p = "0.56.0"
k256 = { version = "0.13", default-features = false, features = ["ecdsa"] }

# alloy op
op-alloy-consensus = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da", default-features = false }
op-alloy-rpc-types = { git = "https://github.com/ethereum-optimism/optimism", rev = "423d93e6374a65f3a83c1ed5e29c5998c972a5da", default-features = false }
Expand Down
2 changes: 0 additions & 2 deletions bin/world-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ reth-tracing.workspace = true
# op-reth
reth-optimism-consensus.workspace = true

reth-provider.workspace = true

# misc
dotenvy.workspace = true
clap.workspace = true
Expand Down
1 change: 1 addition & 0 deletions bin/world-chain/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ fn main() {
node_exit_future,
node: _node,
} = builder.node(node).launch().await?;

node_exit_future.await?;

Ok(())
Expand Down
14 changes: 14 additions & 0 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@ hex.workspace = true
reth-network-peers.workspace = true
tracing.workspace = true

# kona consensus node (in-process) — CLI args / P2P config
kona-node-service.workspace = true
kona-disc.workspace = true
kona-gossip.workspace = true
kona-peers.workspace = true
kona-sources.workspace = true
kona-cli.workspace = true
kona-genesis.workspace = true
discv5.workspace = true
libp2p.workspace = true
k256.workspace = true
url.workspace = true
reqwest.workspace = true

[dev-dependencies]
alloy-genesis.workspace = true
reth-node-core.workspace = true
Expand Down
7 changes: 7 additions & 0 deletions crates/cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ use world_chain_chainspec::{
};

pub mod builder;
pub mod kona;
pub mod p2p;
pub mod pbh;

pub use builder::*;
pub use kona::*;
pub use p2p::*;
pub use pbh::*;

Expand Down Expand Up @@ -151,6 +153,10 @@ pub struct WorldChainArgs {
#[command(flatten)]
pub flashblocks: Option<FlashblocksArgs>,

/// Kona consensus node args
#[command(flatten)]
pub kona: Option<KonaArgs>,

/// Comma-separated list of peer IDs to which transactions should be propagated
#[arg(long = "tx-peers", value_delimiter = ',', value_name = "PEER_ID")]
pub tx_peers: Option<Vec<PeerId>>,
Expand Down Expand Up @@ -545,6 +551,7 @@ mod tests {
block_uncompressed_size_limit: None,
},
flashblocks: None,
kona: None,
tx_peers: Some(vec![peer_id.parse().unwrap()]),
disable_bootnodes: true,
simulate_enabled: false,
Expand Down
Loading
Loading