Merge pull request #7219 from ethereum/develop

Merge develop into release.

Author: chriseth

.circleci/README.md

@@ -9,9 +9,6 @@ cd .circleci/docker/
 
 docker build -t ethereum/solc-buildpack-deps:ubuntu1904 -f Dockerfile.ubuntu1904 .
 docker push solidity/solc-buildpack-deps:ubuntu1904
-
-docker build -t ethereum/solc-buildpack-deps:archlinux -f Dockerfile.archlinux .
-docker push solidity/solc-buildpack-deps:archlinux
 ```
 
 which you can find on Dockerhub after the push at:

.circleci/config.yml

@@ -36,8 +36,9 @@ defaults:
         mkdir -p build
         cd build
         protoc --proto_path=../test/tools/ossfuzz yulProto.proto --cpp_out=../test/tools/ossfuzz
+        protoc --proto_path=../test/tools/ossfuzz abiV2Proto.proto --cpp_out=../test/tools/ossfuzz
         cmake .. -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} $CMAKE_OPTIONS
-        make ossfuzz ossfuzz_proto -j4
+        make ossfuzz ossfuzz_proto ossfuzz_abiv2 -j4
 
   - run_proofs: &run_proofs
       name: Correctness proofs for optimization rules
@@ -69,6 +70,7 @@ defaults:
   - artifacts_executables_ossfuzz: &artifacts_executables_ossfuzz
       root: build
       paths:
+        - test/tools/ossfuzz/abiv2_proto_ossfuzz
         - test/tools/ossfuzz/const_opt_ossfuzz
         - test/tools/ossfuzz/solc_noopt_ossfuzz
         - test/tools/ossfuzz/solc_opt_ossfuzz
@@ -179,7 +181,23 @@ jobs:
             pip install --user codespell
       - run:
           name: Check spelling
-          command: ~/.local/bin/codespell -S "*.enc,.git" -I ./scripts/codespell_whitelist.txt
+          command: ~/.local/bin/codespell -S "*.enc,.git,Dockerfile*" -I ./scripts/codespell_whitelist.txt
+
+  chk_docs_examples:
+    docker:
+      - image: circleci/node
+    environment:
+      TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - run:
+          name: JS deps
+          command: sudo npm install -g solhint
+      - run:
+          name: Test Docs examples
+          command: ./test/docsCodeStyle.sh
 
   chk_coding_style:
     docker:
@@ -231,6 +249,18 @@ jobs:
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
 
+  b_ubu18: &build_ubuntu1804
+    docker:
+      - image: ethereum/solidity-buildpack-deps:ubuntu1804
+    environment:
+      CMAKE_OPTIONS: -DCMAKE_CXX_FLAGS=-O2
+      CMAKE_BUILD_TYPE: RelWithDebugInfo
+    steps:
+      - checkout
+      - run: *run_build
+      - store_artifacts: *artifacts_solc
+      - persist_to_workspace: *artifacts_executables
+
   b_ubu_codecov:
     <<: *build_ubuntu1904
     environment:
@@ -252,7 +282,7 @@ jobs:
           at: build
       - run:
           name: "soltest: Syntax Tests"
-          command: build/test/soltest -t 'syntaxTest*' -- --no-ipc --testpath test
+          command: build/test/soltest -t 'syntaxTest*' -- --testpath test
       - run:
           name: "Code Coverage: Syntax Tests"
           command: codecov --flags syntax --gcov-root build
@@ -303,10 +333,14 @@ jobs:
 
   b_archlinux:
     docker:
-      - image: ethereum/solidity-buildpack-deps:archlinux
+      - image: archlinux/base
     environment:
       TERM: xterm
     steps:
+      - run:
+          name: Install build dependencies
+          command: |
+            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake z3 cvc4 git openssh tar
       - checkout
       - run: *run_build
       - store_artifacts: *artifacts_solc
@@ -444,7 +478,6 @@ jobs:
     environment:
       EVM: constantinople
       OPTIMIZE: 0
-      SOLTEST_IPC: 0
       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
 
   t_ubu_homestead:
@@ -572,6 +605,7 @@ workflows:
       # basic checks
       - chk_spelling: *workflow_trigger_on_tags
       - chk_coding_style: *workflow_trigger_on_tags
+      - chk_docs_examples: *workflow_trigger_on_tags
       - chk_buglist: *workflow_trigger_on_tags
       - chk_proofs: *workflow_trigger_on_tags
 
@@ -587,6 +621,7 @@ workflows:
 
       # Ubuntu 18.10 build and tests
       - b_ubu: *workflow_trigger_on_tags
+      - b_ubu18: *workflow_trigger_on_tags
       - t_ubu_cli: *workflow_ubuntu1904
       - t_ubu_homestead: *workflow_ubuntu1904
       - t_ubu_homestead_opt: *workflow_ubuntu1904
@@ -631,4 +666,3 @@ workflows:
       # Code Coverage enabled build and tests
       - b_ubu_codecov: *workflow_trigger_on_tags
       - t_ubu_codecov: *workflow_ubuntu1904_codecov
-

.circleci/docker/Dockerfile.archlinux

@@ -21,11 +21,14 @@
 #
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
-FROM buildpack-deps:disco
+FROM buildpack-deps:disco AS base
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN set -ex; \
+	dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
+	echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
+	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
 	apt-get update; \
 	apt-get install -qqy --no-install-recommends \
 		build-essential \
@@ -34,21 +37,14 @@ RUN set -ex; \
 		libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		libjsoncpp-dev \
-		llvm-8-dev libcvc4-dev libleveldb1d \
+		llvm-8-dev libcvc4-dev libz3-static-dev libleveldb1d \
 		; \
 	apt-get install -qy python-pip python-sphinx; \
 	update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-8 1; \
 	pip install codecov; \
 	rm -rf /var/lib/apt/lists/*
 
-# Aleth for end-to-end tests
-ARG ALETH_VERSION="1.6.0"
-ARG ALETH_HASH="7f7004e1563299bc57882e32b32e4a195747dfb6"
-ARG ALETH_URL="https://github.com/ethereum/aleth/releases/download/v${ALETH_VERSION}/aleth-${ALETH_VERSION}-linux-x86_64.tar.gz"
-RUN set -ex; \
-	wget -q -O /tmp/aleth.tar.gz "${ALETH_URL}"; \
-	test "$(shasum /tmp/aleth.tar.gz)" = "$ALETH_HASH  /tmp/aleth.tar.gz"; \
-	tar -xf /tmp/aleth.tar.gz -C /usr
+FROM base AS libraries
 
 # Z3
 RUN set -ex; \
@@ -60,21 +56,23 @@ RUN set -ex; \
 	ninja install/strip; \
 	rm -rf /usr/src/z3
 
-# OSSFUZZ: LPM package (do not remove build dirs as solidity compiles/links against that dir)
+# OSSFUZZ: libprotobuf-mutator
 RUN set -ex; \
-	mkdir /src; \
-	cd /src; \
-	git clone https://github.com/google/libprotobuf-mutator.git; \
-	cd libprotobuf-mutator; \
+	git clone https://github.com/google/libprotobuf-mutator.git \
+	    /usr/src/libprotobuf-mutator; \
+	cd /usr/src/libprotobuf-mutator; \
 	git checkout d1fe8a7d8ae18f3d454f055eba5213c291986f21; \
-	mkdir ../LPM; \
-	cd ../LPM; \
-	cmake ../libprotobuf-mutator -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON -DLIB_PROTO_MUTATOR_TESTING=OFF -DCMAKE_BUILD_TYPE=Release; \
+	mkdir build; \
+	cd build; \
+	cmake .. -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \
+        -DLIB_PROTO_MUTATOR_TESTING=OFF -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX="/usr"; \
 	ninja; \
 	cp -vpr external.protobuf/bin/* /usr/bin/; \
 	cp -vpr external.protobuf/include/* /usr/include/; \
 	cp -vpr external.protobuf/lib/* /usr/lib/; \
-	ninja install/strip
+	ninja install/strip; \
+	rm -rf /usr/src/libprotobuf-mutator
 
 # OSSFUZZ: libfuzzer
 RUN set -ex; \
@@ -113,12 +111,16 @@ RUN set -ex; \
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.1.0" --recurse-submodules https://github.com/chfast/evmone.git; \
+	git clone --branch="v0.1.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
+	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
 	ninja; \
 	ninja install/strip; \
 	rm -rf /usr/src/evmone
 
+FROM base
+COPY --from=libraries /usr/lib /usr/lib
+COPY --from=libraries /usr/bin /usr/bin
+COPY --from=libraries /usr/include /usr/include

.circleci/docker/Dockerfile.ubuntu1904

@@ -36,27 +36,17 @@ set -e
 OPTIMIZE=${OPTIMIZE:-"0"}
 EVM=${EVM:-"invalid"}
 WORKDIR=${CIRCLE_WORKING_DIRECTORY:-.}
-SOLTEST_IPC=${SOLTEST_IPC:-1}
 REPODIR="$(realpath $(dirname $0)/..)"
-ALETH_PATH="/usr/bin/aleth"
 
 source "${REPODIR}/scripts/common.sh"
 # Test result output directory (CircleCI is reading test results from here)
 mkdir -p test_results
 
-ALETH_PID=$(run_aleth)
-
-function cleanup() {
-	safe_kill $ALETH_PID $ALETH_PATH
-}
-trap cleanup INT TERM
-
 # in case we run with ASAN enabled, we must increase stck size.
 ulimit -s 16384
 
 BOOST_TEST_ARGS="--color_output=no --show_progress=yes --logger=JUNIT,error,test_results/$EVM.xml"
-SOLTEST_ARGS="--evm-version=$EVM --ipcpath "${WORKDIR}/geth.ipc" $flags"
-test "${SOLTEST_IPC}" = "1" || SOLTEST_ARGS="$SOLTEST_ARGS --no-ipc"
+SOLTEST_ARGS="--evm-version=$EVM --evmonepath /usr/lib/libevmone.so $flags"
 test "${OPTIMIZE}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --optimize"
 test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2 --optimize-yul"
 

.circleci/soltest.sh

@@ -10,8 +10,8 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.5.10")
-project(solidity VERSION ${PROJECT_VERSION} LANGUAGES CXX)
+set(PROJECT_VERSION "0.5.11")
+project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
 
 if (${CMAKE_VERSION} VERSION_LESS "3.9.0")
 	# needed for the big endian test for older cmake versions

CMakeLists.txt

@@ -1,3 +1,35 @@
+### 0.5.11 (2019-08-12)
+
+
+Language Features:
+ * Inline Assembly: Support direct constants of value type in inline assembly.
+
+Compiler Features:
+ * ABI: Additional internal type info in the field ``internalType``.
+ * eWasm: Highly experimental eWasm output using ``--ewasm`` in the commandline interface or output selection of ``ewasm.wast`` in standard-json.
+ * Metadata: Update the swarm hash to the current specification, changes ``bzzr0`` to ``bzzr1`` and urls to use ``bzz-raw://``.
+ * Standard JSON Interface: Compile only selected sources and contracts.
+ * Standard JSON Interface: Provide secondary error locations (e.g. the source position of other conflicting declarations).
+ * SMTChecker: Do not erase knowledge about storage pointers if another storage pointer is assigned.
+ * SMTChecker: Support string literal type.
+ * Standard JSON Interface: Provide AST even on errors if ``--error-recovery`` commandline switch or StandardCompiler `settings.parserErrorRecovery` is true.
+ * Yul Optimizer: Do not inline function if it would result in expressions being duplicated that are not cheap.
+
+Bugfixes:
+ * ABI decoder: Ensure that decoded arrays always point to distinct memory locations.
+ * Code Generator: Treat dynamically encoded but statically sized arrays and structs in calldata properly.
+ * SMTChecker: Fix internal error when inlining functions that contain tuple expressions.
+ * SMTChecker: Fix pointer knowledge erasing in loops.
+ * SMTChecker: Fix internal error when using compound bitwise assignment operators inside branches.
+ * SMTChecker: Fix internal error when inlining a function that returns a tuple containing an unsupported type inside a branch.
+ * SMTChecker: Fix internal error when inlining functions that use state variables and belong to a different source.
+ * SMTChecker: Fix internal error when reporting counterexamples concerning state variables from different source files.
+ * SMTChecker: Fix SMT sort mismatch when using string literals.
+ * View/Pure Checker: Properly detect state variable access through base class.
+ * Yul Analyzer: Check availability of data objects already in analysis phase.
+ * Yul Optimizer: Fix an issue where memory-accessing code was removed even though ``msize`` was used in the program.
+
+
 ### 0.5.10 (2019-06-25)
 
 Important Bugfixes:
@@ -6,7 +38,7 @@ Important Bugfixes:
 
 
 Compiler Features:
- * Commandline Interface: Experimental parser error recovery via the ``--error-recovery`` commandline switch.
+ * Commandline Interface: Experimental parser error recovery via the ``--error-recovery`` commandline switch or StandardCompiler `settings.parserErrorRecovery` boolean.
  * Optimizer: Add rule to simplify ``SUB(~0, X)`` to ``NOT(X)``.
  * Yul Optimizer: Make the optimizer work for all dialects of Yul including eWasm.
 

Changelog.md

@@ -17,14 +17,14 @@ Solidity is a statically typed, contract-oriented, high-level language for imple
 
 Solidity is a statically-typed curly-braces programming language designed for developing smart contracts
 that run on the Ethereum Virtual Machine. Smart contracts are programs that are executed inside a peer-to-peer
-network where nobody has special authority over the execution and thus they allow to implement tokens of value,
+network where nobody has special authority over the execution, and thus they allow to implement tokens of value,
 ownership, voting and other kinds of logics.
 
 When deploying contracts, you should use the latest released version of Solidity. This is because breaking changes as well as new features and bug fixes are introduced regularly. We currently use a 0.x version number [to indicate this fast pace of change](https://semver.org/#spec-item-4).
 
 ## Build and Install
 
-Instructions about how to build and install the Solidity compiler can be found in the [Solidity documentation](https://solidity.readthedocs.io/en/latest/installing-solidity.html#building-from-source)
+Instructions about how to build and install the Solidity compiler can be found in the [Solidity documentation](https://solidity.readthedocs.io/en/latest/installing-solidity.html#building-from-source).
 
 
 ## Example
@@ -61,10 +61,10 @@ Please follow the
 if you want to help.
 
 ## Maintainers
-[@axic](https://github.com/axic)
-[@chriseth](https://github.com/chriseth)
+* [@axic](https://github.com/axic)
+* [@chriseth](https://github.com/chriseth)
 
 ## License
-Solidity is licensed under [GNU General Public License v3.0](LICENSE.txt)
+Solidity is licensed under [GNU General Public License v3.0](LICENSE.txt).
 
 Some third-party code has its [own licensing terms](cmake/templates/license.h.in).

README.md

@@ -43,6 +43,7 @@
 ### Release solc-js
  - [ ] Increment the version number, create a pull request for that, merge it after tests succeeded.
  - [ ] Run ``npm publish`` in the updated ``solc-js`` repository.
+ - [ ] Make sure to push the tag ``npm publish`` created with ``git push --tags``.
 
 ### Post-release
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.

ReleaseChecklist.md

@@ -5,9 +5,6 @@
 #
 # http://solidity.readthedocs.org
 #
-# TODO - Tests currently disabled, because Tests-over-IPC code is using UNIX
-# sockets unconditionally at the time of writing.
-#
 # ------------------------------------------------------------------------------
 # This file is part of solidity.
 #
@@ -71,7 +68,7 @@ build_script:
 
 test_script:
     - cd %APPVEYOR_BUILD_FOLDER%\build\test\%CONFIGURATION%
-    - soltest.exe --show-progress -- --testpath %APPVEYOR_BUILD_FOLDER%\test --no-ipc --no-smt
+    - soltest.exe --show-progress -- --testpath %APPVEYOR_BUILD_FOLDER%\test --no-smt
 # Skip bytecode compare if private key is not available
     - cd %APPVEYOR_BUILD_FOLDER%
     - ps: if ($env:priv_key) {