diff options
author | Fred Carlsen <fred@sjelfull.no> | 2018-11-27 23:19:36 +0800 |
---|---|---|
committer | Fred Carlsen <fred@sjelfull.no> | 2018-11-27 23:19:36 +0800 |
commit | 9b0020a884bdb98f9da434878fec171ab533ba7e (patch) | |
tree | ca285eb7dfd2c68f781b8b74d409fb69665a58dc /packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts | |
parent | ec12e46e3f52ebb44338c113cecd073979821fae (diff) | |
parent | fdc4a4e5fa31d8797abf6313f4488147853ed77e (diff) | |
download | dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.gz dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.bz2 dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.lz dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.xz dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.tar.zst dexon-sol-tools-9b0020a884bdb98f9da434878fec171ab533ba7e.zip |
Merge remote-tracking branch 'upstream/development' into website
Diffstat (limited to 'packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts')
-rw-r--r-- | packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts index 80bbc52c7..8a88431b3 100644 --- a/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.ts +++ b/packages/abi-gen-wrappers/src/generated-wrappers/forwarder.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'; @@ -661,7 +662,7 @@ export class ForwarderContract extends BaseContract { }, }; public static async deployFrom0xArtifactAsync( - artifact: ContractArtifact, + artifact: ContractArtifact | SimpleContractArtifact, provider: Provider, txDefaults: Partial<TxData>, _exchange: string, |