diff options
author | Fabio Berger <me@fabioberger.com> | 2018-11-22 05:19:31 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-11-22 05:19:31 +0800 |
commit | 83a043e6397421db0d1d5b8059341b84eeb1e1a7 (patch) | |
tree | b7685c0285283ebce73786a2e8b0ff0996eeb243 /packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts | |
parent | 8175192f60e2c2827f6e7d664fbe8bf2d9ddee9c (diff) | |
parent | f46a49fd13c88dd86c9661d76bace18844642c04 (diff) | |
download | dexon-sol-tools-master.tar dexon-sol-tools-master.tar.gz dexon-sol-tools-master.tar.bz2 dexon-sol-tools-master.tar.lz dexon-sol-tools-master.tar.xz dexon-sol-tools-master.tar.zst dexon-sol-tools-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/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts')
-rw-r--r-- | packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts b/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts index 8ca70e026..27f108ebc 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.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'; @@ -1800,7 +1801,7 @@ export class AssetProxyOwnerContract extends BaseContract { }, }; public static async deployFrom0xArtifactAsync( - artifact: ContractArtifact, + artifact: ContractArtifact | SimpleContractArtifact, provider: Provider, txDefaults: Partial<TxData>, _owners: string[], |