diff --git a/.github/workflows/ci-all-via-ir.yml b/.github/workflows/ci-all-via-ir.yml index 4bf8a063a..cfad0d155 100644 --- a/.github/workflows/ci-all-via-ir.yml +++ b/.github/workflows/ci-all-via-ir.yml @@ -46,6 +46,7 @@ jobs: forge test --use 0.8.17 --via-ir ) || ( [ "${{ matrix.profile }}" = "via-ir-3" ] && + forge test --use 0.8.31 --via-ir && forge test --use 0.8.30 --via-ir && forge test --use 0.8.29 --via-ir && forge test --use 0.8.28 --via-ir && diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e07df422..bc691c3e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - profile: [post-prague,post-prague-via-ir,solc-past-versions-0,solc-past-versions-1,via-ir,min-solc,min-solc-via-ir,intense] + profile: [post-osaka,post-osaka-via-ir,solc-past-versions-0,solc-past-versions-1,via-ir,min-solc,min-solc-via-ir,intense] steps: - uses: actions/checkout@v5 - name: Install Foundry Stable @@ -27,13 +27,13 @@ jobs: run: forge install - name: Run Tests with ${{ matrix.profile }} run: > - ( [ "${{ matrix.profile }}" = "post-prague" ] && - FOUNDRY_PROFILE=post_prague forge test --use 0.8.30 && - FOUNDRY_PROFILE=zksync forge test --use 0.8.30 + ( [ "${{ matrix.profile }}" = "post-osaka" ] && + FOUNDRY_PROFILE=post_osaka forge test --use 0.8.31 && + FOUNDRY_PROFILE=zksync forge test --use 0.8.31 ) || - ( [ "${{ matrix.profile }}" = "post-prague-via-ir" ] && - FOUNDRY_PROFILE=post_prague forge test --use 0.8.30 --via-ir && - FOUNDRY_PROFILE=zksync forge test --use 0.8.30 --via-ir + ( [ "${{ matrix.profile }}" = "post-osaka-via-ir" ] && + FOUNDRY_PROFILE=post_osaka forge test --use 0.8.31 --via-ir && + FOUNDRY_PROFILE=zksync forge test --use 0.8.31 --via-ir ) || ( [ "${{ matrix.profile }}" = "solc-past-versions-0" ] && FOUNDRY_PROFILE=pre_global_structs forge test --use 0.8.5 --fuzz-runs 16 && @@ -62,7 +62,8 @@ jobs: forge test --use 0.8.26 --fuzz-runs 16 && forge test --use 0.8.27 --fuzz-runs 16 && forge test --use 0.8.28 --fuzz-runs 16 && - forge test --use 0.8.29 --fuzz-runs 16 + forge test --use 0.8.29 --fuzz-runs 16 && + forge test --use 0.8.30 --fuzz-runs 16 ) || ( [ "${{ matrix.profile }}" = "via-ir" ] && diff --git a/foundry.toml b/foundry.toml index 0e9c6acc5..706888272 100644 --- a/foundry.toml +++ b/foundry.toml @@ -4,8 +4,8 @@ # The Default Profile [profile.default] -solc_version = "0.8.30" -evm_version = "paris" # Cancun will be tested in the CI. +solc_version = "0.8.31" +evm_version = "paris" # osaka will be tested in the CI. auto_detect_solc = false optimizer = true optimizer_runs = 1_000 @@ -20,8 +20,8 @@ remappings = [ skip = ["*/g/*", "*/*7702*", "*/*BlockHashLib*", "*/*Transient*", "*/ext/ithaca/*", "*/ext/zksync/*"] -[profile.post_prague] -evm_version = "prague" +[profile.post_osaka] +evm_version = "osaka" skip = ["*/ext/ithaca/*"] [profile.zksync]