aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract_templates
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2018-11-22 02:47:31 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2018-11-22 02:47:31 +0800
commit921d9d7ed5a549878b3a9130a99b9cbe2ae11903 (patch)
treeee20d3005850619160e7dc985736e47813c4af68 /packages/contract_templates
parentb2e1be5cfe373f7cdafd5bd9a0c3ec1ea1e5f1d5 (diff)
parent68c15de8908b1e8eb8f04d26301fec62ed2af1c1 (diff)
downloaddexon-0x-contracts-921d9d7ed5a549878b3a9130a99b9cbe2ae11903.tar.gz
dexon-0x-contracts-921d9d7ed5a549878b3a9130a99b9cbe2ae11903.tar.zst
dexon-0x-contracts-921d9d7ed5a549878b3a9130a99b9cbe2ae11903.zip
Merge branch 'development' into feature/instant/rollbar-env
Diffstat (limited to 'packages/contract_templates')
-rw-r--r--packages/contract_templates/contract.handlebars3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 9c1952ed4..9b2a2b336 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -4,6 +4,7 @@
import { BaseContract } from '@0x/base-contract';
import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types';
import { BigNumber, classUtils, logUtils } from '@0x/utils';
+import { SimpleContractArtifact } from '@0x/types';
import { Web3Wrapper } from '@0x/web3-wrapper';
import * as ethers from 'ethers';
import * as _ from 'lodash';
@@ -40,7 +41,7 @@ export class {{contractName}}Contract extends BaseContract {
{{/this.constant}}
{{/each}}
public static async deployFrom0xArtifactAsync(
- artifact: ContractArtifact,
+ artifact: ContractArtifact | SimpleContractArtifact,
provider: Provider,
txDefaults: Partial<TxData>,
{{> typed_params inputs=ctor.inputs}}