From ef7cd321c915b5857fffc76ef5558320ae9b271d Mon Sep 17 00:00:00 2001 From: Dan Coombs Date: Mon, 25 Nov 2024 09:05:13 -0600 Subject: [PATCH] fix(pool): don't log an error during validation failure in gas check (#915) --- .github/workflows/ci.yaml | 4 +++- .github/workflows/compliance.yaml | 2 ++ .github/workflows/release.yaml | 3 +++ .github/workflows/unit.yaml | 2 ++ Dockerfile | 2 +- Dockerfile.build | 2 +- crates/pool/src/mempool/uo_pool.rs | 5 ++++- 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 97f0bebea..25500eea1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -28,8 +28,10 @@ jobs: cache-on-failure: true - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 - # Build to generate the ABI bindings. + with: + version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" + # Build to generate the ABI bindings. - name: cargo build uses: actions-rs/cargo@v1 with: diff --git a/.github/workflows/compliance.yaml b/.github/workflows/compliance.yaml index 6f7b69d31..d41dc9a99 100644 --- a/.github/workflows/compliance.yaml +++ b/.github/workflows/compliance.yaml @@ -21,6 +21,8 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 + with: + version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" - uses: KengoTODA/actions-setup-docker-compose@v1 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a321229c1..3a42b1d6b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -63,6 +63,9 @@ jobs: - name: Foundry install if: contains( ${{ matrix.target }}, 'apple') uses: foundry-rs/foundry-toolchain@v1 + with: + version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" + - name: Install protobuf if: contains( ${{ matrix.target }}, 'apple') uses: arduino/setup-protoc@v3 diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index 225940d12..182e785f4 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -34,6 +34,8 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 + with: + version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" - name: Install latest nextest release uses: taiki-e/install-action@nextest diff --git a/Dockerfile b/Dockerfile index 0f4b1f594..07ff37211 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg- SHELL ["/bin/bash", "-c"] RUN curl -L https://foundry.paradigm.xyz | bash ENV PATH="/root/.foundry/bin:${PATH}" -RUN foundryup +RUN foundryup -v nightly-fe2acca4e379793539db80e032d76ffe0110298b RUN cargo install cargo-chef --locked diff --git a/Dockerfile.build b/Dockerfile.build index 2324e2af4..d5c5578bf 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,6 +1,6 @@ ARG CROSS_BASE_IMAGE -FROM ghcr.io/foundry-rs/foundry:nightly-ac802618e15039b31e464ae6d1fe3ee39f87cefd as foundry +FROM ghcr.io/foundry-rs/foundry:nightly-fe2acca4e379793539db80e032d76ffe0110298b as foundry FROM $CROSS_BASE_IMAGE COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge diff --git a/crates/pool/src/mempool/uo_pool.rs b/crates/pool/src/mempool/uo_pool.rs index 2af5ef6a5..b0d8f28e5 100644 --- a/crates/pool/src/mempool/uo_pool.rs +++ b/crates/pool/src/mempool/uo_pool.rs @@ -191,7 +191,10 @@ where tracing::error!("Failed to simulate handle op for gas limit efficiency check, failing open: {:?}", e); } Ok(Err(e)) => { - tracing::error!("Failed to simulate handle op for gas limit efficiency check, failing open: {:?}", e); + tracing::debug!( + "Validation error during gas limit efficiency check, failing open: {:?}", + e + ); } Ok(Ok(execution_res)) => { let total_gas_used: u128 = (execution_res.paid / U256::from(gas_price))