Skip to content
Merged
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
678 changes: 437 additions & 241 deletions Cargo.lock

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,33 @@ ethereum-consensus = { git = "https://github.com/datachainlab/ethereum-light-cli
ethereum-light-client-verifier = { git = "https://github.com/datachainlab/ethereum-light-client-rs", rev = "v0.2.0", default-features = false }

# Kona
kona-mpt = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-client = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-host = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-proof = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-preimage = {git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-executor = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-driver = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-providers-alloy= { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-genesis = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-protocol = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-derive = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
kona-mpt = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-client = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-host = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-proof = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-preimage = {git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-executor = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-driver = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-providers-alloy= { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-genesis = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-protocol = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
kona-derive = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }

# Alloy
alloy-consensus = { version = "1.0.9", default-features = false }
alloy-primitives = { version = "1.1.2", default-features = false }
alloy-eips = { version = "1.0.9", default-features = false }
alloy-trie = { version = "0.8.1", default-features = false }
alloy-consensus = { version = "1.0.25", default-features = false }
alloy-primitives = { version = "1.3.1", default-features = false }
alloy-eips = { version = "1.0.25", default-features = false }
alloy-trie = { version = "0.9.1", default-features = false }

# OP Alloy
op-alloy-rpc-types-engine = { version = "0.17.2", default-features = false }
op-alloy-consensus= { version = "0.17.2", default-features = false }
op-alloy-rpc-types-engine = { version = "0.20.0", default-features = false }
op-alloy-consensus= { version = "0.20.0", default-features = false }

# Ethereum
revm = { version = "24.0.1", default-features = false }
op-revm = { version = "5.0.1", default-features = false }
alloy-evm = { version = "0.10.0", default-features = false, features = ["op"] }
alloy-op-evm = { version = "0.10.0", default-features = false }
revm = { version = "29.0.0", default-features = false }
op-revm = { version = "10.0.0", default-features = false }
alloy-evm = { version = "0.21.0", default-features = false, features = ["op"] }
alloy-op-evm = { version = "0.21.0", default-features = false }

# Cryptography
sha2 = { version = "0.10.8", default-features = false }
Expand Down
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
PHONY: sync-lock
sync-lock:
cargo update -p kona-client
cd tools/deps && python sync_lock.py
# Check build
cargo build
4 changes: 2 additions & 2 deletions derivation/src/derivation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use core::clone::Clone;
use core::fmt::Debug;
use kona_client::fpvm_evm::FpvmOpEvmFactory;
use kona_client::single::fetch_safe_head_hash;
use kona_derive::sources::EthereumDataSource;
use kona_derive::EthereumDataSource;
use kona_driver::Driver;
use kona_executor::TrieDBProvider;
use kona_genesis::RollupConfig;
Expand Down Expand Up @@ -185,7 +185,7 @@ mod test {
fn test_verify_config_invalid_error() {
let rollup_config = RollupConfig::default();
let rollup_config2 = RollupConfig {
l2_chain_id: rollup_config.l2_chain_id + 1,
l2_chain_id: (rollup_config.l2_chain_id.id() + 1).into(),
..rollup_config.clone()
};

Expand Down
2 changes: 1 addition & 1 deletion derivation/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ pub enum Error {
#[error("DriverError: err={0:?}")]
DriverError(#[from] kona_driver::DriverError<kona_executor::ExecutorError>),
#[error("PipelineError: err={0:?}")]
PipelineError(#[from] kona_derive::errors::PipelineErrorKind),
PipelineError(#[from] kona_derive::PipelineErrorKind),
#[error("SerdeError: err={0:?}")]
SerdeError(#[from] serde_json::Error),
#[error("UnexpectedLocalPreimageKey: key={0:?}")]
Expand Down
1 change: 1 addition & 0 deletions derivation/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![no_std]
#![allow(clippy::result_large_err)]
extern crate alloc;

pub mod derivation;
Expand Down
6 changes: 2 additions & 4 deletions derivation/src/oracle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ impl PreimageOracleClient for MemoryOracleClient {
Ok(value.clone())
} else {
Err(PreimageOracleError::Other(format!(
"key not found: {:?}",
key
"key not found: {key:?}"
)))
}
}
Expand All @@ -58,8 +57,7 @@ impl PreimageOracleClient for MemoryOracleClient {
Ok(())
} else {
Err(PreimageOracleError::Other(format!(
"key not found: {:?}",
key
"key not found: {key:?}"
)))
}
}
Expand Down
4 changes: 2 additions & 2 deletions light-client/src/account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ mod test {
"48b7747ba1094684d9197bbaa5dcb134587d23e493fb53a29e400c50e50f5147"
)),
);
assert!(res.is_ok(), "{:?}", res);
assert!(res.is_ok(), "{res:?}");
}

#[test]
Expand Down Expand Up @@ -149,7 +149,7 @@ mod test {
"568a51c3253bbd2d46e3923b35df0489712df11453fd04dd71341120356952c0"
)),
);
assert!(res.is_ok(), "{:?}", res);
assert!(res.is_ok(), "{res:?}");
}

#[test]
Expand Down
Loading
Loading