diff --git a/Cargo.toml b/Cargo.toml index 07fed277cc..434e340d8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ exclude = ["**/target", "benches/", "tests"] anyhow = { version = "1.0.79", default-features = false } tracing = { version = "0.1.40", default-features = false } cfg-if = "1.0.0" +alloy-primitives = { version = "0.7.0", default-features = false } [profile.dev] opt-level = 1 diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml index e382c87f08..af5cc2a4a0 100644 --- a/crates/derive/Cargo.toml +++ b/crates/derive/Cargo.toml @@ -12,13 +12,13 @@ homepage.workspace = true # Workspace anyhow.workspace = true tracing.workspace = true +alloy-primitives = { workspace = true, features = ["rlp"] } # External -op-alloy-consensus = { git = "https://github.com/clabby/op-alloy", branch = "refcell/consensus-port", default-features = false } -alloy-primitives = { version = "0.7.0", default-features = false, features = ["rlp"] } alloy-rlp = { version = "0.3.4", default-features = false, features = ["derive"] } alloy-sol-types = { version = "0.7.0", default-features = false } alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07", default-features = false } +op-alloy-consensus = { git = "https://github.com/clabby/op-alloy", branch = "refcell/consensus-port", default-features = false } alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "e3f2f07", default-features = false } async-trait = "0.1.77" hashbrown = "0.14.3" diff --git a/crates/preimage/Cargo.toml b/crates/preimage/Cargo.toml index 2fc4acce84..975b2fe83d 100644 --- a/crates/preimage/Cargo.toml +++ b/crates/preimage/Cargo.toml @@ -13,13 +13,11 @@ homepage.workspace = true anyhow.workspace = true cfg-if.workspace = true tracing.workspace = true +alloy-primitives.workspace = true # local kona-common = { path = "../common", version = "0.0.1" } -# External -alloy-primitives = { version = "0.7.0", default-features = false } - [dev-dependencies] tokio = { version = "1.36.0", features = ["full"] } tempfile = "3.10.0" diff --git a/examples/simple-revm/Cargo.lock b/examples/simple-revm/Cargo.lock index 38018b62d1..64979c2062 100644 --- a/examples/simple-revm/Cargo.lock +++ b/examples/simple-revm/Cargo.lock @@ -37,6 +37,22 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99bbad0a6b588ef4aec1b5ddbbfdacd9ef04e00b979617765b03174318ee1f3a" +dependencies = [ + "bytes", + "cfg-if", + "const-hex", + "derive_more", + "hex-literal", + "itoa", + "ruint", + "tiny-keccak", +] + [[package]] name = "alloy-rlp" version = "0.3.4" @@ -369,9 +385,11 @@ dependencies = [ name = "kona-preimage" version = "0.0.1" dependencies = [ + "alloy-primitives 0.7.0", "anyhow", "cfg-if", "kona-common", + "tracing", ] [[package]] @@ -496,6 +514,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -616,7 +640,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b3683a40f1e94e7389c8e81e5f26bb5d30875ed0b48ab07985ec32eb6d6c712" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.6.2", "auto_impl", "bitflags", "bitvec", @@ -828,6 +852,22 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + [[package]] name = "typenum" version = "1.17.0"