From f2ced67a8d85e8da8e72b71a2a2756e1b60b256b Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 6 Jun 2018 12:21:12 +0200
Subject: Remove unused imports from contract handlebar template

---
 packages/contract_templates/contract.handlebars | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/contract_templates')

diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 5fb19af11..37adc68fb 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -6,8 +6,8 @@
 // tslint:disable-next-line:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
 import { ContractArtifact } from '@0xproject/sol-compiler';
-import { BlockParam, BlockParamLiteral, CallData, ContractAbi, DataItem, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types';
-import { BigNumber, classUtils, logUtils, promisify } from '@0xproject/utils';
+import { CallData, ContractAbi, DecodedLogArgs, MethodAbi, Provider, TxData } from 'ethereum-types';
+import { BigNumber, classUtils, logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethers from 'ethers';
 import * as _ from 'lodash';
-- 
cgit v1.2.3


From cea81df969160b7c33d52e54c668b0a2908750d7 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 6 Jun 2018 14:49:41 +0200
Subject: Add missing import

---
 packages/contract_templates/contract.handlebars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/contract_templates')

diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 37adc68fb..31dbc15cb 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -6,7 +6,7 @@
 // tslint:disable-next-line:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
 import { ContractArtifact } from '@0xproject/sol-compiler';
-import { CallData, ContractAbi, DecodedLogArgs, MethodAbi, Provider, TxData } from 'ethereum-types';
+import { BlockParam, CallData, ContractAbi, DecodedLogArgs, MethodAbi, Provider, TxData } from 'ethereum-types';
 import { BigNumber, classUtils, logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethers from 'ethers';
-- 
cgit v1.2.3


From 61d9e418e8dcb768537a5d2f124be8c7f65e5cdd Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 4 Jun 2018 17:25:44 -0700
Subject: Fix linter issues in generated contract wrappers

---
 packages/contract_templates/contract.handlebars           | 4 ++--
 packages/contract_templates/partials/callAsync.handlebars | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/contract_templates')

diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 5fb19af11..75654b069 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -2,7 +2,7 @@
  * This file is auto-generated using abi-gen. Don't edit directly.
  * Templates can be found at https://github.com/0xProject/0x-monorepo/tree/development/packages/contract_templates.
  */
-// tslint:disable:no-consecutive-blank-lines ordered-imports
+// tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace
 // tslint:disable-next-line:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
 import { ContractArtifact } from '@0xproject/sol-compiler';
@@ -83,7 +83,7 @@ export class {{contractName}}Contract extends BaseContract {
         return contractInstance;
     }
     constructor(abi: ContractAbi, address: string, provider: Provider, txDefaults?: Partial<TxData>) {
-        super("{{contractName}}", abi, address, provider, txDefaults);
+        super('{{contractName}}', abi, address, provider, txDefaults);
         classUtils.bindAll(this, ['_ethersInterfacesByFunctionSignature', 'address', 'abi', '_web3Wrapper']);
     }
 } // tslint:disable:max-file-line-count
diff --git a/packages/contract_templates/partials/callAsync.handlebars b/packages/contract_templates/partials/callAsync.handlebars
index 99fda80e1..5d14b1823 100644
--- a/packages/contract_templates/partials/callAsync.handlebars
+++ b/packages/contract_templates/partials/callAsync.handlebars
@@ -18,7 +18,7 @@ async callAsync(
             data: encodedData,
         },
         self._web3Wrapper.getContractDefaults(),
-    )
+    );
     const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
     let resultArray = ethersFunction.parse(rawCallResult);
     const outputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).outputs;
-- 
cgit v1.2.3


From a97d77064aacda3de74b04894f110b05298c5ca8 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 6 Jun 2018 15:26:40 -0700
Subject: Get build and tests to pass

---
 packages/contract_templates/contract.handlebars | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'packages/contract_templates')

diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 9e77b711d..431359109 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -3,14 +3,15 @@
  * Templates can be found at https://github.com/0xProject/0x-monorepo/tree/development/packages/contract_templates.
  */
 // tslint:disable:no-consecutive-blank-lines ordered-imports align trailing-comma whitespace
-// tslint:disable-next-line:no-unused-variable
+// tslint:disable:no-unused-variable
 import { BaseContract } from '@0xproject/base-contract';
 import { ContractArtifact } from '@0xproject/sol-compiler';
-import { BlockParam, CallData, ContractAbi, DecodedLogArgs, MethodAbi, Provider, TxData } from 'ethereum-types';
-import { BigNumber, classUtils, logUtils } from '@0xproject/utils';
+import { BlockParam, BlockParamLiteral, CallData, ContractAbi, DataItem, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types';
+import { BigNumber, classUtils, logUtils, promisify } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as ethers from 'ethers';
 import * as _ from 'lodash';
+// tslint:enable:no-unused-variable
 
 {{#if events}}
 export type {{contractName}}ContractEventArgs =
-- 
cgit v1.2.3