From d6d7c9219b66c252c64528db615faafb4ddc650c Mon Sep 17 00:00:00 2001 From: arkpar Date: Sat, 31 Jan 2015 14:41:11 +0100 Subject: json and solidity ABI generted for events --- AST.cpp | 17 +++++++++++++++++ AST.h | 2 ++ InterfaceHandler.cpp | 43 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/AST.cpp b/AST.cpp index d7bfb0d3..10464726 100644 --- a/AST.cpp +++ b/AST.cpp @@ -152,6 +152,23 @@ void ContractDefinition::checkIllegalOverrides() const } } +std::vector> const& ContractDefinition::getInterfaceEvents() const +{ + if (!m_interfaceEvents) + { + set eventsSeen; + m_interfaceEvents.reset(new std::vector>()); + for (ContractDefinition const* contract: getLinearizedBaseContracts()) + for (ASTPointer const& e: contract->getEvents()) + if (eventsSeen.count(e->getName()) == 0) + { + eventsSeen.insert(e->getName()); + m_interfaceEvents->push_back(e); + } + } + return *m_interfaceEvents; +} + vector, FunctionTypePointer>> const& ContractDefinition::getInterfaceFunctionList() const { if (!m_interfaceFunctionList) diff --git a/AST.h b/AST.h index 113daf72..fefd0e94 100755 --- a/AST.h +++ b/AST.h @@ -222,6 +222,7 @@ public: std::vector> const& getFunctionModifiers() const { return m_functionModifiers; } std::vector> const& getDefinedFunctions() const { return m_definedFunctions; } std::vector> const& getEvents() const { return m_events; } + std::vector> const& getInterfaceEvents() const; virtual TypePointer getType(ContractDefinition const* m_currentContract) const override; @@ -257,6 +258,7 @@ private: std::vector m_linearizedBaseContracts; mutable std::unique_ptr, FunctionTypePointer>>> m_interfaceFunctionList; + mutable std::unique_ptr>> m_interfaceEvents; }; class InheritanceSpecifier: public ASTNode diff --git a/InterfaceHandler.cpp b/InterfaceHandler.cpp index c4bed99f..e9c74fb8 100644 --- a/InterfaceHandler.cpp +++ b/InterfaceHandler.cpp @@ -37,16 +37,11 @@ std::unique_ptr InterfaceHandler::getDocumentation(ContractDefiniti std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinition const& _contractDef) { - Json::Value methods(Json::arrayValue); - + Json::Value abi(Json::arrayValue); for (auto const& it: _contractDef.getInterfaceFunctions()) { Json::Value method; - Json::Value inputs(Json::arrayValue); - Json::Value outputs(Json::arrayValue); - - auto populateParameters = [](vector const& _paramNames, - vector const& _paramTypes) + 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"); @@ -66,9 +61,28 @@ std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinitio it.second->getParameterTypeNames()); method["outputs"] = populateParameters(it.second->getReturnParameterNames(), it.second->getReturnParameterTypeNames()); - methods.append(method); + abi.append(method); + } + + for (auto const& it: _contractDef.getInterfaceEvents()) + { + Json::Value event; + event["type"] = "event"; + event["name"] = it->getName(); + Json::Value params(Json::arrayValue); + for (auto const& p: it->getParameters()) + { + Json::Value input; + input["name"] = p->getName(); + input["type"] = p->getType()->toString(); + input["indexed"] = p->isIndexed(); + params.append(input); + } + event["inputs"] = params; + abi.append(event); } - return std::unique_ptr(new std::string(m_writer.write(methods))); + + return std::unique_ptr(new std::string(m_writer.write(abi))); } unique_ptr InterfaceHandler::getABISolidityInterface(ContractDefinition const& _contractDef) @@ -94,6 +108,17 @@ unique_ptr InterfaceHandler::getABISolidityInterface(ContractDefinition ret.pop_back(); ret += "{}"; } + for (auto const& it: _contractDef.getInterfaceEvents()) + { + std::string params; + for (auto const& p: it->getParameters()) + params += (params.empty() ? "(" : ",") + p->getType()->toString() + (p->isIndexed() ? " indexed " : " ") + p->getName(); + if (!params.empty()) + params += ")"; + + ret += "event " + it->getName() + params + ";"; + } + return unique_ptr(new string(ret + "}")); } -- cgit v1.2.3 From bc9d376590503956f73ee75070c74832ad97e6d2 Mon Sep 17 00:00:00 2001 From: arkpar Date: Sat, 31 Jan 2015 14:44:04 +0100 Subject: style --- InterfaceHandler.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/InterfaceHandler.cpp b/InterfaceHandler.cpp index e9c74fb8..7d0598ed 100644 --- a/InterfaceHandler.cpp +++ b/InterfaceHandler.cpp @@ -81,7 +81,6 @@ std::unique_ptr InterfaceHandler::getABIInterface(ContractDefinitio event["inputs"] = params; abi.append(event); } - return std::unique_ptr(new std::string(m_writer.write(abi))); } @@ -118,7 +117,6 @@ unique_ptr InterfaceHandler::getABISolidityInterface(ContractDefinition ret += "event " + it->getName() + params + ";"; } - return unique_ptr(new string(ret + "}")); } -- cgit v1.2.3 From 4e440b6e5da8cb1122342377156f3706300f98c7 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 31 Jan 2015 16:50:33 +0100 Subject: Fix scoping of event arguments. --- AST.h | 2 +- NameAndTypeResolver.cpp | 7 ++++++- NameAndTypeResolver.h | 23 ++++++++++++----------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/AST.h b/AST.h index 113daf72..a3adca79 100755 --- a/AST.h +++ b/AST.h @@ -471,7 +471,7 @@ private: /** * Definition of a (loggable) event. */ -class EventDefinition: public Declaration, public Documented +class EventDefinition: public Declaration, public VariableScope, public Documented { public: EventDefinition(Location const& _location, diff --git a/NameAndTypeResolver.cpp b/NameAndTypeResolver.cpp index 75df637c..7dc42bc6 100644 --- a/NameAndTypeResolver.cpp +++ b/NameAndTypeResolver.cpp @@ -263,10 +263,15 @@ bool DeclarationRegistrationHelper::visit(VariableDeclaration& _declaration) bool DeclarationRegistrationHelper::visit(EventDefinition& _event) { - registerDeclaration(_event, false); + registerDeclaration(_event, true); return true; } +void DeclarationRegistrationHelper::endVisit(EventDefinition&) +{ + closeCurrentScope(); +} + void DeclarationRegistrationHelper::enterNewSubScope(Declaration const& _declaration) { map::iterator iter; diff --git a/NameAndTypeResolver.h b/NameAndTypeResolver.h index 4555491f..4b7ce6e7 100644 --- a/NameAndTypeResolver.h +++ b/NameAndTypeResolver.h @@ -94,17 +94,18 @@ public: DeclarationRegistrationHelper(std::map& _scopes, ASTNode& _astRoot); private: - bool visit(ContractDefinition& _contract); - void endVisit(ContractDefinition& _contract); - bool visit(StructDefinition& _struct); - void endVisit(StructDefinition& _struct); - bool visit(FunctionDefinition& _function); - void endVisit(FunctionDefinition& _function); - bool visit(ModifierDefinition& _modifier); - void endVisit(ModifierDefinition& _modifier); - void endVisit(VariableDefinition& _variableDefinition); - bool visit(VariableDeclaration& _declaration); - bool visit(EventDefinition& _event); + bool visit(ContractDefinition& _contract) override; + void endVisit(ContractDefinition& _contract) override; + bool visit(StructDefinition& _struct) override; + void endVisit(StructDefinition& _struct) override; + bool visit(FunctionDefinition& _function) override; + void endVisit(FunctionDefinition& _function) override; + bool visit(ModifierDefinition& _modifier) override; + void endVisit(ModifierDefinition& _modifier) override; + void endVisit(VariableDefinition& _variableDefinition) override; + bool visit(VariableDeclaration& _declaration) override; + bool visit(EventDefinition& _event) override; + void endVisit(EventDefinition& _event) override; void enterNewSubScope(Declaration const& _declaration); void closeCurrentScope(); -- cgit v1.2.3