Merge pull request #9967 from ethereum/develop

Merge develop into breaking.
This commit is contained in:
chriseth
2020-10-06 17:45:53 +02:00
committed by GitHub
161 changed files with 6537 additions and 259 deletions
+4
View File
@@ -21,6 +21,10 @@ Both kinds of source mappings use integer identifiers to refer to source files.
The identifier of a source file is stored in
``output['sources'][sourceName]['id']`` where ``output`` is the output of the
standard-json compiler interface parsed as JSON.
For some utility routines, the compiler generates "internal" source files
that are not part of the original input but are referenced from the source
mappings. These source files together with their identifiers can be
obtained via ``output['contracts'][sourceName][contractName]['evm']['bytecode']['generatedSources']``.
.. note ::
In the case of instructions that are not associated with any particular source file,
+2
View File
@@ -200,6 +200,8 @@ Input Description
// Optional
"settings":
{
// Optional: Stop compilation after the given stage. Currently only "parsing" is valid here
"stopAfter": "parsing",
// Optional: Sorted list of remappings
"remappings": [ ":g=/dir" ],
// Optional: Optimizer settings