Merge from v0.8.29

.circleci/README.md

@@ -2,7 +2,7 @@
 
 ### Docker images
 
-The docker images are build locally on the developer machine:
+The docker images are built locally on the developer machine:
 
 ```sh
 cd .circleci/docker/
@@ -13,7 +13,7 @@ docker push ethereum/solidity-buildpack-deps:ubuntu2404-<revision>
 
 The current revisions per docker image are stored in [circle ci pipeline parameters](https://github.com/CircleCI-Public/api-preview-docs/blob/master/docs/pipeline-parameters.md#pipeline-parameters) called `<image-desc>-docker-image-rev` (e.g., `ubuntu-2404-docker-image-rev`). Please update the value assigned to the parameter(s) corresponding to the docker image(s) being updated at the time of the update. Please verify that the value assigned to the parameter matches the revision part of the docker image tag (`<revision>` in the docker build/push snippet shown above). Otherwise, the docker image used by circle ci and the one actually pushed to docker hub will differ.
 
-Once the docker image has been built and pushed to Dockerhub, you can find it at:
+Once the docker image has been built and pushed to Docker Hub, you can find it at:
 
     https://hub.docker.com/r/ethereum/solidity-buildpack-deps:ubuntu2404-<revision>
 

.circleci/build_win.ps1

@@ -18,7 +18,7 @@ else {
 mkdir build
 cd build
 $boost_dir=(Resolve-Path $PSScriptRoot\..\deps\boost\lib\cmake\Boost-*)
-..\deps\cmake\bin\cmake -G "Visual Studio 16 2019" -DBoost_DIR="$boost_dir\" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="$PSScriptRoot\..\upload" -DUSE_Z3=OFF ..
+..\deps\cmake\bin\cmake -G "Visual Studio 16 2019" -DBoost_DIR="$boost_dir\" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="$PSScriptRoot\..\upload" ..
 if ( -not $? ) { throw "CMake configure failed." }
 msbuild solidity.sln /p:Configuration=Release /m:10 /v:minimal
 if ( -not $? ) { throw "Build failed." }

.circleci/config.yml

@@ -9,25 +9,29 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-25
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:b3f321fb2d8e7a41ca9328672061c1840e5cd3fb5be503aa158d1c508deacf0a"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-26
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:1f387a77be889f65a2a25986a5c5eccc88cec23fabe6aeaf351790751145c81e"
+  ubuntu-2204-docker-image:
+    type: string
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:877fcc2589779f8245770711d10db92eda97d338dae76b6a9f27dde1a41b3aa0"
   ubuntu-2404-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-1
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:5d6d27551104321a30326d6024bd4e96d9d899a97a78eb9feea364996f1d18b5"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-3
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ef6a91d7f1434c67fb9e05c6136d80f71c0ad9198479e1a88e3437680993cda4"
   ubuntu-2404-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404.clang-2
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:bc99a858ba18e088c1cb889ce631e3e707bb3348f0ae452bfe69116dbb931173"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404.clang-4
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:97fb2d1bc002b3624161f539a1d29543c0e6c6f4d9a61f611b9b60e99e18f377"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-6
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8883fa2845bbc1e0922af60439313666e4ba325f67a117e17d78cca3ea6589b3"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-10
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:bd55d9a3b13c88608709ec442188c414d30f4c49f23dc2ce8b76bf8c90603fc7"
   emscripten-docker-image:
     type: string
     # NOTE: Please remember to update the `scripts/build_emscripten.sh` whenever the hash of this image changes.
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-17
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:c57f2bfb8c15d70fe290629358dd1c73dc126e3760f443b54764797556b887d4"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-20
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:98f963ed799a0d206ef8e7b5475f847e0dea53b7fdea9618bbc6106a62730bd2"
   evm-version:
     type: string
     default: cancun
@@ -503,15 +507,6 @@ defaults:
         MAKEFLAGS: -j5
         CPUs: 5
 
-  - base_python_small: &base_python_small
-      docker:
-        - image: cimg/python:3.6
-      resource_class: small
-      environment: &base_python_small_env
-        TERM: xterm
-        MAKEFLAGS: -j 2
-        CPUs: 2
-
   - base_ubuntu_clang: &base_ubuntu_clang
       docker:
         - image: << pipeline.parameters.ubuntu-clang-ossfuzz-docker-image >>
@@ -560,6 +555,42 @@ defaults:
         MAKEFLAGS: -j 10
         CPUs: 10
 
+  - base_ubuntu2204: &base_ubuntu2204
+      docker:
+        - image: << pipeline.parameters.ubuntu-2204-docker-image >>
+      environment: &base_ubuntu2204_env
+        TERM: xterm
+        CC: gcc
+        CXX: g++
+        MAKEFLAGS: -j 3
+        CPUs: 3
+
+  - base_ubuntu2204_large: &base_ubuntu2204_large
+      <<: *base_ubuntu2204
+      resource_class: large
+      environment: &base_ubuntu2204_large_env
+        <<: *base_ubuntu2204_env
+        MAKEFLAGS: -j 5
+        CPUs: 5
+
+  - base_ubuntu2204_clang: &base_ubuntu2204_clang
+      docker:
+        - image: << pipeline.parameters.ubuntu-2204-docker-image >>
+      environment: &base_ubuntu2204_clang_env
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 3
+        CPUs: 3
+
+  - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
+      <<: *base_ubuntu2204_clang
+      resource_class: large
+      environment: &base_ubuntu2204_clang_large_env
+        <<: *base_ubuntu2204_clang_env
+        MAKEFLAGS: -j 5
+        CPUs: 5
+
   - base_ubuntu2404: &base_ubuntu2404
       docker:
         - image: << pipeline.parameters.ubuntu-2404-docker-image >>
@@ -769,9 +800,6 @@ defaults:
       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
@@ -815,6 +843,8 @@ defaults:
       binary_type: native
       image: cimg/rust:1.74.0-node
       resource_class: medium
+      # TODO: Use nightly Foundry builds after https://github.com/PaulRBerg/prb-math/issues/248 is fixed
+      foundry_version: "v0.3.0"
 
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *requires_b_ubu_static
@@ -865,7 +895,7 @@ defaults:
 jobs:
 
   chk_spelling:
-    <<: *base_python_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - attach_workspace:
@@ -876,11 +906,7 @@ jobs:
             pip install --user codespell
       - run:
           name: Check spelling
-          command: |
-            ~/.local/bin/codespell \
-              --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt,deps" \
-              --ignore-words scripts/codespell_whitelist.txt \
-              --exclude-file scripts/codespell_ignored_lines.txt
+          command: ~/.local/bin/codespell
       - matrix_notify_failure_unless_pr
 
   chk_docs_examples:
@@ -918,7 +944,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   chk_errorcodes:
-    <<: *base_python_small
+    <<: *base_ubuntu2404_small
     steps:
       - checkout
       - run:
@@ -1023,6 +1049,8 @@ jobs:
       # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562#c27
       CMAKE_OPTIONS: -DSANITIZE=address -DPEDANTIC=OFF
       CMAKE_BUILD_TYPE: Release
+      # Set the number of jobs to two instead of the default three, so that we do not run out of memory
+      MAKEFLAGS: -j 2
     steps:
       - build
 
@@ -1058,10 +1086,10 @@ jobs:
     # to avoid glibc incompatibilities.
     # See: https://github.com/ethereum/solidity/issues/13954
     # On large runs 2x faster than on medium. 3x on xlarge.
-    <<: *base_ubuntu2004_xlarge
+    <<: *base_ubuntu2404_xlarge
     environment:
-      <<: *base_ubuntu2004_xlarge_env
-      CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DSOLC_STATIC_STDLIBS=ON
+      <<: *base_ubuntu2404_xlarge_env
+      CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DSOLC_LINK_STATIC=ON
     steps:
       - checkout
       - run_build
@@ -1078,16 +1106,18 @@ jobs:
             - solc/solc-static-linux
       - matrix_notify_failure_unless_pr
 
-  # Builds in C++20 mode and uses debug build in order to speed up.
-  # Do *NOT* store any artifacts or workspace as we don't run tests on this build.
-  b_ubu_cxx20:
-    <<: *base_ubuntu2404_large
+  b_ubu_2204:
+    <<: *base_ubuntu2204_large
+    steps:
+      - checkout
+      - run_build
+      - matrix_notify_failure_unless_pr
+
+  b_ubu_2204_clang:
+    <<: *base_ubuntu2204_clang_large
     environment:
-      <<: *base_ubuntu2404_large_env
-      CMAKE_BUILD_TYPE: Debug
-      # gold is more memory-efficient than the default, allows us to stay with the "large" resource class without OOM errors
-      CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_FLAGS=-fuse-ld=gold
-      MAKEFLAGS: -j 6
+      <<: *base_ubuntu2204_clang_large_env
+      MAKEFLAGS: -j 10
     steps:
       - checkout
       - run_build
@@ -1122,8 +1152,6 @@ jobs:
     <<: *base_archlinux_large
     environment:
       <<: *base_archlinux_large_env
-      # This can be switched off if we run out of sync with Arch.
-      USE_Z3: ON
     steps:
       - run:
           name: Install build dependencies
@@ -1155,6 +1183,7 @@ jobs:
     environment:
       <<: *base_osx_env
       EVM: << pipeline.parameters.evm-version >>
+      EOF_VERSION: 0
       OPTIMIZE: 0
     steps:
       - checkout
@@ -1247,6 +1276,7 @@ jobs:
     environment:
       <<: *base_archlinux_env
       EVM: << pipeline.parameters.evm-version >>
+      EOF_VERSION: 0
       OPTIMIZE: 0
       # For Archlinux we do not have prebuilt docker images and we would need to build evmone from source,
       # thus we forgo semantics tests to speed things up.
@@ -1264,6 +1294,7 @@ jobs:
     environment:
       <<: *base_ubuntu2404_clang_env
       EVM: << pipeline.parameters.evm-version >>
+      EOF_VERSION: 0
       OPTIMIZE: 0
       # The high parallelism in this job is causing the SMT tests to run out of memory,
       # so disabling for now.
@@ -1313,6 +1344,7 @@ jobs:
     environment:
       <<: *base_ubuntu2404_env
       EVM: << pipeline.parameters.evm-version >>
+      EOF_VERSION: 0
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
@@ -1328,6 +1360,7 @@ jobs:
     environment:
       <<: *base_ubuntu2404_clang_env
       EVM: << pipeline.parameters.evm-version >>
+      EOF_VERSION: 0
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
@@ -1340,6 +1373,7 @@ jobs:
     environment:
       <<: *base_ubuntu2404_clang_env
       EVM: << pipeline.parameters.evm-version >>
+      EOF_VERSION: 0
       SOLTEST_FLAGS: --no-smt
     steps:
       - soltest
@@ -1372,11 +1406,12 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   t_ems_ext_edr:
-    <<: *base_node_small
+    # Runs out of memory on the small instance
+    <<: *base_ubuntu2404
     docker:
       - image: cimg/rust:1.79.0-node
     environment:
-      <<: *base_node_small_env
+      <<: *base_ubuntu2404_env
       EDR_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
     steps:
       - checkout
@@ -1440,6 +1475,9 @@ jobs:
       python2:
         type: boolean
         default: false
+      foundry_version:
+        type:  string
+        default: "nightly"
     docker:
       - image: << parameters.image >>
     resource_class: << parameters.resource_class >>
@@ -1453,7 +1491,8 @@ jobs:
       - checkout
       - attach_workspace:
           at: /tmp/workspace
-      - install_foundry
+      - install_foundry:
+          version: << parameters.foundry_version >>
       - run:
           name: Ensure pnpm is installed if npm is present
           command: |
@@ -1466,6 +1505,7 @@ jobs:
             - run:
                 name: Install Python 2 and make it the default
                 command: |
+                  sudo apt update
                   # python is used by node-gyp to build native modules (needed for Colony).
                   # In the 14.x image node-gyp still requires Python 2.
                   sudo apt install python2 --assume-yes --no-install-recommends
@@ -1836,8 +1876,9 @@ workflows:
 
       # build-only
       - b_docs: *requires_nothing
-      - b_ubu_cxx20: *requires_nothing
       - b_ubu_ossfuzz: *requires_nothing
+      - b_ubu_2204: *requires_nothing
+      - b_ubu_2204_clang: *requires_nothing
 
       # OS/X build and tests
       - b_osx: *requires_nothing