From 707b592ccaa6e398c84b2284b4c7f890267ad907 Mon Sep 17 00:00:00 2001 From: dancoombs Date: Mon, 15 Jan 2024 17:25:18 -0500 Subject: [PATCH] chore: update to rust 1.75 --- .github/workflows/ci.yaml | 2 +- Cargo.toml | 2 +- Dockerfile | 2 +- bin/rundler/src/cli/builder.rs | 4 ++-- bin/rundler/src/cli/node/mod.rs | 2 +- bin/rundler/src/cli/pool.rs | 2 +- crates/sim/src/simulation/simulation.rs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2228e412d..01b49772c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ jobs: uses: dtolnay/rust-toolchain@stable with: components: clippy - toolchain: 1.74.0 + toolchain: 1.75.0 - name: Install toolchain (nightly) run: rustup toolchain add nightly --component rustfmt --profile minimal - uses: Swatinem/rust-cache@v2 diff --git a/Cargo.toml b/Cargo.toml index 64fce6acf..af6dc4fd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ resolver = "2" [workspace.package] version = "0.1.0-beta" edition = "2021" -rust-version = "1.74" +rust-version = "1.75" license = "MIT OR Apache-2.0" repository = "https://github.com/alchemyplatform/rundler" diff --git a/Dockerfile b/Dockerfile index 1c5f94289..177fb5e20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Adapted from https://github.com/paradigmxyz/reth/blob/main/Dockerfile # syntax=docker/dockerfile:1.4 -FROM rust:1.74.0 AS chef-builder +FROM rust:1.75.0 AS chef-builder # Install system dependencies RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list diff --git a/bin/rundler/src/cli/builder.rs b/bin/rundler/src/cli/builder.rs index 057f46082..542ddc8fd 100644 --- a/bin/rundler/src/cli/builder.rs +++ b/bin/rundler/src/cli/builder.rs @@ -200,7 +200,7 @@ impl BuilderArgs { rpc_url, entry_point_address: common .entry_points - .get(0) + .first() .context("should have at least one entry point")? .parse() .context("should parse entry point address")?, @@ -220,7 +220,7 @@ impl BuilderArgs { priority_fee_mode, sender_type: self.sender_type, eth_poll_interval: Duration::from_millis(common.eth_poll_interval_millis), - sim_settings: common.try_into()?, + sim_settings: common.into(), mempool_configs, max_blocks_to_wait_for_mine: self.max_blocks_to_wait_for_mine, replacement_fee_percent_increase: self.replacement_fee_percent_increase, diff --git a/bin/rundler/src/cli/node/mod.rs b/bin/rundler/src/cli/node/mod.rs index d76434c1e..910197723 100644 --- a/bin/rundler/src/cli/node/mod.rs +++ b/bin/rundler/src/cli/node/mod.rs @@ -55,7 +55,7 @@ pub async fn run(bundler_args: NodeCliArgs, common_args: CommonArgs) -> anyhow:: let rpc_task_args = rpc_args.to_args( &common_args, (&common_args).try_into()?, - (&common_args).try_into()?, + (&common_args).into(), (&common_args).try_into()?, )?; diff --git a/bin/rundler/src/cli/pool.rs b/bin/rundler/src/cli/pool.rs index 2301a0cd9..cc57f2ccd 100644 --- a/bin/rundler/src/cli/pool.rs +++ b/bin/rundler/src/cli/pool.rs @@ -163,7 +163,7 @@ impl PoolArgs { blocklist: blocklist.clone(), allowlist: allowlist.clone(), precheck_settings: common.try_into()?, - sim_settings: common.try_into()?, + sim_settings: common.into(), mempool_channel_configs: mempool_channel_configs.clone(), throttled_entity_mempool_count: self.throttled_entity_mempool_count, throttled_entity_live_blocks: self.throttled_entity_live_blocks, diff --git a/crates/sim/src/simulation/simulation.rs b/crates/sim/src/simulation/simulation.rs index 8951cb17a..4be19c39a 100644 --- a/crates/sim/src/simulation/simulation.rs +++ b/crates/sim/src/simulation/simulation.rs @@ -1155,7 +1155,7 @@ mod tests { assert!(matches!( res, Err(SimulationError { violation_error: ViolationError::Violations(violations), entity_infos: None}) if matches!( - violations.get(0), + violations.first(), Some(&SimulationViolation::UnintendedRevertWithMessage( EntityType::Paymaster, ref reason,