diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f7fe58aca..ebaaf091f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,7 +29,7 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 with: - version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" + version: "v0.3.0" # Build to generate the ABI bindings. - name: cargo build diff --git a/.github/workflows/compliance.yaml b/.github/workflows/compliance.yaml index 414549366..f6c294199 100644 --- a/.github/workflows/compliance.yaml +++ b/.github/workflows/compliance.yaml @@ -25,7 +25,7 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 with: - version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" + version: "v0.3.0" - uses: KengoTODA/actions-setup-docker-compose@v1 with: diff --git a/.github/workflows/compliance_v06.yaml b/.github/workflows/compliance_v06.yaml index 0ec61e281..3102cb04a 100644 --- a/.github/workflows/compliance_v06.yaml +++ b/.github/workflows/compliance_v06.yaml @@ -22,6 +22,11 @@ jobs: path: rundler submodules: recursive + - name: Install Foundry + uses: foundry-rs/foundry-toolchain@v1 + with: + version: "v0.3.0" + - uses: KengoTODA/actions-setup-docker-compose@v1 with: version: '2.14.2' diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3a42b1d6b..d67257a90 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -64,7 +64,7 @@ jobs: if: contains( ${{ matrix.target }}, 'apple') uses: foundry-rs/foundry-toolchain@v1 with: - version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" + version: "v0.3.0" - name: Install protobuf if: contains( ${{ matrix.target }}, 'apple') diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index f62badb15..270f0a647 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -35,7 +35,7 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 with: - version: "nightly-fe2acca4e379793539db80e032d76ffe0110298b" + version: "v0.3.0" - name: Install latest nextest release uses: taiki-e/install-action@nextest diff --git a/Dockerfile b/Dockerfile index b734e4c35..98c5ab56c 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 -i nightly-fe2acca4e379793539db80e032d76ffe0110298b +RUN foundryup -i v0.3.0 RUN cargo install cargo-chef --locked diff --git a/Dockerfile.build b/Dockerfile.build index d5c5578bf..35f03015b 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,6 +1,6 @@ ARG CROSS_BASE_IMAGE -FROM ghcr.io/foundry-rs/foundry:nightly-fe2acca4e379793539db80e032d76ffe0110298b as foundry +FROM ghcr.io/foundry-rs/foundry:v0.3.0 as foundry FROM $CROSS_BASE_IMAGE COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge @@ -19,4 +19,3 @@ RUN apt-get update && apt-get install -y unzip RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip \ && unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local \ && chmod +x /usr/local/bin/protoc - diff --git a/crates/contracts/src/v0_7.rs b/crates/contracts/src/v0_7.rs index 013e7afbb..ddbed0a2e 100644 --- a/crates/contracts/src/v0_7.rs +++ b/crates/contracts/src/v0_7.rs @@ -248,7 +248,7 @@ const __ENTRY_POINT_SIMULATIONS_V0_7_DEPLOYED_BYTECODE_HEX: &[u8] = include_byte "../contracts/out/v0_7/EntryPointSimulations.sol/EntryPointSimulations_deployedBytecode.txt" ); -const __ENTRY_POINT_SIMULATIONS_V0_7_DEPLOYED_BYTECODE: [u8; 16893] = { +const __ENTRY_POINT_SIMULATIONS_V0_7_DEPLOYED_BYTECODE: [u8; 16494] = { match const_hex::const_decode_to_array(__ENTRY_POINT_SIMULATIONS_V0_7_DEPLOYED_BYTECODE_HEX) { Ok(a) => a, Err(_) => panic!("Failed to decode entry point simulations hex"), @@ -263,7 +263,7 @@ const __CALL_GAS_ESTIMATION_PROXY_V0_7_DEPLOYED_BYTECODE_HEX: &[u8] = include_by "../contracts/out/v0_7/CallGasEstimationProxy.sol/CallGasEstimationProxy_deployedBytecode.txt" ); -const __CALL_GAS_ESTIMATION_PROXY_V0_7_DEPLOYED_BYTECODE: [u8; 3558] = { +const __CALL_GAS_ESTIMATION_PROXY_V0_7_DEPLOYED_BYTECODE: [u8; 3421] = { match const_hex::const_decode_to_array(__CALL_GAS_ESTIMATION_PROXY_V0_7_DEPLOYED_BYTECODE_HEX) { Ok(a) => a, Err(_) => panic!("Failed to decode call gas estimation proxy hex"), diff --git a/crates/sim/src/estimation/v0_6.rs b/crates/sim/src/estimation/v0_6.rs index faafecf10..fe609daa4 100644 --- a/crates/sim/src/estimation/v0_6.rs +++ b/crates/sim/src/estimation/v0_6.rs @@ -412,7 +412,7 @@ impl CallGasEstimatorSpecialization for CallGasEstimatorSpecializationV06 { /// /// The easiest way to get the updated value is to run this module's tests. The /// failure will tell you the new value. -const PROXY_TARGET_OFFSET: usize = 163; +const PROXY_TARGET_OFFSET: usize = 159; // Replaces the address of the proxy target where it appears in the proxy // bytecode so we don't need the same fixed address every time. diff --git a/crates/sim/src/estimation/v0_7.rs b/crates/sim/src/estimation/v0_7.rs index cb9c294f6..de45b2144 100644 --- a/crates/sim/src/estimation/v0_7.rs +++ b/crates/sim/src/estimation/v0_7.rs @@ -487,7 +487,7 @@ impl CallGasEstimatorSpecialization for CallGasEstimatorSpecializationV07 { /// /// The easiest way to get the updated value is to run this module's tests. The /// failure will tell you the new value. -const PROXY_TARGET_OFFSET: usize = 163; +const PROXY_TARGET_OFFSET: usize = 159; // Replaces the address of the proxy target where it appears in the proxy // bytecode so we don't need the same fixed address every time. diff --git a/docs/developing.md b/docs/developing.md index 94daa0ea4..2dc9ddd69 100644 --- a/docs/developing.md +++ b/docs/developing.md @@ -12,13 +12,13 @@ git submodule update --init --recursive 2. Install prerequisites -* [Rust/Cargo](https://www.rust-lang.org/tools/install): 1.72 or higher with nightly +* [Rust/Cargo](https://www.rust-lang.org/tools/install): 1.83 or higher with nightly * [Cocogitto](https://github.com/cocogitto/cocogitto): Commit linting * [Docker](https://docs.docker.com/engine/install/): Run spec tests * [PDM](https://pdm.fming.dev/latest/#installation): Run spec tests * [Protoc](https://grpc.io/docs/protoc-installation/): Compile protobuf * [Buf](https://buf.build/docs/installation): Protobuf linting -* [Foundry](https://book.getfoundry.sh/getting-started/installation): Compile contracts +* [Foundry ^0.3.0](https://book.getfoundry.sh/getting-started/installation): Compile contracts ## Build & Test