aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract_templates
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-11-22 05:19:31 +0800
committerFabio Berger <me@fabioberger.com>2018-11-22 05:19:31 +0800
commit83a043e6397421db0d1d5b8059341b84eeb1e1a7 (patch)
treeb7685c0285283ebce73786a2e8b0ff0996eeb243 /packages/contract_templates
parent8175192f60e2c2827f6e7d664fbe8bf2d9ddee9c (diff)
parentf46a49fd13c88dd86c9661d76bace18844642c04 (diff)
downloaddexon-0x-contracts-master.tar.gz
dexon-0x-contracts-master.tar.zst
dexon-0x-contracts-master.zip
Merge branch 'development'master
* development: (81 commits) Publish Updated CHANGELOGS print out error message and stack immediately return the patch incremented version if no changelog entries exist Put python package above TS/JS packages Reduce title size reduce text side in README Improve top-level README Fix prettier remove unused flag Add CHANGELOG entry Fix additional comments Improve comments Add migrations, contract-addresses and contract-artifacts to Developers home Create migrations doc reference page Add additional CHANGELOG to types package Add CHANGELOG entry Fix prettier Fix `SimpleContractArtifact` type Update abi-gen-wrappers ...
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}}