aboutsummaryrefslogtreecommitdiffstats
path: root/packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-11-21 23:14:26 +0800
committerFabio Berger <me@fabioberger.com>2018-11-21 23:14:26 +0800
commit584dc6217d45f53294102a98f6222c5dc6b788c1 (patch)
tree927f17e68d6baf8ea86a8f2e5a68aaeb6daa08a2 /packages/abi-gen-wrappers/src/generated-wrappers/asset_proxy_owner.ts
parentedf07d9b5b2be0384cf1adb53023845662f9c5e4 (diff)
parentf66b695a470af8bd87fda017384e3059e66b10d8 (diff)
downloaddexon-0x-contracts-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.gz
dexon-0x-contracts-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.zst
dexon-0x-contracts-584dc6217d45f53294102a98f6222c5dc6b788c1.zip
Merge branch 'development' of github.com:0xProject/0x-monorepo into development
* 'development' of github.com:0xProject/0x-monorepo: Add additional CHANGELOG to types package Add CHANGELOG entry Fix prettier Fix `SimpleContractArtifact` type Update abi-gen-wrappers Add @0x/types to dependencies of `@0x/abi-gen-wrappers` Allow a `SimpleContractArtifact` to be passed into `deployFrom0xArtifactAsync` Update issue template fix(instant): Use new valid svg image for instant isDisabled -> isInputDisabled Allow user to select other token on success fix: do not use document on import fix(instant): Don't allow changing of assets when order processing fix: npmignore file ignoring index.d.ts fix: specify new location of index.js in package.json feat: fix instant build and add to project references chore: make instant public
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.ts3
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[],