From 4883b8be108ea99162844d82983cbfb54a5cd46b Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 4 Sep 2018 18:37:33 +0100 Subject: remove console log --- packages/website/ts/components/generate_order/generate_order_form.tsx | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx index bb6265170..054b9524f 100644 --- a/packages/website/ts/components/generate_order/generate_order_form.tsx +++ b/packages/website/ts/components/generate_order/generate_order_form.tsx @@ -353,7 +353,6 @@ export class GenerateOrderForm extends React.Component 0) { globalErrMsg = 'Order signing failed. Please refresh and try again'; -- cgit v1.2.3 From 8a683b854150acadf7deee7a3f19119f83136276 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 4 Sep 2018 18:37:41 +0100 Subject: Fix imports --- packages/website/ts/utils/utils.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index eda0e513d..d78dfb1fc 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -1,12 +1,11 @@ import { ContractWrappersError } from '@0xproject/contract-wrappers'; import { assetDataUtils, OrderError } from '@0xproject/order-utils'; import { constants as sharedConstants, Networks } from '@0xproject/react-shared'; -import { ECSignature, ExchangeContractErrs } from '@0xproject/types'; +import { ExchangeContractErrs } from '@0xproject/types'; 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'; -- cgit v1.2.3 From c916dd6ebb069244cbe1da9aeeb643ccc7f47aa0 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 4 Sep 2018 18:39:53 +0100 Subject: Add back order validation logic --- packages/website/ts/blockchain.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index b97d86e99..36c449573 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -369,13 +369,11 @@ export class Blockchain { fillTakerTokenAmount: BigNumber, takerAddress: string, ): Promise { - // 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(); -- cgit v1.2.3 From 1690f59857b14da5eccaaf6f9264b46aaddebe9e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 4 Sep 2018 18:42:50 +0100 Subject: Remove unused imports and console.log --- packages/website/ts/components/fill_order.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'packages/website/ts') diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx index 95f2039b3..4c7fa0356 100644 --- a/packages/website/ts/components/fill_order.tsx +++ b/packages/website/ts/components/fill_order.tsx @@ -1,6 +1,5 @@ -import { assetDataUtils, orderHashUtils, signatureUtils } from '@0xproject/order-utils'; +import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils'; import { colors } from '@0xproject/react-shared'; -import { Order as ZeroExOrder } from '@0xproject/types'; import { BigNumber, logUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as accounting from 'accounting'; @@ -24,7 +23,6 @@ import { portalOrderSchema } from 'ts/schemas/portal_order_schema'; import { validator } from 'ts/schemas/validator'; import { AlertTypes, BlockchainErrs, PortalOrder, Token, TokenByAddress, WebsitePaths } from 'ts/types'; import { analytics } from 'ts/utils/analytics'; -import { constants } from 'ts/utils/constants'; import { errorReporter } from 'ts/utils/error_reporter'; import { orderParser } from 'ts/utils/order_parser'; import { utils } from 'ts/utils/utils'; @@ -485,7 +483,6 @@ export class FillOrder extends React.Component { }); } - console.log(parsedOrder); this.setState({ didOrderValidationRun: true, orderJSON, -- cgit v1.2.3