aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/website/ts/components/fill_order.tsx10
-rw-r--r--packages/website/ts/components/fill_order_json.tsx2
-rw-r--r--packages/website/ts/components/generate_order/generate_order_form.tsx2
-rw-r--r--packages/website/ts/components/order_json.tsx3
-rw-r--r--packages/website/ts/schemas/metadata_schema.ts3
-rw-r--r--packages/website/ts/types.ts1
-rw-r--r--packages/website/ts/utils/utils.ts2
7 files changed, 3 insertions, 20 deletions
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index ad3d6bf74..d2c36ff0c 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -109,7 +109,6 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
<FillOrderJSON
blockchain={this.props.blockchain}
tokenByAddress={this.props.tokenByAddress}
- networkId={this.props.networkId}
orderJSON={this.state.orderJSON}
onFillOrderJSONChanged={this._onFillOrderJSONChanged.bind(this)}
/>
@@ -136,7 +135,6 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
<FillOrderJSON
blockchain={this.props.blockchain}
tokenByAddress={this.props.tokenByAddress}
- networkId={this.props.networkId}
orderJSON={this.state.orderJSON}
onFillOrderJSONChanged={this._onFillOrderJSONChanged.bind(this)}
/>
@@ -444,12 +442,8 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
const signature = parsedOrder.signedOrder.ecSignature;
const isValidSignature = ZeroEx.isValidSignature(signature.hash, signature, parsedOrder.signedOrder.maker);
- if (this.props.networkId !== parsedOrder.metadata.networkId) {
- orderJSONErrMsg = `This order was made on another Ethereum network
- (id: ${parsedOrder.metadata.networkId}). Connect to this network to fill.`;
- parsedOrder = undefined;
- } else if (exchangeContractAddr !== parsedOrder.signedOrder.exchangeContractAddress) {
- orderJSONErrMsg = 'This order was made using a deprecated 0x Exchange contract.';
+ if (exchangeContractAddr !== parsedOrder.signedOrder.exchangeContractAddress) {
+ orderJSONErrMsg = 'This order was made on another network or using a deprecated Exchange contract';
parsedOrder = undefined;
} else if (orderHash !== signature.hash) {
orderJSONErrMsg = 'Order hash does not match supplied plaintext values';
diff --git a/packages/website/ts/components/fill_order_json.tsx b/packages/website/ts/components/fill_order_json.tsx
index f8e43481a..877b65116 100644
--- a/packages/website/ts/components/fill_order_json.tsx
+++ b/packages/website/ts/components/fill_order_json.tsx
@@ -12,7 +12,6 @@ import { utils } from 'ts/utils/utils';
interface FillOrderJSONProps {
blockchain: Blockchain;
tokenByAddress: TokenByAddress;
- networkId: number;
orderJSON: string;
onFillOrderJSONChanged: (event: any) => void;
}
@@ -43,7 +42,6 @@ export class FillOrderJSON extends React.Component<FillOrderJSONProps, FillOrder
const hintSalt = ZeroEx.generatePseudoRandomSalt();
const feeRecipient = constants.NULL_ADDRESS;
const hintOrder = utils.generateOrder(
- this.props.networkId,
exchangeContract,
hintSideToAssetToken,
hintOrderExpiryTimestamp,
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 c9417f5a4..6fe0fa4f3 100644
--- a/packages/website/ts/components/generate_order/generate_order_form.tsx
+++ b/packages/website/ts/components/generate_order/generate_order_form.tsx
@@ -216,7 +216,6 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
orderMakerFee={this.props.hashData.makerFee}
orderTakerFee={this.props.hashData.takerFee}
orderFeeRecipient={this.props.hashData.feeRecipientAddress}
- networkId={this.props.networkId}
sideToAssetToken={this.props.sideToAssetToken}
tokenByAddress={this.props.tokenByAddress}
/>
@@ -329,7 +328,6 @@ export class GenerateOrderForm extends React.Component<GenerateOrderFormProps, G
try {
const signatureData = await this.props.blockchain.signOrderHashAsync(orderHash);
const order = utils.generateOrder(
- this.props.networkId,
exchangeContractAddr,
this.props.sideToAssetToken,
hashData.orderExpiryTimestamp,
diff --git a/packages/website/ts/components/order_json.tsx b/packages/website/ts/components/order_json.tsx
index 1b6b32a04..a908f2895 100644
--- a/packages/website/ts/components/order_json.tsx
+++ b/packages/website/ts/components/order_json.tsx
@@ -20,7 +20,6 @@ interface OrderJSONProps {
orderMakerFee: BigNumber;
orderTakerFee: BigNumber;
orderFeeRecipient: string;
- networkId: number;
sideToAssetToken: SideToAssetToken;
tokenByAddress: TokenByAddress;
}
@@ -40,7 +39,6 @@ export class OrderJSON extends React.Component<OrderJSONProps, OrderJSONState> {
}
public render() {
const order = utils.generateOrder(
- this.props.networkId,
this.props.exchangeContractIfExists,
this.props.sideToAssetToken,
this.props.orderExpiryTimestamp,
@@ -162,7 +160,6 @@ You can see and fill it here: ${this.state.shareLink}`);
}
private _getOrderUrl() {
const order = utils.generateOrder(
- this.props.networkId,
this.props.exchangeContractIfExists,
this.props.sideToAssetToken,
this.props.orderExpiryTimestamp,
diff --git a/packages/website/ts/schemas/metadata_schema.ts b/packages/website/ts/schemas/metadata_schema.ts
index 272b23fbd..ff3bea13a 100644
--- a/packages/website/ts/schemas/metadata_schema.ts
+++ b/packages/website/ts/schemas/metadata_schema.ts
@@ -3,8 +3,7 @@ export const orderMetadataSchema = {
properties: {
makerToken: { $ref: '/Token' },
takerToken: { $ref: '/Token' },
- networkId: { type: 'number' },
},
- required: ['makerToken', 'takerToken', 'networkId'],
+ required: ['makerToken', 'takerToken'],
type: 'object',
};
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts
index 9281310d1..a628ebec1 100644
--- a/packages/website/ts/types.ts
+++ b/packages/website/ts/types.ts
@@ -76,7 +76,6 @@ export interface SignedOrder {
}
export interface OrderMetadata {
- networkId: number;
makerToken: OrderToken;
takerToken: OrderToken;
}
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 279b2c1b2..eaff5c658 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -59,7 +59,6 @@ export const utils = {
return formattedDate;
},
generateOrder(
- networkId: number,
exchangeContractAddress: string,
sideToAssetToken: SideToAssetToken,
expirationUnixTimestampSec: BigNumber,
@@ -91,7 +90,6 @@ export const utils = {
exchangeContractAddress,
},
metadata: {
- networkId,
makerToken: {
name: makerToken.name,
symbol: makerToken.symbol,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:47:48 +0800