diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-09-05 02:55:42 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-09-05 02:55:42 +0800 |
commit | a173c5fc38f32a5c965cbd4cc7268294580a35f1 (patch) | |
tree | c4f0b7edf84992ad32d24af75c0de37c02c56772 /packages/website/ts | |
parent | f5237f79716fb9ab5f16a64445fb21ea715d70b8 (diff) | |
parent | 1690f59857b14da5eccaaf6f9264b46aaddebe9e (diff) | |
download | dexon-0x-contracts-a173c5fc38f32a5c965cbd4cc7268294580a35f1.tar dexon-0x-contracts-a173c5fc38f32a5c965cbd4cc7268294580a35f1.tar.gz dexon-0x-contracts-a173c5fc38f32a5c965cbd4cc7268294580a35f1.tar.bz2 dexon-0x-contracts-a173c5fc38f32a5c965cbd4cc7268294580a35f1.tar.lz dexon-0x-contracts-a173c5fc38f32a5c965cbd4cc7268294580a35f1.tar.xz dexon-0x-contracts-a173c5fc38f32a5c965cbd4cc7268294580a35f1.tar.zst dexon-0x-contracts-a173c5fc38f32a5c965cbd4cc7268294580a35f1.zip |
Merge branch 'feature/website/update-portal-v2' of https://github.com/0xProject/0x-monorepo into feature/website/update-portal-v2
Diffstat (limited to 'packages/website/ts')
-rw-r--r-- | packages/website/ts/blockchain.ts | 12 | ||||
-rw-r--r-- | packages/website/ts/components/fill_order.tsx | 1 | ||||
-rw-r--r-- | packages/website/ts/utils/utils.ts | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 711185cb1..a976f915f 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -368,13 +368,11 @@ export class Blockchain { fillTakerTokenAmount: BigNumber, takerAddress: string, ): Promise<void> { - // TODO: add validation here - // we can use OrderValidationUtils here? - // await this._contractWrappers.exchange.validateFillOrderThrowIfInvalidAsync( - // signedOrder, - // fillTakerTokenAmount, - // takerAddress, - // ); + await this._contractWrappers.exchange.validateFillOrderThrowIfInvalidAsync( + signedOrder, + fillTakerTokenAmount, + takerAddress, + ); } public isValidAddress(address: string): boolean { const lowercaseAddress = address.toLowerCase(); diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx index d082b9f70..4c7fa0356 100644 --- a/packages/website/ts/components/fill_order.tsx +++ b/packages/website/ts/components/fill_order.tsx @@ -483,7 +483,6 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> { }); } - console.log(parsedOrder); this.setState({ didOrderValidationRun: true, orderJSON, diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 027810905..d78dfb1fc 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -6,7 +6,6 @@ import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as bowser from 'bowser'; import deepEqual = require('deep-equal'); -import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; import * as moment from 'moment'; import * as numeral from 'numeral'; |