Merge pull request ethereum#2510 from ethereum/develop

Version 0.4.12

Author: chriseth

.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{cpp,h}]
+indent_style = tab
+
+[*.{py,rst,sh,yml}]
+indent_style = space
+indent_size = 4
+
+[std/**.sol]
+indent_style = space
+indent_size = 4

.gitignore

@@ -41,3 +41,4 @@ docs/utils/__pycache__
 # IDE files
 .idea
 browse.VC.db
+CMakeLists.txt.user

.travis.yml

@@ -191,6 +191,7 @@ before_script:
       && scripts/create_source_tarball.sh)
 
 script:
+    - test $SOLC_EMSCRIPTEN != On || (scripts/test_emscripten.sh)
     - test $SOLC_DOCS != On || (scripts/docs.sh)
     - test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh)
     - test $SOLC_STOREBYTECODE != On || (cd $TRAVIS_BUILD_DIR && scripts/bytecodecompare/storebytecode.sh)

CMakeLists.txt

@@ -8,7 +8,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.4.11")
+set(PROJECT_VERSION "0.4.12")
 project(solidity VERSION ${PROJECT_VERSION})
 
 # Let's find our dependencies
@@ -24,6 +24,15 @@ include(EthExecutableHelper)
 # Include utils
 include(EthUtils)
 
+# Create license.h from LICENSE.txt and template
+# Converting to char array is required due to MSVC's string size limit.
+file(READ ${CMAKE_SOURCE_DIR}/LICENSE.txt LICENSE_TEXT HEX)
+string(REGEX MATCHALL ".." LICENSE_TEXT "${LICENSE_TEXT}")
+string(REGEX REPLACE ";" ",\n\t0x" LICENSE_TEXT "${LICENSE_TEXT}")
+set(LICENSE_TEXT "0x${LICENSE_TEXT}")
+
+configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" "license.h")
+
 include(EthOptions)
 configure_project(TESTS)
 

Changelog.md

@@ -1,3 +1,41 @@
+### 0.4.12 (2017-07-03)
+
+Features:
+ * Assembly: Add ``CREATE2`` (EIP86), ``STATICCALL`` (EIP214), ``RETURNDATASIZE`` and ``RETURNDATACOPY`` (EIP211) instructions.
+ * Assembly: Display auxiliary data in the assembly output.
+ * Assembly: Renamed ``SHA3`` to ``KECCAK256``.
+ * AST: export all attributes to JSON format.
+ * C API (``jsonCompiler``): Use the Standard JSON I/O internally.
+ * Code Generator: Added the Whiskers template system.
+ * Inline Assembly: ``for`` and ``switch`` statements.
+ * Inline Assembly: Function definitions and function calls.
+ * Inline Assembly: Introduce ``keccak256`` as an opcode. ``sha3`` is still a valid alias.
+ * Inline Assembly: Present proper error message when not supplying enough arguments to a functional
+   instruction.
+ * Inline Assembly: Warn when instructions shadow Solidity variables.
+ * Inline Assembly: Warn when using ``jump``s.
+ * Remove obsolete Why3 output.
+ * Type Checker: Enforce strict UTF-8 validation.
+ * Type Checker: Warn about copies in storage that might overwrite unexpectedly.
+ * Type Checker: Warn about type inference from literal numbers.
+ * Static Analyzer: Warn about deprecation of ``callcode``.
+
+Bugfixes:
+ * Assembly: mark ``MLOAD`` to have side effects in the optimiser.
+ * Code Generator: Fix ABI encoding of empty literal string.
+ * Code Generator: Fix negative stack size checks.
+ * Code generator: Use ``REVERT`` instead of ``INVALID`` for generated input validation routines.
+ * Inline Assembly: Enforce function arguments when parsing functional instructions.
+ * Optimizer: Disallow optimizations involving ``MLOAD`` because it changes ``MSIZE``.
+ * Static Analyzer: Unused variable warnings no longer issued for variables used inside inline assembly.
+ * Type Checker: Fix address literals not being treated as compile-time constants.
+ * Type Checker: Fixed crash concerning non-callable types.
+ * Type Checker: Fixed segfault with constant function parameters
+ * Type Checker: Disallow comparisons between mapping and non-internal function types.
+ * Type Checker: Disallow invoking the same modifier multiple times.
+ * Type Checker: Do not treat strings that look like addresses as addresses.
+ * Type Checker: Support valid, but incorrectly rejected UTF-8 sequences.
+
 ### 0.4.11 (2017-05-03)
 
 Features:

README.md

@@ -2,7 +2,7 @@
 [![Join the chat at https://gitter.im/ethereum/solidity](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/solidity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Useful links
-To get started you can find an introduction to the language in the [Solidity documentation](https://solidity.readthedocs.org). In the documentation, you can find [code examples](http://solidity.readthedocs.io/en/latest/solidity-by-example.html) as well as [a reference](http://solidity.readthedocs.io/en/latest/solidity-in-depth.html) of the syntax and details on how to write smart contracts.
+To get started you can find an introduction to the language in the [Solidity documentation](https://solidity.readthedocs.org). In the documentation, you can find [code examples](https://solidity.readthedocs.io/en/latest/solidity-by-example.html) as well as [a reference](https://solidity.readthedocs.io/en/latest/solidity-in-depth.html) of the syntax and details on how to write smart contracts.
 
 You can start using [Solidity in your browser](https://ethereum.github.io/browser-solidity/) with no need to download or compile anything.
 
@@ -11,9 +11,9 @@ The changelog for this project can be found [here](https://github.com/ethereum/s
 Solidity is still under development. So please do not hesitate and open an [issue in GitHub](https://github.com/ethereum/solidity/issues) if you encounter anything strange.
 
 ## Building
-See the [Solidity documentation](http://solidity.readthedocs.io/en/latest/installing-solidity.html#building-from-source) for build instructions.
+See the [Solidity documentation](https://solidity.readthedocs.io/en/latest/installing-solidity.html#building-from-source) for build instructions.
 
 ## How to Contribute
-Please see our contribution guidelines in [the Solidity documentation](http://solidity.readthedocs.io/en/latest/contributing.html).
+Please see our contribution guidelines in [the Solidity documentation](https://solidity.readthedocs.io/en/latest/contributing.html).
 
 Any contributions are welcome!

appveyor.yml

@@ -65,7 +65,8 @@ build_script:
     - msbuild solidity.sln /p:Configuration=%CONFIGURATION% /m:%NUMBER_OF_PROCESSORS% /v:minimal
     - cd %APPVEYOR_BUILD_FOLDER%
     - scripts\release.bat %CONFIGURATION%
-    - scripts\bytecodecompare\storebytecode.bat %CONFIGURATION% %APPVEYOR_REPO_COMMIT%
+    - ps: $bytecodedir = git show -s --format="%cd-%H" --date=short
+    - ps: scripts\bytecodecompare\storebytecode.bat $Env:CONFIGURATION $bytecodedir
 
 test_script:
     - cd %APPVEYOR_BUILD_FOLDER%

cmake/EthCompilerSettings.cmake

@@ -65,7 +65,7 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 
 	# Build everything as shared libraries (.so files)
 	add_definitions(-DSHAREDLIB)
-	
+
 	# If supported for the target machine, emit position-independent code, suitable for dynamic
 	# linking and avoiding any limit on the size of the global offset table.
 	add_compile_options(-fPIC)
@@ -94,6 +94,12 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 			add_compile_options(-fstack-protector)
 		endif()
 
+		# Until https://github.com/ethereum/solidity/issues/2479 is handled
+		# disable all implicit fallthrough warnings in the codebase for GCC > 7.0
+		if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
+			add_compile_options(-Wno-implicit-fallthrough)
+		endif()
+
 	# Additional Clang-specific compiler settings.
 	elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 

cmake/UseDev.cmake

@@ -10,6 +10,7 @@ function(eth_apply TARGET REQUIRED SUBMODULE)
 		target_link_libraries(${TARGET} ${Boost_RANDOM_LIBRARIES})
 		target_link_libraries(${TARGET} ${Boost_FILESYSTEM_LIBRARIES})
 		target_link_libraries(${TARGET} ${Boost_SYSTEM_LIBRARIES})
+		target_link_libraries(${TARGET} ${Boost_REGEX_LIBRARIES})
 
 		if (DEFINED MSVC)
 			target_link_libraries(${TARGET} ${Boost_CHRONO_LIBRARIES})

cmake/templates/license.h.in

@@ -0,0 +1,75 @@
+#pragma once
+
+#include <string>
+
+static std::string const otherLicenses{R"(Most of the code is licensed under GPLv3 (see below), the license for individual
+parts are as follows:
+
+libkeccak-tiny:
+  A single-file implementation of SHA-3 and SHAKE implemented by David Leon Gil
+  License: CC0, attribution kindly requested. Blame taken too, but not liability.
+
+jsoncpp:
+  The JsonCpp library's source code, including accompanying documentation,
+  tests and demonstration applications, are licensed under the following
+  conditions...
+
+  The JsonCpp Authors explicitly disclaim copyright in all
+  jurisdictions which recognize such a disclaimer. In such jurisdictions,
+  this software is released into the Public Domain.
+
+  In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
+  2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is
+  released under the terms of the MIT License (see below).
+
+  In jurisdictions which recognize Public Domain property, the user of this
+  software may choose to accept it either as 1) Public Domain, 2) under the
+  conditions of the MIT License (see below), or 3) under the terms of dual
+  Public Domain/MIT License conditions described here, as they choose.
+
+  The MIT License is about as close to Public Domain as a license can get, and is
+  described in clear, concise terms at:
+
+	 http://en.wikipedia.org/wiki/MIT_License
+
+  The full text of the MIT License follows:
+
+  ========================================================================
+  Copyright (c) 2007-2010 The JsonCpp Authors
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation
+  files (the "Software"), to deal in the Software without
+  restriction, including without limitation the rights to use, copy,
+  modify, merge, publish, distribute, sublicense, and/or sell copies
+  of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+  ========================================================================
+  (END LICENSE TEXT)
+
+  The MIT license is compatible with both the GPL and commercial
+  software, affording one all of the rights of Public Domain with the
+  minor nuisance of being required to keep the above copyright notice
+  and license text in the source code. Note also that by accepting the
+  Public Domain "license" you can re-license your copy using whatever
+  license you like.
+
+All other code is licensed under GPL version 3:
+
+)"};
+
+static char const licenseText[] = {
+	@LICENSE_TEXT@, 0
+};