From d5c2a6b26a617101d282897295024fa105f1d503 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 31 Jan 2015 08:23:58 -0800 Subject: [PATCH] Code for outputing events as well as functions. --- libsolidity/InterfaceHandler.cpp | 33 +++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/libsolidity/InterfaceHandler.cpp b/libsolidity/InterfaceHandler.cpp index c4bed99f7..8979f3562 100644 --- a/libsolidity/InterfaceHandler.cpp +++ b/libsolidity/InterfaceHandler.cpp @@ -37,14 +37,28 @@ std::unique_ptr InterfaceHandler::getDocumentation(ContractDefiniti std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinition const& _contractDef) { - Json::Value methods(Json::arrayValue); - - for (auto const& it: _contractDef.getInterfaceFunctions()) + Json::Value members(Json::arrayValue); +/* + for (ASTPointer const& it: _contractDef.getEvents()) { - Json::Value method; + Json::Value event;5 Json::Value inputs(Json::arrayValue); - Json::Value outputs(Json::arrayValue); + event["type"] = "event"; + Json::Value params(Json::arrayValue); + for (ASTPointer const& p: it->getParameters()) + { + Json::Value param; + param["name"] = p->getName(); + param["type"] = p->getType()->toString(); + param["indexed"] = p->isIndexed(); + params.append(param); + } + event["inputs"] = params; + members.append(event); + }*/ + for (auto const& it: _contractDef.getInterfaceFunctions()) + { auto populateParameters = [](vector const& _paramNames, vector const& _paramTypes) { @@ -59,6 +73,11 @@ std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinitio } return params; }; + + Json::Value method; + Json::Value inputs(Json::arrayValue); + Json::Value outputs(Json::arrayValue); + method["type"] = "function"; method["name"] = it.second->getDeclaration().getName(); method["constant"] = it.second->isConstant(); @@ -66,9 +85,9 @@ std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinitio it.second->getParameterTypeNames()); method["outputs"] = populateParameters(it.second->getReturnParameterNames(), it.second->getReturnParameterTypeNames()); - methods.append(method); + members.append(method); } - return std::unique_ptr(new std::string(m_writer.write(methods))); + return std::unique_ptr(new std::string(m_writer.write(members))); } unique_ptr InterfaceHandler::getABISolidityInterface(ContractDefinition const& _contractDef)