From 2630f7a0550c5544200338d944c4ee7c88708a88 Mon Sep 17 00:00:00 2001 From: refcell Date: Wed, 20 Nov 2024 01:36:21 -0500 Subject: [PATCH] fix: imports (#829) --- Cargo.lock | 32 +++++++++++++---------- Cargo.toml | 14 +++------- crates/driver/src/pipeline.rs | 2 +- crates/proof-sdk/proof/src/l1/pipeline.rs | 2 +- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a3777b5c..06ec62ffe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -952,9 +952,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "byteorder" @@ -1754,9 +1754,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -1895,9 +1895,9 @@ checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", @@ -2912,8 +2912,9 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "op-alloy-consensus" -version = "0.6.6" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72da577a88d35b893fae6467112651f26ef023434c196b2a0b3dc75bc853e0e4" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2927,8 +2928,9 @@ dependencies = [ [[package]] name = "op-alloy-genesis" -version = "0.6.6" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "818180672dd14ca6642fb57942e1cbd602669f42b6e0222b7ea9bbcae065d67e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2941,8 +2943,9 @@ dependencies = [ [[package]] name = "op-alloy-protocol" -version = "0.6.6" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1803a1ac96203b8f713b1fa9b7509c46c645ca7bc22b582761a7495e999d4301" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -2963,8 +2966,9 @@ dependencies = [ [[package]] name = "op-alloy-rpc-types-engine" -version = "0.6.6" -source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c227fcc7d81d4023363ba12406e57ebcc1c7cbb1075c38ea471ae32138d4706d" dependencies = [ "alloy-eips", "alloy-primitives", diff --git a/Cargo.toml b/Cargo.toml index 97d2d737a..228696a55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,12 +24,6 @@ default-members = ["bin/host", "bin/client"] # https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html resolver = "2" -[patch.crates-io] -op-alloy-genesis = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } -op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" } - [workspace.lints.rust] missing-debug-implementations = "warn" missing-docs = "warn" @@ -95,10 +89,10 @@ alloy-rpc-types-engine = { version = "0.6.4", default-features = false } alloy-rpc-types-beacon = { version = "0.6.4", default-features = false } # OP Alloy -op-alloy-genesis = { version = "0.6.6", default-features = false } -op-alloy-protocol = { version = "0.6.6", default-features = false } -op-alloy-consensus = { version = "0.6.6", default-features = false } -op-alloy-rpc-types-engine = { version = "0.6.6", default-features = false } +op-alloy-genesis = { version = "0.6.7", default-features = false } +op-alloy-protocol = { version = "0.6.7", default-features = false } +op-alloy-consensus = { version = "0.6.7", default-features = false } +op-alloy-rpc-types-engine = { version = "0.6.7", default-features = false } # General lru = "0.12.4" diff --git a/crates/driver/src/pipeline.rs b/crates/driver/src/pipeline.rs index b56b41bd1..a949f65a6 100644 --- a/crates/driver/src/pipeline.rs +++ b/crates/driver/src/pipeline.rs @@ -20,7 +20,7 @@ where P: Pipeline + SignalReceiver, { /// Flushes any cache on re-org. - fn flush(&self); + fn flush(&mut self); /// Produces the disputed [OpAttributesWithParent] payload, directly after the given /// starting l2 safe head. diff --git a/crates/proof-sdk/proof/src/l1/pipeline.rs b/crates/proof-sdk/proof/src/l1/pipeline.rs index 540279b6a..b2e1719b5 100644 --- a/crates/proof-sdk/proof/src/l1/pipeline.rs +++ b/crates/proof-sdk/proof/src/l1/pipeline.rs @@ -104,7 +104,7 @@ where B: BlobProvider + Send + Sync + Debug + Clone, { /// Flushes the cache on re-org. - fn flush(&self) { + fn flush(&mut self) { self.caching_oracle.flush(); } }