diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35031c80..77912e1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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: diff --git a/Cargo.toml b/Cargo.toml index 538e366a..cfa8cb2e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/clippy.toml b/clippy.toml deleted file mode 100644 index 80fcb9d2..00000000 --- a/clippy.toml +++ /dev/null @@ -1 +0,0 @@ -msrv = "1.86" diff --git a/crates/consensus/src/transaction/tx_type.rs b/crates/consensus/src/transaction/tx_type.rs index c29a05db..fb6d864b 100644 --- a/crates/consensus/src/transaction/tx_type.rs +++ b/crates/consensus/src/transaction/tx_type.rs @@ -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 diff --git a/crates/rpc-types-engine/src/payload/mod.rs b/crates/rpc-types-engine/src/payload/mod.rs index deccd8ac..4367784f 100644 --- a/crates/rpc-types-engine/src/payload/mod.rs +++ b/crates/rpc-types-engine/src/payload/mod.rs @@ -543,18 +543,18 @@ impl OpExecutionPayload { self, sidecar: &OpExecutionPayloadSidecar, ) -> Result, 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 { @@ -605,10 +605,10 @@ impl OpExecutionPayload { F: FnMut(alloy_primitives::Bytes) -> Result, E: Into, { - 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)?), @@ -664,10 +664,10 @@ impl OpExecutionPayload { E: Into, { 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 {