Rename exchangeContract to exchangeContractAddress

packages/website/ts/components/fill_order.tsx

@@ -422,7 +422,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
             const parsedTakerFee = new BigNumber(parsedOrder.taker.feeAmount);
 
             const zeroExOrder: ZeroExOrder = {
-                exchangeContractAddress: parsedOrder.exchangeContract,
+                exchangeContractAddress: parsedOrder.exchangeContractAddress,
                 expirationUnixTimestampSec: expiration,
                 feeRecipient: parsedOrder.feeRecipient,
                 maker: parsedOrder.maker.address,
@@ -443,7 +443,7 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
                 orderJSONErrMsg = `This order was made on another Ethereum network
                                    (id: ${parsedOrder.networkId}). Connect to this network to fill.`;
                 parsedOrder = undefined;
-            } else if (exchangeContractAddr !== parsedOrder.exchangeContract) {
+            } else if (exchangeContractAddr !== parsedOrder.exchangeContractAddress) {
                 orderJSONErrMsg = 'This order was made using a deprecated 0x Exchange contract.';
                 parsedOrder = undefined;
             } else if (orderHash !== signature.hash) {

packages/website/ts/schemas/order_schema.ts

@@ -7,7 +7,7 @@ export const orderSchema = {
         signature: { $ref: '/SignatureData' },
         expirationUnixTimestampSec: { type: 'string' },
         feeRecipient: { type: 'string' },
-        exchangeContract: { type: 'string' },
+        exchangeContractAddress: { type: 'string' },
         networkId: { type: 'number' },
     },
     required: [
@@ -17,7 +17,7 @@ export const orderSchema = {
         'signature',
         'expirationUnixTimestampSec',
         'feeRecipient',
-        'exchangeContract',
+        'exchangeContractAddress',
         'networkId',
     ],
     type: 'object',

packages/website/ts/types.ts

@@ -87,7 +87,7 @@ export interface SerializedOrder {
     feeRecipient: string;
     salt: string;
     signature: SignatureData;
-    exchangeContract: string;
+    exchangeContractAddress: string;
     networkId: number;
 }
 

packages/website/ts/utils/utils.ts

@@ -60,9 +60,9 @@ export const utils = {
     },
     generateOrder(
         networkId: number,
-        exchangeContract: string,
+        exchangeContractAddress: string,
         sideToAssetToken: SideToAssetToken,
-        orderExpiryTimestamp: BigNumber,
+        expirationUnixTimestampSec: BigNumber,
         orderTakerAddress: string,
         orderMakerAddress: string,
         makerFee: BigNumber,
@@ -97,11 +97,11 @@ export const utils = {
                 amount: sideToAssetToken[Side.Receive].amount.toString(),
                 feeAmount: takerFee.toString(),
             },
-            expirationUnixTimestampSec: orderExpiryTimestamp.toString(),
+            expirationUnixTimestampSec: expirationUnixTimestampSec.toString(),
             feeRecipient,
             salt: orderSalt.toString(),
             signature: signatureData,
-            exchangeContract,
+            exchangeContractAddress,
             networkId,
         };
         return order;