From e0ff70778a3de88e25cc4c4f879799d6b73a4a61 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 16 Mar 2017 23:59:36 +0000 Subject: Rename ErrorMesage to ErrorMessage --- solc/jsonCompiler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solc') diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index 6ebd1a55..45322117 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -143,18 +143,18 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback if (!contents_c && !error_c) { result.success = false; - result.contentsOrErrorMesage = "File not found."; + result.contentsOrErrorMessage = "File not found."; } if (contents_c) { result.success = true; - result.contentsOrErrorMesage = string(contents_c); + result.contentsOrErrorMessage = string(contents_c); free(contents_c); } if (error_c) { result.success = false; - result.contentsOrErrorMesage = string(error_c); + result.contentsOrErrorMessage = string(error_c); free(error_c); } return result; -- cgit v1.2.3 From 623b8eb107a97861e3e7e0c13acee39c8d5f4075 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 10 Apr 2017 12:48:41 +0100 Subject: Pull out ReadFile from CompilerStack --- solc/CommandLineInterface.cpp | 10 +++++----- solc/jsonCompiler.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 31f70272..f0b73152 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -630,11 +630,11 @@ bool CommandLineInterface::processInput() return link(); } - CompilerStack::ReadFileCallback fileReader = [this](string const& _path) + ReadFile::Callback fileReader = [this](string const& _path) { auto path = boost::filesystem::path(_path); if (!boost::filesystem::exists(path)) - return CompilerStack::ReadFileResult{false, "File not found."}; + return ReadFile::Result{false, "File not found."}; auto canonicalPath = boost::filesystem::canonical(path); bool isAllowed = false; for (auto const& allowedDir: m_allowedDirectories) @@ -650,14 +650,14 @@ bool CommandLineInterface::processInput() } } if (!isAllowed) - return CompilerStack::ReadFileResult{false, "File outside of allowed directories."}; + return ReadFile::Result{false, "File outside of allowed directories."}; else if (!boost::filesystem::is_regular_file(canonicalPath)) - return CompilerStack::ReadFileResult{false, "Not a valid file."}; + return ReadFile::Result{false, "Not a valid file."}; else { auto contents = dev::contentsString(canonicalPath.string()); m_sourceCodes[path.string()] = contents; - return CompilerStack::ReadFileResult{true, contents}; + return ReadFile::Result{true, contents}; } }; diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index 45322117..74d6a901 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -130,7 +130,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback { Json::Value output(Json::objectValue); Json::Value errors(Json::arrayValue); - CompilerStack::ReadFileCallback readCallback; + ReadFile::Callback readCallback; if (_readCallback) { readCallback = [=](string const& _path) @@ -138,7 +138,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback char* contents_c = nullptr; char* error_c = nullptr; _readCallback(_path.c_str(), &contents_c, &error_c); - CompilerStack::ReadFileResult result; + ReadFile::Result result; result.success = true; if (!contents_c && !error_c) { -- cgit v1.2.3 From b1db6eac8b298967b73e3f09c75f12f566b3074c Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 29 Mar 2017 22:40:10 +0100 Subject: Introduce formatExceptionInformation --- solc/jsonCompiler.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'solc') diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index 45322117..f55d0c8d 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -56,9 +56,7 @@ string formatError( function const& _scannerFromSourceName ) { - ostringstream errorOutput; - SourceReferenceFormatter::printExceptionInformation(errorOutput, _exception, _name, _scannerFromSourceName); - return errorOutput.str(); + return SourceReferenceFormatter::formatExceptionInformation(_exception, _name, _scannerFromSourceName); } Json::Value functionHashes(ContractDefinition const& _contract) -- cgit v1.2.3 From a182dfe26695b24704047265cbe1cac80d0f8a83 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 10 Apr 2017 13:05:50 +0100 Subject: Remove empty wrapper formatError from jsonCompiler --- solc/jsonCompiler.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'solc') diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index f55d0c8d..0bf890af 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -50,15 +50,6 @@ extern "C" { typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error); } -string formatError( - Exception const& _exception, - string const& _name, - function const& _scannerFromSourceName -) -{ - return SourceReferenceFormatter::formatExceptionInformation(_exception, _name, _scannerFromSourceName); -} - Json::Value functionHashes(ContractDefinition const& _contract) { Json::Value functionHashes(Json::objectValue); @@ -168,7 +159,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback for (auto const& error: compiler.errors()) { auto err = dynamic_pointer_cast(error); - errors.append(formatError( + errors.append(SourceReferenceFormatter::formatExceptionInformation( *error, (err->type() == Error::Type::Warning) ? "Warning" : "Error", scannerFromSourceName @@ -178,19 +169,19 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback } catch (Error const& error) { - errors.append(formatError(error, error.typeName(), scannerFromSourceName)); + errors.append(SourceReferenceFormatter::formatExceptionInformation(error, error.typeName(), scannerFromSourceName)); } catch (CompilerError const& exception) { - errors.append(formatError(exception, "Compiler error (" + exception.lineInfo() + ")", scannerFromSourceName)); + errors.append(SourceReferenceFormatter::formatExceptionInformation(exception, "Compiler error (" + exception.lineInfo() + ")", scannerFromSourceName)); } catch (InternalCompilerError const& exception) { - errors.append(formatError(exception, "Internal compiler error (" + exception.lineInfo() + ")", scannerFromSourceName)); + errors.append(SourceReferenceFormatter::formatExceptionInformation(exception, "Internal compiler error (" + exception.lineInfo() + ")", scannerFromSourceName)); } catch (UnimplementedFeatureError const& exception) { - errors.append(formatError(exception, "Unimplemented feature (" + exception.lineInfo() + ")", scannerFromSourceName)); + errors.append(SourceReferenceFormatter::formatExceptionInformation(exception, "Unimplemented feature (" + exception.lineInfo() + ")", scannerFromSourceName)); } catch (Exception const& exception) { @@ -243,7 +234,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback { Json::Value errors(Json::arrayValue); for (auto const& error: formalErrors) - errors.append(formatError( + errors.append(SourceReferenceFormatter::formatExceptionInformation( *error, (error->type() == Error::Type::Warning) ? "Warning" : "Error", scannerFromSourceName -- cgit v1.2.3 From d90fd439e2e96551018b4f90ec073cf7e9b6e4d9 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 10 Apr 2017 14:52:05 +0100 Subject: Use new gasEstimate in jsonCompiler --- solc/jsonCompiler.cpp | 63 ++++++++++----------------------------------------- 1 file changed, 12 insertions(+), 51 deletions(-) (limited to 'solc') diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index 065716ea..b465d8db 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -58,61 +58,22 @@ Json::Value functionHashes(ContractDefinition const& _contract) return functionHashes; } -Json::Value gasToJson(GasEstimator::GasConsumption const& _gas) -{ - if (_gas.isInfinite || _gas.value > std::numeric_limits::max()) - return Json::Value(Json::nullValue); - else - return Json::Value(Json::LargestUInt(_gas.value)); -} - Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract) { - Json::Value gasEstimates(Json::objectValue); - using Gas = GasEstimator::GasConsumption; - if (!_compiler.assemblyItems(_contract) && !_compiler.runtimeAssemblyItems(_contract)) - return gasEstimates; - if (eth::AssemblyItems const* items = _compiler.assemblyItems(_contract)) - { - Gas gas = GasEstimator::functionalEstimation(*items); - u256 bytecodeSize(_compiler.runtimeObject(_contract).bytecode.size()); - Json::Value creationGas(Json::arrayValue); - creationGas[0] = gasToJson(gas); - creationGas[1] = gasToJson(bytecodeSize * eth::GasCosts::createDataGas); - gasEstimates["creation"] = creationGas; - } - if (eth::AssemblyItems const* items = _compiler.runtimeAssemblyItems(_contract)) + Json::Value estimates = _compiler.gasEstimates(_contract); + Json::Value output(Json::objectValue); + + if (estimates["creation"].isObject()) { - ContractDefinition const& contract = _compiler.contractDefinition(_contract); - Json::Value externalFunctions(Json::objectValue); - for (auto it: contract.interfaceFunctions()) - { - string sig = it.second->externalSignature(); - externalFunctions[sig] = gasToJson(GasEstimator::functionalEstimation(*items, sig)); - } - if (contract.fallbackFunction()) - externalFunctions[""] = gasToJson(GasEstimator::functionalEstimation(*items, "INVALID")); - gasEstimates["external"] = externalFunctions; - Json::Value internalFunctions(Json::objectValue); - for (auto const& it: contract.definedFunctions()) - { - if (it->isPartOfExternalInterface() || it->isConstructor()) - continue; - size_t entry = _compiler.functionEntryPoint(_contract, *it); - GasEstimator::GasConsumption gas = GasEstimator::GasConsumption::infinite(); - if (entry > 0) - gas = GasEstimator::functionalEstimation(*items, entry, *it); - FunctionType type(*it); - string sig = it->name() + "("; - auto paramTypes = type.parameterTypes(); - for (auto it = paramTypes.begin(); it != paramTypes.end(); ++it) - sig += (*it)->toString() + (it + 1 == paramTypes.end() ? "" : ","); - sig += ")"; - internalFunctions[sig] = gasToJson(gas); - } - gasEstimates["internal"] = internalFunctions; + Json::Value creation(Json::arrayValue); + creation[0] = estimates["creation"]["executionCost"]; + creation[1] = estimates["creation"]["codeDepositCost"]; + output["creation"] = creation; } - return gasEstimates; + output["external"] = estimates["external"]; + output["internal"] = estimates["internal"]; + + return output; } string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback _readCallback) -- cgit v1.2.3 From 328f2b0a8efa41d0343b4df022ce1106a5984fb4 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 10 Apr 2017 14:52:13 +0100 Subject: Use new gasEstimate in CLI --- solc/CommandLineInterface.cpp | 72 +++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 33 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index f0b73152..90cc4769 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -315,49 +315,55 @@ void CommandLineInterface::handleMeta(DocumentationType _type, string const& _co void CommandLineInterface::handleGasEstimation(string const& _contract) { - using Gas = GasEstimator::GasConsumption; - if (!m_compiler->assemblyItems(_contract) && !m_compiler->runtimeAssemblyItems(_contract)) - return; + Json::Value estimates = m_compiler->gasEstimates(_contract); cout << "Gas estimation:" << endl; - if (eth::AssemblyItems const* items = m_compiler->assemblyItems(_contract)) + + if (estimates["creation"].isObject()) { - Gas gas = GasEstimator::functionalEstimation(*items); - u256 bytecodeSize(m_compiler->runtimeObject(_contract).bytecode.size()); + Json::Value creation = estimates["creation"]; cout << "construction:" << endl; - cout << " " << gas << " + " << (bytecodeSize * eth::GasCosts::createDataGas) << " = "; - gas += bytecodeSize * eth::GasCosts::createDataGas; - cout << gas << endl; + if (creation["executionCost"].isNull()) + cout << " infinite"; + else + cout << " " << creation["executionCost"]; + if (creation["codeDepositCost"].isNull()) + cout << " + infinite"; + else + cout << " + " << creation["codeDepositCost"]; + if (creation["totalCost"].isNull()) + cout << " = infinite"; + else + cout << " = " << creation["totalCost"] << endl; } - if (eth::AssemblyItems const* items = m_compiler->runtimeAssemblyItems(_contract)) + + if (estimates["external"].isObject()) { - ContractDefinition const& contract = m_compiler->contractDefinition(_contract); + Json::Value externalFunctions = estimates["external"]; cout << "external:" << endl; - for (auto it: contract.interfaceFunctions()) - { - string sig = it.second->externalSignature(); - GasEstimator::GasConsumption gas = GasEstimator::functionalEstimation(*items, sig); - cout << " " << sig << ":\t" << gas << endl; - } - if (contract.fallbackFunction()) + for (auto const& name: externalFunctions.getMemberNames()) { - GasEstimator::GasConsumption gas = GasEstimator::functionalEstimation(*items, "INVALID"); - cout << " fallback:\t" << gas << endl; + if (name.empty()) + cout << " fallback:\t"; + else + cout << " " << name << ":\t"; + if (externalFunctions[name].isNull()) + cout << "infinite" << endl; + else + cout << externalFunctions[name] << endl; } + } + + if (estimates["internal"].isObject()) + { + Json::Value internalFunctions = estimates["internal"]; cout << "internal:" << endl; - for (auto const& it: contract.definedFunctions()) + for (auto const& name: internalFunctions.getMemberNames()) { - if (it->isPartOfExternalInterface() || it->isConstructor()) - continue; - size_t entry = m_compiler->functionEntryPoint(_contract, *it); - GasEstimator::GasConsumption gas = GasEstimator::GasConsumption::infinite(); - if (entry > 0) - gas = GasEstimator::functionalEstimation(*items, entry, *it); - FunctionType type(*it); - cout << " " << it->name() << "("; - auto paramTypes = type.parameterTypes(); - for (auto it = paramTypes.begin(); it != paramTypes.end(); ++it) - cout << (*it)->toString() << (it + 1 == paramTypes.end() ? "" : ","); - cout << "):\t" << gas << endl; + cout << " " << name << ":\t"; + if (internalFunctions[name].isNull()) + cout << "infinite" << endl; + else + cout << internalFunctions[name] << endl; } } } -- cgit v1.2.3 From fe4fccaaf21dbb7cbfed9b758a3d8f12f979c6dc Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 11 Apr 2017 10:01:24 +0100 Subject: The gasEstimates objects must always be present in the jsonCompiler even if empty (backwards compat) --- solc/jsonCompiler.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'solc') diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index b465d8db..accbc13c 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -70,8 +70,10 @@ Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract) creation[1] = estimates["creation"]["codeDepositCost"]; output["creation"] = creation; } - output["external"] = estimates["external"]; - output["internal"] = estimates["internal"]; + else + output["creation"] = Json::objectValue; + output["external"] = estimates.get("external", Json::objectValue); + output["internal"] = estimates.get("internal", Json::objectValue); return output; } -- cgit v1.2.3 From 54dcb0e11be09caf35e02792d47695685ba1f4cb Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 12 Apr 2017 12:06:01 +0100 Subject: Keep gas values as a string in CompilerStack::gasEstimate --- solc/CommandLineInterface.cpp | 25 +++++-------------------- solc/jsonCompiler.cpp | 29 +++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 24 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 90cc4769..947a2004 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -322,18 +322,9 @@ void CommandLineInterface::handleGasEstimation(string const& _contract) { Json::Value creation = estimates["creation"]; cout << "construction:" << endl; - if (creation["executionCost"].isNull()) - cout << " infinite"; - else - cout << " " << creation["executionCost"]; - if (creation["codeDepositCost"].isNull()) - cout << " + infinite"; - else - cout << " + " << creation["codeDepositCost"]; - if (creation["totalCost"].isNull()) - cout << " = infinite"; - else - cout << " = " << creation["totalCost"] << endl; + cout << " " << creation["executionCost"].asString(); + cout << " + " << creation["codeDepositCost"].asString(); + cout << " = " << creation["totalCost"].asString() << endl; } if (estimates["external"].isObject()) @@ -346,10 +337,7 @@ void CommandLineInterface::handleGasEstimation(string const& _contract) cout << " fallback:\t"; else cout << " " << name << ":\t"; - if (externalFunctions[name].isNull()) - cout << "infinite" << endl; - else - cout << externalFunctions[name] << endl; + cout << externalFunctions[name].asString() << endl; } } @@ -360,10 +348,7 @@ void CommandLineInterface::handleGasEstimation(string const& _contract) for (auto const& name: internalFunctions.getMemberNames()) { cout << " " << name << ":\t"; - if (internalFunctions[name].isNull()) - cout << "infinite" << endl; - else - cout << internalFunctions[name] << endl; + cout << internalFunctions[name].asString() << endl; } } } diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index accbc13c..fd375ce3 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -58,6 +58,27 @@ Json::Value functionHashes(ContractDefinition const& _contract) return functionHashes; } +/// 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::max()) + return Json::Value(Json::nullValue); + else + return Json::Value(Json::LargestUInt(value)); +} + Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract) { Json::Value estimates = _compiler.gasEstimates(_contract); @@ -66,14 +87,14 @@ Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract) if (estimates["creation"].isObject()) { Json::Value creation(Json::arrayValue); - creation[0] = estimates["creation"]["executionCost"]; - creation[1] = estimates["creation"]["codeDepositCost"]; + creation[0] = gasToJson(estimates["creation"]["executionCost"]); + creation[1] = gasToJson(estimates["creation"]["codeDepositCost"]); output["creation"] = creation; } else output["creation"] = Json::objectValue; - output["external"] = estimates.get("external", Json::objectValue); - output["internal"] = estimates.get("internal", Json::objectValue); + output["external"] = gasToJson(estimates.get("external", Json::objectValue)); + output["internal"] = gasToJson(estimates.get("internal", Json::objectValue)); return output; } -- cgit v1.2.3 From 8bf842050e83c33ad08789219ea62b8ace33de88 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 19 Apr 2017 16:59:03 +0100 Subject: Support --allow-paths in the CLI --- solc/CommandLineInterface.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 947a2004..76102b53 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -102,6 +102,7 @@ static string const g_strSrcMapRuntime = "srcmap-runtime"; static string const g_strVersion = "version"; static string const g_stdinFileNameStr = ""; static string const g_strMetadataLiteral = "metadata-literal"; +static string const g_strAllowPaths = "allow-paths"; static string const g_argAbi = g_strAbi; static string const g_argAddStandard = g_strAddStandard; @@ -131,6 +132,7 @@ static string const g_argSignatureHashes = g_strSignatureHashes; static string const g_argVersion = g_strVersion; static string const g_stdinFileName = g_stdinFileNameStr; static string const g_argMetadataLiteral = g_strMetadataLiteral; +static string const g_argAllowPaths = g_strAllowPaths; /// Possible arguments to for --combined-json static set const g_combinedJsonArgs{ @@ -533,7 +535,12 @@ Allowed options)", "Switch to linker mode, ignoring all options apart from --libraries " "and modify binaries in place." ) - (g_argMetadataLiteral.c_str(), "Store referenced sources are literal data in the metadata output."); + (g_argMetadataLiteral.c_str(), "Store referenced sources are literal data in the metadata output.") + ( + g_argAllowPaths.c_str(), + po::value()->value_name("path(s)"), + "Allow a given path for imports. A list of paths can be supplied by separating them with a comma." + ); po::options_description outputComponents("Output Components"); outputComponents.add_options() (g_argAst.c_str(), "AST of all source files.") @@ -601,6 +608,13 @@ Allowed options)", bool CommandLineInterface::processInput() { + if (m_args.count(g_argAllowPaths)) + { + vector paths; + for (string const& path: boost::split(paths, m_args[g_argAllowPaths].as(), boost::is_any_of(","))) + m_allowedDirectories.push_back(boost::filesystem::path(path)); + } + readInputFilesAndConfigureRemappings(); if (m_args.count(g_argLibraries)) -- cgit v1.2.3 From 8c9e57fadf35711fd18ba2a129c0690d2a09cc03 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 9 Feb 2017 14:55:57 +0000 Subject: Add --standard-json to solc --- solc/CommandLineInterface.cpp | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 76102b53..a622fcfe 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -103,6 +104,7 @@ static string const g_strVersion = "version"; static string const g_stdinFileNameStr = ""; static string const g_strMetadataLiteral = "metadata-literal"; static string const g_strAllowPaths = "allow-paths"; +static string const g_strStandardJSON = "standard-json"; static string const g_argAbi = g_strAbi; static string const g_argAddStandard = g_strAddStandard; @@ -133,6 +135,7 @@ static string const g_argVersion = g_strVersion; static string const g_stdinFileName = g_stdinFileNameStr; static string const g_argMetadataLiteral = g_strMetadataLiteral; static string const g_argAllowPaths = g_strAllowPaths; +static string const g_argStandardJSON = g_strStandardJSON; /// Possible arguments to for --combined-json static set const g_combinedJsonArgs{ @@ -526,6 +529,11 @@ Allowed options)", "Output a single json document containing the specified information." ) (g_argGas.c_str(), "Print an estimate of the maximal gas usage for each function.") + ( + g_argStandardJSON.c_str(), + "Switch to Standard JSON input / output mode, ignoring all options." + "It reads from standard input and provides the result on the standard output." + ) ( g_argAssemble.c_str(), "Switch to assembly mode, ignoring all options and assumes input is assembly." @@ -615,6 +623,20 @@ bool CommandLineInterface::processInput() m_allowedDirectories.push_back(boost::filesystem::path(path)); } + if (m_args.count(g_argStandardJSON)) + { + string input; + while (!cin.eof()) + { + string tmp; + getline(cin, tmp); + input.append(tmp + "\n"); + } + StandardCompiler compiler; + cout << compiler.compile(input) << endl; + return true; + } + readInputFilesAndConfigureRemappings(); if (m_args.count(g_argLibraries)) @@ -882,7 +904,9 @@ void CommandLineInterface::handleAst(string const& _argStr) bool CommandLineInterface::actOnInput() { - if (m_onlyAssemble) + if (m_args.count(g_argStandardJSON)) + return true; + else if (m_onlyAssemble) outputAssembly(); else if (m_onlyLink) writeLinkedFiles(); -- cgit v1.2.3 From 4f3c76364c5f76c42f28fcaeb28f57946545a61a Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 16 Mar 2017 23:48:51 +0000 Subject: Export StandardCompiler as compileStandard in soljson --- solc/jsonCompiler.cpp | 80 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 31 deletions(-) (limited to 'solc') diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index fd375ce3..42c25de0 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,41 @@ extern "C" { typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error); } +ReadFile::Callback wrapReadCallback(CStyleReadFileCallback _readCallback = nullptr) +{ + ReadFile::Callback readCallback; + if (_readCallback) + { + readCallback = [=](string const& _path) + { + char* contents_c = nullptr; + char* error_c = nullptr; + _readCallback(_path.c_str(), &contents_c, &error_c); + ReadFile::Result result; + result.success = true; + if (!contents_c && !error_c) + { + result.success = false; + result.contentsOrErrorMessage = "File not found."; + } + if (contents_c) + { + result.success = true; + result.contentsOrErrorMessage = string(contents_c); + free(contents_c); + } + if (error_c) + { + result.success = false; + result.contentsOrErrorMessage = string(error_c); + free(error_c); + } + return result; + }; + } + return readCallback; +} + Json::Value functionHashes(ContractDefinition const& _contract) { Json::Value functionHashes(Json::objectValue); @@ -103,37 +139,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback { Json::Value output(Json::objectValue); Json::Value errors(Json::arrayValue); - ReadFile::Callback readCallback; - if (_readCallback) - { - readCallback = [=](string const& _path) - { - char* contents_c = nullptr; - char* error_c = nullptr; - _readCallback(_path.c_str(), &contents_c, &error_c); - ReadFile::Result result; - result.success = true; - if (!contents_c && !error_c) - { - result.success = false; - result.contentsOrErrorMessage = "File not found."; - } - if (contents_c) - { - result.success = true; - result.contentsOrErrorMessage = string(contents_c); - free(contents_c); - } - if (error_c) - { - result.success = false; - result.contentsOrErrorMessage = string(error_c); - free(error_c); - } - return result; - }; - } - CompilerStack compiler(readCallback); + CompilerStack compiler(wrapReadCallback(_readCallback)); auto scannerFromSourceName = [&](string const& _sourceName) -> solidity::Scanner const& { return compiler.scanner(_sourceName); }; bool success = false; try @@ -287,6 +293,13 @@ string compileSingle(string const& _input, bool _optimize) return compile(sources, _optimize, nullptr); } + +string compileStandardInternal(string const& _input, CStyleReadFileCallback _readCallback = nullptr) +{ + StandardCompiler compiler(wrapReadCallback(_readCallback)); + return compiler.compile(_input); +} + static string s_outputBuffer; extern "C" @@ -310,4 +323,9 @@ extern char const* compileJSONCallback(char const* _input, bool _optimize, CStyl s_outputBuffer = compileMulti(_input, _optimize, _readCallback); return s_outputBuffer.c_str(); } +extern char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback) +{ + s_outputBuffer = compileStandardInternal(_input, _readCallback); + return s_outputBuffer.c_str(); +} } -- cgit v1.2.3 From b30fad4a49b911577c0c04ef9dadaf7ea0617b28 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 20 Apr 2017 20:01:17 +0100 Subject: Check for path permissions before opening file in the CLI file reader --- solc/CommandLineInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 76102b53..d115d5ab 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -638,8 +638,6 @@ bool CommandLineInterface::processInput() ReadFile::Callback fileReader = [this](string const& _path) { auto path = boost::filesystem::path(_path); - if (!boost::filesystem::exists(path)) - return ReadFile::Result{false, "File not found."}; auto canonicalPath = boost::filesystem::canonical(path); bool isAllowed = false; for (auto const& allowedDir: m_allowedDirectories) @@ -656,6 +654,8 @@ bool CommandLineInterface::processInput() } if (!isAllowed) return ReadFile::Result{false, "File outside of allowed directories."}; + else if (!boost::filesystem::exists(path)) + return ReadFile::Result{false, "File not found."}; else if (!boost::filesystem::is_regular_file(canonicalPath)) return ReadFile::Result{false, "Not a valid file."}; else -- cgit v1.2.3 From 4566b4b336c2e572aeb98b174cabb110b454921a Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 19 Apr 2017 16:45:36 +0100 Subject: Pass readFileCallback to StandardCompiler in CLI --- solc/CommandLineInterface.cpp | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 49dfd0b5..2bfd0bf2 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -616,6 +616,37 @@ Allowed options)", bool CommandLineInterface::processInput() { + ReadFile::Callback fileReader = [this](string const& _path) + { + auto path = boost::filesystem::path(_path); + auto canonicalPath = boost::filesystem::canonical(path); + bool isAllowed = false; + for (auto const& allowedDir: m_allowedDirectories) + { + // If dir is a prefix of boostPath, we are fine. + if ( + std::distance(allowedDir.begin(), allowedDir.end()) <= std::distance(canonicalPath.begin(), canonicalPath.end()) && + std::equal(allowedDir.begin(), allowedDir.end(), canonicalPath.begin()) + ) + { + isAllowed = true; + break; + } + } + if (!isAllowed) + return ReadFile::Result{false, "File outside of allowed directories."}; + else if (!boost::filesystem::exists(path)) + return ReadFile::Result{false, "File not found."}; + else if (!boost::filesystem::is_regular_file(canonicalPath)) + return ReadFile::Result{false, "Not a valid file."}; + else + { + auto contents = dev::contentsString(canonicalPath.string()); + m_sourceCodes[path.string()] = contents; + return ReadFile::Result{true, contents}; + } + }; + if (m_args.count(g_argAllowPaths)) { vector paths; @@ -632,7 +663,7 @@ bool CommandLineInterface::processInput() getline(cin, tmp); input.append(tmp + "\n"); } - StandardCompiler compiler; + StandardCompiler compiler(fileReader); cout << compiler.compile(input) << endl; return true; } @@ -657,37 +688,6 @@ bool CommandLineInterface::processInput() return link(); } - ReadFile::Callback fileReader = [this](string const& _path) - { - auto path = boost::filesystem::path(_path); - auto canonicalPath = boost::filesystem::canonical(path); - bool isAllowed = false; - for (auto const& allowedDir: m_allowedDirectories) - { - // If dir is a prefix of boostPath, we are fine. - if ( - std::distance(allowedDir.begin(), allowedDir.end()) <= std::distance(canonicalPath.begin(), canonicalPath.end()) && - std::equal(allowedDir.begin(), allowedDir.end(), canonicalPath.begin()) - ) - { - isAllowed = true; - break; - } - } - if (!isAllowed) - return ReadFile::Result{false, "File outside of allowed directories."}; - else if (!boost::filesystem::exists(path)) - return ReadFile::Result{false, "File not found."}; - else if (!boost::filesystem::is_regular_file(canonicalPath)) - return ReadFile::Result{false, "Not a valid file."}; - else - { - auto contents = dev::contentsString(canonicalPath.string()); - m_sourceCodes[path.string()] = contents; - return ReadFile::Result{true, contents}; - } - }; - m_compiler.reset(new CompilerStack(fileReader)); auto scannerFromSourceName = [&](string const& _sourceName) -> solidity::Scanner const& { return m_compiler->scanner(_sourceName); }; try -- cgit v1.2.3 From b7951be44a978ba3eb1a99c429e5f73770bd0972 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 20 Apr 2017 23:32:42 +0100 Subject: Add exception guard to ReadFileCallback in CLI --- solc/CommandLineInterface.cpp | 53 ++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 21 deletions(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 2bfd0bf2..632c400b 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -618,32 +618,43 @@ bool CommandLineInterface::processInput() { ReadFile::Callback fileReader = [this](string const& _path) { - auto path = boost::filesystem::path(_path); - auto canonicalPath = boost::filesystem::canonical(path); - bool isAllowed = false; - for (auto const& allowedDir: m_allowedDirectories) + try { - // If dir is a prefix of boostPath, we are fine. - if ( - std::distance(allowedDir.begin(), allowedDir.end()) <= std::distance(canonicalPath.begin(), canonicalPath.end()) && - std::equal(allowedDir.begin(), allowedDir.end(), canonicalPath.begin()) - ) + auto path = boost::filesystem::path(_path); + auto canonicalPath = boost::filesystem::canonical(path); + bool isAllowed = false; + for (auto const& allowedDir: m_allowedDirectories) { - isAllowed = true; - break; + // If dir is a prefix of boostPath, we are fine. + if ( + std::distance(allowedDir.begin(), allowedDir.end()) <= std::distance(canonicalPath.begin(), canonicalPath.end()) && + std::equal(allowedDir.begin(), allowedDir.end(), canonicalPath.begin()) + ) + { + isAllowed = true; + break; + } + } + if (!isAllowed) + return ReadFile::Result{false, "File outside of allowed directories."}; + else if (!boost::filesystem::exists(path)) + return ReadFile::Result{false, "File not found."}; + else if (!boost::filesystem::is_regular_file(canonicalPath)) + return ReadFile::Result{false, "Not a valid file."}; + else + { + auto contents = dev::contentsString(canonicalPath.string()); + m_sourceCodes[path.string()] = contents; + return ReadFile::Result{true, contents}; } } - if (!isAllowed) - return ReadFile::Result{false, "File outside of allowed directories."}; - else if (!boost::filesystem::exists(path)) - return ReadFile::Result{false, "File not found."}; - else if (!boost::filesystem::is_regular_file(canonicalPath)) - return ReadFile::Result{false, "Not a valid file."}; - else + catch (Exception const& _exception) + { + return ReadFile::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)}; + } + catch (...) { - auto contents = dev::contentsString(canonicalPath.string()); - m_sourceCodes[path.string()] = contents; - return ReadFile::Result{true, contents}; + return ReadFile::Result{false, "Unknown exception in read callback."}; } }; -- cgit v1.2.3 From 017fedebfef7a98020873387af46b2329b23ab10 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 24 Apr 2017 14:22:39 +0200 Subject: Add missing space. --- solc/CommandLineInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solc') diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 632c400b..63d41cdf 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -531,7 +531,7 @@ Allowed options)", (g_argGas.c_str(), "Print an estimate of the maximal gas usage for each function.") ( g_argStandardJSON.c_str(), - "Switch to Standard JSON input / output mode, ignoring all options." + "Switch to Standard JSON input / output mode, ignoring all options. " "It reads from standard input and provides the result on the standard output." ) ( -- cgit v1.2.3 From 4eae971b31b4b43544473774e4bb98dfad1af07c Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 24 Apr 2017 16:36:37 +0100 Subject: Export compileStandard on emscripten --- solc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solc') diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index fa7e0bde..a5515d81 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() if (EMSCRIPTEN) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\"]' -s RESERVED_FUNCTION_POINTERS=20") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20") add_executable(soljson jsonCompiler.cpp ${HEADERS}) eth_use(soljson REQUIRED Solidity::solidity) else() -- cgit v1.2.3