Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update to rust 1.75 #554

Merged
merged 1 commit into from
Jan 16, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions bin/rundler/src/cli/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")?,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion bin/rundler/src/cli/node/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()?,
)?;

Expand Down
2 changes: 1 addition & 1 deletion bin/rundler/src/cli/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion crates/sim/src/simulation/simulation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading