Merge pull request #304 from joincivil/ritave/feature/abi-gen-constructor

Added constructor ABIs to abi-gen

4 files changed, 18 insertions, 1 deletions

diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md
index 346bba4bf..0afd6abd4 100644
--- a/packages/abi-gen/CHANGELOG.md
+++ b/packages/abi-gen/CHANGELOG.md
@@ -4,3 +4,4 @@ v0.x.x - _TBD, 2018_
 ------------------------
 * Fixed array typings with union types (#295)
 * Add event ABIs to context data passed to templates (#302)
+* Add constructor ABIs to context data passed to templates (#304)
\ No newline at end of file
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index db429d9a9..fbf3db687 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -43,6 +43,6 @@
     "shx": "^0.2.2",
     "tslint": "5.8.0",
     "typescript": "~2.6.1",
-    "web3-typescript-typings": "^0.7.2"
+    "web3-typescript-typings": "^0.9.0"
   }
 }
diff --git a/packages/abi-gen/src/index.ts b/packages/abi-gen/src/index.ts
index ed71087b2..527af32b1 100644
--- a/packages/abi-gen/src/index.ts
+++ b/packages/abi-gen/src/index.ts
@@ -14,6 +14,7 @@ import * as Web3 from 'web3';
 import { ContextData, ParamKind } from './types';
 import { utils } from './utils';
 
+const ABI_TYPE_CONSTRUCTOR = 'constructor';
 const ABI_TYPE_METHOD = 'function';
 const ABI_TYPE_EVENT = 'event';
 const MAIN_TEMPLATE_NAME = 'contract.mustache';
@@ -75,6 +76,11 @@ for (const abiFileName of abiFileNames) {
         process.exit(1);
     }
 
+    let ctor = ABI.find((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_CONSTRUCTOR) as Web3.ConstructorAbi;
+    if (_.isUndefined(ctor)) {
+        ctor = utils.getEmptyConstructor(); // The constructor exists, but it's implicit in JSON's ABI definition
+    }
+
     const methodAbis = ABI.filter((abi: Web3.AbiDefinition) => abi.type === ABI_TYPE_METHOD) as Web3.MethodAbi[];
     const methodsData = _.map(methodAbis, methodAbi => {
         _.map(methodAbi.inputs, input => {
@@ -95,6 +101,7 @@ for (const abiFileName of abiFileNames) {
 
     const contextData = {
         contractName: namedContent.name,
+        ctor,
         methods: methodsData,
         events: eventAbis,
     };
diff --git a/packages/abi-gen/src/utils.ts b/packages/abi-gen/src/utils.ts
index 764daa142..524c54a5e 100644
--- a/packages/abi-gen/src/utils.ts
+++ b/packages/abi-gen/src/utils.ts
@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import * as _ from 'lodash';
 import * as path from 'path';
+import * as Web3 from 'web3';
 
 import { ParamKind } from './types';
 
@@ -56,4 +57,12 @@ export const utils = {
             throw new Error(`Failed to read ${filename}: ${err}`);
         }
     },
+    getEmptyConstructor(): Web3.ConstructorAbi {
+        return {
+            type: 'constructor',
+            stateMutability: 'nonpayable',
+            payable: false,
+            inputs: [],
+        };
+    },
 };