Skip to content

Commit 15e2c8b

Browse files
yoshidanyoshidan
authored
Bump kona to kona-node/v1.0.1 (#23)
1 parent ee0c308 commit 15e2c8b

File tree

15 files changed

+581
-312
lines changed

15 files changed

+581
-312
lines changed

‎Cargo.lock‎

Lines changed: 437 additions & 241 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,33 @@ ethereum-consensus = { git = "https://github.com/datachainlab/ethereum-light-cli
2222
ethereum-light-client-verifier = { git = "https://github.com/datachainlab/ethereum-light-client-rs", rev = "v0.2.0", default-features = false }
2323

2424
# Kona
25-
kona-mpt = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
26-
kona-client = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
27-
kona-host = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
28-
kona-proof = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
29-
kona-preimage = {git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
30-
kona-executor = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
31-
kona-driver = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
32-
kona-providers-alloy= { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
33-
kona-genesis = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
34-
kona-protocol = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
35-
kona-derive = { git="https://github.com/anton-rs/kona", rev= "kona-client/v1.0.2", default-features = false }
25+
kona-mpt = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
26+
kona-client = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
27+
kona-host = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
28+
kona-proof = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
29+
kona-preimage = {git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
30+
kona-executor = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
31+
kona-driver = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
32+
kona-providers-alloy= { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
33+
kona-genesis = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
34+
kona-protocol = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
35+
kona-derive = { git="https://github.com/op-rs/kona", rev= "kona-node/v1.0.1", default-features = false }
3636

3737
# Alloy
38-
alloy-consensus = { version = "1.0.9", default-features = false }
39-
alloy-primitives = { version = "1.1.2", default-features = false }
40-
alloy-eips = { version = "1.0.9", default-features = false }
41-
alloy-trie = { version = "0.8.1", default-features = false }
38+
alloy-consensus = { version = "1.0.25", default-features = false }
39+
alloy-primitives = { version = "1.3.1", default-features = false }
40+
alloy-eips = { version = "1.0.25", default-features = false }
41+
alloy-trie = { version = "0.9.1", default-features = false }
4242

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

4747
# Ethereum
48-
revm = { version = "24.0.1", default-features = false }
49-
op-revm = { version = "5.0.1", default-features = false }
50-
alloy-evm = { version = "0.10.0", default-features = false, features = ["op"] }
51-
alloy-op-evm = { version = "0.10.0", default-features = false }
48+
revm = { version = "29.0.0", default-features = false }
49+
op-revm = { version = "10.0.0", default-features = false }
50+
alloy-evm = { version = "0.21.0", default-features = false, features = ["op"] }
51+
alloy-op-evm = { version = "0.21.0", default-features = false }
5252

5353
# Cryptography
5454
sha2 = { version = "0.10.8", default-features = false }

‎Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
PHONY: sync-lock
2+
sync-lock:
3+
cargo update -p kona-client
4+
cd tools/deps && python sync_lock.py
5+
# Check build
6+
cargo build

‎derivation/src/derivation.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use core::clone::Clone;
88
use core::fmt::Debug;
99
use kona_client::fpvm_evm::FpvmOpEvmFactory;
1010
use kona_client::single::fetch_safe_head_hash;
11-
use kona_derive::sources::EthereumDataSource;
11+
use kona_derive::EthereumDataSource;
1212
use kona_driver::Driver;
1313
use kona_executor::TrieDBProvider;
1414
use kona_genesis::RollupConfig;
@@ -185,7 +185,7 @@ mod test {
185185
fn test_verify_config_invalid_error() {
186186
let rollup_config = RollupConfig::default();
187187
let rollup_config2 = RollupConfig {
188-
l2_chain_id: rollup_config.l2_chain_id + 1,
188+
l2_chain_id: (rollup_config.l2_chain_id.id() + 1).into(),
189189
..rollup_config.clone()
190190
};
191191

‎derivation/src/errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub enum Error {
5555
#[error("DriverError: err={0:?}")]
5656
DriverError(#[from] kona_driver::DriverError<kona_executor::ExecutorError>),
5757
#[error("PipelineError: err={0:?}")]
58-
PipelineError(#[from] kona_derive::errors::PipelineErrorKind),
58+
PipelineError(#[from] kona_derive::PipelineErrorKind),
5959
#[error("SerdeError: err={0:?}")]
6060
SerdeError(#[from] serde_json::Error),
6161
#[error("UnexpectedLocalPreimageKey: key={0:?}")]

‎derivation/src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![no_std]
2+
#![allow(clippy::result_large_err)]
23
extern crate alloc;
34

45
pub mod derivation;

‎derivation/src/oracle.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ impl PreimageOracleClient for MemoryOracleClient {
4646
Ok(value.clone())
4747
} else {
4848
Err(PreimageOracleError::Other(format!(
49-
"key not found: {:?}",
50-
key
49+
"key not found: {key:?}"
5150
)))
5251
}
5352
}
@@ -58,8 +57,7 @@ impl PreimageOracleClient for MemoryOracleClient {
5857
Ok(())
5958
} else {
6059
Err(PreimageOracleError::Other(format!(
61-
"key not found: {:?}",
62-
key
60+
"key not found: {key:?}"
6361
)))
6462
}
6563
}

‎light-client/src/account.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ mod test {
9191
"48b7747ba1094684d9197bbaa5dcb134587d23e493fb53a29e400c50e50f5147"
9292
)),
9393
);
94-
assert!(res.is_ok(), "{:?}", res);
94+
assert!(res.is_ok(), "{res:?}");
9595
}
9696

9797
#[test]
@@ -149,7 +149,7 @@ mod test {
149149
"568a51c3253bbd2d46e3923b35df0489712df11453fd04dd71341120356952c0"
150150
)),
151151
);
152-
assert!(res.is_ok(), "{:?}", res);
152+
assert!(res.is_ok(), "{res:?}");
153153
}
154154

155155
#[test]

0 commit comments

Comments
 (0)