diff options
author | Fabio Berger <me@fabioberger.com> | 2018-11-21 23:14:26 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-11-21 23:14:26 +0800 |
commit | 584dc6217d45f53294102a98f6222c5dc6b788c1 (patch) | |
tree | 927f17e68d6baf8ea86a8f2e5a68aaeb6daa08a2 /packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts | |
parent | edf07d9b5b2be0384cf1adb53023845662f9c5e4 (diff) | |
parent | f66b695a470af8bd87fda017384e3059e66b10d8 (diff) | |
download | dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.gz dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.bz2 dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.lz dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.xz dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.zst dexon-sol-tools-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/erc20_token.ts')
-rw-r--r-- | packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts index 8ee563b7e..ab208cbf5 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/erc20_token.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'; @@ -508,7 +509,7 @@ export class ERC20TokenContract extends BaseContract { }, }; public static async deployFrom0xArtifactAsync( - artifact: ContractArtifact, + artifact: ContractArtifact | SimpleContractArtifact, provider: Provider, txDefaults: Partial<TxData>, ): Promise<ERC20TokenContract> { |