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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: ["stable", "nightly", "1.86"] # MSRV
rust: ["stable", "nightly", "1.88"] # MSRV
flags: ["--no-default-features", "", "--all-features"]
exclude:
# Some features have higher MSRV.
- rust: "1.86" # MSRV
- rust: "1.88" # MSRV
flags: "--all-features"
steps:
- uses: actions/checkout@v5
Expand All @@ -45,13 +45,13 @@ jobs:
cache-on-failure: true
# Only run tests on latest stable and above
- name: Install cargo-nextest
if: ${{ matrix.rust != '1.86' }} # MSRV
if: ${{ matrix.rust != '1.88' }} # MSRV
uses: taiki-e/install-action@nextest
- name: build
if: ${{ matrix.rust == '1.86' }} # MSRV
if: ${{ matrix.rust == '1.88' }} # MSRV
run: cargo build --workspace ${{ matrix.flags }}
- name: test
if: ${{ matrix.rust != '1.86' }} # MSRV
if: ${{ matrix.rust != '1.88' }} # MSRV
run: cargo nextest run --workspace ${{ matrix.flags }}

doctest:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"
[workspace.package]
version = "0.22.0"
edition = "2024"
rust-version = "1.86"
rust-version = "1.88"
authors = ["Alloy Contributors"]
license = "MIT OR Apache-2.0"
homepage = "https://github.com/alloy-rs/op-alloy"
Expand Down
1 change: 0 additions & 1 deletion clippy.toml

This file was deleted.

1 change: 1 addition & 0 deletions crates/consensus/src/transaction/tx_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use core::fmt::Display;
/// Identifier for an Optimism deposit transaction
pub const DEPOSIT_TX_TYPE_ID: u8 = 126; // 0x7E

#[allow(clippy::derivable_impls)]
impl Default for OpTxType {
fn default() -> Self {
Self::Legacy
Expand Down
32 changes: 16 additions & 16 deletions crates/rpc-types-engine/src/payload/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -543,18 +543,18 @@ impl OpExecutionPayload {
self,
sidecar: &OpExecutionPayloadSidecar,
) -> Result<Block<alloy_primitives::Bytes>, OpPayloadError> {
if let Some(payload) = self.as_v2() {
if !payload.withdrawals.is_empty() {
return Err(OpPayloadError::NonEmptyL1Withdrawals);
}
if let Some(payload) = self.as_v2()
&& !payload.withdrawals.is_empty()
{
return Err(OpPayloadError::NonEmptyL1Withdrawals);
}

let mut block = self.into_block_raw()?;

if let Some(blobs_hashes) = sidecar.versioned_hashes() {
if !blobs_hashes.is_empty() {
return Err(OpPayloadError::NonEmptyBlobVersionedHashes);
}
if let Some(blobs_hashes) = sidecar.versioned_hashes()
&& !blobs_hashes.is_empty()
{
return Err(OpPayloadError::NonEmptyBlobVersionedHashes);
}
if let Some(reqs_hash) = sidecar.requests_hash() {
if reqs_hash != EMPTY_REQUESTS_HASH {
Expand Down Expand Up @@ -605,10 +605,10 @@ impl OpExecutionPayload {
F: FnMut(alloy_primitives::Bytes) -> Result<T, E>,
E: Into<PayloadError>,
{
if let Some(payload) = self.as_v2() {
if !payload.withdrawals.is_empty() {
return Err(OpPayloadError::NonEmptyL1Withdrawals);
}
if let Some(payload) = self.as_v2()
&& !payload.withdrawals.is_empty()
{
return Err(OpPayloadError::NonEmptyL1Withdrawals);
}
let block = match self {
Self::V1(payload) => return Ok(payload.try_into_block_with(f)?),
Expand Down Expand Up @@ -664,10 +664,10 @@ impl OpExecutionPayload {
E: Into<PayloadError>,
{
let mut base_payload = self.try_into_block_with(f)?;
if let Some(blobs_hashes) = sidecar.versioned_hashes() {
if !blobs_hashes.is_empty() {
return Err(OpPayloadError::NonEmptyBlobVersionedHashes);
}
if let Some(blobs_hashes) = sidecar.versioned_hashes()
&& !blobs_hashes.is_empty()
{
return Err(OpPayloadError::NonEmptyBlobVersionedHashes);
}
if let Some(reqs_hash) = sidecar.requests_hash() {
if reqs_hash != EMPTY_REQUESTS_HASH {
Expand Down
Loading