diff options
author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-11-22 06:14:27 +0800 |
---|---|---|
committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-11-22 06:14:27 +0800 |
commit | 0adc8f5053894de7df85aacb6a8bf8714f989f0a (patch) | |
tree | 24ddf4531ef472739b276711a4b85e9a3017b156 /packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts | |
parent | eca63b1a5815c61901453837f9c2b737fa82eb20 (diff) | |
parent | f46a49fd13c88dd86c9661d76bace18844642c04 (diff) | |
download | dexon-sol-tools-0adc8f5053894de7df85aacb6a8bf8714f989f0a.tar dexon-sol-tools-0adc8f5053894de7df85aacb6a8bf8714f989f0a.tar.gz dexon-sol-tools-0adc8f5053894de7df85aacb6a8bf8714f989f0a.tar.bz2 dexon-sol-tools-0adc8f5053894de7df85aacb6a8bf8714f989f0a.tar.lz dexon-sol-tools-0adc8f5053894de7df85aacb6a8bf8714f989f0a.tar.xz dexon-sol-tools-0adc8f5053894de7df85aacb6a8bf8714f989f0a.tar.zst dexon-sol-tools-0adc8f5053894de7df85aacb6a8bf8714f989f0a.zip |
Merge branch 'development' into feature/header-tweaks
Diffstat (limited to 'packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts')
-rw-r--r-- | packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts index ab207b38e..474472e43 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_proxy.ts @@ -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'; @@ -601,7 +602,7 @@ export class ERC20ProxyContract extends BaseContract { }, }; public static async deployFrom0xArtifactAsync( - artifact: ContractArtifact, + artifact: ContractArtifact | SimpleContractArtifact, provider: Provider, txDefaults: Partial<TxData>, ): Promise<ERC20ProxyContract> { |