diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2018-12-22 09:04:17 +0800 |
---|---|---|
committer | Greg Hysen <greg.hysen@gmail.com> | 2019-01-08 07:50:48 +0800 |
commit | cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9 (patch) | |
tree | fd063745d6e40e21ff7c85a3063ecafb93d98062 /packages | |
parent | b249a50d8f0054328a901525af6316133ed64023 (diff) | |
download | dexon-sol-tools-cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9.tar dexon-sol-tools-cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9.tar.gz dexon-sol-tools-cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9.tar.bz2 dexon-sol-tools-cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9.tar.lz dexon-sol-tools-cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9.tar.xz dexon-sol-tools-cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9.tar.zst dexon-sol-tools-cb1bfa0f9790706bf9ce08aad0bf8fd9e2621ce9.zip |
ran prettier + added changelog entry for contract wrappers
Diffstat (limited to 'packages')
-rw-r--r-- | packages/contract-wrappers/CHANGELOG.json | 10 | ||||
-rw-r--r-- | packages/contract-wrappers/src/contract_wrappers/dutch_auction_wrapper.ts | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 581fbdee1..dadba6190 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -3,6 +3,16 @@ "version": "4.2.0", "changes": [ { + "note": + "Added Dutch Auction wrapper", + "pr": 1465 + } + ] + }, + { + "version": "4.1.4", + "changes": [ + { "note": "Add support for Trust Wallet signature denial error" }, { diff --git a/packages/contract-wrappers/src/contract_wrappers/dutch_auction_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/dutch_auction_wrapper.ts index b7cdff670..bb1e89555 100644 --- a/packages/contract-wrappers/src/contract_wrappers/dutch_auction_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/dutch_auction_wrapper.ts @@ -4,7 +4,7 @@ import { _getDefaultContractAddresses } from '../utils/contract_addresses'; import { DutchAuctionDetails, SignedOrder } from '@0x/types'; import { ContractAbi } from 'ethereum-types'; import { Web3Wrapper } from '@0x/web3-wrapper'; -import { BigNumber, abiUtils } from '@0x/utils'; +import { BigNumber } from '@0x/utils'; import * as _ from 'lodash'; import ethAbi = require('ethereumjs-abi'); import { schemas } from '@0x/json-schemas'; @@ -22,7 +22,6 @@ import { assetDataUtils } from '@0x/order-utils'; export class DutchAuctionWrapper extends ContractWrapper { public abi: ContractAbi = DutchAuction.compilerOutput.abi; public address: string; - private _exchangeAddress: string; private _dutchAuctionContractIfExists?: DutchAuctionContract; /** * Instantiate DutchAuctionWrapper @@ -31,14 +30,11 @@ export class DutchAuctionWrapper extends ContractWrapper { * @param address The address of the Dutch Auction contract. If undefined, will * default to the known address corresponding to the networkId. */ - constructor(web3Wrapper: Web3Wrapper, networkId: number, address?: string, exchangeAddress?: string) { + constructor(web3Wrapper: Web3Wrapper, networkId: number, address?: string) { super(web3Wrapper, networkId); this.address = this.address = _.isUndefined(address) ? _getDefaultContractAddresses(networkId).dutchAuction : address; - this._exchangeAddress = _.isUndefined(exchangeAddress) - ? _getDefaultContractAddresses(networkId).exchange - : exchangeAddress; } /** * Matches the buy and sell orders at an amount given the following: the current block time, the auction |