Merge from v0.8.25

.circleci/config.yml

@@ -155,7 +155,7 @@ commands:
             )
             echo "export FOUNDRY_REPO=$FOUNDRY_REPO" >> "$BASH_ENV"
             echo "export FOUNDRY_VERSION=$FOUNDRY_VERSION" >> "$BASH_ENV"
-            echo "export FOUNDRY_RELEASE_TAG='nightly-${FOUNDRY_RELEASE_SHA}'" >> "$BASH_ENV"
+            echo "export FOUNDRY_RELEASE_TAG='${FOUNDRY_VERSION}'" >> "$BASH_ENV"
             # Save commit sha for caching
             echo "$FOUNDRY_RELEASE_SHA" > /tmp/workspace/foundry-release-sha
       - restore_cache:
@@ -220,11 +220,18 @@ commands:
           command: .circleci/soltest.sh
 
   run_soltest_all:
+    parameters:
+      # NOTE: If not specified, soltest_all.sh will use the default values as specified in the script.
+      # In other words, it will execute for all EVM versions that are not marked as deprecated.
+      evm_versions:
+        description: "List of EVM versions (separated by space)."
+        type: string
+        default: ""
     steps:
       - run:
           name: soltest_all
           no_output_timeout: 30m
-          command: .circleci/soltest_all.sh
+          command: .circleci/soltest_all.sh "<< parameters.evm_versions >>"
 
   run_cmdline_tests:
     steps:
@@ -242,6 +249,13 @@ commands:
   # --------------------------------------------------------------------------
   # Artifact Commands
 
+  remove_signature_from_universal_binary:
+    description: Remove signature from universal binary
+    steps:
+      - run:
+          name: Remove signature from universal binary
+          command: codesign --remove-signature build/solc/solc
+
   store_artifacts_solc:
     description: Store compiled solc executable as artifact
     steps:
@@ -498,7 +512,6 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j5
         CPUs: 5
-        ETH_EVMONE: /usr/local/lib/libevmone.dylib
 
   - base_python_small: &base_python_small
       docker:
@@ -716,11 +729,14 @@ defaults:
       image: cimg/node:14.20
       python2: true
 
-  - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
+  - job_native_compile_ext_gnosis: &job_native_compile_ext_gnosis
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_gnosis
+      name: t_native_compile_ext_gnosis
       project: gnosis
       binary_type: native
+      # NOTE: We are disabling the gnosis test suite due to version discrepancies that are difficult to fix.
+      #        Check again after (and if) https://github.com/safe-global/safe-contracts/pull/644 is merged.
+      compile_only: 1
       image: cimg/node:18.16
 
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
@@ -738,18 +754,24 @@ defaults:
       binary_type: native
       image: cimg/node:18.16
 
-  - job_native_test_ext_trident: &job_native_test_ext_trident
+  - job_native_compile_ext_trident: &job_native_compile_ext_trident
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_trident
+      name: t_native_compile_ext_trident
       project: trident
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       image: cimg/node:18.16
 
-  - job_native_test_ext_euler: &job_native_test_ext_euler
+  - job_native_compile_ext_euler: &job_native_compile_ext_euler
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_euler
+      name: t_native_compile_ext_euler
       project: euler
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       resource_class: medium
 
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
@@ -759,18 +781,24 @@ defaults:
       binary_type: native
       image: cimg/node:18.16
 
-  - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
+  - job_native_compile_ext_bleeps: &job_native_compile_ext_bleeps
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_bleeps
+      name: t_native_compile_ext_bleeps
       project: bleeps
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       resource_class: medium
 
-  - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
+  - job_native_compile_ext_pool_together: &job_native_compile_ext_pool_together
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_pool_together
+      name: t_native_compile_ext_pool_together
       project: pool-together
       binary_type: native
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
       image: cimg/node:18.16
 
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
@@ -810,19 +838,24 @@ defaults:
       binary_type: native
       image: cimg/node:18.16
 
-  - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
+  - job_native_compile_ext_chainlink: &job_native_compile_ext_chainlink
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_chainlink
+      name: t_native_compile_ext_chainlink
       project: chainlink
       binary_type: native
-      image: cimg/node:18.16
+      # NOTE: test suite disabled due to dependence on a specific version of Hardhat
+      # which does not support shanghai EVM.
+      compile_only: 1
+      image: cimg/node:16.20
       resource_class: large # Tests run out of memory on a smaller machine
 
-  - job_native_test_ext_gp2: &job_native_test_ext_gp2
+  - job_native_compile_ext_gp2: &job_native_compile_ext_gp2
       <<: *requires_b_ubu_static
-      name: t_native_test_ext_gp2
+      name: t_native_compile_ext_gp2
       project: gp2
       binary_type: native
+      # NOTE: test suite disabled due to constant failures.
+      compile_only: 1
       image: cimg/node:18.16
 
   - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
@@ -969,16 +1002,26 @@ jobs:
     <<: *base_ubuntu2204_small
     steps:
       - checkout
+      - run:
+          # TODO: Add these to the base image
+          name: Install gas_diff_stats.py dependencies
+          command: python3 -m pip install --user parsec tabulate
       - run:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
+      - run:
+          name: Smoke test for gas_diff_stats.py
+          command: scripts/gas_diff_stats.py
       - matrix_notify_failure_unless_pr
 
   t_win_pyscripts:
     <<: *base_win
     steps:
       - run: git config --global core.autocrlf false
       - checkout
+      - run:
+          name: Install dependencies
+          command: python -m pip install --user requests parsec tabulate
       - run:
           name: Python unit tests
           command: python.exe test/pyscriptTests.py
@@ -1155,6 +1198,7 @@ jobs:
       - checkout
       - install_dependencies_osx
       - run_build
+      - remove_signature_from_universal_binary
       - store_artifacts_solc
       - store_artifacts_yul_phaser
       - persist_executables_to_workspace_osx
@@ -1232,6 +1276,20 @@ jobs:
     steps:
       - soltest_all
 
+  t_ubu_soltest_deprecated_evm_versions: &t_ubu_soltest_deprecated_evm_versions
+    <<: *base_ubuntu2204_large
+    parallelism: 50
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - run_soltest_all:
+          evm_versions: homestead byzantium
+      - store_test_results:
+          path: test_results/
+      - store_artifacts_test_results
+      - matrix_notify_failure_unless_pr
+
   t_ubu_lsp: &t_ubu_lsp
     <<: *base_ubuntu2204_small
     steps:
@@ -1370,15 +1428,36 @@ jobs:
   t_ems_ext_hardhat:
     <<: *base_node_small
     docker:
-      - image: cimg/node:18.16
+      - image: cimg/rust:1.74.0-node
     environment:
       <<: *base_node_small_env
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
     steps:
       - checkout
       - attach_workspace:
           at: /tmp/workspace
-      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git
+      - run:
+          name: Ensure pnpm is installed if npm is present
+          command: sudo npm install -g pnpm
+      - run:
+          name: Retrieve Hardhat latest release tag
+          command: |
+            # Make authenticated requests when the Github token is available
+            if [[ -n "$GITHUB_ACCESS_TOKEN" ]]; then
+              EXTRA_HEADERS=(--header "Authorization: Bearer ${GITHUB_ACCESS_TOKEN}")
+            fi
+            HARDHAT_LATEST_RELEASE_TAG=$(
+              curl \
+                --silent \
+                --location \
+                --fail \
+                --show-error \
+                "${EXTRA_HEADERS[@]}" \
+                https://api.github.com/repos/nomiclabs/hardhat/releases/latest \
+                | jq --raw-output .tag_name \
+            )
+            echo "export HARDHAT_LATEST_RELEASE_TAG='${HARDHAT_LATEST_RELEASE_TAG}'" >> "$BASH_ENV"
+      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git --branch "$HARDHAT_LATEST_RELEASE_TAG"
       - run:
           name: Install dependencies
           command: |
@@ -1392,6 +1471,9 @@ jobs:
 
             # NOTE: This is expected to work without running `pnpm build` first.
             cd hardhat/packages/hardhat-core
+            # TODO: temporarily set hardhat stack traces tests to use cancun hardfork
+            # Remove this when hardhat switch to cancun by default: https://github.com/NomicFoundation/hardhat/issues/4851
+            sed -i 's/hardfork: "shanghai",/hardfork: "cancun",/' test/internal/hardhat-network/stack-traces/execution.ts
             pnpm test
       - matrix_notify_failure_unless_pr
 
@@ -1689,8 +1771,12 @@ jobs:
       # platforms so line ending conversions must absolutely be disabled.
       - run: git config --global core.autocrlf false
       - checkout
-      # Ensure windows has python3 alias required by prepare_bytecode_report
-      - run: ln -s /c/tools/miniconda3/python /c/tools/miniconda3/python3
+      - run:
+          name: Force install python3.12.2
+          command: choco install python3 --pre --force --version=3.12.2
+      - run:
+          name: Create a symlink for python3
+          command: ln -s /c/ProgramData/chocolatey/bin/python3.12 /c/ProgramData/chocolatey/bin/python3
       - attach_workspace:
           at: build
       - prepare_bytecode_report:
@@ -1828,9 +1914,7 @@ workflows:
 
       - t_ext: *job_ems_compile_ext_colony
 
-      # NOTE: We are disabling the gnosis test suite due to version discrepancies that are difficult to fix.
-      #       Check again after (and if) https://github.com/safe-global/safe-contracts/pull/644 is merged.
-      #- t_ext: *job_native_test_ext_gnosis
+      - t_ext: *job_native_compile_ext_gnosis
       - t_ext: *job_native_test_ext_zeppelin
       - t_ext: *job_native_test_ext_ens
       - t_ext: *job_native_test_ext_yield_liquidator
@@ -1839,42 +1923,38 @@ workflows:
       - t_ext: *job_native_test_ext_prb_math
       - t_ext: *job_native_test_ext_elementfi
       - t_ext: *job_native_test_ext_brink
-      # NOTE: We are disabling gp2 tests due to constant failures.
-      # - t_ext: *job_native_test_ext_gp2
-      # NOTE: The external tests below were commented because they
-      # depend on a specific version of hardhat which does not support shanghai EVM.
-      #- t_ext: *job_native_test_ext_trident
-      #- t_ext: *job_native_test_ext_euler
-      #- t_ext: *job_native_test_ext_bleeps
-      #- t_ext: *job_native_test_ext_pool_together
-      #- t_ext: *job_native_test_ext_chainlink
+      - t_ext: *job_native_compile_ext_gp2
+      - t_ext: *job_native_compile_ext_euler
+      - t_ext: *job_native_compile_ext_pool_together
+      # TODO: Dropping the external tests below since they are based on old forks and
+      # fail after update the default evm version to cancun.
+      #- t_ext: *job_native_compile_ext_trident
+      #- t_ext: *job_native_compile_ext_chainlink
+      #- t_ext: *job_native_compile_ext_bleeps
 
       - c_ext_benchmarks:
           <<: *requires_nothing
           requires:
             - t_ems_compile_ext_colony
-            # NOTE: We are disabling the gnosis test suite due to version discrepancies that are difficult to fix.
-            #       Check again after (and if) https://github.com/safe-global/safe-contracts/pull/644 is merged.
-            #- t_native_test_ext_gnosis
+            - t_native_compile_ext_gnosis
             - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
             - t_native_test_ext_yield_liquidator
             - t_native_test_ext_perpetual_pools
             - t_native_test_ext_uniswap
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
-            # NOTE: We are disabling gp2 tests due to constant failures.
-            #- t_native_test_ext_gp2
+            - t_native_compile_ext_gp2
             # TODO: Dropping prb-math from the benchmarks since it is not implemented yet
             # in the new Foundry external testing infrastructure.
             # - t_native_test_ext_prb_math
-            # NOTE: The external tests below were commented because they
-            # depend on a specific version of hardhat which does not support shanghai EVM.
-            #- t_native_test_ext_trident
-            #- t_native_test_ext_euler
-            #- t_native_test_ext_bleeps
-            #- t_native_test_ext_pool_together
-            #- t_native_test_ext_chainlink
+            - t_native_compile_ext_euler
+            - t_native_compile_ext_pool_together
+            # TODO: Dropping the external tests below since they are based on old forks and
+            # fail after update the default evm version to cancun.
+            #- t_native_compile_ext_trident
+            #- t_native_compile_ext_chainlink
+            #- t_native_compile_ext_bleeps
 
       # Windows build and tests
       - b_win: *requires_nothing

.circleci/soltest_all.sh

@@ -31,9 +31,12 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 # shellcheck source=scripts/common.sh
 source "${REPODIR}/scripts/common.sh"
 
-EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris shanghai cancun)
-DEFAULT_EVM=shanghai
-[[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
+DEFAULT_EVM_VALUES=(constantinople petersburg istanbul berlin london paris shanghai cancun)
+# Deserialize the EVM_VALUES array if it was provided as argument or
+# set EVM_VALUES to the default values.
+IFS=" " read -ra EVM_VALUES <<< "${1:-${DEFAULT_EVM_VALUES[@]}}"
+
+DEFAULT_EVM=cancun
 OPTIMIZE_VALUES=(0 1)
 
 # Run for ABI encoder v1, without SMTChecker tests.

CMakeLists.txt

@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.24")
+set(PROJECT_VERSION "0.8.25")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)