Merge pull request #9536 from ethereum/develop

Merge develop into release for 0.7.0

Author: chriseth

Diff for: .circleci/config.yml

@@ -9,16 +9,20 @@ version: 2.1
 parameters:
   ubuntu-1804-docker-image:
     type: string
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:4484ac3da8fdc337cc77a7a7be1af71cd0f28f9c890d934f1d6ae7532beb66b1"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1804-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9ab317e583c395e50884ba82e9f99811c374344cea4c550725be8ec836e07acc"
   ubuntu-2004-docker-image:
     type: string
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:48b5bb6b91ac7dddfe9345c88876ebed126c652258800f114caed69db73b29bf"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:cbfa42d8ecbe94391ba8837e218869242666de7a0da6ccac065a856c85b6a6a0"
   ubuntu-2004-clang-docker-image:
     type: string
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d8775de58167db5a11690fdb6ef639317fe1e579ec5d46e9732d2d903b55d135"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a4d5271b5552139d9f2caefc50d42f401bf74132cf8f253e199e11c80ab42de"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:db52f3257396814215744a19904e42c07e040ab36b68be72a27ba71ad2f1083c"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:efaabb3c143f64171be596932c62013bcfd7f73b1fbcb832025a34dd2b6e6922"
   emscripten-docker-image:
     type: string
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d557d015918c3cf68b0d22839bab41013f0757b651a7fef21595f89721dbebcc"
@@ -385,11 +389,13 @@ jobs:
       - run: *run_docs_pragma_min_version
 
   b_ubu_clang: &build_ubuntu2004_clang
+    resource_class: xlarge
     docker:
       - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
     environment:
       CC: clang
       CXX: clang++
+      MAKEFLAGS: -j 10
     steps:
       - checkout
       - run: *run_build

Diff for: CMakeLists.txt

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

Diff for: Changelog.md

@@ -1,3 +1,49 @@
+### 0.7.0 (2020-07-28)
+
+Breaking changes:
+ * Inline Assembly: Disallow ``.`` in user-defined function and variable names.
+ * Inline Assembly: Slot and offset of storage pointer variable ``x`` are accessed via ``x.slot`` and ``x.offset`` instead of ``x_slot`` and ``x_offset``.
+ * JSON AST: Mark hex string literals with ``kind: "hexString"``.
+ * JSON AST: Remove members with ``null`` value from JSON output.
+ * Parser: Disallow ``gwei`` as identifier.
+ * Parser: Disallow dot syntax for ``value`` and ``gas``.
+ * Parser: Disallow non-printable characters in string literals.
+ * Parser: Introduce Unicode string literals: ``unicode"😃"``.
+ * Parser: NatSpec comments on variables are only allowed for public state variables.
+ * Parser: Remove the ``finney`` and ``szabo`` denominations.
+ * Parser: Remove the identifier ``now`` (replaced by ``block.timestamp``).
+ * Reference Resolver: ``using A for B`` only affects the contract it is mentioned in and not all derived contracts
+ * Type Checker: Disallow ``virtual`` for library functions.
+ * Type Checker: Disallow assignments to state variables that contain nested mappings.
+ * Type checker: Disallow events with same name and parameter types in inheritance hierarchy.
+ * Type Checker: Disallow shifts by signed types.
+ * Type Checker: Disallow structs and arrays in memory or calldata if they contain nested mappings.
+ * Type Checker: Exponentiation and shifts of literals by non-literals will always use ``uint256`` or ``int256`` as a type.
+ * Yul: Disallow consecutive and trailing dots in identifiers. Leading dots were already disallowed.
+ * Yul: Disallow EVM instruction `pc()`.
+
+
+Language Features:
+ * Inheritance: Allow overrides to have stricter state mutability: ``view`` can override ``nonpayable`` and ``pure`` can override ``view``.
+ * Parser: Deprecate visibility for constructors.
+ * State mutability: Do not issue recommendation for stricter mutability for virtual functions but do issue it for functions that override.
+
+
+Compiler Features:
+ * SMTChecker: Report multi-transaction counterexamples including the function calls that initiate the transactions. This does not include concrete values for reference types and reentrant calls.
+ * Variable declarations using the ``var`` keyword are not recognized anymore.
+
+
+Bugfixes:
+ * Immutables: Fix internal compiler error when immutables are not assigned.
+ * Inheritance: Disallow public state variables overwriting ``pure`` functions.
+ * NatSpec: Constructors and functions have consistent userdoc output.
+ * SMTChecker: Fix internal error when assigning to a 1-tuple.
+ * SMTChecker: Fix internal error when tuples have extra effectless parenthesis.
+ * State Mutability: Constant public state variables are considered ``pure`` functions.
+ * Type Checker: Fixing deduction issues on function types when function call has named arguments.
+
+
 ### 0.6.12 (2020-07-22)
 
 Language Features:
@@ -29,6 +75,7 @@ Build System:
 
 ### 0.6.11 (2020-07-07)
 
+
 Language Features:
  * General: Add unit denomination ``gwei``
  * Yul: Support ``linkersymbol`` builtin in standalone assembly mode to refer to library addresses.

Diff for: README.md

@@ -37,7 +37,7 @@ found in the [Solidity documentation](https://solidity.readthedocs.io/en/latest/
 A "Hello World" program in Solidity is of even less use than in other languages, but still:
 
 ```solidity
-pragma solidity ^0.6.0;
+pragma solidity >=0.6.0 <0.8.0;
 
 contract HelloWorld {
   function helloWorld() external pure returns (string memory) {

Diff for: ReleaseChecklist.md

@@ -26,15 +26,26 @@
  - [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball. Make sure to create ``prerelease.txt`` before: (``echo -n > prerelease.txt``). This will create the tarball in a directory called ``upload``.
  - [ ] Take the tarball from the upload directory (its name should be ``solidity_x.x.x.tar.gz``, otherwise ``prerelease.txt`` was missing in the step before) and upload the source tarball to the release page.
 
+### Homebrew and MacOS
+ - [ ] Update the version and the hash (``sha256sum solidity_x.x.x.tar.gz``) in https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb
+ - [ ] Take the binary from the ``b_osx`` run of the released commit in circle-ci and add it to the release page as ``solc-macos``.
+
+### Update solc-bin
+ - [ ] Copy ``soljson.js`` from the release page to ``solc-bin/bin/soljson-v<version>+commit.<commit>.js``
+ - [ ] Copy ``solc-static-linux`` from the release page to ``solc-bin/linux-amd64/solc-linux-amd64-v<version>+commit.<commit>``
+ - [ ] Copy ``solc-macos`` from the release page to ``solc-bin/macos-amd64/solc-macos-amd64-v<version>+commit.<commit>``
+ - [ ] Copy ``solc-windows.zip`` from the release page to ``solc-bin/windows-amd64/solc-windows-amd64-v<version>+commit.<commit>.zip``
+ - [ ] Make the linux and the macos binaries executable.
+ - [ ] Run ``./update`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``.
+ - [ ] Create a pull request and merge.
+
 ### PPA
  - [ ] Change ``scripts/release_ppa.sh`` to match your key's email and key id.
  - [ ] Run ``scripts/release_ppa.sh release`` to create the PPA release (you need the relevant openssl key).
  - [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*. SERIOUSLY: DO NOT PROCEED EARLIER!!! *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty`` and ``Xenial`` while selecting ``Copy existing binaries``.
- - [ ] Check that the Docker release was pushed to Docker Hub (this still seems to have problems, run ``./scripts/docker_deploy_manual.sh v0.x.x``).
 
-### Homebrew and MacOS
- - [ ] Update the version and the hash (``sha256sum solidity_x.x.x.tar.gz``) in https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb
- - [ ] Take the binary from the ``b_osx`` run of the released commit in circle-ci and add it to the release page as ``solc-macos``.
+### Docker
+ - [ ] Check that the Docker release was pushed to Docker Hub (this still seems to have problems, run ``./scripts/docker_deploy_manual.sh v0.x.x``).
 
 ### Documentation
  - [ ] Build the new version on https://readthedocs.org/projects/solidity/ (select `latest` on the bottom of the page and click `BUILD`)
@@ -46,6 +57,7 @@
  - [ ] Make sure to push the tag ``npm publish`` created with ``git push --tags``.
 
 ### Post-release
+ - [ ] Publish the blog post.
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.
  - [ ] Merge ``release`` back into ``develop``.
  - [ ] Announce on Twitter and Reddit.

Diff for: docs/050-breaking-changes.rst

@@ -311,7 +311,7 @@ This will no longer compile with Solidity v0.5.0. However, you can define a comp
 ::
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.5.0 <0.7.0;
+    pragma solidity >=0.5.0 <0.8.0;
     interface OldContract {
         function someOldFunction(uint8 a) external;
         function anotherOldFunction() external returns (bool);
@@ -329,7 +329,7 @@ Given the interface defined above, you can now easily use the already deployed p
 ::
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.5.0 <0.7.0;
+    pragma solidity >=0.5.0 <0.8.0;
 
     interface OldContract {
         function someOldFunction(uint8 a) external;

Diff for: docs/070-breaking-changes.rst

@@ -0,0 +1,133 @@
+********************************
+Solidity v0.7.0 Breaking Changes
+********************************
+
+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/ethereum/solidity/releases/tag/v0.7.0>`_.
+
+
+Silent Changes of the Semantics
+===============================
+
+* Exponentiation and shifts of literals by non-literals (e.g. ``1 << x`` or ``2 ** x``)
+  will always use either the type ``uint256`` (for non-negative literals) or
+  ``int256`` (for negative literals) to perform the operation.
+  Previously, the operation was performed in the type of the shift amount / the
+  exponent which can be misleading.
+
+
+Changes to the Syntax
+=====================
+
+* In external function and contract creation calls, Ether and gas is now specified using a new syntax:
+  ``x.f{gas: 10000, value: 2 ether}(arg1, arg2)``.
+  The old syntax -- ``x.f.gas(10000).value(2 ether)(arg1, arg2)`` -- will cause an error.
+
+* The global variable ``now`` is deprecated, ``block.timestamp`` should be used instead.
+  The single identifier ``now`` is too generic for a global variable and could give the impression
+  that it changes during transaction processing, whereas ``block.timestamp`` correctly
+  reflects the fact that it is just a property of the block.
+
+* NatSpec comments on variables are only allowed for public state variables and not
+  for local or internal variables.
+
+* The token ``gwei`` is a keyword now (used to specify, e.g. ``2 gwei`` as a number)
+  and cannot be used as an identifier.
+
+* String literals now can only contain printable ASCII characters and this also includes a variety of
+  escape sequences, such as hexadecimal (``\xff``) and unicode escapes (``\u20ac``).
+
+* Unicode string literals are supported now to accommodate valid UTF-8 sequences. They are identified
+  with the ``unicode`` prefix: ``unicode"Hello 😃"``.
+
+* State Mutability: The state mutability of functions can now be restricted during inheritance:
+  Functions with default state mutability can be overridden by ``pure`` and ``view`` functions
+  while ``view`` functions can be overridden by ``pure`` functions.
+  At the same time, public state variables are considered ``view`` and even ``pure``
+  if they are constants.
+
+
+
+Inline Assembly
+---------------
+
+* Disallow ``.`` in user-defined function and variable names in inline assembly.
+  It is still valid if you use Solidity in Yul-only mode.
+
+* Slot and offset of storage pointer variable ``x`` are accessed via ``x.slot``
+  and ``x.offset`` instead of ``x_slot`` and ``x_offset``.
+
+Removal of Unused or Unsafe Features
+====================================
+
+Mappings outside Storage
+------------------------
+
+* If a struct or array contains a mapping, it can only be used in storage.
+  Previously, mapping members were silently skipped in memory, which
+  is confusing and error-prone.
+
+* Assignments to structs or arrays in storage does not work if they contain
+  mappings.
+  Previously, mappings were silently skipped during the copy operation, which
+  is misleading and error-prone.
+
+Functions and Events
+--------------------
+
+* Visibility (``public`` / ``external``) is not needed for constructors anymore:
+  To prevent a contract from being created, it can be marked ``abstract``.
+  This makes the visibility concept for constructors obsolete.
+
+* Type Checker: Disallow ``virtual`` for library functions:
+  Since libraries cannot be inherited from, library functions should not be virtual.
+
+* Multiple events with the same name and parameter types in the same
+  inheritance hierarchy are disallowed.
+
+* ``using A for B`` only affects the contract it is mentioned in.
+  Previously, the effect was inherited. Now, you have to repeat the ``using``
+  statement in all derived contracts that make use of the feature.
+
+Expressions
+-----------
+
+* Shifts by signed types are disallowed.
+  Previously, shifts by negative amounts were allowed, but reverted at runtime.
+
+* The ``finney`` and ``szabo`` denominations are removed.
+  They are rarely used and do not make the actual amount readily visible. Instead, explicit
+  values like ``1e20`` or the very common ``gwei`` can be used.
+
+Declarations
+------------
+
+* The keyword ``var`` cannot be used anymore.
+  Previously, this keyword would parse but result in a type error and
+  a suggestion about which type to use. Now, it results in a parser error.
+
+Interface Changes
+=================
+
+* JSON AST: Mark hex string literals with ``kind: "hexString"``.
+* JSON AST: Members with value ``null`` are removed from JSON output.
+* NatSpec: Constructors and functions have consistent userdoc output.
+
+
+How to update your code
+=======================
+
+This section gives detailed instructions on how to update prior code for every breaking change.
+
+* Change ``x.f.value(...)()`` to ``x.f{value: ...}()``. Similarly ``(new C).value(...)()`` to
+  ``new C{value: ...}()`` and ``x.f.gas(...).value(...)()`` to ``x.f{gas: ..., value: ...}()``.
+* Change ``now`` to ``block.timestamp``.
+* Change types of right operand in shift operators to unsigned types. For example change ``x >> (256 - y)`` to
+  ``x >> uint(256 - y)``.
+* Repeat the ``using A for B`` statements in all derived contracts if needed.
+* Remove the ``public`` keyword from every constructor.
+* Remove the ``internal`` keyword from every constructor and add ``abstract`` to the contract (if not already present).
+* Change ``_slot`` and ``_offset`` suffixes in inline assembly to ``.slot`` and ``.offset``, respectively.

Diff for: docs/Solidity.g4

@@ -253,6 +253,7 @@ primaryExpression
   | numberLiteral
   | hexLiteral
   | stringLiteral
+  | unicodeStringLiteral
   | identifier ('[' ']')?
   | TypeKeyword
   | tupleExpression
@@ -306,7 +307,7 @@ assemblyBlock
   : '{' assemblyItem* '}' ;
 
 assemblyExpression
-  : assemblyCall | assemblyLiteral ;
+  : assemblyCall | assemblyLiteral | assemblyIdentifier ;
 
 assemblyCall
   : ( 'return' | 'address' | 'byte' | identifier ) ( '(' assemblyExpression? ( ',' assemblyExpression )* ')' )? ;
@@ -318,7 +319,10 @@ assemblyAssignment
   : assemblyIdentifierList ':=' assemblyExpression ;
 
 assemblyIdentifierList
-  : identifier ( ',' identifier )* ;
+  : assemblyIdentifier ( ',' assemblyIdentifier )* ;
+
+assemblyIdentifier
+  : identifier ( '.' identifier )* ;
 
 assemblyStackAssignment
   : '=:' identifier ;
@@ -358,11 +362,12 @@ assemblyType
 subAssembly
   : 'assembly' identifier assemblyBlock ;
 
+// 'finney' and 'szabo' are no longer supported as denominations by latest Solidity.
 numberLiteral
-  : (DecimalNumber | HexNumber) (NumberUnit | Gwei)?;
+  : (DecimalNumber | HexNumber) (NumberUnit | Gwei | Finney | Szabo)?;
 
 identifier
-  : (Gwei | 'from' | 'calldata' | 'address' | Identifier) ;
+  : (Gwei | Finney | Szabo | 'from' | 'calldata' | 'address' | Identifier) ;
 
 BooleanLiteral
   : 'true' | 'false' ;
@@ -382,10 +387,12 @@ HexDigits
   : HexCharacter ( '_'? HexCharacter )* ;
 
 NumberUnit
-  : 'wei' | 'szabo' | 'finney' | 'ether'
+  : 'wei' | 'ether'
   | 'seconds' | 'minutes' | 'hours' | 'days' | 'weeks' | 'years' ;
 
 Gwei: 'gwei' ;
+Szabo: 'szabo' ;
+Finney: 'finney' ;
 
 HexLiteralFragment
   : 'hex' (('"' HexDigits? '"') | ('\'' HexDigits? '\'')) ;
@@ -455,6 +462,13 @@ StringLiteralFragment
   : '"' DoubleQuotedStringCharacter* '"'
   | '\'' SingleQuotedStringCharacter* '\'' ;
 
+unicodeStringLiteral
+  : UnicodeStringLiteralFragment+ ;
+
+UnicodeStringLiteralFragment
+  : 'unicode"' DoubleQuotedStringCharacter* '"'
+  | 'unicode\'' SingleQuotedStringCharacter* '\'' ;
+
 fragment
 DoubleQuotedStringCharacter
   : ~["\r\n\\] | ('\\' .) ;