cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10409 from ssi91/not-serialized-json-fields

Browse Source 
[BREAKING] do not serialize fields abi, devdoc, userdoc and storage-layout
This commit is contained in:
Kamil Śliwak 2020-11-28 21:18:16 +01:00 committed by GitHub
commit 656cb810a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -16,6 +16,7 @@ Breaking Changes:
* Type System: Explicit conversions from literals to integer type is as strict as implicit conversions. * Type System: Explicit conversions from literals to integer type is as strict as implicit conversions.
* Type System: Explicit conversions from literals to enums are only allowed if the value fits in the enum. * Type System: Explicit conversions from literals to enums are only allowed if the value fits in the enum.
* Type System: Declarations with the name ``this``, ``super`` and ``_`` are disallowed, with the exception of public functions and events. * Type System: Declarations with the name ``this``, ``super`` and ``_`` are disallowed, with the exception of public functions and events.
* Command Line Interface: JSON fields `abi`, `devdoc`, `userdoc` and `storage-layout` are now sub-objects rather than strings.
Language Features: Language Features:
* Super constructors can now be called using the member notation e.g. ``M.C(123)``. * Super constructors can now be called using the member notation e.g. ``M.C(123)``.

5
docs/080-breaking-changes.rst
View File

@ -61,3 +61,8 @@ New Restrictions
* Declarations with the name ``this``, ``super`` and ``_`` are disallowed, with the exception of * Declarations with the name ``this``, ``super`` and ``_`` are disallowed, with the exception of
public functions and events. public functions and events.
Interface Changes
=================
* Changed output of ``--combined-json``. JSON fields ``abi``, ``devdoc``, ``userdoc`` and ``storage-layout`` are sub-objects now. Before 0.8.0 they used to be serialised as strings.

8
solc/CommandLineInterface.cpp
View File

@ -1632,7 +1632,7 @@ void CommandLineInterface::handleCombinedJSON()
{ {
Json::Value& contractData = output[g_strContracts][contractName] = Json::objectValue; Json::Value& contractData = output[g_strContracts][contractName] = Json::objectValue;
if (requests.count(g_strAbi)) if (requests.count(g_strAbi))
contractData[g_strAbi] = jsonCompactPrint(m_compiler->contractABI(contractName)); contractData[g_strAbi] = m_compiler->contractABI(contractName);
if (requests.count("metadata")) if (requests.count("metadata"))
contractData["metadata"] = m_compiler->metadata(contractName); contractData["metadata"] = m_compiler->metadata(contractName);
if (requests.count(g_strBinary) && m_compiler->compilationSuccessful()) if (requests.count(g_strBinary) && m_compiler->compilationSuccessful())
@ -1644,7 +1644,7 @@ void CommandLineInterface::handleCombinedJSON()
if (requests.count(g_strAsm) && m_compiler->compilationSuccessful()) if (requests.count(g_strAsm) && m_compiler->compilationSuccessful())
contractData[g_strAsm] = m_compiler->assemblyJSON(contractName); contractData[g_strAsm] = m_compiler->assemblyJSON(contractName);
if (requests.count(g_strStorageLayout) && m_compiler->compilationSuccessful()) if (requests.count(g_strStorageLayout) && m_compiler->compilationSuccessful())
contractData[g_strStorageLayout] = jsonCompactPrint(m_compiler->storageLayout(contractName)); contractData[g_strStorageLayout] = m_compiler->storageLayout(contractName);
if (requests.count(g_strGeneratedSources) && m_compiler->compilationSuccessful()) if (requests.count(g_strGeneratedSources) && m_compiler->compilationSuccessful())
contractData[g_strGeneratedSources] = m_compiler->generatedSources(contractName, false); contractData[g_strGeneratedSources] = m_compiler->generatedSources(contractName, false);
if (requests.count(g_strGeneratedSourcesRuntime) && m_compiler->compilationSuccessful()) if (requests.count(g_strGeneratedSourcesRuntime) && m_compiler->compilationSuccessful())
@ -1662,9 +1662,9 @@ void CommandLineInterface::handleCombinedJSON()
if (requests.count(g_strSignatureHashes)) if (requests.count(g_strSignatureHashes))
contractData[g_strSignatureHashes] = m_compiler->methodIdentifiers(contractName); contractData[g_strSignatureHashes] = m_compiler->methodIdentifiers(contractName);
if (requests.count(g_strNatspecDev)) if (requests.count(g_strNatspecDev))
contractData[g_strNatspecDev] = jsonCompactPrint(m_compiler->natspecDev(contractName)); contractData[g_strNatspecDev] = m_compiler->natspecDev(contractName);
if (requests.count(g_strNatspecUser)) if (requests.count(g_strNatspecUser))
contractData[g_strNatspecUser] = jsonCompactPrint(m_compiler->natspecUser(contractName)); contractData[g_strNatspecUser] = m_compiler->natspecUser(contractName);
} }
bool needsSourceList = requests.count(g_strAst) || requests.count(g_strSrcMap) || requests.count(g_strSrcMapRuntime); bool needsSourceList = requests.count(g_strAst) || requests.count(g_strSrcMap) || requests.count(g_strSrcMapRuntime);