Initial changes for v2 portal

3 files changed, 72 insertions, 41 deletions

diff --git a/packages/website/ts/utils/analytics.ts b/packages/website/ts/utils/analytics.ts
index e5a1ddfa4..62dbff2b9 100644
--- a/packages/website/ts/utils/analytics.ts
+++ b/packages/website/ts/utils/analytics.ts
@@ -1,5 +1,6 @@
+import { assetDataUtils } from '@0xproject/order-utils';
 import * as _ from 'lodash';
-import { ObjectMap, Order } from 'ts/types';
+import { ObjectMap, PortalOrder } from 'ts/types';
 import { utils } from 'ts/utils/utils';
 
 export interface HeapAnalytics {
@@ -53,12 +54,16 @@ export class Analytics {
     }
     // tslint:enable:no-floating-promises
     // Custom methods
-    public trackOrderEvent(eventName: string, order: Order): void {
+    public trackOrderEvent(eventName: string, order: PortalOrder): void {
+        const takerTokenAmount = order.signedOrder.takerAssetAmount.toString();
+        const makerTokenAmount = order.signedOrder.makerAssetAmount.toString();
+        const takerToken = assetDataUtils.decodeERC20AssetData(order.signedOrder.takerAssetData).tokenAddress;
+        const makerToken = assetDataUtils.decodeERC20AssetData(order.signedOrder.makerAssetData).tokenAddress;
         const orderLoggingData = {
-            takerTokenAmount: order.signedOrder.takerTokenAmount,
-            makeTokenAmount: order.signedOrder.makerTokenAmount,
-            takerToken: order.metadata.takerToken.symbol,
-            makerToken: order.metadata.makerToken.symbol,
+            takerTokenAmount,
+            makerTokenAmount,
+            takerToken,
+            makerToken,
         };
         this.track(eventName, orderLoggingData);
     }
diff --git a/packages/website/ts/utils/order_parser.ts b/packages/website/ts/utils/order_parser.ts
index be08da80e..e542bb484 100644
--- a/packages/website/ts/utils/order_parser.ts
+++ b/packages/website/ts/utils/order_parser.ts
@@ -1,12 +1,12 @@
-import { logUtils } from '@0xproject/utils';
+import { BigNumber, logUtils } from '@0xproject/utils';
 import * as _ from 'lodash';
 
 import { portalOrderSchema } from 'ts/schemas/portal_order_schema';
 import { validator } from 'ts/schemas/validator';
-import { Order } from 'ts/types';
+import { PortalOrder } from 'ts/types';
 
 export const orderParser = {
-    parse(queryString: string): Order | undefined {
+    parse(queryString: string): PortalOrder | undefined {
         if (queryString.length === 0) {
             return undefined;
         }
@@ -28,6 +28,33 @@ export const orderParser = {
             logUtils.log(`Invalid shared order: ${validationResult.errors}`);
             return undefined;
         }
-        return order;
+        const result = convertOrderStringFieldsToBigNumber(order);
+        return result;
     },
 };
+
+// TODO: consolidate this function with that in typeConverters in @0xproject/connect
+function convertOrderStringFieldsToBigNumber(order: any): any {
+    return convertStringsFieldsToBigNumbers(order, [
+        'makerAssetAmount',
+        'takerAssetAmount',
+        'makerFee',
+        'takerFee',
+        'expirationTimeSeconds',
+        'salt',
+    ]);
+}
+
+// TODO: consolidate this function with that in typeConverters in @0xproject/connect
+function convertStringsFieldsToBigNumbers(obj: any, fields: string[]): any {
+    const result = _.assign({}, obj);
+    _.each(fields, field => {
+        _.update(result, field, (value: string) => {
+            if (_.isUndefined(value)) {
+                throw new Error(`Could not find field '${field}' while converting string fields to BigNumber.`);
+            }
+            return new BigNumber(value);
+        });
+    });
+    return result;
+}
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 39bbd404c..ab9852d16 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -1,11 +1,12 @@
-import { ContractWrappersError, ExchangeContractErrs } from '@0xproject/contract-wrappers';
-import { OrderError } from '@0xproject/order-utils';
+import { ContractWrappersError } from '@0xproject/contract-wrappers';
+import { assetDataUtils, OrderError, signatureUtils } from '@0xproject/order-utils';
 import { constants as sharedConstants, Networks } from '@0xproject/react-shared';
-import { ECSignature, Provider } from '@0xproject/types';
+import { ECSignature, 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';
@@ -16,7 +17,7 @@ import {
     BrowserType,
     Environments,
     OperatingSystemType,
-    Order,
+    PortalOrder,
     Providers,
     ProviderType,
     ScreenWidths,
@@ -64,35 +65,36 @@ export const utils = {
         return formattedDate;
     },
     generateOrder(
-        exchangeContractAddress: string,
+        exchangeAddress: string,
         sideToAssetToken: SideToAssetToken,
-        expirationUnixTimestampSec: BigNumber,
+        expirationTimeSeconds: BigNumber,
         orderTakerAddress: string,
         orderMakerAddress: string,
         makerFee: BigNumber,
         takerFee: BigNumber,
-        feeRecipient: string,
-        ecSignature: ECSignature,
+        feeRecipientAddress: string,
+        signature: string,
         tokenByAddress: TokenByAddress,
         orderSalt: BigNumber,
-    ): Order {
+    ): PortalOrder {
         const makerToken = tokenByAddress[sideToAssetToken[Side.Deposit].address];
         const takerToken = tokenByAddress[sideToAssetToken[Side.Receive].address];
         const order = {
             signedOrder: {
-                maker: orderMakerAddress,
-                taker: orderTakerAddress,
-                makerFee: makerFee.toString(),
-                takerFee: takerFee.toString(),
-                makerTokenAmount: sideToAssetToken[Side.Deposit].amount.toString(),
-                takerTokenAmount: sideToAssetToken[Side.Receive].amount.toString(),
-                makerTokenAddress: makerToken.address,
-                takerTokenAddress: takerToken.address,
-                expirationUnixTimestampSec: expirationUnixTimestampSec.toString(),
-                feeRecipient,
-                salt: orderSalt.toString(),
-                ecSignature,
-                exchangeContractAddress,
+                senderAddress: constants.NULL_ADDRESS,
+                makerAddress: orderMakerAddress,
+                takerAddress: orderTakerAddress,
+                makerFee,
+                takerFee,
+                makerAssetAmount: sideToAssetToken[Side.Deposit].amount,
+                takerAssetAmount: sideToAssetToken[Side.Receive].amount,
+                makerAssetData: assetDataUtils.encodeERC20AssetData(makerToken.address),
+                takerAssetData: assetDataUtils.encodeERC20AssetData(takerToken.address),
+                expirationTimeSeconds,
+                feeRecipientAddress,
+                salt: orderSalt,
+                signature,
+                exchangeAddress,
             },
             metadata: {
                 makerToken: {
@@ -231,10 +233,10 @@ export const utils = {
         const ContractWrappersErrorToHumanReadableError: { [error: string]: string } = {
             [ContractWrappersError.ExchangeContractDoesNotExist]: 'Exchange contract does not exist',
             [ContractWrappersError.EtherTokenContractDoesNotExist]: 'EtherToken contract does not exist',
-            [ContractWrappersError.TokenTransferProxyContractDoesNotExist]:
-                'TokenTransferProxy contract does not exist',
-            [ContractWrappersError.TokenRegistryContractDoesNotExist]: 'TokenRegistry contract does not exist',
-            [ContractWrappersError.TokenContractDoesNotExist]: 'Token contract does not exist',
+            [ContractWrappersError.ERC20ProxyContractDoesNotExist]: 'ERC20 proxy contract des not exist',
+            [ContractWrappersError.ERC721ProxyContractDoesNotExist]: 'ERC721 proxy contract des not exist',
+            [ContractWrappersError.ERC20TokenContractDoesNotExist]: 'ERC20 token contract does not exist',
+            [ContractWrappersError.ERC721TokenContractDoesNotExist]: 'ERC721 token contract does not exist',
             [ContractWrappersError.ZRXContractDoesNotExist]: 'ZRX contract does not exist',
             [BlockchainCallErrs.UserHasNoAssociatedAddresses]: 'User has no addresses available',
             [OrderError.InvalidSignature]: 'Order signature is not valid',
@@ -247,12 +249,9 @@ export const utils = {
         } = {
             [ExchangeContractErrs.OrderFillExpired]: 'This order has expired',
             [ExchangeContractErrs.OrderCancelExpired]: 'This order has expired',
-            [ExchangeContractErrs.OrderCancelAmountZero]: "Order cancel amount can't be 0",
-            [ExchangeContractErrs.OrderAlreadyCancelledOrFilled]:
-                'This order has already been completely filled or cancelled',
+            [ExchangeContractErrs.OrderCancelled]: 'This order has been cancelled',
             [ExchangeContractErrs.OrderFillAmountZero]: "Order fill amount can't be 0",
-            [ExchangeContractErrs.OrderRemainingFillAmountZero]:
-                'This order has already been completely filled or cancelled',
+            [ExchangeContractErrs.OrderRemainingFillAmountZero]: 'This order has already been completely filled',
             [ExchangeContractErrs.OrderFillRoundingError]:
                 'Rounding error will occur when filling this order. Please try filling a different amount.',
             [ExchangeContractErrs.InsufficientTakerBalance]: