-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5105 from ethereum/libsolc-api
Remove old libsolc API (compileJSON, compileJSONMulti, compileJSONCallback)
- Loading branch information
Showing
8 changed files
with
41 additions
and
379 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ | |
| /** | ||
| * @author Christian <[email protected]> | ||
| * @date 2014 | ||
| * JSON interface for the solidity compiler to be used from Javascript. | ||
| * Public compiler API. | ||
| */ | ||
|
|
||
| #include <libsolc/libsolc.h> | ||
|
|
@@ -72,193 +72,7 @@ ReadCallback::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = n | |
| return readCallback; | ||
| } | ||
|
|
||
| /// Translates a gas value as a string to a JSON number or null | ||
| Json::Value gasToJson(Json::Value const& _value) | ||
| { | ||
| if (_value.isObject()) | ||
| { | ||
| Json::Value ret = Json::objectValue; | ||
| for (auto const& sig: _value.getMemberNames()) | ||
| ret[sig] = gasToJson(_value[sig]); | ||
| return ret; | ||
| } | ||
|
|
||
| if (_value == "infinite") | ||
| return Json::Value(Json::nullValue); | ||
|
|
||
| u256 value(_value.asString()); | ||
| if (value > std::numeric_limits<Json::LargestUInt>::max()) | ||
| return Json::Value(Json::nullValue); | ||
| else | ||
| return Json::Value(Json::LargestUInt(value)); | ||
| } | ||
|
|
||
| Json::Value translateGasEstimates(Json::Value const& estimates) | ||
| { | ||
| Json::Value output(Json::objectValue); | ||
|
|
||
| if (estimates["creation"].isObject()) | ||
| { | ||
| Json::Value creation(Json::arrayValue); | ||
| creation[0] = gasToJson(estimates["creation"]["executionCost"]); | ||
| creation[1] = gasToJson(estimates["creation"]["codeDepositCost"]); | ||
| output["creation"] = creation; | ||
| } | ||
| else | ||
| output["creation"] = Json::objectValue; | ||
| output["external"] = gasToJson(estimates.get("external", Json::objectValue)); | ||
| output["internal"] = gasToJson(estimates.get("internal", Json::objectValue)); | ||
|
|
||
| return output; | ||
| } | ||
|
|
||
| string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback _readCallback) | ||
| { | ||
| /// create new JSON input format | ||
| Json::Value input = Json::objectValue; | ||
| input["language"] = "Solidity"; | ||
| input["sources"] = Json::objectValue; | ||
| for (auto const& source: _sources) | ||
| { | ||
| input["sources"][source.first] = Json::objectValue; | ||
| input["sources"][source.first]["content"] = source.second; | ||
| } | ||
| input["settings"] = Json::objectValue; | ||
| input["settings"]["optimizer"] = Json::objectValue; | ||
| input["settings"]["optimizer"]["enabled"] = _optimize; | ||
| input["settings"]["optimizer"]["runs"] = 200; | ||
|
|
||
| // Enable all SourceUnit-level outputs. | ||
| input["settings"]["outputSelection"]["*"][""][0] = "*"; | ||
| // Enable all Contract-level outputs. | ||
| input["settings"]["outputSelection"]["*"]["*"][0] = "*"; | ||
|
|
||
| StandardCompiler compiler(wrapReadCallback(_readCallback)); | ||
| Json::Value ret = compiler.compile(input); | ||
|
|
||
| /// transform JSON to match the old format | ||
| // { | ||
| // "errors": [ "Error 1", "Error 2" ], | ||
| // "sourceList": [ "sourcename1", "sourcename2" ], | ||
| // "sources": { | ||
| // "sourcename1": { | ||
| // "AST": {} | ||
| // } | ||
| // }, | ||
| // "contracts": { | ||
| // "Contract1": { | ||
| // "interface": "[...abi...]", | ||
| // "bytecode": "ff0011...", | ||
| // "runtimeBytecode": "ff0011", | ||
| // "opcodes": "PUSH 1 POP STOP", | ||
| // "metadata": "{...metadata...}", | ||
| // "functionHashes": { | ||
| // "test(uint256)": "11ff2233" | ||
| // }, | ||
| // "gasEstimates": { | ||
| // "creation": [ 224, 42000 ], | ||
| // "external": { | ||
| // "11ff2233": null, | ||
| // "3322ff11": 1234 | ||
| // }, | ||
| // "internal": { | ||
| // } | ||
| // }, | ||
| // "srcmap" = "0:1:2", | ||
| // "srcmapRuntime" = "0:1:2", | ||
| // "assembly" = {} | ||
| // } | ||
| // } | ||
| // } | ||
| Json::Value output = Json::objectValue; | ||
|
|
||
| if (ret.isMember("errors")) | ||
| { | ||
| output["errors"] = Json::arrayValue; | ||
| for (auto const& error: ret["errors"]) | ||
| output["errors"].append( | ||
| !error["formattedMessage"].empty() ? error["formattedMessage"] : error["message"] | ||
| ); | ||
| } | ||
|
|
||
| output["sourceList"] = Json::arrayValue; | ||
| for (auto const& source: _sources) | ||
| output["sourceList"].append(source.first); | ||
|
|
||
| if (ret.isMember("sources")) | ||
| { | ||
| output["sources"] = Json::objectValue; | ||
| for (auto const& sourceName: ret["sources"].getMemberNames()) | ||
| { | ||
| output["sources"][sourceName] = Json::objectValue; | ||
| output["sources"][sourceName]["AST"] = ret["sources"][sourceName]["legacyAST"]; | ||
| } | ||
| } | ||
|
|
||
| if (ret.isMember("contracts")) | ||
| { | ||
| output["contracts"] = Json::objectValue; | ||
| for (auto const& sourceName: ret["contracts"].getMemberNames()) | ||
| for (auto const& contractName: ret["contracts"][sourceName].getMemberNames()) | ||
| { | ||
| Json::Value contractInput = ret["contracts"][sourceName][contractName]; | ||
| Json::Value contractOutput = Json::objectValue; | ||
| contractOutput["interface"] = jsonCompactPrint(contractInput["abi"]); | ||
| contractOutput["metadata"] = contractInput["metadata"]; | ||
| contractOutput["functionHashes"] = contractInput["evm"]["methodIdentifiers"]; | ||
| contractOutput["gasEstimates"] = translateGasEstimates(contractInput["evm"]["gasEstimates"]); | ||
| contractOutput["assembly"] = contractInput["evm"]["legacyAssembly"]; | ||
| contractOutput["bytecode"] = contractInput["evm"]["bytecode"]["object"]; | ||
| contractOutput["opcodes"] = contractInput["evm"]["bytecode"]["opcodes"]; | ||
| contractOutput["srcmap"] = contractInput["evm"]["bytecode"]["sourceMap"]; | ||
| contractOutput["runtimeBytecode"] = contractInput["evm"]["deployedBytecode"]["object"]; | ||
| contractOutput["srcmapRuntime"] = contractInput["evm"]["deployedBytecode"]["sourceMap"]; | ||
| output["contracts"][sourceName + ":" + contractName] = contractOutput; | ||
| } | ||
| } | ||
|
|
||
| try | ||
| { | ||
| return jsonCompactPrint(output); | ||
| } | ||
| catch (...) | ||
| { | ||
| return "{\"errors\":[\"Unknown error while generating JSON.\"]}"; | ||
| } | ||
| } | ||
|
|
||
| string compileMulti(string const& _input, bool _optimize, CStyleReadFileCallback _readCallback = nullptr) | ||
| { | ||
| string errors; | ||
| Json::Value input; | ||
| if (!jsonParseStrict(_input, input, &errors)) | ||
| { | ||
| Json::Value jsonErrors(Json::arrayValue); | ||
| jsonErrors.append("Error parsing input JSON: " + errors); | ||
| Json::Value output(Json::objectValue); | ||
| output["errors"] = jsonErrors; | ||
| return jsonCompactPrint(output); | ||
| } | ||
| else | ||
| { | ||
| StringMap sources; | ||
| Json::Value jsonSources = input["sources"]; | ||
| if (jsonSources.isObject()) | ||
| for (auto const& sourceName: jsonSources.getMemberNames()) | ||
| sources[sourceName] = jsonSources[sourceName].asString(); | ||
| return compile(sources, _optimize, _readCallback); | ||
| } | ||
| } | ||
|
|
||
| string compileSingle(string const& _input, bool _optimize) | ||
| { | ||
| StringMap sources; | ||
| sources[""] = _input; | ||
| return compile(sources, _optimize, nullptr); | ||
| } | ||
|
|
||
|
|
||
| string compileStandardInternal(string const& _input, CStyleReadFileCallback _readCallback = nullptr) | ||
| string compile(string const& _input, CStyleReadFileCallback _readCallback = nullptr) | ||
| { | ||
| StandardCompiler compiler(wrapReadCallback(_readCallback)); | ||
| return compiler.compile(_input); | ||
|
|
@@ -270,48 +84,18 @@ static string s_outputBuffer; | |
|
|
||
| extern "C" | ||
| { | ||
| extern char const* license() noexcept | ||
| extern char const* solidity_license() noexcept | ||
| { | ||
| static string fullLicenseText = otherLicenses + licenseText; | ||
| return fullLicenseText.c_str(); | ||
| } | ||
| extern char const* version() noexcept | ||
| { | ||
| return VersionString.c_str(); | ||
| } | ||
| extern char const* compileJSON(char const* _input, bool _optimize) noexcept | ||
| { | ||
| s_outputBuffer = compileSingle(_input, _optimize); | ||
| return s_outputBuffer.c_str(); | ||
| } | ||
| extern char const* compileJSONMulti(char const* _input, bool _optimize) noexcept | ||
| { | ||
| s_outputBuffer = compileMulti(_input, _optimize); | ||
| return s_outputBuffer.c_str(); | ||
| } | ||
| extern char const* compileJSONCallback(char const* _input, bool _optimize, CStyleReadFileCallback _readCallback) noexcept | ||
| { | ||
| s_outputBuffer = compileMulti(_input, _optimize, _readCallback); | ||
| return s_outputBuffer.c_str(); | ||
| } | ||
| extern char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback) noexcept | ||
| { | ||
| s_outputBuffer = compileStandardInternal(_input, _readCallback); | ||
| return s_outputBuffer.c_str(); | ||
| } | ||
| extern char const* solidity_license() noexcept | ||
| { | ||
| /// todo: make this the default or an alias | ||
| return license(); | ||
| } | ||
| extern char const* solidity_version() noexcept | ||
| { | ||
| /// todo: make this the default or an alias | ||
| return version(); | ||
| return VersionString.c_str(); | ||
| } | ||
| extern char const* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback) noexcept | ||
| { | ||
| /// todo: make this the default or an alias | ||
| return compileStandard(_input, _readCallback); | ||
| s_outputBuffer = compile(_input, _readCallback); | ||
| return s_outputBuffer.c_str(); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ | |
| /** | ||
| * @author Christian <[email protected]> | ||
| * @date 2014 | ||
| * JSON interface for the solidity compiler to be used from Javascript. | ||
| * Public compiler API. | ||
| */ | ||
|
|
||
| #include <stdbool.h> | ||
|
|
@@ -36,13 +36,6 @@ extern "C" { | |
| /// heap-allocated and are free'd by the caller. | ||
| typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error); | ||
|
|
||
| char const* license() SOLC_NOEXCEPT; | ||
| char const* version() SOLC_NOEXCEPT; | ||
| char const* compileJSON(char const* _input, bool _optimize) SOLC_NOEXCEPT; | ||
| char const* compileJSONMulti(char const* _input, bool _optimize) SOLC_NOEXCEPT; | ||
| char const* compileJSONCallback(char const* _input, bool _optimize, CStyleReadFileCallback _readCallback) SOLC_NOEXCEPT; | ||
| char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback) SOLC_NOEXCEPT; | ||
|
|
||
| char const* solidity_license() SOLC_NOEXCEPT; | ||
| char const* solidity_version() SOLC_NOEXCEPT; | ||
| char const* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback) SOLC_NOEXCEPT; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.