3 files changed, 26 insertions, 17 deletions

diff --git a/packages/abi-gen/src/index.ts b/packages/abi-gen/src/index.ts
index 19d289e49..ed71087b2 100644
--- a/packages/abi-gen/src/index.ts
+++ b/packages/abi-gen/src/index.ts
@@ -2,7 +2,7 @@
 
 import chalk from 'chalk';
 import * as fs from 'fs';
-import {sync as globSync} from 'glob';
+import { sync as globSync } from 'glob';
 import * as Handlebars from 'handlebars';
 import * as _ from 'lodash';
 import * as mkdirp from 'mkdirp';
@@ -11,10 +11,11 @@ import * as yargs from 'yargs';
 import toSnakeCase = require('to-snake-case');
 import * as Web3 from 'web3';
 
-import {ContextData, ParamKind} from './types';
-import {utils} from './utils';
+import { ContextData, ParamKind } from './types';
+import { utils } from './utils';
 
 const ABI_TYPE_METHOD = 'function';
+const ABI_TYPE_EVENT = 'event';
 const MAIN_TEMPLATE_NAME = 'contract.mustache';
 
 const args = yargs
@@ -32,8 +33,7 @@ const args = yargs
         describe: 'Folder where to put the output files',
         type: 'string',
         demand: true,
-    })
-    .argv;
+    }).argv;
 
 function writeOutputFile(name: string, renderedTsCode: string): void {
     const fileName = toSnakeCase(name);
@@ -66,14 +66,15 @@ for (const abiFileName of abiFileNames) {
     const namedContent = utils.getNamedContent(abiFileName);
     utils.log(`Processing: ${chalk.bold(namedContent.name)}...`);
     const parsedContent = JSON.parse(namedContent.content);
-    const ABI = _.isArray(parsedContent) ?
-                parsedContent : // ABI file
-                parsedContent.abi; // Truffle contracts file
+    const ABI = _.isArray(parsedContent)
+        ? parsedContent // ABI file
+        : parsedContent.abi; // Truffle contracts file
     if (_.isUndefined(ABI)) {
         utils.log(`${chalk.red(`ABI not found in ${abiFileName}.`)}`);
         utils.log(`Please make sure your ABI file is either an array with ABI entries or an object with the abi key`);
         process.exit(1);
     }
+
     const methodAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_METHOD) as Web3.MethodAbi[];
     const methodsData = _.map(methodAbis, methodAbi => {
         _.map(methodAbi.inputs, input => {
@@ -89,9 +90,13 @@ for (const abiFileName of abiFileNames) {
         };
         return methodData;
     });
+
+    const eventAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_EVENT) as Web3.EventAbi[];
+
     const contextData = {
         contractName: namedContent.name,
         methods: methodsData,
+        events: eventAbis,
     };
     const renderedTsCode = template(contextData);
     writeOutputFile(namedContent.name, renderedTsCode);
diff --git a/packages/abi-gen/src/types.ts b/packages/abi-gen/src/types.ts
index 1dc039c83..8b158d77a 100644
--- a/packages/abi-gen/src/types.ts
+++ b/packages/abi-gen/src/types.ts
@@ -12,4 +12,5 @@ export interface Method extends Web3.MethodAbi {
 export interface ContextData {
     contractName: string;
     methods: Method[];
+    events: Web3.EventAbi[];
 }
diff --git a/packages/abi-gen/src/utils.ts b/packages/abi-gen/src/utils.ts
index b3f60a02a..764daa142 100644
--- a/packages/abi-gen/src/utils.ts
+++ b/packages/abi-gen/src/utils.ts
@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as path from 'path';
 
-import {ParamKind} from './types';
+import { ParamKind } from './types';
 
 export const utils = {
     solTypeToTsType(paramKind: ParamKind, solType: string): string {
@@ -14,19 +14,22 @@ export const utils = {
             return arrayTsType;
         } else {
             const solTypeRegexToTsType = [
-                {regex: '^string$', tsType: 'string'},
-                {regex: '^address$', tsType: 'string'},
-                {regex: '^bool$', tsType: 'boolean'},
-                {regex: '^u?int\\d*$', tsType: 'BigNumber'},
-                {regex: '^bytes\\d*$', tsType: 'string'},
+                { regex: '^string$', tsType: 'string' },
+                { regex: '^address$', tsType: 'string' },
+                { regex: '^bool$', tsType: 'boolean' },
+                { regex: '^u?int\\d*$', tsType: 'BigNumber' },
+                { regex: '^bytes\\d*$', tsType: 'string' },
             ];
             if (paramKind === ParamKind.Input) {
                 // web3 allows to pass those an non-bignumbers and that's nice
                 // but it always returns stuff as BigNumbers
-                solTypeRegexToTsType.unshift({regex: '^u?int(8|16|32)?$', tsType: 'number|BigNumber'});
+                solTypeRegexToTsType.unshift({
+                    regex: '^u?int(8|16|32)?$',
+                    tsType: 'number|BigNumber',
+                });
             }
             for (const regexAndTxType of solTypeRegexToTsType) {
-                const {regex, tsType} = regexAndTxType;
+                const { regex, tsType } = regexAndTxType;
                 if (solType.match(regex)) {
                     return tsType;
                 }
@@ -41,7 +44,7 @@ export const utils = {
         const name = path.parse(filename).name;
         return name;
     },
-    getNamedContent(filename: string): {name: string; content: string} {
+    getNamedContent(filename: string): { name: string; content: string } {
         const name = utils.getPartialNameFromFileName(filename);
         try {
             const content = fs.readFileSync(filename).toString();