diff --git a/libsolidity/InterfaceHandler.cpp b/libsolidity/InterfaceHandler.cpp index 42656d37b..d4958475b 100644 --- a/libsolidity/InterfaceHandler.cpp +++ b/libsolidity/InterfaceHandler.cpp @@ -38,33 +38,26 @@ std::unique_ptr InterfaceHandler::getDocumentation(ContractDefiniti std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinition const& _contractDef) { Json::Value abi(Json::arrayValue); - auto allFunctions = _contractDef.getInterfaceFunctions(); - FunctionTypePointer functionTypePointer = nullptr; - if (_contractDef.getConstructor()) + auto populateParameters = [](vector const& _paramNames, vector const& _paramTypes) { - functionTypePointer = make_shared(*_contractDef.getConstructor(), false); - allFunctions.insert(make_pair(_contractDef.getConstructorsInterface(), functionTypePointer)); - } + Json::Value params(Json::arrayValue); + solAssert(_paramNames.size() == _paramTypes.size(), "Names and types vector size does not match"); + for (unsigned i = 0; i < _paramNames.size(); ++i) + { + Json::Value param; + param["name"] = _paramNames[i]; + param["type"] = _paramTypes[i]; + params.append(param); + } + return params; + }; - for (auto it: allFunctions) + for (auto it: _contractDef.getInterfaceFunctions()) { - auto populateParameters = [](vector const& _paramNames, vector const& _paramTypes) - { - Json::Value params(Json::arrayValue); - solAssert(_paramNames.size() == _paramTypes.size(), "Names and types vector size does not match"); - for (unsigned i = 0; i < _paramNames.size(); ++i) - { - Json::Value param; - param["name"] = _paramNames[i]; - param["type"] = _paramTypes[i]; - params.append(param); - } - return params; - }; Json::Value method; - method["type"] = (functionTypePointer == it.second ? "constructor" : "function"); + method["type"] = "function"; method["name"] = it.second->getDeclaration().getName(); method["constant"] = it.second->isConstant(); method["inputs"] = populateParameters(it.second->getParameterNames(), @@ -73,6 +66,18 @@ std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinitio it.second->getReturnParameterTypeNames()); abi.append(method); } + if (_contractDef.getConstructor()) + { + Json::Value method; + method["type"] = "constructor"; + auto externalFunction = FunctionType(*_contractDef.getConstructor()).externalFunctionType(); + solAssert(!!externalFunction, ""); + method["inputs"] = populateParameters( + externalFunction->getParameterNames(), + externalFunction->getParameterTypeNames() + ); + abi.append(method); + } for (auto const& it: _contractDef.getInterfaceEvents()) { diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index de2af1d27..f9ecb7d9c 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -505,11 +505,8 @@ BOOST_AUTO_TEST_CASE(constructor_abi) char const* interface = R"([ { - "constant" : false, - "inputs" : [], - "name" : "test", - "outputs" : [], - "type" : "constructor" + "inputs" : [], + "type" : "constructor" } ])"; checkInterface(sourceCode, interface);