solidity-docs · soldocsbot · Mar 17, 2025 · Mar 20, 2025 · Mar 19, 2025 · Mar 17, 2025
diff --git a/CMakeLists.txt b/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.31")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
@@ -34,19 +34,39 @@ endif()
 
 option(SOLC_LINK_STATIC "Link solc executable statically on supported platforms" OFF)
 option(SOLC_STATIC_STDLIBS "Link solc against static versions of libgcc and libstdc++ on supported platforms" OFF)
-option(STRICT_Z3_VERSION "Use the latest version of Z3" ON)
+option(STRICT_Z3_VERSION "Require the exact version of Z3 solver expected by our test suite." ON)
 option(PEDANTIC "Enable extra warnings and pedantic build flags. Treat all warnings as errors." ON)
 option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser steps." OFF)
+option(
+	IGNORE_VENDORED_DEPENDENCIES
+	"Ignore libraries provided as submodules of the repository and allow CMake to look for \
+them in the typical locations, including system-wide dirs."
+	OFF
+)
+option(
+	ONLY_BUILD_SOLIDITY_LIBRARIES
+	"Only build library targets that can be statically linked against. Do not build executables or tests."
+	OFF
+)
+mark_as_advanced(PROFILE_OPTIMIZER_STEPS)
+mark_as_advanced(IGNORE_VENDORED_DEPENDENCIES)
+mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
 
 # Setup cccache.
 include(EthCcache)
 
 # Let's find our dependencies
 include(EthDependencies)
-include(fmtlib)
-include(jsoncpp)
-include(range-v3)
-include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
+if (NOT IGNORE_VENDORED_DEPENDENCIES)
+  include(fmtlib)
+  include(nlohmann-json)
+  include(range-v3)
+else ()
+  message(WARNING "-- Ignoring vendored dependencies. Will use installed versions if found. Versions may differ from the ones the compiler was tested with. Make sure to run the test suite and thoroughly test the resulting binaries before using them in production.")
+  find_package(fmt REQUIRED)
+  find_package(nlohmann_json REQUIRED)
+  find_package(range-v3 REQUIRED)
+endif()
 
 find_package(Threads)
 
@@ -75,62 +95,31 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/license.h.in" include/lice
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.12.1")
-set(MINIMUM_Z3_VERSION "4.8.16")
-find_package(Z3)
-if (${Z3_FOUND})
-  if (${STRICT_Z3_VERSION})
-    if (NOT ("${Z3_VERSION_STRING}" VERSION_EQUAL ${LATEST_Z3_VERSION}))
-      message(
-        FATAL_ERROR
-        "SMTChecker tests require Z3 ${LATEST_Z3_VERSION} for all tests to pass.\n\
-Build with -DSTRICT_Z3_VERSION=OFF if you want to use a different version. \
-You can also use -DUSE_Z3=OFF to build without Z3. In both cases use --no-smt when running tests."
-      )
-    endif()
-  else()
-    if ("${Z3_VERSION_STRING}" VERSION_LESS ${MINIMUM_Z3_VERSION})
-      message(
-        FATAL_ERROR
-        "Solidity requires Z3 ${MINIMUM_Z3_VERSION} or newer. You can also use -DUSE_Z3=OFF to build without Z3."
-      )
-    endif()
-  endif()
-endif()
 
-if(${USE_Z3_DLOPEN})
-  add_definitions(-DHAVE_Z3)
-  add_definitions(-DHAVE_Z3_DLOPEN)
-  find_package(Python3 COMPONENTS Interpreter)
-  if(${Z3_FOUND})
-    get_target_property(Z3_HEADER_HINTS z3::libz3 INTERFACE_INCLUDE_DIRECTORIES)
-  endif()
-  find_path(Z3_HEADER_PATH z3.h HINTS ${Z3_HEADER_HINTS})
-  if(Z3_HEADER_PATH)
-    set(Z3_FOUND TRUE)
-  else()
-    message(SEND_ERROR "Dynamic loading of Z3 requires Z3 headers to be present at build time.")
-  endif()
-  if(NOT ${Python3_FOUND})
-    message(SEND_ERROR "Dynamic loading of Z3 requires Python 3 to be present at build time.")
-  endif()
-  if(${SOLC_LINK_STATIC})
-    message(SEND_ERROR "solc cannot be linked statically when dynamically loading Z3.")
-  endif()
-elseif (${Z3_FOUND})
-  add_definitions(-DHAVE_Z3)
-  message("Z3 SMT solver found. This enables optional SMT checking with Z3.")
-endif()
-
-find_package(CVC4 QUIET)
-if (${CVC4_FOUND})
-  add_definitions(-DHAVE_CVC4)
-  message("CVC4 SMT solver found. This enables optional SMT checking with CVC4.")
-endif()
-
-if (NOT (${Z3_FOUND} OR ${CVC4_FOUND}))
-  message("No SMT solver found (or it has been forcefully disabled). Optional SMT checking will not be available.\
-  \nPlease install Z3 or CVC4 or remove the option disabling them (USE_Z3, USE_CVC4).")
+if(EMSCRIPTEN)
+    set(TESTED_Z3_VERSION "4.13.3")
+    set(MINIMUM_Z3_VERSION "4.8.16")
+    find_package(Z3)
+    if (${Z3_FOUND})
+      add_definitions(-DEMSCRIPTEN_BUILD)
+      if (${STRICT_Z3_VERSION})
+        if (NOT ("${Z3_VERSION_STRING}" VERSION_EQUAL ${TESTED_Z3_VERSION}))
+          message(
+            FATAL_ERROR
+            "SMTChecker tests require Z3 ${TESTED_Z3_VERSION} for all tests to pass.\n"
+          )
+        endif()
+      else()
+        if ("${Z3_VERSION_STRING}" VERSION_LESS ${MINIMUM_Z3_VERSION})
+          message(
+            FATAL_ERROR
+            "Solidity requires Z3 ${MINIMUM_Z3_VERSION} or newer."
+          )
+        endif()
+      endif()
+    else()
+        message(FATAL_ERROR "Solidity requires Z3 for emscripten build.")
+    endif()
 endif()
 
 add_subdirectory(libsolutil)
@@ -141,12 +130,15 @@ add_subdirectory(libyul)
 add_subdirectory(libsolidity)
 add_subdirectory(libsolc)
 add_subdirectory(libstdlib)
-add_subdirectory(tools)
 
-if (NOT EMSCRIPTEN)
-	add_subdirectory(solc)
-endif()
+if (NOT ONLY_BUILD_SOLIDITY_LIBRARIES)
+	add_subdirectory(tools)
 
-if (TESTS AND NOT EMSCRIPTEN)
-	add_subdirectory(test)
+	if (NOT EMSCRIPTEN)
+		add_subdirectory(solc)
+	endif()
+
+	if (TESTS AND NOT EMSCRIPTEN)
+		add_subdirectory(test)
+	endif()
 endif()
diff --git a/docs/050-breaking-changes.rst b/docs/050-breaking-changes.rst
@@ -2,9 +2,17 @@
 Solidity v0.5.0 重大变化
 ********************************
 
+<<<<<<< HEAD
 本节强调了 Solidity 0.5.0 版本中引入的主要重大变化，
 以及这些变化背后的原因和如何更新受影响的代码。
 对于完整的列表，请查看 `版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.5.0>`_。
+=======
+This section highlights the main breaking changes introduced in Solidity
+version 0.5.0, along with the reasoning behind the changes and how to update
+affected code.
+For the full list check
+`the release changelog <https://github.com/argotorg/solidity/releases/tag/v0.5.0>`_.
+>>>>>>> english/develop
 
 .. note::
    用 Solidity v0.5.0 编译的合约仍然可以与合约甚至用旧版本编译的库对接，

diff --git a/docs/060-breaking-changes.rst b/docs/060-breaking-changes.rst
@@ -2,8 +2,16 @@
 Solidity 0.6.0 重大变化
 ********************************
 
+<<<<<<< HEAD
 本节强调了 Solidity 0.6.0 版本中引入的主要重大变化，以及这些变化背后的原因和如何更新受影响的代码。
 对于完整的列表，请查看 `版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.6.0>`_。
+=======
+This section highlights the main breaking changes introduced in Solidity
+version 0.6.0, along with the reasoning behind the changes and how to update
+affected code.
+For the full list check
+`the release changelog <https://github.com/argotorg/solidity/releases/tag/v0.6.0>`_.
+>>>>>>> english/develop
 
 
 编译器可能不会发出警告的变化

diff --git a/docs/070-breaking-changes.rst b/docs/070-breaking-changes.rst
@@ -2,9 +2,17 @@
 Solidity v0.7.0 重大变化
 ********************************
 
+<<<<<<< HEAD
 本节强调了 Solidity 0.7.0 版本中引入的主要重大变化，
 以及这些变化背后的原因和如何更新受影响的代码。
 对于完整的列表，请查看 `版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.7.0>`_。
+=======
+This section highlights the main breaking changes introduced in Solidity
+version 0.7.0, along with the reasoning behind the changes and how to update
+affected code.
+For the full list check
+`the release changelog <https://github.com/argotorg/solidity/releases/tag/v0.7.0>`_.
+>>>>>>> english/develop
 
 
 语义的微小变化

diff --git a/docs/080-breaking-changes.rst b/docs/080-breaking-changes.rst
@@ -2,8 +2,15 @@
 Solidity v0.8.0 重大变化
 ********************************
 
+<<<<<<< HEAD
 本节强调了 Solidity 0.8.0 版本中引入的主要重大变化。对于完整的列表，请查看
 `版本更新日志 <https://github.com/ethereum/solidity/releases/tag/v0.8.0>`_。
+=======
+This section highlights the main breaking changes introduced in Solidity
+version 0.8.0.
+For the full list check
+`the release changelog <https://github.com/argotorg/solidity/releases/tag/v0.8.0>`_.
+>>>>>>> english/develop
 
 语义的微小变化
 ===============================
@@ -132,8 +139,13 @@ Solidity v0.8.0 重大变化
 * ``--combined-json`` 的输出已经改变。JSON字段 ``abi``, ``devdoc``, ``userdoc`` 和
   ``storage-layout`` 现在是子对象。在0.8.0之前，它们曾被序列化为字符串。
 
+<<<<<<< HEAD
 * “传统AST“ 已被删除（ ``--ast-json`` 在命令行界面， ``legacyAST`` 用于标准JSON）。
   使用 “紧凑型AST”（ ``--ast-compact-json`` 参数. ``AST``）作为替代。
+=======
+* The "legacy AST" has been removed (``--ast-json`` on the commandline interface and ``legacyAST`` for standard JSON).
+  Use the "compact AST" (``--ast-compact-json`` resp. ``AST``) as replacement.
+>>>>>>> english/develop
 
 * 旧的错误报告器（ ``--old-reporter`` ）已经被删除。
 

diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
@@ -93,7 +93,7 @@ h1 {
 }
 
 section:first-of-type h1:first-of-type {
-    font-family: 'Overpass mono', monospace;
+    font-family: 'Overpass Mono', monospace;
     font-size: 48px;
     margin-top: 3rem;
     margin-bottom: 5rem;
@@ -229,7 +229,7 @@ small * {
 .wy-side-nav-search {
     background-color: transparent !important;
     color: var(--color-a) !important;
-    box-shadow: 0 4 4 0 var(--color-a);
+    box-shadow: 0 4px 4px 0 var(--color-a);
     border-bottom: 1px solid var(--color-d) !important;
 }
 
@@ -823,4 +823,4 @@ a.skip-to-content:focus {
 #content {
     scroll-margin-top: 6rem;
     scroll-behavior: smooth;
-}
+}
diff --git a/docs/_static/css/toggle.css b/docs/_static/css/toggle.css
@@ -85,4 +85,9 @@ html.transition *:after {
 
 .wy-menu-vertical a:hover {
     background-color: #0002;
+}
+
+body {
+    font-weight: 300;
+    letter-spacing: 0.5px;
 }
diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
@@ -16,7 +16,11 @@
 我们假设合约的接口函数是强类型的，在编译时就知道，并且是静态的。
 我们假设所有合约在编译时都有它们所调用的任何合约的接口定义。
 
+<<<<<<< HEAD
 本规范不涉及其接口是动态的或其他只有在运行时才知道的合约。
+=======
+This specification does not address contracts whose interface is dynamic or otherwise known only at run-time. Also, the ABI specification for libraries is :ref:`slightly different <library-selectors>`.
+>>>>>>> english/develop
 
 .. _abi_function_selector:
 .. index:: ! selector; of a function
@@ -44,7 +48,13 @@
 类型
 =====
 
+<<<<<<< HEAD
 以下是基础类型：
+=======
+Note that the library ABIs can take types different than below e.g. for non-storage structs. See :ref:`library selectors <library-selectors>` for details.
+
+The following elementary types exist:
+>>>>>>> english/develop
 
 - ``uint<M>``： ``M`` 位的无符号整数， ``0 < M <= 256``， ``M % 8 == 0``。例如： ``uint32``， ``uint8``， ``uint256``。